major update. server clean up and much added documentation

3 files changed, 18 insertions, 18 deletions

diff --git a/src/tools/crapnet.cpp b/src/tools/crapnet.cpp
index ba8a30d8..f807bb61 100644
--- a/src/tools/crapnet.cpp
+++ b/src/tools/crapnet.cpp
@@ -8,7 +8,7 @@ struct packet
 	packet *prev;
 	packet *next;
 	
-	NETADDR4 send_to;
+	NETADDR send_to;
 	int64 timestamp;
 	int id;
 	int data_size;
@@ -20,10 +20,10 @@ static packet *last = (packet *)0;
 static int current_latency = 0;
 static int debug = 0;
 
-int run(int port, NETADDR4 dest)
+int run(int port, NETADDR dest)
 {
-	NETADDR4 src = {{0,0,0,0},port};
-	NETSOCKET socket = net_udp4_create(src);
+	NETADDR src = {NETTYPE_IPV4, {0,0,0,0},port};
+	NETSOCKET socket = net_udp_create(src);
 	
 	char buffer[1024*2];
 	int id = 0;
@@ -35,8 +35,8 @@ int run(int port, NETADDR4 dest)
 		{
 			// fetch data
 			int data_trash = 0;
-			NETADDR4 from;
-			int bytes = net_udp4_recv(socket, &from, buffer, 1024*2);
+			NETADDR from;
+			int bytes = net_udp_recv(socket, &from, buffer, 1024*2);
 			if(bytes <= 0)
 				break;
 				
@@ -46,7 +46,7 @@ int run(int port, NETADDR4 dest)
 			// create new packet				
 			packet *p = (packet *)mem_alloc(sizeof(packet)+bytes, 1);
 
-			if(net_addr4_cmp(&from, &dest) == 0)
+			if(net_addr_comp(&from, &dest) == 0)
 			{
 				p->send_to = src; // from the server
 			}
@@ -112,7 +112,7 @@ int run(int port, NETADDR4 dest)
 				
 				// send and remove packet
 				//if((rand()%20) != 0) // heavy packetloss
-				net_udp4_send(socket, &p->send_to, p->data, p->data_size);
+				net_udp_send(socket, &p->send_to, p->data, p->data_size);
 				
 				// update lag
 				double flux = rand()/(double)RAND_MAX;
@@ -136,7 +136,7 @@ int run(int port, NETADDR4 dest)
 
 int main(int argc, char **argv)
 {
-	NETADDR4 a = {{127,0,0,1},8303};
+	NETADDR a = {NETTYPE_IPV4, {127,0,0,1},8303};
 	run(8302, a);
 	return 0;
 }
diff --git a/src/tools/fake_server.c b/src/tools/fake_server.c
index 9f588e37..763caa73 100644
--- a/src/tools/fake_server.c
+++ b/src/tools/fake_server.c
@@ -37,7 +37,7 @@ int flags = 0;
 const char *version = "0.3.0 2d82e361de24cb25";
 const char *map = "somemap";
 const char *server_name = "unnamed server";
-NETADDR4 master_servers[16] = {{{0},0}};
+NETADDR master_servers[16] = {{0,{0},0}};
 int num_masters = 0;
 
 const char *player_names[16] = {0};
@@ -109,7 +109,7 @@ static void build_infomessage()
 	}
 }
 
-static void send_serverinfo(NETADDR4 *addr)
+static void send_serverinfo(NETADDR *addr)
 {
 	NETCHUNK p;
 	p.client_id = -1;
@@ -120,7 +120,7 @@ static void send_serverinfo(NETADDR4 *addr)
 	netserver_send(net, &p);
 }
 
-static void send_fwcheckresponse(NETADDR4 *addr)
+static void send_fwcheckresponse(NETADDR *addr)
 {
 	NETCHUNK p;
 	p.client_id = -1;
@@ -134,7 +134,7 @@ static void send_fwcheckresponse(NETADDR4 *addr)
 static int run()
 {
 	int64 next_heartbeat = 0;
-	NETADDR4 bindaddr = {{0},0};
+	NETADDR bindaddr = {NETTYPE_IPV4, {0},0};
 	net = netserver_open(bindaddr, 0, 0);
 	if(!net)
 		return -1;
diff --git a/src/tools/packetgen.c b/src/tools/packetgen.c
index dcfe0885..9e46c44d 100644
--- a/src/tools/packetgen.c
+++ b/src/tools/packetgen.c
@@ -3,15 +3,15 @@
 
 enum { NUM_SOCKETS = 64 };
 
-int run(NETADDR4 dest)
+int run(NETADDR dest)
 {
 	NETSOCKET sockets[NUM_SOCKETS];
 	int i;
 	
 	for(i = 0; i < NUM_SOCKETS; i++)
 	{
-		NETADDR4 bindaddr = {{0,0,0,0}, 0};
-	 	sockets[i] = net_udp4_create(bindaddr);
+		NETADDR bindaddr = {NETTYPE_IPV4, {0}, 0};
+	 	sockets[i] = net_udp_create(bindaddr);
 	}
 	
 	while(1)
@@ -24,13 +24,13 @@ int run(NETADDR4 dest)
 		size %= 256;
 		socket_to_use %= NUM_SOCKETS;
 		io_read(io_stdin(), data, size);
-		net_udp4_send(sockets[socket_to_use], &dest, data, size);
+		net_udp_send(sockets[socket_to_use], &dest, data, size);
 	}
 }
 
 int main(int argc, char **argv)
 {
-	NETADDR4 dest = {{127,0,0,1},8303};
+	NETADDR dest = {NETTYPE_IPV4, {127,0,0,1},8303};
 	run(dest);
 	return 0;
 }