Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

enet NAT punchthrough test improvement, seems to work fine for my test setup

Browse Source
This commit is contained in:
erwin coumans
2013-05-04 21:28:51 -07:00
parent c0a1ad8fcd
commit 818a78efe3
2 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
test/enet/client/main.cpp
View File

@@ -52,7 +52,7 @@ int main(int argc, char* argv[])
ENetPeer* natpeer=0; ENetPeer* natpeer=0;
/* Connect to some.server.net:1234. */ /* Connect to some.server.net:1234. */
enet_address_set_host (& dedicatedserveraddress, "localhost"); enet_address_set_host (& dedicatedserveraddress, "bulletphysics.org");//localhost");
dedicatedserveraddress.port = 1234; dedicatedserveraddress.port = 1234;
/* Initiate the connection, allocating the two channels 0 and 1. */ /* Initiate the connection, allocating the two channels 0 and 1. */
dedicatedpeer = enet_host_connect (client, & dedicatedserveraddress, 2, 0); dedicatedpeer = enet_host_connect (client, & dedicatedserveraddress, 2, 0);
@@ -65,29 +65,33 @@ int main(int argc, char* argv[])
if (enet_host_service (client, & event, 5000) > 0 && if (enet_host_service (client, & event, 5000) > 0 &&
event.type == ENET_EVENT_TYPE_CONNECT) event.type == ENET_EVENT_TYPE_CONNECT)
{ {
puts ("Connection to some.server.net:1234 succeeded."); char servername[1024];
enet_address_get_host(&dedicatedserveraddress,servername, 1024);
#if 0 char serverinfo[1024];
/* Create a reliable packet of size 7 containing "packet\0" */
ENetPacket * packet = enet_packet_create ("packet",
strlen ("packet") + 1,
ENET_PACKET_FLAG_RELIABLE);
/* Extend the packet so and append the string "foo", so it now */
/* contains "packetfoo\0" */
enet_packet_resize (packet, strlen ("packetfoo") + 1);
strcpy ((char*)& packet -> data [strlen ("packet")], "foo");
/* Send the packet to the peer over channel id 0. */
/* One could also broadcast the packet by */
/* enet_host_broadcast (host, 0, packet); */
enet_peer_send (dedicatedpeer, 0, packet);
#endif
sprintf(serverinfo,"Connection to %s:%d succeeded", servername,dedicatedserveraddress.port);
puts (serverinfo);
/////.... /////....
/* Wait up to 1000 milliseconds for an event. */ /* Wait up to 1000 milliseconds for an event. */
while (enet_host_service (client, & event, 1000000000) > 0) while (enet_host_service (client, & event, 1000000000) > 0)
{ {
if (natpeer)
{
/* Create a reliable packet of size 7 containing "packet\0" */
ENetPacket * packet = enet_packet_create ("packet",
strlen ("packet") + 1,
ENET_PACKET_FLAG_RELIABLE);
/* Extend the packet so and append the string "foo", so it now */
/* contains "packetfoo\0" */
enet_packet_resize (packet, strlen ("packetfoo") + 1);
strcpy ((char*)& packet -> data [strlen ("packet")], "foo");
/* Send the packet to the peer over channel id 0. */
/* One could also broadcast the packet by */
/* enet_host_broadcast (host, 0, packet); */
enet_peer_send (natpeer, 0, packet);
}
switch (event.type) switch (event.type)
{ {
case ENET_EVENT_TYPE_CONNECT: case ENET_EVENT_TYPE_CONNECT:

6
test/enet/server/main.cpp
View File

@@ -47,8 +47,10 @@ int main(int argc, char* argv[])
switch (event.type) switch (event.type)
{ {
case ENET_EVENT_TYPE_CONNECT: case ENET_EVENT_TYPE_CONNECT:
printf ("A new client connected from %x:%u.\n", char clientname[1024];
event.peer -> address.host, enet_address_get_host(&event.peer -> address,clientname, 1024);
printf ("A new client connected from %s:%u.\n",
clientname,
event.peer -> address.port); event.peer -> address.port);
/* Store any relevant client information here. */ /* Store any relevant client information here. */
event.peer -> data = "Client information"; event.peer -> data = "Client information";