extresponse: make svqc receive only those on the server socket, and csqc/menuqc only...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9498 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/clvm_cmds.c b/clvm_cmds.c
index 03f3af9bf9096b1c1d3d2b0edfd1cd5a3a1a4a25..89bea834150ca5f2cf7e8d056e8863722a239931 100644 (file)
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -4283,7 +4283,7 @@ NULL,                                                     // #620
 NULL,                                                  // #621
 NULL,                                                  // #622
 NULL,                                                  // #623
-VM_getextresponse,                             // #624 string getextresponse(void)
+VM_CL_getextresponse,                  // #624 string getextresponse(void)
 NULL,                                                  // #625
 };
 

diff --git a/mvm_cmds.c b/mvm_cmds.c
index 29f4406b3ee5d481c290b9d778baa48168ffb53b..2bcf93feaff9ff1f37da5eb7455c740152fe35b5 100644 (file)
--- a/mvm_cmds.c
+++ b/mvm_cmds.c
@@ -1402,7 +1402,7 @@ VM_M_refreshserverlist,                   // #620 void refreshhostcache(void)
 VM_M_getserverlistnumber,              // #621 float gethostcachenumber(float fld, float hostnr)
 VM_M_getserverlistindexforkey,// #622 float gethostcacheindexforkey(string key)
 VM_M_addwantedserverlistkey,   // #623 void addwantedhostcachekey(string key)
-VM_getextresponse,                             // #624 string getextresponse(void)
+VM_CL_getextresponse,                  // #624 string getextresponse(void)
 VM_netaddress_resolve,          // #625 string netaddress_resolve(string, float)
 VM_M_getgamedirinfo,            // #626 string getgamedirinfo(float n, float prop)
 NULL

diff --git a/netconn.c b/netconn.c
index 906cdf07b5f54e47c765145a09fbabf055f22761..f57265c0a1f18673b566d147b57c6b462460753d 100755 (executable)
--- a/netconn.c
+++ b/netconn.c
@@ -136,6 +136,10 @@ char net_extresponse[NET_EXTRESPONSE_MAX][1400];
 int net_extresponse_count = 0;
 int net_extresponse_last = 0;
 
+char sv_net_extresponse[NET_EXTRESPONSE_MAX][1400];
+int sv_net_extresponse_count = 0;
+int sv_net_extresponse_last = 0;
+
 // ServerList interface
 serverlist_mask_t serverlist_andmasks[SERVERLIST_ANDMASKCOUNT];
 serverlist_mask_t serverlist_ormasks[SERVERLIST_ORMASKCOUNT];
@@ -2789,11 +2793,11 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat
                }
                if (!strncmp(string, "extResponse ", 12))
                {
-                       ++net_extresponse_count;
-                       if(net_extresponse_count > NET_EXTRESPONSE_MAX)
-                               net_extresponse_count = NET_EXTRESPONSE_MAX;
-                       net_extresponse_last = (net_extresponse_last + 1) % NET_EXTRESPONSE_MAX;
-                       dpsnprintf(net_extresponse[net_extresponse_last], sizeof(net_extresponse[net_extresponse_last]), "'%s' %s", addressstring2, string + 12);
+                       ++sv_net_extresponse_count;
+                       if(sv_net_extresponse_count > NET_EXTRESPONSE_MAX)
+                               sv_net_extresponse_count = NET_EXTRESPONSE_MAX;
+                       sv_net_extresponse_last = (net_extresponse_last + 1) % NET_EXTRESPONSE_MAX;
+                       dpsnprintf(sv_net_extresponse[sv_net_extresponse_last], sizeof(sv_net_extresponse[net_extresponse_last]), "'%s' %s", addressstring2, string + 12);
                        return true;
                }
                if (!strncmp(string, "ping", 4))

diff --git a/netconn.h b/netconn.h
index f7159d6a8ab073c4db857aef5d41c27fa774abb9..2a4ec7af4d037b02b2bb8679f395d52e945b29c4 100755 (executable)
--- a/netconn.h
+++ b/netconn.h
@@ -373,6 +373,10 @@ extern char net_extresponse[NET_EXTRESPONSE_MAX][1400];
 extern int net_extresponse_count;
 extern int net_extresponse_last;
 
+extern char sv_net_extresponse[NET_EXTRESPONSE_MAX][1400];
+extern int sv_net_extresponse_count;
+extern int sv_net_extresponse_last;
+
 extern double masterquerytime;
 extern int masterquerycount;
 extern int masterreplycount;

diff --git a/prvm_cmds.c b/prvm_cmds.c
index be7fc68a946960c0d7ac1abb105553854003901a..755c0802c0449cde47a23dd0d650e7b0f2e6a927 100644 (file)
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -5287,7 +5287,7 @@ void VM_netaddress_resolve (void)
 }
 
 //string(void) getextresponse = #624; // returns the next extResponse packet that was sent to this client
-void VM_getextresponse (void)
+void VM_CL_getextresponse (void)
 {
        VM_SAFEPARMCOUNT(0,VM_argv);
 
@@ -5302,6 +5302,21 @@ void VM_getextresponse (void)
        }
 }
 
+void VM_SV_getextresponse (void)
+{
+       VM_SAFEPARMCOUNT(0,VM_argv);
+
+       if (sv_net_extresponse_count <= 0)
+               PRVM_G_INT(OFS_RETURN) = OFS_NULL;
+       else
+       {
+               int first;
+               --sv_net_extresponse_count;
+               first = (sv_net_extresponse_last + NET_EXTRESPONSE_MAX - sv_net_extresponse_count) % NET_EXTRESPONSE_MAX;
+               PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(sv_net_extresponse[first]);
+       }
+}
+
 /*
 =========
 VM_M_callfunction

diff --git a/prvm_cmds.h b/prvm_cmds.h
index b2e85274cc06cdab5a64e376a5647ddbdc4513ce..1a836e2d6ccfdf8cada0f38f877e9b948a196af5 100644 (file)
--- a/prvm_cmds.h
+++ b/prvm_cmds.h
@@ -443,7 +443,8 @@ void VM_argv_end_index (void);
 void VM_buf_cvarlist(void);
 void VM_cvar_description(void);
 
-void VM_getextresponse (void);
+void VM_CL_getextresponse (void);
+void VM_SV_getextresponse (void);
 
 void VM_isfunction(void);
 void VM_callfunction(void);

diff --git a/svvm_cmds.c b/svvm_cmds.c
index ce61e9f5debbbf5029412f8189e8839dcabd9af7..c23aefb5d494c9e2eddfb08c5718ff3e239afbc9 100644 (file)
--- a/svvm_cmds.c
+++ b/svvm_cmds.c
@@ -3701,7 +3701,7 @@ NULL,                                                     // #620
 NULL,                                                  // #621
 NULL,                                                  // #622
 NULL,                                                  // #623
-VM_getextresponse,                             // #624 string getextresponse(void)
+VM_SV_getextresponse,                  // #624 string getextresponse(void)
 NULL,                                                  // #625
 };