Overhaul to console structure, a bit
This commit is contained in:
+12
-12
@@ -83,7 +83,7 @@ static void WINS_GetLocalAddress (void)
|
||||
if (gethostname(buff, MAXHOSTNAMELEN) == SOCKET_ERROR)
|
||||
{
|
||||
err = SOCKETERRNO;
|
||||
Con_SafePrintf("WINS_GetLocalAddress: WARNING: gethostname failed (%s)\n",
|
||||
console::safe_print("WINS_GetLocalAddress: WARNING: gethostname failed (%s)\n",
|
||||
socketerror(err));
|
||||
return;
|
||||
}
|
||||
@@ -100,7 +100,7 @@ static void WINS_GetLocalAddress (void)
|
||||
#endif
|
||||
if (local == NULL)
|
||||
{
|
||||
Con_SafePrintf("WINS_GetLocalAddress: gethostbyname failed (%s)\n",
|
||||
console::safe_print("WINS_GetLocalAddress: gethostbyname failed (%s)\n",
|
||||
__WSAE_StrError(err));
|
||||
return;
|
||||
}
|
||||
@@ -125,7 +125,7 @@ sys_socket_t WINS_Init (void)
|
||||
err = WSAStartup(MAKEWORD(1,1), &winsockdata);
|
||||
if (err != 0)
|
||||
{
|
||||
Con_SafePrintf("Winsock initialization failed (%s)\n",
|
||||
console::safe_print("Winsock initialization failed (%s)\n",
|
||||
socketerror(err));
|
||||
return INVALID_SOCKET;
|
||||
}
|
||||
@@ -136,7 +136,7 @@ sys_socket_t WINS_Init (void)
|
||||
if (gethostname(buff, MAXHOSTNAMELEN) != 0)
|
||||
{
|
||||
err = SOCKETERRNO;
|
||||
Con_SafePrintf("WINS_Init: WARNING: gethostname failed (%s)\n",
|
||||
console::safe_print("WINS_Init: WARNING: gethostname failed (%s)\n",
|
||||
socketerror(err));
|
||||
}
|
||||
else
|
||||
@@ -166,7 +166,7 @@ sys_socket_t WINS_Init (void)
|
||||
|
||||
if ((net_controlsocket = WINS_OpenSocket(0)) == INVALID_SOCKET)
|
||||
{
|
||||
Con_SafePrintf("WINS_Init: Unable to open control socket, UDP disabled\n");
|
||||
console::safe_print("WINS_Init: Unable to open control socket, UDP disabled\n");
|
||||
if (--winsock_initialized == 0)
|
||||
WSACleanup ();
|
||||
return INVALID_SOCKET;
|
||||
@@ -176,7 +176,7 @@ sys_socket_t WINS_Init (void)
|
||||
broadcastaddr.sin_addr.s_addr = INADDR_BROADCAST;
|
||||
broadcastaddr.sin_port = htons((unsigned short)net_hostport);
|
||||
|
||||
Con_SafePrintf("UDP Initialized\n");
|
||||
console::safe_print("UDP Initialized\n");
|
||||
tcpipAvailable = true;
|
||||
|
||||
return net_controlsocket;
|
||||
@@ -226,7 +226,7 @@ sys_socket_t WINS_OpenSocket (int port)
|
||||
if ((newsocket = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP)) == INVALID_SOCKET)
|
||||
{
|
||||
err = SOCKETERRNO;
|
||||
Con_SafePrintf("WINS_OpenSocket: %s\n", socketerror(err));
|
||||
console::safe_print("WINS_OpenSocket: %s\n", socketerror(err));
|
||||
return INVALID_SOCKET;
|
||||
}
|
||||
|
||||
@@ -252,7 +252,7 @@ sys_socket_t WINS_OpenSocket (int port)
|
||||
|
||||
ErrorReturn:
|
||||
err = SOCKETERRNO;
|
||||
Con_SafePrintf("WINS_OpenSocket: %s\n", socketerror(err));
|
||||
console::safe_print("WINS_OpenSocket: %s\n", socketerror(err));
|
||||
closesocket (newsocket);
|
||||
return INVALID_SOCKET;
|
||||
}
|
||||
@@ -359,7 +359,7 @@ int WINS_Read (sys_socket_t socketid, byte *buf, int len, struct qsockaddr *addr
|
||||
int err = SOCKETERRNO;
|
||||
if (err == NET_EWOULDBLOCK || err == NET_ECONNREFUSED)
|
||||
return 0;
|
||||
Con_SafePrintf ("WINS_Read, recvfrom: %s\n", socketerror(err));
|
||||
console::safe_print ("WINS_Read, recvfrom: %s\n", socketerror(err));
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
@@ -375,7 +375,7 @@ static int WINS_MakeSocketBroadcastCapable (sys_socket_t socketid)
|
||||
== SOCKET_ERROR)
|
||||
{
|
||||
int err = SOCKETERRNO;
|
||||
Con_SafePrintf ("UDP, setsockopt: %s\n", socketerror(err));
|
||||
console::safe_print ("UDP, setsockopt: %s\n", socketerror(err));
|
||||
return -1;
|
||||
}
|
||||
net_broadcastsocket = socketid;
|
||||
@@ -397,7 +397,7 @@ int WINS_Broadcast (sys_socket_t socketid, byte *buf, int len)
|
||||
ret = WINS_MakeSocketBroadcastCapable (socketid);
|
||||
if (ret == -1)
|
||||
{
|
||||
Con_Printf("Unable to make socket broadcast capable\n");
|
||||
console::info("Unable to make socket broadcast capable\n");
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
@@ -418,7 +418,7 @@ int WINS_Write (sys_socket_t socketid, byte *buf, int len, struct qsockaddr *add
|
||||
int err = SOCKETERRNO;
|
||||
if (err == NET_EWOULDBLOCK)
|
||||
return 0;
|
||||
Con_SafePrintf ("WINS_Write, sendto: %s\n", socketerror(err));
|
||||
console::safe_print ("WINS_Write, sendto: %s\n", socketerror(err));
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user