Changeset 151Tweet

Timestamp:

Jul 1, 2008, 6:22:32 PM (15 years ago)

Author:

holiday

Message:

localhost net testing enabled by setting client listen port to udp/20204 (main_net_cfg->port+2 instead of +1)

Location:

abuse/trunk/src

Files:

• innet.cpp (modified) (2 diffs)
• net/netdrv.cpp (modified) (5 diffs)

abuse/trunk/src/innet.cpp

@@ -382 +382 @@
     dprintf("Joining game in progress, hang on....\n");
 
-    game_sock=prot->create_listen_socket(main_net_cfg->port+1,net_socket::SOCKET_FAST);     // this is used for fast game packet transmission
+    game_sock=prot->create_listen_socket(main_net_cfg->port+2,net_socket::SOCKET_FAST);     // this is used for fast game packet transmission
     if (!game_sock) { if (comm_sock) delete comm_sock; comm_sock=NULL; prot=NULL; return 0; }
     game_sock->read_selectable();
@@ -394 +394 @@
 
     uint8_t ctype=CLIENT_ABUSE;
-    uint16_t port=lstl(main_net_cfg->port+1),cnum;
+    uint16_t port=lstl(main_net_cfg->port+2),cnum;
 
     uint8_t reg;

abuse/trunk/src/net/netdrv.cpp

@@ -273 +273 @@
     if (out->write(&cmd,1)!=1) { mdie("could not write block ack1"); }  // send something to unblock engine
       } break;
+      
       case NFCMD_KILL_SLACKERS :
       {
@@ -288 +289 @@
     if (in->read(&cmd,1)!=1) { mdie("could not read send ack2"); }    // read something to block ourselves for engine
       } break;
-
 
       case NFCMD_REQUEST_ENTRY :
@@ -299 +299 @@
     if (out->write(&success,2)!=2) mdie("cound not send lsf read failure");
       } break;
+      
       case NFCMD_BECOME_SERVER :
       {
@@ -304 +305 @@
     if (out->write(&cmd,1)!=1) mdie("cound not send ok");
       } break;
+      
       case NFCMD_REQUEST_LSF :
       {
@@ -450 +452 @@
   strcpy(sn_start,server_name);
 
-  net_socket *sock=connect_to_server(server_name,DEFAULT_COMM_PORT,0);
+  net_socket *sock=connect_to_server(server_name, DEFAULT_COMM_PORT, 0);
   if (!sock)
   {