From 2bed6c79c9e39d858fe71ab4e0b6f79330ace7aa Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Mon, 21 Jun 2010 12:20:25 +0000 Subject: [PATCH] net_bsd.c, net_dgrm.h, net_loop.c, net_loop.h, net_sdl.c, net_win.c: more trivialities. git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@217 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/net_bsd.c | 104 ++++++++++++++++---------------- Quake/net_dgrm.h | 3 +- Quake/net_loop.c | 12 ++-- Quake/net_loop.h | 4 +- Quake/net_sdl.c | 106 ++++++++++++++++----------------- Quake/net_win.c | 150 +++++++++++++++++++++++------------------------ 6 files changed, 190 insertions(+), 189 deletions(-) diff --git a/Quake/net_bsd.c b/Quake/net_bsd.c index cd900682..ce13cd96 100644 --- a/Quake/net_bsd.c +++ b/Quake/net_bsd.c @@ -23,43 +23,43 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" #include "net_defs.h" -#include "net_loop.h" #include "net_dgrm.h" +#include "net_loop.h" net_driver_t net_drivers[MAX_NET_DRIVERS] = { { - "Loopback", - false, - Loop_Init, - Loop_Listen, - Loop_SearchForHosts, - Loop_Connect, - Loop_CheckNewConnections, - Loop_GetMessage, - Loop_SendMessage, - Loop_SendUnreliableMessage, - Loop_CanSendMessage, - Loop_CanSendUnreliableMessage, - Loop_Close, - Loop_Shutdown - } - , + "Loopback", + false, + Loop_Init, + Loop_Listen, + Loop_SearchForHosts, + Loop_Connect, + Loop_CheckNewConnections, + Loop_GetMessage, + Loop_SendMessage, + Loop_SendUnreliableMessage, + Loop_CanSendMessage, + Loop_CanSendUnreliableMessage, + Loop_Close, + Loop_Shutdown + }, + { - "Datagram", - false, - Datagram_Init, - Datagram_Listen, - Datagram_SearchForHosts, - Datagram_Connect, - Datagram_CheckNewConnections, - Datagram_GetMessage, - Datagram_SendMessage, - Datagram_SendUnreliableMessage, - Datagram_CanSendMessage, - Datagram_CanSendUnreliableMessage, - Datagram_Close, - Datagram_Shutdown + "Datagram", + false, + Datagram_Init, + Datagram_Listen, + Datagram_SearchForHosts, + Datagram_Connect, + Datagram_CheckNewConnections, + Datagram_GetMessage, + Datagram_SendMessage, + Datagram_SendUnreliableMessage, + Datagram_CanSendMessage, + Datagram_CanSendUnreliableMessage, + Datagram_Close, + Datagram_Shutdown } }; @@ -70,27 +70,27 @@ int net_numdrivers = 2; net_landriver_t net_landrivers[MAX_NET_DRIVERS] = { { - "UDP", - false, - 0, - UDP_Init, - UDP_Shutdown, - UDP_Listen, - UDP_OpenSocket, - UDP_CloseSocket, - UDP_Connect, - UDP_CheckNewConnections, - UDP_Read, - UDP_Write, - UDP_Broadcast, - UDP_AddrToString, - UDP_StringToAddr, - UDP_GetSocketAddr, - UDP_GetNameFromAddr, - UDP_GetAddrFromName, - UDP_AddrCompare, - UDP_GetSocketPort, - UDP_SetSocketPort + "UDP", + false, + 0, + UDP_Init, + UDP_Shutdown, + UDP_Listen, + UDP_OpenSocket, + UDP_CloseSocket, + UDP_Connect, + UDP_CheckNewConnections, + UDP_Read, + UDP_Write, + UDP_Broadcast, + UDP_AddrToString, + UDP_StringToAddr, + UDP_GetSocketAddr, + UDP_GetNameFromAddr, + UDP_GetAddrFromName, + UDP_AddrCompare, + UDP_GetSocketPort, + UDP_SetSocketPort } }; diff --git a/Quake/net_dgrm.h b/Quake/net_dgrm.h index 77d95ad4..ce0f6591 100644 --- a/Quake/net_dgrm.h +++ b/Quake/net_dgrm.h @@ -24,12 +24,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // net_dgrm.h - int Datagram_Init (void); void Datagram_Listen (qboolean state); void Datagram_SearchForHosts (qboolean xmit); qsocket_t *Datagram_Connect (char *host); -qsocket_t *Datagram_CheckNewConnections (void); +qsocket_t *Datagram_CheckNewConnections (void); int Datagram_GetMessage (qsocket_t *sock); int Datagram_SendMessage (qsocket_t *sock, sizebuf_t *data); int Datagram_SendUnreliableMessage (qsocket_t *sock, sizebuf_t *data); diff --git a/Quake/net_loop.c b/Quake/net_loop.c index 951a98d7..b6c97175 100644 --- a/Quake/net_loop.c +++ b/Quake/net_loop.c @@ -18,6 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + // net_loop.c #include "arch_def.h" @@ -26,9 +27,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "net_defs.h" #include "net_loop.h" -qboolean localconnectpending = false; -qsocket_t *loop_client = NULL; -qsocket_t *loop_server = NULL; +static qboolean localconnectpending = false; +static qsocket_t *loop_client = NULL; +static qsocket_t *loop_server = NULL; int Loop_Init (void) { @@ -146,7 +147,7 @@ int Loop_GetMessage (qsocket_t *sock) sock->receiveMessageLength -= length; if (sock->receiveMessageLength) - memmove(sock->receiveMessage, &sock->receiveMessage[length], sock->receiveMessageLength); + memmove (sock->receiveMessage, &sock->receiveMessage[length], sock->receiveMessageLength); if (sock->driverdata && ret == 1) ((qsocket_t *)sock->driverdata)->canSend = true; @@ -166,7 +167,7 @@ int Loop_SendMessage (qsocket_t *sock, sizebuf_t *data) bufferLength = &((qsocket_t *)sock->driverdata)->receiveMessageLength; if ((*bufferLength + data->cursize + 4) > NET_MAXMESSAGE) - Sys_Error("Loop_SendMessage: overflow\n"); + Sys_Error("Loop_SendMessage: overflow"); buffer = ((qsocket_t *)sock->driverdata)->receiveMessage + *bufferLength; @@ -247,3 +248,4 @@ void Loop_Close (qsocket_t *sock) else loop_server = NULL; } + diff --git a/Quake/net_loop.h b/Quake/net_loop.h index 34f084af..9c6b48b1 100644 --- a/Quake/net_loop.h +++ b/Quake/net_loop.h @@ -27,8 +27,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. int Loop_Init (void); void Loop_Listen (qboolean state); void Loop_SearchForHosts (qboolean xmit); -qsocket_t *Loop_Connect (char *host); -qsocket_t *Loop_CheckNewConnections (void); +qsocket_t *Loop_Connect (char *host); +qsocket_t *Loop_CheckNewConnections (void); int Loop_GetMessage (qsocket_t *sock); int Loop_SendMessage (qsocket_t *sock, sizebuf_t *data); int Loop_SendUnreliableMessage (qsocket_t *sock, sizebuf_t *data); diff --git a/Quake/net_sdl.c b/Quake/net_sdl.c index 8f09e07b..e1cee530 100644 --- a/Quake/net_sdl.c +++ b/Quake/net_sdl.c @@ -25,74 +25,74 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" #include "net_defs.h" -#include "net_loop.h" #include "net_dgrm.h" -#include "net_sdlnet.h" +#include "net_loop.h" net_driver_t net_drivers[MAX_NET_DRIVERS] = { { - "Loopback", - false, - Loop_Init, - Loop_Listen, - Loop_SearchForHosts, - Loop_Connect, - Loop_CheckNewConnections, - Loop_GetMessage, - Loop_SendMessage, - Loop_SendUnreliableMessage, - Loop_CanSendMessage, - Loop_CanSendUnreliableMessage, - Loop_Close, - Loop_Shutdown - } - , + "Loopback", + false, + Loop_Init, + Loop_Listen, + Loop_SearchForHosts, + Loop_Connect, + Loop_CheckNewConnections, + Loop_GetMessage, + Loop_SendMessage, + Loop_SendUnreliableMessage, + Loop_CanSendMessage, + Loop_CanSendUnreliableMessage, + Loop_Close, + Loop_Shutdown + }, + { - "Datagram", - false, - Datagram_Init, - Datagram_Listen, - Datagram_SearchForHosts, - Datagram_Connect, - Datagram_CheckNewConnections, - Datagram_GetMessage, - Datagram_SendMessage, - Datagram_SendUnreliableMessage, - Datagram_CanSendMessage, - Datagram_CanSendUnreliableMessage, - Datagram_Close, - Datagram_Shutdown + "Datagram", + false, + Datagram_Init, + Datagram_Listen, + Datagram_SearchForHosts, + Datagram_Connect, + Datagram_CheckNewConnections, + Datagram_GetMessage, + Datagram_SendMessage, + Datagram_SendUnreliableMessage, + Datagram_CanSendMessage, + Datagram_CanSendUnreliableMessage, + Datagram_Close, + Datagram_Shutdown } }; int net_numdrivers = 2; +#include "net_sdlnet.h" net_landriver_t net_landrivers[MAX_NET_DRIVERS] = { { - "UDP", - false, - 0, - SDLN_Init, - SDLN_Shutdown, - SDLN_Listen, - SDLN_OpenSocket, - SDLN_CloseSocket, - SDLN_Connect, - SDLN_CheckNewConnections, - SDLN_Read, - SDLN_Write, - SDLN_Broadcast, - SDLN_AddrToString, - SDLN_StringToAddr, - SDLN_GetSocketAddr, - SDLN_GetNameFromAddr, - SDLN_GetAddrFromName, - SDLN_AddrCompare, - SDLN_GetSocketPort, - SDLN_SetSocketPort + "UDP", + false, + 0, + SDLN_Init, + SDLN_Shutdown, + SDLN_Listen, + SDLN_OpenSocket, + SDLN_CloseSocket, + SDLN_Connect, + SDLN_CheckNewConnections, + SDLN_Read, + SDLN_Write, + SDLN_Broadcast, + SDLN_AddrToString, + SDLN_StringToAddr, + SDLN_GetSocketAddr, + SDLN_GetNameFromAddr, + SDLN_GetAddrFromName, + SDLN_AddrCompare, + SDLN_GetSocketPort, + SDLN_SetSocketPort } }; diff --git a/Quake/net_win.c b/Quake/net_win.c index 9e41f1eb..8627ac77 100644 --- a/Quake/net_win.c +++ b/Quake/net_win.c @@ -24,43 +24,43 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" #include "net_defs.h" -#include "net_loop.h" #include "net_dgrm.h" +#include "net_loop.h" net_driver_t net_drivers[MAX_NET_DRIVERS] = { { - "Loopback", - false, - Loop_Init, - Loop_Listen, - Loop_SearchForHosts, - Loop_Connect, - Loop_CheckNewConnections, - Loop_GetMessage, - Loop_SendMessage, - Loop_SendUnreliableMessage, - Loop_CanSendMessage, - Loop_CanSendUnreliableMessage, - Loop_Close, - Loop_Shutdown - } - , + "Loopback", + false, + Loop_Init, + Loop_Listen, + Loop_SearchForHosts, + Loop_Connect, + Loop_CheckNewConnections, + Loop_GetMessage, + Loop_SendMessage, + Loop_SendUnreliableMessage, + Loop_CanSendMessage, + Loop_CanSendUnreliableMessage, + Loop_Close, + Loop_Shutdown + }, + { - "Datagram", - false, - Datagram_Init, - Datagram_Listen, - Datagram_SearchForHosts, - Datagram_Connect, - Datagram_CheckNewConnections, - Datagram_GetMessage, - Datagram_SendMessage, - Datagram_SendUnreliableMessage, - Datagram_CanSendMessage, - Datagram_CanSendUnreliableMessage, - Datagram_Close, - Datagram_Shutdown + "Datagram", + false, + Datagram_Init, + Datagram_Listen, + Datagram_SearchForHosts, + Datagram_Connect, + Datagram_CheckNewConnections, + Datagram_GetMessage, + Datagram_SendMessage, + Datagram_SendUnreliableMessage, + Datagram_CanSendMessage, + Datagram_CanSendUnreliableMessage, + Datagram_Close, + Datagram_Shutdown } }; @@ -73,52 +73,52 @@ int net_numdrivers = 2; net_landriver_t net_landrivers[MAX_NET_DRIVERS] = { { - "Winsock TCPIP", - false, - 0, - WINS_Init, - WINS_Shutdown, - WINS_Listen, - WINS_OpenSocket, - WINS_CloseSocket, - WINS_Connect, - WINS_CheckNewConnections, - WINS_Read, - WINS_Write, - WINS_Broadcast, - WINS_AddrToString, - WINS_StringToAddr, - WINS_GetSocketAddr, - WINS_GetNameFromAddr, - WINS_GetAddrFromName, - WINS_AddrCompare, - WINS_GetSocketPort, - WINS_SetSocketPort + "Winsock TCPIP", + false, + 0, + WINS_Init, + WINS_Shutdown, + WINS_Listen, + WINS_OpenSocket, + WINS_CloseSocket, + WINS_Connect, + WINS_CheckNewConnections, + WINS_Read, + WINS_Write, + WINS_Broadcast, + WINS_AddrToString, + WINS_StringToAddr, + WINS_GetSocketAddr, + WINS_GetNameFromAddr, + WINS_GetAddrFromName, + WINS_AddrCompare, + WINS_GetSocketPort, + WINS_SetSocketPort }, - { - "Winsock IPX", - false, - 0, - WIPX_Init, - WIPX_Shutdown, - WIPX_Listen, - WIPX_OpenSocket, - WIPX_CloseSocket, - WIPX_Connect, - WIPX_CheckNewConnections, - WIPX_Read, - WIPX_Write, - WIPX_Broadcast, - WIPX_AddrToString, - WIPX_StringToAddr, - WIPX_GetSocketAddr, - WIPX_GetNameFromAddr, - WIPX_GetAddrFromName, - WIPX_AddrCompare, - WIPX_GetSocketPort, - WIPX_SetSocketPort - } + { + "Winsock IPX", + false, + 0, + WIPX_Init, + WIPX_Shutdown, + WIPX_Listen, + WIPX_OpenSocket, + WIPX_CloseSocket, + WIPX_Connect, + WIPX_CheckNewConnections, + WIPX_Read, + WIPX_Write, + WIPX_Broadcast, + WIPX_AddrToString, + WIPX_StringToAddr, + WIPX_GetSocketAddr, + WIPX_GetNameFromAddr, + WIPX_GetAddrFromName, + WIPX_AddrCompare, + WIPX_GetSocketPort, + WIPX_SetSocketPort + } }; int net_numlandrivers = 2;