Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
beb87504
Commit
beb87504
authored
Feb 25, 2020
by
Fabio Alessandrelli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove WebSocket defaults from project settings.
Can be manually set, let's not pollute them further. Should also be done for WebRTC.
parent
092b2bd3
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
35 deletions
+14
-35
emws_client.cpp
modules/websocket/emws_client.cpp
+3
-2
register_types.cpp
modules/websocket/register_types.cpp
+0
-16
websocket_macros.h
modules/websocket/websocket_macros.h
+3
-9
wsl_client.cpp
modules/websocket/wsl_client.cpp
+4
-4
wsl_server.cpp
modules/websocket/wsl_server.cpp
+4
-4
No files found.
modules/websocket/emws_client.cpp
View file @
beb87504
...
...
@@ -231,8 +231,9 @@ Error EMWSClient::set_buffers(int p_in_buffer, int p_in_packets, int p_out_buffe
}
EMWSClient
::
EMWSClient
()
{
_in_buf_size
=
nearest_shift
((
int
)
GLOBAL_GET
(
WSC_IN_BUF
)
-
1
)
+
10
;
_in_pkt_size
=
nearest_shift
((
int
)
GLOBAL_GET
(
WSC_IN_PKT
)
-
1
);
_in_buf_size
=
DEF_BUF_SHIFT
;
_in_pkt_size
=
DEF_PKT_SHIFT
;
_is_connecting
=
false
;
_peer
=
Ref
<
EMWSPeer
>
(
memnew
(
EMWSPeer
));
/* clang-format off */
...
...
modules/websocket/register_types.cpp
View file @
beb87504
...
...
@@ -42,22 +42,6 @@
#endif
void
register_websocket_types
()
{
#define _SET_HINT(NAME, _VAL_, _MAX_) \
GLOBAL_DEF(NAME, _VAL_); \
ProjectSettings::get_singleton()->set_custom_property_info(NAME, PropertyInfo(Variant::INT, NAME, PROPERTY_HINT_RANGE, "2," #_MAX_ ",1,or_greater"));
// Client buffers project settings
_SET_HINT
(
WSC_IN_BUF
,
64
,
4096
);
_SET_HINT
(
WSC_IN_PKT
,
1024
,
16384
);
_SET_HINT
(
WSC_OUT_BUF
,
64
,
4096
);
_SET_HINT
(
WSC_OUT_PKT
,
1024
,
16384
);
// Server buffers project settings
_SET_HINT
(
WSS_IN_BUF
,
64
,
4096
);
_SET_HINT
(
WSS_IN_PKT
,
1024
,
16384
);
_SET_HINT
(
WSS_OUT_BUF
,
64
,
4096
);
_SET_HINT
(
WSS_OUT_PKT
,
1024
,
16384
);
#ifdef JAVASCRIPT_ENABLED
EMWSPeer
::
make_default
();
EMWSClient
::
make_default
();
...
...
modules/websocket/websocket_macros.h
View file @
beb87504
...
...
@@ -31,15 +31,9 @@
#ifndef WEBSOCKETMACTOS_H
#define WEBSOCKETMACTOS_H
#define WSC_IN_BUF "network/limits/websocket_client/max_in_buffer_kb"
#define WSC_IN_PKT "network/limits/websocket_client/max_in_packets"
#define WSC_OUT_BUF "network/limits/websocket_client/max_out_buffer_kb"
#define WSC_OUT_PKT "network/limits/websocket_client/max_out_packets"
#define WSS_IN_BUF "network/limits/websocket_server/max_in_buffer_kb"
#define WSS_IN_PKT "network/limits/websocket_server/max_in_packets"
#define WSS_OUT_BUF "network/limits/websocket_server/max_out_buffer_kb"
#define WSS_OUT_PKT "network/limits/websocket_server/max_out_packets"
// Defaults per peer buffers, 1024 packets with a shared 65536 bytes payload.
#define DEF_PKT_SHIFT 10
#define DEF_BUF_SHIFT 16
/* clang-format off */
#define GDCICLASS(CNAME) \
...
...
modules/websocket/wsl_client.cpp
View file @
beb87504
...
...
@@ -336,10 +336,10 @@ Error WSLClient::set_buffers(int p_in_buffer, int p_in_packets, int p_out_buffer
}
WSLClient
::
WSLClient
()
{
_in_buf_size
=
nearest_shift
((
int
)
GLOBAL_GET
(
WSC_IN_BUF
)
-
1
)
+
10
;
_in_pkt_size
=
nearest_shift
((
int
)
GLOBAL_GET
(
WSC_IN_PKT
)
-
1
)
;
_out_buf_size
=
nearest_shift
((
int
)
GLOBAL_GET
(
WSC_OUT_BUF
)
-
1
)
+
10
;
_out_pkt_size
=
nearest_shift
((
int
)
GLOBAL_GET
(
WSC_OUT_PKT
)
-
1
)
;
_in_buf_size
=
DEF_BUF_SHIFT
;
_in_pkt_size
=
DEF_PKT_SHIFT
;
_out_buf_size
=
DEF_BUF_SHIFT
;
_out_pkt_size
=
DEF_PKT_SHIFT
;
_peer
.
instance
();
_tcp
.
instance
();
...
...
modules/websocket/wsl_server.cpp
View file @
beb87504
...
...
@@ -298,10 +298,10 @@ Error WSLServer::set_buffers(int p_in_buffer, int p_in_packets, int p_out_buffer
}
WSLServer
::
WSLServer
()
{
_in_buf_size
=
nearest_shift
((
int
)
GLOBAL_GET
(
WSS_IN_BUF
)
-
1
)
+
10
;
_in_pkt_size
=
nearest_shift
((
int
)
GLOBAL_GET
(
WSS_IN_PKT
)
-
1
)
;
_out_buf_size
=
nearest_shift
((
int
)
GLOBAL_GET
(
WSS_OUT_BUF
)
-
1
)
+
10
;
_out_pkt_size
=
nearest_shift
((
int
)
GLOBAL_GET
(
WSS_OUT_PKT
)
-
1
)
;
_in_buf_size
=
DEF_BUF_SHIFT
;
_in_pkt_size
=
DEF_PKT_SHIFT
;
_out_buf_size
=
DEF_BUF_SHIFT
;
_out_pkt_size
=
DEF_PKT_SHIFT
;
_server
.
instance
();
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment