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
6e7f0190
Commit
6e7f0190
authored
Aug 27, 2017
by
Rémi Verschelde
Committed by
GitHub
Aug 27, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #10579 from quinnyo/rpc-sender-id
Method to get ID of RPC calling peer
parents
612099e3
7c802837
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
0 deletions
+12
-0
scene_tree.cpp
scene/main/scene_tree.cpp
+9
-0
scene_tree.h
scene/main/scene_tree.h
+3
-0
No files found.
scene/main/scene_tree.cpp
View file @
6e7f0190
...
...
@@ -1708,6 +1708,11 @@ Vector<int> SceneTree::get_network_connected_peers() const {
return
ret
;
}
int
SceneTree
::
get_rpc_sender_id
()
const
{
return
rpc_sender_id
;
}
void
SceneTree
::
set_refuse_new_network_connections
(
bool
p_refuse
)
{
ERR_FAIL_COND
(
!
network_peer
.
is_valid
());
network_peer
->
set_refuse_new_connections
(
p_refuse
);
...
...
@@ -2102,7 +2107,9 @@ void SceneTree::_network_poll() {
ERR_PRINT
(
"Error getting packet!"
);
}
rpc_sender_id
=
sender
;
_network_process_packet
(
sender
,
packet
,
len
);
rpc_sender_id
=
0
;
if
(
!
network_peer
.
is_valid
())
{
break
;
//it's also possible that a packet or RPC caused a disconnection, so also check here
...
...
@@ -2182,6 +2189,7 @@ void SceneTree::_bind_methods() {
ClassDB
::
bind_method
(
D_METHOD
(
"has_network_peer"
),
&
SceneTree
::
has_network_peer
);
ClassDB
::
bind_method
(
D_METHOD
(
"get_network_connected_peers"
),
&
SceneTree
::
get_network_connected_peers
);
ClassDB
::
bind_method
(
D_METHOD
(
"get_network_unique_id"
),
&
SceneTree
::
get_network_unique_id
);
ClassDB
::
bind_method
(
D_METHOD
(
"get_rpc_sender_id"
),
&
SceneTree
::
get_rpc_sender_id
);
ClassDB
::
bind_method
(
D_METHOD
(
"set_refuse_new_network_connections"
,
"refuse"
),
&
SceneTree
::
set_refuse_new_network_connections
);
ClassDB
::
bind_method
(
D_METHOD
(
"is_refusing_new_network_connections"
),
&
SceneTree
::
is_refusing_new_network_connections
);
ClassDB
::
bind_method
(
D_METHOD
(
"_network_peer_connected"
),
&
SceneTree
::
_network_peer_connected
);
...
...
@@ -2266,6 +2274,7 @@ SceneTree::SceneTree() {
call_lock
=
0
;
root_lock
=
0
;
node_count
=
0
;
rpc_sender_id
=
0
;
//create with mainloop
...
...
scene/main/scene_tree.h
View file @
6e7f0190
...
...
@@ -199,6 +199,8 @@ private:
void
_connection_failed
();
void
_server_disconnected
();
int
rpc_sender_id
;
//path sent caches
struct
PathSentCache
{
Map
<
int
,
bool
>
confirmed_peers
;
...
...
@@ -445,6 +447,7 @@ public:
bool
has_network_peer
()
const
;
int
get_network_unique_id
()
const
;
Vector
<
int
>
get_network_connected_peers
()
const
;
int
get_rpc_sender_id
()
const
;
void
set_refuse_new_network_connections
(
bool
p_refuse
);
bool
is_refusing_new_network_connections
()
const
;
...
...
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