nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-10 22:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed rcon_address not having a default port

Browse source 
sv_port now accepts a space-delimited list of addresses/ports to listen upon.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3945 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2012-01-01 06:25:51 +00:00
parent d877bd4e39
commit 016c840497
2 changed files with 36 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
engine/client/cl_main.c
View file

@ -532,7 +532,7 @@ void CL_SendConnectPacket (
} }
if (adr.port == 0) if (adr.port == 0)
adr.port = BigShort (27500); adr.port = BigShort (PORT_QWSERVER);
t2 = Sys_DoubleTime (); t2 = Sys_DoubleTime ();
cls.resendinfo = false; cls.resendinfo = false;
@ -1057,6 +1057,8 @@ void CL_Rcon_f (void)
return; return;
} }
NET_StringToAdr (rcon_address.string, &to); NET_StringToAdr (rcon_address.string, &to);
if (!to.port)
to.port = PORT_QWSERVER;
} }
NET_SendPacket (NS_CLIENT, strlen(message)+1, message NET_SendPacket (NS_CLIENT, strlen(message)+1, message

47
engine/common/net_wins.c
View file

@ -1381,6 +1381,7 @@ ftenet_connections_t *FTENET_CreateCollection(qboolean listen)
qboolean FTENET_AddToCollection(ftenet_connections_t *col, const char *name, const char *address, ftenet_generic_connection_t *(*establish)(qboolean isserver, const char *address), qboolean islisten) qboolean FTENET_AddToCollection(ftenet_connections_t *col, const char *name, const char *address, ftenet_generic_connection_t *(*establish)(qboolean isserver, const char *address), qboolean islisten)
{ {
int count = 0;
int i; int i;
if (!col) if (!col)
return false; return false;
@ -1401,28 +1402,30 @@ qboolean FTENET_AddToCollection(ftenet_connections_t *col, const char *name, con
col->conn[i]->Close(col->conn[i]); col->conn[i]->Close(col->conn[i]);
col->conn[i] = NULL; col->conn[i] = NULL;
break;
} }
} }
} }
if (!address || !*address) if (address && *address)
{ {
return true; //must have at least a port. for (i = 0; i < MAX_CONNECTIONS; i++)
}
for (i = 0; i < MAX_CONNECTIONS; i++)
{
if (!col->conn[i])
{ {
col->conn[i] = establish(islisten, address);
if (!col->conn[i]) if (!col->conn[i])
return false; {
col->conn[i]->name = name; address = COM_Parse(address);
return true; col->conn[i] = establish(islisten, com_token);
if (!col->conn[i])
break;
col->conn[i]->name = name;
count++;
if (address && *address)
continue;
break;
}
} }
} }
return false; return count > 0;
} }
void FTENET_CloseCollection(ftenet_connections_t *col) void FTENET_CloseCollection(ftenet_connections_t *col)
@ -1536,7 +1539,7 @@ int FTENET_Generic_GetLocalAddress(ftenet_generic_connection_t *con, netadr_t *o
{ {
struct addrinfo hints, *result, *itr; struct addrinfo hints, *result, *itr;
memset(&hints, 0, sizeof(struct addrinfo)); memset(&hints, 0, sizeof(struct addrinfo));
hints.ai_family = ((struct sockaddr_in*)&from)->sin_family; /* Allow IPv4 or IPv6 */ hints.ai_family = 0; /* Allow IPv4 or IPv6 */
hints.ai_socktype = SOCK_DGRAM; /* Datagram socket */ hints.ai_socktype = SOCK_DGRAM; /* Datagram socket */
hints.ai_flags = 0; hints.ai_flags = 0;
hints.ai_protocol = 0; /* Any protocol */ hints.ai_protocol = 0; /* Any protocol */
@ -1550,6 +1553,22 @@ int FTENET_Generic_GetLocalAddress(ftenet_generic_connection_t *con, netadr_t *o
{ {
for (itr = result; itr; itr = itr->ai_next) for (itr = result; itr; itr = itr->ai_next)
{ {
if (itr->ai_addr->sa_family != ((struct sockaddr_in*)&from)->sin_family)
{
#ifdef IPV6_V6ONLY
if (((struct sockaddr_in*)&from)->sin_family == AF_INET6 && itr->ai_addr->sa_family == AF_INET)
{
int ipv6only = true;
int optlen = sizeof(ipv6only);
getsockopt(con->thesocket, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&ipv6only, &optlen);
if (ipv6only)
continue;
}
else
#endif
continue;
}
if (idx++ == count) if (idx++ == count)
{ {
SockadrToNetadr((struct sockaddr_qstorage*)itr->ai_addr, out); SockadrToNetadr((struct sockaddr_qstorage*)itr->ai_addr, out);