zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

git-svn-id: https://svn.eduke32.com/eduke32@931 1a8010ca-5511-0410-912e-c29ae57300e0

Browse source
This commit is contained in:
terminx 2008-08-03 12:49:25 +00:00
parent b8a3c94014
commit 9e647243fa
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
polymer/build/src/mmulti.c
View file

@ -841,6 +841,7 @@ int getexternaladdress(char *buffer, const char *host, int port)
struct sockaddr_in dest_addr; struct sockaddr_in dest_addr;
struct hostent *h; struct hostent *h;
char *req = "GET / HTTP/1.0\r\n\r\n"; char *req = "GET / HTTP/1.0\r\n\r\n";
char *text = "Current IP Address: ";
char tempbuf[1024], ipaddr[32]; char tempbuf[1024], ipaddr[32];
memset(buffer, 0, sizeof(buffer)); memset(buffer, 0, sizeof(buffer));
@ -871,7 +872,6 @@ int getexternaladdress(char *buffer, const char *host, int port)
memset(&(dest_addr.sin_zero), '\0', 8); memset(&(dest_addr.sin_zero), '\0', 8);
mysock = socket(PF_INET, SOCK_STREAM, 0); mysock = socket(PF_INET, SOCK_STREAM, 0);
if (mysock == INVALID_SOCKET) if (mysock == INVALID_SOCKET)
@ -896,13 +896,13 @@ int getexternaladdress(char *buffer, const char *host, int port)
// initprintf("sent %d bytes\n",bytes_sent); // initprintf("sent %d bytes\n",bytes_sent);
recv(mysock, (char *)&tempbuf, sizeof(tempbuf), 0); recv(mysock, (char *)&tempbuf, sizeof(tempbuf), 0);
closesocket(mysock); closesocket(mysock);
j = Bstrlen(text);
for (i=0;(unsigned)i<strlen(tempbuf);i++) for (i=Bstrlen(tempbuf);i>0;i--)
{ {
if (tempbuf[i] == ':' && tempbuf[i+1] == ' ') if (!Bstrncmp(&tempbuf[i], text, j))
i += 2;
if (isdigit(tempbuf[i]) && (isdigit(tempbuf[i+1]) || (tempbuf[i+1] == '.')) && (isdigit(tempbuf[i+2]) || (tempbuf[i+2] == '.')) && (isdigit(tempbuf[i+3]) || (tempbuf[i+3] == '.')))
{ {
i += j;
j = 0;
while (isdigit(tempbuf[i]) || (tempbuf[i] == '.')) while (isdigit(tempbuf[i]) || (tempbuf[i] == '.'))
{ {
ipaddr[j] = tempbuf[i]; ipaddr[j] = tempbuf[i];
@ -912,7 +912,7 @@ int getexternaladdress(char *buffer, const char *host, int port)
break; break;
} }
} }
memcpy(buffer,&ipaddr,j); Bmemcpy(buffer,&ipaddr,j);
return(1); return(1);
} }

5
polymer/eduke32/source/game.c
View file

@ -8464,9 +8464,9 @@ static void setup_rancid_net(const char *fn)
if (!Bstrlen(rancid_ip_strings[MAXPLAYERS-1])||!Bstrlen(rancid_ip_strings[1])) if (!Bstrlen(rancid_ip_strings[MAXPLAYERS-1])||!Bstrlen(rancid_ip_strings[1]))
{ {
if (!Bstrlen(rancid_ip_strings[MAXPLAYERS-1])) if (!Bstrlen(rancid_ip_strings[MAXPLAYERS-1]))
initprintf("rmnet: Interface not defined\n"); initprintf("rmnet: Interface not defined!\n");
if (!Bstrlen(rancid_ip_strings[1])) if (!Bstrlen(rancid_ip_strings[1]))
initprintf("rmnet: No peers configured\n"); initprintf("rmnet: No peers configured!\n");
gameexit("Malformed network configuration file!"); gameexit("Malformed network configuration file!");
return; return;
} }
@ -8536,6 +8536,7 @@ static void setup_rancid_net(const char *fn)
} }
} }
} }
else initprintf("rmnet: Unable to get external interface address! Expect problems...\n");
} }
} }
qsort((char *)rancid_ip_strings, rancid_players, sizeof(rancid_ip_strings[0]), (int(*)(const void*,const void*))stringsort); qsort((char *)rancid_ip_strings, rancid_players, sizeof(rancid_ip_strings[0]), (int(*)(const void*,const void*))stringsort);