nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2025-02-03 14:01:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Be slightly more verbose on tcp failures.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6272 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2022-06-19 15:18:30 +00:00
parent 758f47ffc3
commit 9371b7ca14
4 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/common/net.h
View file

@ -130,7 +130,7 @@ typedef enum
extern cvar_t hostname; extern cvar_t hostname;
int TCP_OpenStream (netadr_t *remoteaddr); //makes things easier int TCP_OpenStream (netadr_t *remoteaddr, const char *remotename); //makes things easier. remotename is printable-only
struct ftenet_connections_s; struct ftenet_connections_s;
void NET_Init (void); void NET_Init (void);

2
engine/common/net_ice.c
View file

@ -2989,7 +2989,7 @@ static qboolean FTENET_ICE_GetPacket(ftenet_generic_connection_t *gcon)
const char *s; const char *s;
if (b->timeout > realtime) if (b->timeout > realtime)
return false; return false;
b->generic.thesocket = TCP_OpenStream(&b->brokeradr); //save this for select. b->generic.thesocket = TCP_OpenStream(&b->brokeradr, b->brokername); //save this for select.
b->broker = FS_WrapTCPSocket(b->generic.thesocket, true, b->brokername); b->broker = FS_WrapTCPSocket(b->generic.thesocket, true, b->brokername);
#ifdef HAVE_SSL #ifdef HAVE_SSL

20
engine/common/net_wins.c
View file

@ -6408,7 +6408,7 @@ ftenet_generic_connection_t *FTENET_TCP_EstablishConnection(ftenet_connections_t
} }
else else
{ {
newsocket = TCP_OpenStream(&adr); newsocket = TCP_OpenStream(&adr, address);
if (newsocket == INVALID_SOCKET) if (newsocket == INVALID_SOCKET)
{ {
Z_Free(newcon); Z_Free(newcon);
@ -8321,7 +8321,7 @@ void NET_PrintConnectionsStatus(ftenet_connections_t *collection)
//============================================================================= //=============================================================================
int TCP_OpenStream (netadr_t *remoteaddr) int TCP_OpenStream (netadr_t *remoteaddr, const char *remotename)
{ {
#ifndef HAVE_TCP #ifndef HAVE_TCP
return (int)INVALID_SOCKET; return (int)INVALID_SOCKET;
@ -8382,21 +8382,21 @@ int TCP_OpenStream (netadr_t *remoteaddr)
int err = neterrno(); int err = neterrno();
if (err != NET_EWOULDBLOCK && err != NET_EINPROGRESS) if (err != NET_EWOULDBLOCK && err != NET_EINPROGRESS)
{ {
char buf[256];
NET_AdrToString(buf, sizeof(buf), remoteaddr);
if (err == NET_EADDRNOTAVAIL) if (err == NET_EADDRNOTAVAIL)
{ {
if (remoteaddr->port == 0 && (remoteaddr->type == NA_IP || remoteaddr->type == NA_IPV6)) if (remoteaddr->port == 0 && (remoteaddr->type == NA_IP || remoteaddr->type == NA_IPV6))
Con_Printf ("TCP_OpenStream: no port specified (%s)\n", buf); Con_Printf ("TCP_OpenStream: no port specified (%s)\n", remotename);
else else
Con_Printf ("TCP_OpenStream: invalid address trying to connect to %s\n", buf); Con_Printf ("TCP_OpenStream: invalid address trying to connect to %s\n", remotename);
} }
else if (err == NET_ECONNREFUSED) else if (err == NET_ECONNREFUSED)
Con_Printf ("TCP_OpenStream: connection refused (%s)\n", buf); Con_Printf ("TCP_OpenStream: connection refused (%s)\n", remotename);
else if (err == NET_EACCES) else if (err == NET_EACCES)
Con_Printf ("TCP_OpenStream: access denied: check firewall (%s)\n", buf); Con_Printf ("TCP_OpenStream: access denied: check firewall (%s)\n", remotename);
else if (err == NET_ENETUNREACH)
Con_Printf ("TCP_OpenStream: unreachable (%s)\n", remotename);
else else
Con_Printf ("TCP_OpenStream: connect: error %i (%s)\n", err, buf); Con_Printf ("TCP_OpenStream: connect: error %i (%s)\n", err, remotename);
closesocket(newsocket); closesocket(newsocket);
return (int)INVALID_SOCKET; return (int)INVALID_SOCKET;
} }
@ -9510,7 +9510,7 @@ vfsfile_t *FS_OpenTCP(const char *name, int defaultport, qboolean assumetls)
if (wanttls) if (wanttls)
return NULL; //don't even make the connection if we can't satisfy it. return NULL; //don't even make the connection if we can't satisfy it.
#endif #endif
f = FS_WrapTCPSocket(TCP_OpenStream(&adr), true, name); f = FS_WrapTCPSocket(TCP_OpenStream(&adr, name), true, name);
#ifdef HAVE_SSL #ifdef HAVE_SSL
if (f && wanttls) if (f && wanttls)
f = FS_OpenSSL(name, f, false); f = FS_OpenSSL(name, f, false);

7
engine/http/httpclient.c
View file

@ -1080,8 +1080,13 @@ void HTTPDL_Establish(struct dl_download *dl)
//fixme: support more than one address possibility? //fixme: support more than one address possibility?
//https uses a different default port //https uses a different default port
if (NET_StringToAdr2(con->server, https?443:80, &adr, 1, NULL)) if (NET_StringToAdr2(con->server, https?443:80, &adr, 1, NULL))
con->sock = TCP_OpenStream(&adr); con->sock = TCP_OpenStream(&adr, *dl->redir?dl->redir:dl->url);
con->stream = FS_WrapTCPSocket(con->sock, true, con->server); con->stream = FS_WrapTCPSocket(con->sock, true, con->server);
if (!con->stream)
{
dl->status = DL_FAILED;
return;
}
} }
#ifdef HAVE_SSL #ifdef HAVE_SSL
if (https) if (https)