eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Fixes up tcpconnect a bit (based on bigfoot's patch). Should now work a little better than it ever did.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3216 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2009-06-10 22:36:53 +00:00
parent 226ae08d0a
commit c66ff953b5
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
engine/common/net_wins.c
View file

@ -108,6 +108,7 @@ int NetadrToSockadr (netadr_t *a, struct sockaddr_qstorage *s)
((struct sockaddr_in*)s)->sin_port = a->port; ((struct sockaddr_in*)s)->sin_port = a->port;
return sizeof(struct sockaddr_in); return sizeof(struct sockaddr_in);
case NA_TCP:
case NA_IP: case NA_IP:
memset (s, 0, sizeof(struct sockaddr_in)); memset (s, 0, sizeof(struct sockaddr_in));
((struct sockaddr_in*)s)->sin_family = AF_INET; ((struct sockaddr_in*)s)->sin_family = AF_INET;
@ -127,6 +128,7 @@ int NetadrToSockadr (netadr_t *a, struct sockaddr_qstorage *s)
((struct sockaddr_in6*)s)->sin6_port = a->port; ((struct sockaddr_in6*)s)->sin6_port = a->port;
return sizeof(struct sockaddr_in6); return sizeof(struct sockaddr_in6);
case NA_TCPV6:
case NA_IPV6: case NA_IPV6:
memset (s, 0, sizeof(struct sockaddr_in6)); memset (s, 0, sizeof(struct sockaddr_in6));
((struct sockaddr_in6*)s)->sin6_family = AF_INET6; ((struct sockaddr_in6*)s)->sin6_family = AF_INET6;
@ -200,7 +202,7 @@ qboolean NET_CompareAdr (netadr_t a, netadr_t b)
if (a.type == NA_LOOPBACK) if (a.type == NA_LOOPBACK)
return true; return true;
if (a.type == NA_IP || a.type == NA_BROADCAST_IP) if (a.type == NA_IP || a.type == NA_BROADCAST_IP || a.type == NA_TCP)
{ {
if ((memcmp(a.address.ip, b.address.ip, sizeof(a.address.ip)) == 0) && a.port == b.port) if ((memcmp(a.address.ip, b.address.ip, sizeof(a.address.ip)) == 0) && a.port == b.port)
return true; return true;
@ -208,7 +210,7 @@ qboolean NET_CompareAdr (netadr_t a, netadr_t b)
} }
#ifdef IPPROTO_IPV6 #ifdef IPPROTO_IPV6
if (a.type == NA_IPV6 || a.type == NA_BROADCAST_IP6) if (a.type == NA_IPV6 || a.type == NA_BROADCAST_IP6 || a.type == NA_TCPV6)
{ {
if ((memcmp(a.address.ip6, b.address.ip6, sizeof(a.address.ip6)) == 0) && a.port == b.port) if ((memcmp(a.address.ip6, b.address.ip6, sizeof(a.address.ip6)) == 0) && a.port == b.port)
return true; return true;
@ -338,6 +340,7 @@ qboolean NET_AddressSmellsFunny(netadr_t a)
char *NET_AdrToString (char *s, int len, netadr_t a) char *NET_AdrToString (char *s, int len, netadr_t a)
{ {
char *rs = s;
qboolean doneblank; qboolean doneblank;
char *p; char *p;
int i; int i;
@ -454,7 +457,7 @@ char *NET_AdrToString (char *s, int len, netadr_t a)
// Sys_Error("NET_AdrToString: Bad netadr_t type"); // Sys_Error("NET_AdrToString: Bad netadr_t type");
} }
return s; return rs;
} }
char *NET_BaseAdrToString (char *s, int len, netadr_t a) char *NET_BaseAdrToString (char *s, int len, netadr_t a)
@ -1894,7 +1897,14 @@ closesvstream:
con->tcpstreams = st; con->tcpstreams = st;
st->socketnum = newsock; st->socketnum = newsock;
st->inlen = 0; st->inlen = 0;
/*grab the net address*/
SockadrToNetadr(&from, &st->remoteaddr); SockadrToNetadr(&from, &st->remoteaddr);
/*sockadr doesn't contain transport info, so fix that up here*/
if (st->remoteaddr.type == NA_IP)
st->remoteaddr.type = NA_TCP;
else if (st->remoteaddr.type == NA_IPV6)
st->remoteaddr.type = NA_TCPV6;
//send the qizmo greeting. //send the qizmo greeting.
send(newsock, "qizmo\n", 6, 0); send(newsock, "qizmo\n", 6, 0);
@ -2035,7 +2045,8 @@ ftenet_generic_connection_t *FTENET_TCPConnect_EstablishConnection(int affamily,
newcon->tcpstreams->next = NULL; newcon->tcpstreams->next = NULL;
newcon->tcpstreams->socketnum = newsocket; newcon->tcpstreams->socketnum = newsocket;
newcon->tcpstreams->inlen = 0; newcon->tcpstreams->inlen = 0;
SockadrToNetadr(&qs, &newcon->tcpstreams->remoteaddr);
newcon->tcpstreams->remoteaddr = adr;
//send the qizmo greeting. //send the qizmo greeting.
send(newsocket, "qizmo\n", 6, 0); send(newsocket, "qizmo\n", 6, 0);