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

Code-style consistency improvement:

Browse Source 
Apply clang-format-all.sh using the _clang-format file through all the cpp/.h files.
make sure not to apply it to certain serialization structures, since some parser expects the * as part of the name, instead of type.
This commit contains no other changes aside from adding and applying clang-format-all.sh
This commit is contained in:
erwincoumans
2018-09-23 14:17:31 -07:00
parent b73b05e9fb
commit ab8f16961e
1773 changed files with 1081087 additions and 474249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
test/enet/chat/client/main.cpp
View File

@@ -4,8 +4,8 @@
#include <string.h>
#include <enet/enet.h>
int main(int argc, char* argv[]) {
int main(int argc, char *argv[])
{
ENetHost *client;
ENetAddress address;
ENetPeer *peer;
@@ -15,42 +15,41 @@ int main(int argc, char* argv[]) {
puts("Starting client");
if (enet_initialize() != 0) {
if (enet_initialize() != 0)
{
fprintf(stderr, "Error initialising enet");
exit(EXIT_FAILURE);
}
client = enet_host_create(NULL, /* create a client host */
1, /* number of clients */
2, /* number of channels */
57600 / 8, /* incoming bandwith */
14400 / 8); /* outgoing bandwith */
client = enet_host_create(NULL, /* create a client host */
1, /* number of clients */
2, /* number of channels */
57600 / 8, /* incoming bandwith */
14400 / 8); /* outgoing bandwith */
if (client == NULL) {
if (client == NULL)
{
fprintf(stderr, "Could not create client host");
exit(EXIT_FAILURE);
}
enet_address_set_host(&address, "localhost");
address.port = 1234;
peer = enet_host_connect(client,
&address, /* address to connect to */
2, /* number of channels */
0); /* user data supplied to
&address, /* address to connect to */
2, /* number of channels */
0); /* user data supplied to
the receiving host */
if (peer == NULL) {
fprintf(stderr, "No available peers for initiating an ENet "
"connection.\n");
if (peer == NULL)
{
fprintf(stderr,
"No available peers for initiating an ENet "
"connection.\n");
exit(EXIT_FAILURE);
}
/* Try to connect to server within 5 seconds */
if (enet_host_service(client, &event, 5000) > 0 &&
event.type == ENET_EVENT_TYPE_CONNECT)
@@ -81,32 +80,33 @@ int main(int argc, char* argv[]) {
{
switch (event.type)
{
case ENET_EVENT_TYPE_CONNECT:
printf("A new client connected from %x:%u.\n",
event.peer->address.host,
event.peer->address.port);
case ENET_EVENT_TYPE_CONNECT:
printf("A new client connected from %x:%u.\n",
event.peer->address.host,
event.peer->address.port);
event.peer->data = (void*)"New User";
break;
event.peer->data = (void *)"New User";
break;
case ENET_EVENT_TYPE_RECEIVE:
printf("A packet of length %u containing '%s' was "
"received from %s on channel %u.\n",
event.packet->dataLength,
event.packet->data,
event.peer->data,
event.channelID);
case ENET_EVENT_TYPE_RECEIVE:
printf(
"A packet of length %u containing '%s' was "
"received from %s on channel %u.\n",
event.packet->dataLength,
event.packet->data,
event.peer->data,
event.channelID);
/* Clean up the packet now that we're done using it.
/* Clean up the packet now that we're done using it.
> */
enet_packet_destroy(event.packet);
enet_packet_destroy(event.packet);
break;
break;
case ENET_EVENT_TYPE_DISCONNECT:
printf("%s disconnected.\n", event.peer->data);
case ENET_EVENT_TYPE_DISCONNECT:
printf("%s disconnected.\n", event.peer->data);
break;
break;
}
}
else if (serviceResult > 0)
@@ -114,29 +114,25 @@ int main(int argc, char* argv[]) {
puts("Error with servicing the client");
exit(EXIT_FAILURE);
}
}
printf("Say> ");
#ifdef _WIN32
gets_s(message, 1024);
#else
fgets(message,1024,stdin);
fgets(message, 1024, stdin);
#endif
if (strcmp(message, "exit") == 0 ||
strcmp(message, "quit") == 0) {
strcmp(message, "quit") == 0)
{
break;
}
if (strlen(message) > 0) {
ENetPacket *packet = enet_packet_create(message, strlen
(message) + 1, ENET_PACKET_FLAG_RELIABLE);
if (strlen(message) > 0)
{
ENetPacket *packet = enet_packet_create(message, strlen(message) + 1, ENET_PACKET_FLAG_RELIABLE);
enet_peer_send(peer, 0, packet);
}
}
enet_peer_disconnect(peer, 0);
@@ -145,24 +141,20 @@ int main(int argc, char* argv[]) {
/* and drop any packets received packets */
while (enet_host_service(client, &event, 3000) > 0)
{
switch (event.type)
{
case ENET_EVENT_TYPE_RECEIVE:
enet_packet_destroy(event.packet);
break;
case ENET_EVENT_TYPE_RECEIVE:
enet_packet_destroy(event.packet);
break;
case ENET_EVENT_TYPE_DISCONNECT:
puts("Disconnection succeeded.");
break;
case ENET_EVENT_TYPE_DISCONNECT:
puts("Disconnection succeeded.");
break;
}
}
enet_host_destroy(client);
enet_deinitialize();
return 0;
}

62
test/enet/chat/server/main.cpp
View File

@@ -17,7 +17,6 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
/* Bind the server to the default localhost. */
/* A specific host address can be specified by */
/* enet_address_set_host (& address, "x.x.x.x"); */
@@ -26,10 +25,10 @@ int main(int argc, char *argv[])
address.port = 1234;
server = enet_host_create(&address,
32, /* number of clients */
2, /* number of channels */
0, /* Any incoming bandwith */
0); /* Any outgoing bandwith */
32, /* number of clients */
2, /* number of channels */
0, /* Any incoming bandwith */
0); /* Any outgoing bandwith */
if (server == NULL)
{
@@ -37,7 +36,6 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
while (true)
{
serviceResult = 1;
@@ -50,42 +48,42 @@ int main(int argc, char *argv[])
if (serviceResult > 0)
{
switch (event.type)
{
case ENET_EVENT_TYPE_CONNECT:
printf("A new client connected from %x:%u.\n",
event.peer->address.host,
event.peer->address.port);
case ENET_EVENT_TYPE_CONNECT:
printf("A new client connected from %x:%u.\n",
event.peer->address.host,
event.peer->address.port);
/* Store any relevant client information here. */
event.peer->data = (void*)"Client information";
/* Store any relevant client information here. */
event.peer->data = (void *)"Client information";
break;
break;
case ENET_EVENT_TYPE_RECEIVE:
printf("A packet of length %lu containing '%s' was "
"received from %s on channel %u.\n",
event.packet->dataLength,
event.packet->data,
event.peer->data,
event.channelID);
case ENET_EVENT_TYPE_RECEIVE:
printf(
"A packet of length %lu containing '%s' was "
"received from %s on channel %u.\n",
event.packet->dataLength,
event.packet->data,
event.peer->data,
event.channelID);
/* Tell all clients about this message */
enet_host_broadcast(server, 0, event.packet);
/* Tell all clients about this message */
enet_host_broadcast(server, 0, event.packet);
break;
break;
case ENET_EVENT_TYPE_DISCONNECT:
printf("%s disconnected.\n", event.peer->data);
case ENET_EVENT_TYPE_DISCONNECT:
printf("%s disconnected.\n", event.peer->data);
/* Reset the peer's client information. */
/* Reset the peer's client information. */
event.peer->data = NULL;
event.peer->data = NULL;
break;
case ENET_EVENT_TYPE_NONE:
break;
break;
case ENET_EVENT_TYPE_NONE:
break;
}
}
else if (serviceResult > 0)
@@ -94,12 +92,10 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
}
}
enet_host_destroy(server);
enet_deinitialize();
return 0;
}

192
test/enet/nat_punchthrough/client/main.cpp
View File

@@ -1,38 +1,33 @@
#include <stdio.h>
#include <enet/enet.h>
#include <string.h>
int main(int argc, char* argv[])
{
printf("starting client (and server)\n");
if (enet_initialize () != 0)
{
fprintf (stderr, "An error occurred while initializing ENet.\n");
return EXIT_FAILURE;
}
atexit (enet_deinitialize);
if (enet_initialize() != 0)
{
fprintf(stderr, "An error occurred while initializing ENet.\n");
return EXIT_FAILURE;
}
atexit(enet_deinitialize);
ENetAddress selfaddress;
selfaddress.host = ENET_HOST_ANY;
/* Bind the server to port 1111. */
selfaddress.port = 1111;
ENetHost * client=0;
ENetHost* client = 0;
while (!client)
{
client = enet_host_create (&selfaddress/* create a client host */,
32 /* only 32 connections */,
2 /* allow up 2 channels to be used, 0 and 1 */,
0/*57600 / 8 56K modem with 56 Kbps downstream bandwidth */,
0 /* 14400 / 8 56K modem with 14 Kbps upstream bandwidth */);
client = enet_host_create(&selfaddress /* create a client host */,
32 /* only 32 connections */,
2 /* allow up 2 channels to be used, 0 and 1 */,
0 /*57600 / 8 56K modem with 56 Kbps downstream bandwidth */,
0 /* 14400 / 8 56K modem with 14 Kbps upstream bandwidth */);
if (client == NULL)
{
selfaddress.port++;
@@ -40,140 +35,121 @@ int main(int argc, char* argv[])
}
if (client == NULL)
{
fprintf (stderr,
"An error occurred while trying to create an ENet client host.\n");
exit (EXIT_FAILURE);
fprintf(stderr,
"An error occurred while trying to create an ENet client host.\n");
exit(EXIT_FAILURE);
}
ENetAddress dedicatedserveraddress;
ENetEvent event;
ENetPeer* dedicatedpeer=0;
ENetPeer* natpeer=0;
ENetPeer* dedicatedpeer = 0;
ENetPeer* natpeer = 0;
/* Connect to some.server.net:1234. */
enet_address_set_host (& dedicatedserveraddress, "localhost");
enet_address_set_host(&dedicatedserveraddress, "localhost");
dedicatedserveraddress.port = 1234;
/* 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);
if (dedicatedpeer == NULL)
{
fprintf (stderr, "No available peers for initiating an ENet connection.\n");
exit (EXIT_FAILURE);
fprintf(stderr, "No available peers for initiating an ENet connection.\n");
exit(EXIT_FAILURE);
}
/* Wait up to 5 seconds for the connection attempt to succeed. */
if (enet_host_service (client, & event, 5000) > 0 &&
if (enet_host_service(client, &event, 5000) > 0 &&
event.type == ENET_EVENT_TYPE_CONNECT)
{
char servername[1024];
enet_address_get_host(&dedicatedserveraddress,servername, 1024);
enet_address_get_host(&dedicatedserveraddress, servername, 1024);
char serverinfo[1024];
sprintf(serverinfo,"Connection to %s:%d succeeded", servername,dedicatedserveraddress.port);
puts (serverinfo);
sprintf(serverinfo, "Connection to %s:%d succeeded", servername, dedicatedserveraddress.port);
puts(serverinfo);
/////....
/* 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);
/* 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)
{
case ENET_EVENT_TYPE_CONNECT:
printf ("A new client connected from %x:%u.\n",
event.peer -> address.host,
event.peer -> address.port);
/* Store any relevant client information here. */
event.peer -> data = (char*)"Client information";
break;
case ENET_EVENT_TYPE_RECEIVE:
printf ("A packet of length %u containing %s was received from %s on channel %u.\n",
event.packet -> dataLength,
event.packet -> data,
event.peer -> data,
event.channelID);
/* Clean up the packet now that we're done using it. */
case ENET_EVENT_TYPE_CONNECT:
printf("A new client connected from %x:%u.\n",
event.peer->address.host,
event.peer->address.port);
/* Store any relevant client information here. */
event.peer->data = (char*)"Client information";
break;
case ENET_EVENT_TYPE_RECEIVE:
printf("A packet of length %u containing %s was received from %s on channel %u.\n",
event.packet->dataLength,
event.packet->data,
event.peer->data,
event.channelID);
/* Clean up the packet now that we're done using it. */
if (event.packet->dataLength==sizeof(ENetAddress))
{
ENetAddress* address = (ENetAddress*)event.packet->data;
printf("received other client's address from server, connecting...\n");
natpeer = enet_host_connect (client, address, 2, 0);
if (natpeer== NULL)
if (event.packet->dataLength == sizeof(ENetAddress))
{
fprintf (stderr, "No available peers for initiating an ENet connection.\n");
exit (EXIT_FAILURE);
}
/* Wait up to 5 seconds for the connection attempt to succeed. */
if (enet_host_service (client, & event, 5000) > 0 &&
event.type == ENET_EVENT_TYPE_CONNECT)
{
puts ("Connection to natpeer succeeded.");
} else
{
enet_peer_reset (natpeer);
puts ("Connection to natpeer failed.");
natpeer=0;
exit(0);
ENetAddress* address = (ENetAddress*)event.packet->data;
printf("received other client's address from server, connecting...\n");
natpeer = enet_host_connect(client, address, 2, 0);
if (natpeer == NULL)
{
fprintf(stderr, "No available peers for initiating an ENet connection.\n");
exit(EXIT_FAILURE);
}
/* Wait up to 5 seconds for the connection attempt to succeed. */
if (enet_host_service(client, &event, 5000) > 0 &&
event.type == ENET_EVENT_TYPE_CONNECT)
{
puts("Connection to natpeer succeeded.");
}
else
{
enet_peer_reset(natpeer);
puts("Connection to natpeer failed.");
natpeer = 0;
exit(0);
}
}
}
enet_packet_destroy(event.packet);
break;
enet_packet_destroy (event.packet);
break;
case ENET_EVENT_TYPE_DISCONNECT:
printf ("%s disconnected.\n", event.peer -> data);
/* Reset the peer's client information. */
event.peer -> data = NULL;
case ENET_EVENT_TYPE_DISCONNECT:
printf("%s disconnected.\n", event.peer->data);
/* Reset the peer's client information. */
event.peer->data = NULL;
}
}
/* One could just use enet_host_service() instead. */
enet_host_flush (client);//host);
enet_host_flush(client); //host);
}
else
{
/* Either the 5 seconds are up or a disconnect event was */
/* received. Reset the peer in the event the 5 seconds */
/* had run out without any significant event. */
enet_peer_reset (dedicatedpeer);
puts ("Connection to some.server.net:1234 failed.");
enet_peer_reset(dedicatedpeer);
puts("Connection to some.server.net:1234 failed.");
}
enet_host_destroy(client);
return 0;
}

137
test/enet/nat_punchthrough/server/main.cpp
View File

@@ -3,107 +3,98 @@
#include <enet/enet.h>
#include <string.h>
ENetPeer* mypeers[2]={0,0};
ENetPeer* mypeers[2] = {0, 0};
ENetAddress clientAddresses[2];
int numpeers=0;
int numpeers = 0;
int main(int argc, char* argv[])
{
fprintf(stderr,"starting enet dedicated server\n");
fprintf(stderr, "starting enet dedicated server\n");
if (enet_initialize () != 0)
{
fprintf (stderr, "An error occurred while initializing ENet.\n");
return EXIT_FAILURE;
}
atexit (enet_deinitialize);
if (enet_initialize() != 0)
{
fprintf(stderr, "An error occurred while initializing ENet.\n");
return EXIT_FAILURE;
}
atexit(enet_deinitialize);
ENetAddress address;
ENetHost * server;
ENetHost* server;
/* Bind the server to the default localhost. */
/* A specific host address can be specified by */
/* enet_address_set_host (& address, "x.x.x.x"); */
address.host = ENET_HOST_ANY;
/* Bind the server to port 1234. */
address.port = 1234;
server = enet_host_create (& address /* the address to bind the server host to */,
32 /* allow up to 32 clients and/or outgoing connections */,
2 /* allow up to 2 channels to be used, 0 and 1 */,
0 /* assume any amount of incoming bandwidth */,
0 /* assume any amount of outgoing bandwidth */);
server = enet_host_create(&address /* the address to bind the server host to */,
32 /* allow up to 32 clients and/or outgoing connections */,
2 /* allow up to 2 channels to be used, 0 and 1 */,
0 /* assume any amount of incoming bandwidth */,
0 /* assume any amount of outgoing bandwidth */);
if (server == NULL)
{
fprintf (stderr,
"An error occurred while trying to create an ENet server host.\n");
exit (EXIT_FAILURE);
fprintf(stderr,
"An error occurred while trying to create an ENet server host.\n");
exit(EXIT_FAILURE);
}
ENetEvent event;
/* Wait up to 10000000 milliseconds for an event. */
while (enet_host_service (server, & event, 10000000) > 0)
/* Wait up to 10000000 milliseconds for an event. */
while (enet_host_service(server, &event, 10000000) > 0)
{
switch (event.type)
{
case ENET_EVENT_TYPE_CONNECT:
char clientname[1024];
enet_address_get_host(&event.peer -> address,clientname, 1024);
printf ("A new client connected from %s:%u.\n",
clientname,
event.peer -> address.port);
/* Store any relevant client information here. */
event.peer -> data = (char*)"Client information";
if (numpeers<2)
{
clientAddresses[numpeers] = event.peer->address;
mypeers[numpeers] = event.peer;
}
numpeers++;
if (numpeers==2)
{
printf("exchanging addresses for NAT punchthrough\n");
//exchange the address info
for (int i=0;i<2;i++)
case ENET_EVENT_TYPE_CONNECT:
char clientname[1024];
enet_address_get_host(&event.peer->address, clientname, 1024);
printf("A new client connected from %s:%u.\n",
clientname,
event.peer->address.port);
/* Store any relevant client information here. */
event.peer->data = (char*)"Client information";
if (numpeers < 2)
{
int sz = sizeof(ENetAddress);
/* Create a reliable packet of size 7 containing "packet\0" */
ENetPacket * packet = enet_packet_create (&clientAddresses[i],
sz,
ENET_PACKET_FLAG_RELIABLE);
enet_peer_send (mypeers[1-i], 0, packet);
clientAddresses[numpeers] = event.peer->address;
mypeers[numpeers] = event.peer;
}
numpeers++;
if (numpeers == 2)
{
printf("exchanging addresses for NAT punchthrough\n");
//exchange the address info
for (int i = 0; i < 2; i++)
{
int sz = sizeof(ENetAddress);
/* Create a reliable packet of size 7 containing "packet\0" */
ENetPacket* packet = enet_packet_create(&clientAddresses[i],
sz,
ENET_PACKET_FLAG_RELIABLE);
enet_peer_send(mypeers[1 - i], 0, packet);
}
//prepare for the next pair of clients to connect/NAT punchthrough
numpeers = 0;
}
//prepare for the next pair of clients to connect/NAT punchthrough
numpeers=0;
}
break;
case ENET_EVENT_TYPE_RECEIVE:
printf ("A packet of length %u containing %s was received from %s on channel %u.\n",
event.packet -> dataLength,
event.packet -> data,
event.peer -> data,
event.channelID);
/* Clean up the packet now that we're done using it. */
enet_packet_destroy (event.packet);
break;
case ENET_EVENT_TYPE_RECEIVE:
printf("A packet of length %u containing %s was received from %s on channel %u.\n",
event.packet->dataLength,
event.packet->data,
event.peer->data,
event.channelID);
/* Clean up the packet now that we're done using it. */
enet_packet_destroy(event.packet);
break;
case ENET_EVENT_TYPE_DISCONNECT:
printf ("%s disconnected.\n", event.peer -> data);
/* Reset the peer's client information. */
event.peer -> data = NULL;
break;
case ENET_EVENT_TYPE_DISCONNECT:
printf("%s disconnected.\n", event.peer->data);
/* Reset the peer's client information. */
event.peer->data = NULL;
}
}
enet_host_destroy(server);
printf("server exited, press <enter> key\n");
getchar();