fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-09 01:01:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

net_udp.c: check whether the address returned by gethostbyname is an IPv4 address

Browse source 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@462 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2011-06-27 13:10:19 +00:00
parent e5a5e89f53
commit 9052c6faa8
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Quake/net_udp.c
View file

@ -65,6 +65,10 @@ sys_socket_t UDP_Init (void)
Con_SafePrintf("UDP_Init: gethostbyname failed (%s)\n",
hstrerror(h_errno));
}
else if (local->h_addrtype != AF_INET)
{
Con_SafePrintf("UDP_Init: address from gethostbyname not IPv4\n");
}
else
{
myAddr = *(in_addr_t *)local->h_addr_list[0];
@ -82,8 +86,8 @@ sys_socket_t UDP_Init (void)
broadcastaddr.sin_port = htons((unsigned short)net_hostport);
UDP_GetSocketAddr (net_controlsocket, &addr);
Q_strcpy(my_tcpip_address, UDP_AddrToString (&addr));
colon = Q_strrchr (my_tcpip_address, ':');
strcpy(my_tcpip_address, UDP_AddrToString (&addr));
colon = strrchr (my_tcpip_address, ':');
if (colon)
*colon = 0;
@ -208,7 +212,7 @@ static int PartialIPAddress (const char *in, struct qsockaddr *hostaddr)
}
if (*b++ == ':')
port = Q_atoi(b);
port = atoi(b);
else
port = net_hostport;
@ -219,6 +223,7 @@ static int PartialIPAddress (const char *in, struct qsockaddr *hostaddr)
return 0;
}
//=============================================================================
int UDP_Connect (sys_socket_t socketid, struct qsockaddr *addr)
@ -383,11 +388,11 @@ int UDP_GetNameFromAddr (struct qsockaddr *addr, char *name)
sizeof(struct in_addr), AF_INET);
if (hostentry)
{
Q_strncpy (name, (char *)hostentry->h_name, NET_NAMELEN - 1);
strncpy (name, (char *)hostentry->h_name, NET_NAMELEN - 1);
return 0;
}
Q_strcpy (name, UDP_AddrToString (addr));
strcpy (name, UDP_AddrToString (addr));
return 0;
}

2
Quake/net_wins.c
View file

@ -336,7 +336,7 @@ sys_socket_t WINS_CheckNewConnections (void)
return INVALID_SOCKET;
if (recvfrom (net_acceptsocket, buf, sizeof(buf), MSG_PEEK, NULL, NULL)
!= SOCKET_ERROR) /* >= 0 */
!= SOCKET_ERROR)
{
return net_acceptsocket;
}