fte/fteqw
2
0
Fork 1
Code Issues Pull requests Releases 1 Activity Actions

Fix a bug that mushi got stuck on.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4619 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2014-02-22 00:28:22 +00:00
parent ce67f11851
commit c604c0c17f
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engine/common/net_wins.c
View file

@ -1653,7 +1653,9 @@ static ftenet_generic_connection_t *FTENET_IPX_EstablishConnection(qboolean isse
static ftenet_generic_connection_t *FTENET_WebSocket_EstablishConnection(qboolean isserver, const char *address); static ftenet_generic_connection_t *FTENET_WebSocket_EstablishConnection(qboolean isserver, const char *address);
#endif #endif
static ftenet_generic_connection_t *FTENET_IRCConnect_EstablishConnection(qboolean isserver, const char *address); static ftenet_generic_connection_t *FTENET_IRCConnect_EstablishConnection(qboolean isserver, const char *address);
#ifdef HAVE_NATPMP
static ftenet_generic_connection_t *FTENET_NATPMP_EstablishConnection(qboolean isserver, const char *address); static ftenet_generic_connection_t *FTENET_NATPMP_EstablishConnection(qboolean isserver, const char *address);
#endif
#ifdef HAVE_NATPMP #ifdef HAVE_NATPMP
typedef struct typedef struct
@ -1709,8 +1711,10 @@ static qboolean NET_Was_NATPMP(ftenet_connections_t *collection)
pmp->natadr.connum = i+1; pmp->natadr.connum = i+1;
Con_DPrintf("NAT-PMP: Public ip is %s\n", adrbuf); Con_DPrintf("NAT-PMP: Public ip is %s\n", adrbuf);
#ifdef SUPPORT_ICE
if (pmp->natadr.type && pmp->natadr.port) if (pmp->natadr.type && pmp->natadr.port)
ICE_AddLCandidateConn(collection, &pmp->natadr, ICE_SRFLX); //let ICE connections know about it ICE_AddLCandidateConn(collection, &pmp->natadr, ICE_SRFLX); //let ICE connections know about it
#endif
return true; return true;
} }
if (net_message.cursize == 16 && pmpreqrep->op == 129) if (net_message.cursize == 16 && pmpreqrep->op == 129)
@ -1741,8 +1745,10 @@ static qboolean NET_Was_NATPMP(ftenet_connections_t *collection)
Con_DPrintf("NAT-PMP: Local port %u publically available on port %u\n", (unsigned short)BigShort(pmpreqrep->privport), (unsigned short)BigShort(pmpreqrep->pubport)); Con_DPrintf("NAT-PMP: Local port %u publically available on port %u\n", (unsigned short)BigShort(pmpreqrep->privport), (unsigned short)BigShort(pmpreqrep->pubport));
pmp->natadr.port = pmpreqrep->pubport; pmp->natadr.port = pmpreqrep->pubport;
#ifdef SUPPORT_ICE
if (pmp->natadr.type && pmp->natadr.port) if (pmp->natadr.type && pmp->natadr.port)
ICE_AddLCandidateConn(collection, &pmp->natadr, ICE_SRFLX); ICE_AddLCandidateConn(collection, &pmp->natadr, ICE_SRFLX);
#endif
return true; return true;
} }
return false; return false;