Skip to content
Snippets Groups Projects
Commit 772aac5e authored by Florent Berthaut's avatar Florent Berthaut
Browse files

Fixed network

parent 00d851a4
No related branches found
No related tags found
No related merge requests found
...@@ -245,10 +245,7 @@ func _process(delta) : ...@@ -245,10 +245,7 @@ func _process(delta) :
_osc_output_address = peer["address"] _osc_output_address = peer["address"]
_osc_output_port = peer["port"] _osc_output_port = peer["port"]
_osc_to_pd.set_output(_osc_output_address, _osc_output_port) _osc_to_pd.set_output(_osc_output_address, _osc_output_port)
var local_addr = "127.0.0.1" var local_addr = _osc_to_pd.get_local_address()
for addr in IP.get_local_addresses() :
if not ":" in addr and addr!="127.0.0.1":
local_addr = addr
_osc_to_pd.send_msg("/ivmi/hello_from_gd","sf",[local_addr, _input_port]) _osc_to_pd.send_msg("/ivmi/hello_from_gd","sf",[local_addr, _input_port])
PdMode.LIBPD : #libpd mode PdMode.LIBPD : #libpd mode
......
...@@ -44,10 +44,19 @@ func has_msg() : ...@@ -44,10 +44,19 @@ func has_msg() :
func get_msg() : func get_msg() :
return _unpack_osc(_socket.get_packet()) return _unpack_osc(_socket.get_packet())
func get_last_peer() : func get_last_peer() :
return {"address":_socket.get_packet_ip(), "port":_socket.get_packet_port()} return {"address":_socket.get_packet_ip(), "port":_socket.get_packet_port()}
func get_local_address() -> String :
var address : String = "127.0.0.1"
var addrs = IP.get_local_addresses()
for a in addrs :
if a!="127.0.0.1" and not a.contains(":") and not a.begins_with("169.") :
address=a
return address
func _make_osc_string(s,buff) : func _make_osc_string(s,buff) :
buff.put_data(s.to_ascii_buffer()) buff.put_data(s.to_ascii_buffer())
buff.put_u8(0) buff.put_u8(0)
......
...@@ -31,11 +31,10 @@ func start() : ...@@ -31,11 +31,10 @@ func start() :
_osc_discov.set_input_port(mcprt) _osc_discov.set_input_port(mcprt)
_osc_discov.set_multicast(mcadd) _osc_discov.set_multicast(mcadd)
print(_osc_discov.get_local_address())
#retrieve local address #retrieve local address
_local_addr = "127.0.0.1" _local_addr = _osc_discov.get_local_address()
for addr in IP.get_local_addresses() :
if addr!="127.0.0.1" and not ":" in addr :
_local_addr = addr
func _process(delta) : func _process(delta) :
#when server send ping to multicast #when server send ping to multicast
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment