new network code. not perfect. connectionless packets is missing so no server discovery is possible. reduced network traffic by A LOT

1 files changed, 23 insertions, 17 deletions

diff --git a/src/engine/e_network.h b/src/engine/e_network.h
index 29843849..cfa59d84 100644
--- a/src/engine/e_network.h
+++ b/src/engine/e_network.h
@@ -9,9 +9,9 @@ typedef struct
 	int flags;
 	int data_size;
 	const void *data;
-} NETPACKET;
+} NETCHUNK;
 
-typedef struct
+/*typedef struct
 {
 	int send_bytes;
 	int recv_bytes;
@@ -20,7 +20,7 @@ typedef struct
 	
 	int resend_packets;
 	int resend_bytes;
-} NETSTATS;
+} NETSTATS;*/
 
 typedef struct NETSERVER_t NETSERVER;
 typedef struct NETCLIENT_t NETCLIENT;
@@ -28,8 +28,9 @@ typedef struct NETCLIENT_t NETCLIENT;
 enum
 {
 	NETFLAG_ALLOWSTATELESS=1,
-	PACKETFLAG_VITAL=1,
-	PACKETFLAG_CONNLESS=2,
+	NETSENDFLAG_VITAL=1,
+	NETSENDFLAG_CONNLESS=2,
+	NETSENDFLAG_FLUSH=4,
 	
 	NETSTATE_OFFLINE=0,
 	NETSTATE_CONNECTING,
@@ -39,30 +40,34 @@ enum
 typedef int (*NETFUNC_DELCLIENT)(int cid, void *user);
 typedef int (*NETFUNC_NEWCLIENT)(int cid, void *user);
 
+/* both */
+void netcommon_openlog(const char *filename);
+void netcommon_init();
+
 /* server side */
 NETSERVER *netserver_open(NETADDR4 bindaddr, int max_clients, int flags);
 int netserver_set_callbacks(NETSERVER *s, NETFUNC_NEWCLIENT new_client, NETFUNC_DELCLIENT del_client, void *user);
-int netserver_recv(NETSERVER *s, NETPACKET *packet);
-int netserver_send(NETSERVER *s, NETPACKET *packet);
+int netserver_recv(NETSERVER *s, NETCHUNK *chunk);
+int netserver_send(NETSERVER *s, NETCHUNK *chunk);
 int netserver_close(NETSERVER *s);
 int netserver_update(NETSERVER *s);
 NETSOCKET netserver_socket(NETSERVER *s);
 int netserver_drop(NETSERVER *s, int client_id, const char *reason);
 int netserver_client_addr(NETSERVER *s, int client_id, NETADDR4 *addr);
 int netserver_max_clients(NETSERVER *s);
-void netserver_stats(NETSERVER *s, NETSTATS *stats);
+/*void netserver_stats(NETSERVER *s, NETSTATS *stats);*/
 
 /* client side */
 NETCLIENT *netclient_open(NETADDR4 bindaddr, int flags);
 int netclient_disconnect(NETCLIENT *c, const char *reason);
 int netclient_connect(NETCLIENT *c, NETADDR4 *addr);
-int netclient_recv(NETCLIENT *c, NETPACKET *packet);
-int netclient_send(NETCLIENT *c, NETPACKET *packet);
+int netclient_recv(NETCLIENT *c, NETCHUNK *chunk);
+int netclient_send(NETCLIENT *c, NETCHUNK *chunk);
 int netclient_close(NETCLIENT *c);
 int netclient_update(NETCLIENT *c);
 int netclient_state(NETCLIENT *c);
 int netclient_gotproblems(NETCLIENT *c);
-void netclient_stats(NETCLIENT *c, NETSTATS *stats);
+/*void netclient_stats(NETCLIENT *c, NETSTATS *stats);*/
 const char *netclient_error_string(NETCLIENT *c);
 
 #ifdef __cplusplus
@@ -79,14 +84,14 @@ public:
 	int set_callbacks(NETFUNC_NEWCLIENT new_client, NETFUNC_DELCLIENT del_client, void *user)
 	{ return netserver_set_callbacks(ptr, new_client, del_client, user); }
 	
-	int recv(NETPACKET *packet) { return netserver_recv(ptr, packet); }
-	int send(NETPACKET *packet) { return netserver_send(ptr, packet); }
+	int recv(NETCHUNK *chunk) { return netserver_recv(ptr, chunk); }
+	int send(NETCHUNK *chunk) { return netserver_send(ptr, chunk); }
 	int update() { return netserver_update(ptr); }
 	
 	int drop(int client_id, const char *reason) { return netserver_drop(ptr, client_id, reason); } 
 
 	int max_clients() { return netserver_max_clients(ptr); }
-	void stats(NETSTATS *stats) { netserver_stats(ptr, stats); }
+	/*void stats(NETSTATS *stats) { netserver_stats(ptr, stats); }*/
 };
 
 
@@ -103,13 +108,14 @@ public:
 	int connect(NETADDR4 *addr) { return netclient_connect(ptr, addr); }
 	int disconnect(const char *reason) { return netclient_disconnect(ptr, reason); }
 	
-	int recv(NETPACKET *packet) { return netclient_recv(ptr, packet); }
-	int send(NETPACKET *packet) { return netclient_send(ptr, packet); }
+	int recv(NETCHUNK *chunk) { return netclient_recv(ptr, chunk); }
+	int send(NETCHUNK *chunk) { return netclient_send(ptr, chunk); }
 	int update() { return netclient_update(ptr); }
 	
 	const char *error_string() { return netclient_error_string(ptr); }
 	
 	int state() { return netclient_state(ptr); }
-	void stats(NETSTATS *stats) { netclient_stats(ptr, stats); }
+	/*void stats(NETSTATS *stats) { netclient_stats(ptr, stats); }*/
 };
 #endif
+