From 927449b5ad3a24c07444744df5273d64c79a67f1 Mon Sep 17 00:00:00 2001 From: havoc Date: Fri, 28 Mar 2003 03:33:18 +0000 Subject: [PATCH] renamed all net_wins.c functions to UDP instead of WINS, this allows use of net_bsd.c and net_udp.h instead of net_win.c and net_wins.h git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@2864 d7cf8633-e32d-0410-b094-e92efae38249 --- darkplaces.dsp | 10 ++--- makefile.mingw | 2 +- makefile.mingwcross | 4 +- net_win.c | 101 -------------------------------------------- net_wins.c | 76 ++++++++++++++++----------------- net_wins.h | 47 --------------------- 6 files changed, 46 insertions(+), 194 deletions(-) delete mode 100644 net_win.c delete mode 100644 net_wins.h diff --git a/darkplaces.dsp b/darkplaces.dsp index df293b48..82014427 100644 --- a/darkplaces.dsp +++ b/darkplaces.dsp @@ -260,6 +260,10 @@ SOURCE=.\model_sprite.c # End Source File # Begin Source File +SOURCE=.\net_bsd.c +# End Source File +# Begin Source File + SOURCE=.\net_dgrm.c # End Source File # Begin Source File @@ -276,10 +280,6 @@ SOURCE=.\net_master.c # End Source File # Begin Source File -SOURCE=.\net_win.c -# End Source File -# Begin Source File - SOURCE=.\net_wins.c # End Source File # Begin Source File @@ -580,7 +580,7 @@ SOURCE=.\net_master.h # End Source File # Begin Source File -SOURCE=.\net_wins.h +SOURCE=.\net_udp.h # End Source File # Begin Source File diff --git a/makefile.mingw b/makefile.mingw index 63889847..1f9d3852 100644 --- a/makefile.mingw +++ b/makefile.mingw @@ -40,7 +40,7 @@ builddate: .c.o: gcc $(CFLAGS) -c $*.c -darkplaces: $(OBJECTS) vid_wgl.o sys_win.o snd_win.o net_win.o net_wins.o cd_win.o conproc.o +darkplaces: $(OBJECTS) vid_wgl.o sys_win.o snd_win.o net_bsd.o net_wins.o cd_win.o conproc.o gcc -o $@ $^ $(LDFLAGS) diff --git a/makefile.mingwcross b/makefile.mingwcross index f4276542..4806003a 100644 --- a/makefile.mingwcross +++ b/makefile.mingwcross @@ -42,8 +42,8 @@ SHAREDOBJECTS= builddate.o cmd.o collision.o common.o crc.o cvar.o \ OBJ_COMMON= $(CLIENTOBJECTS) $(SERVEROBJECTS) $(SHAREDOBJECTS) -OBJ_WGL= vid_wgl.o $(OBJ_CD) $(OBJ_SND) net_win.o net_wins.o sys_win.o -OBJ_DED= vid_null.o cd_null.o snd_null.o net_win.o net_wins.o sys_win.o +OBJ_WGL= vid_wgl.o $(OBJ_CD) $(OBJ_SND) net_bsd.o net_wins.o sys_win.o +OBJ_DED= vid_null.o cd_null.o snd_null.o net_bsd.o net_wins.o sys_win.o # Compilation diff --git a/net_win.c b/net_win.c deleted file mode 100644 index 3bd5d1d6..00000000 --- a/net_win.c +++ /dev/null @@ -1,101 +0,0 @@ -/* -Copyright (C) 1996-1997 Id Software, Inc. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ -#include "quakedef.h" - -#include "net_loop.h" -#include "net_dgrm.h" - -net_driver_t net_drivers[MAX_NET_DRIVERS] = -{ - { - "Loopback", - false, - Loop_Init, - Loop_Listen, - Loop_SearchForHosts, - Loop_SearchForInetHosts, - Loop_Connect, - Loop_CheckNewConnections, - Loop_GetMessage, - Loop_SendMessage, - Loop_SendUnreliableMessage, - Loop_CanSendMessage, - Loop_CanSendUnreliableMessage, - Loop_Close, - Loop_Shutdown, - Loop_Heartbeat - } - , - { - "Datagram", - false, - Datagram_Init, - Datagram_Listen, - Datagram_SearchForHosts, - Datagram_SearchForInetHosts, - Datagram_Connect, - Datagram_CheckNewConnections, - Datagram_GetMessage, - Datagram_SendMessage, - Datagram_SendUnreliableMessage, - Datagram_CanSendMessage, - Datagram_CanSendUnreliableMessage, - Datagram_Close, - Datagram_Shutdown, - Datagram_Heartbeat - } -}; - -int net_numdrivers = 2; - - -#include "net_wins.h" - -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_Recv, - WINS_Send, - WINS_Read, - WINS_Write, - WINS_Broadcast, - WINS_AddrToString, - WINS_StringToAddr, - WINS_GetSocketAddr, - WINS_GetNameFromAddr, - WINS_GetAddrFromName, - WINS_AddrCompare, - WINS_GetSocketPort, - WINS_SetSocketPort - } -}; - -int net_numlandrivers = 1; - diff --git a/net_wins.c b/net_wins.c index fea9a91d..0468e384 100644 --- a/net_wins.c +++ b/net_wins.c @@ -31,7 +31,7 @@ static struct qsockaddr broadcastaddr; static unsigned long myAddr; -#include "net_wins.h" +#include "net_udp.h" WSADATA winsockdata; @@ -64,7 +64,7 @@ BOOL PASCAL FAR BlockingHook(void) } -void WINS_GetLocalAddress(void) +void UDP_GetLocalAddress(void) { struct hostent *local = NULL; char buff[MAXHOSTNAMELEN]; @@ -90,7 +90,7 @@ void WINS_GetLocalAddress(void) } -int WINS_Init (void) +int UDP_Init (void) { int i; char buff[MAXHOSTNAMELEN]; @@ -155,9 +155,9 @@ int WINS_Init (void) strcpy(my_tcpip_address, "INADDR_ANY"); } - if ((net_controlsocket = WINS_OpenSocket (0)) == -1) + if ((net_controlsocket = UDP_OpenSocket (0)) == -1) { - Con_Printf("WINS_Init: Unable to open control socket\n"); + Con_Printf("UDP_Init: Unable to open control socket\n"); WSACleanup (); return -1; } @@ -174,38 +174,38 @@ int WINS_Init (void) //============================================================================= -void WINS_Shutdown (void) +void UDP_Shutdown (void) { - WINS_Listen (false); - WINS_CloseSocket (net_controlsocket); + UDP_Listen (false); + UDP_CloseSocket (net_controlsocket); WSACleanup (); } //============================================================================= -void WINS_Listen (qboolean state) +void UDP_Listen (qboolean state) { // enable listening if (state) { if (net_acceptsocket != -1) return; - WINS_GetLocalAddress(); - if ((net_acceptsocket = WINS_OpenSocket (net_hostport)) == -1) - Sys_Error ("WINS_Listen: Unable to open accept socket\n"); + UDP_GetLocalAddress(); + if ((net_acceptsocket = UDP_OpenSocket (net_hostport)) == -1) + Sys_Error ("UDP_Listen: Unable to open accept socket\n"); return; } // disable listening if (net_acceptsocket == -1) return; - WINS_CloseSocket (net_acceptsocket); + UDP_CloseSocket (net_acceptsocket); net_acceptsocket = -1; } //============================================================================= -int WINS_OpenSocket (int port) +int UDP_OpenSocket (int port) { int newsocket; struct sockaddr_in address; @@ -223,7 +223,7 @@ int WINS_OpenSocket (int port) if( bind (newsocket, (void *)&address, sizeof(address)) == 0) return newsocket; - Sys_Error ("Unable to bind to %s", WINS_AddrToString((struct qsockaddr *)&address)); + Sys_Error ("Unable to bind to %s", UDP_AddrToString((struct qsockaddr *)&address)); ErrorReturn: closesocket (newsocket); return -1; @@ -231,7 +231,7 @@ ErrorReturn: //============================================================================= -int WINS_CloseSocket (int socket) +int UDP_CloseSocket (int socket) { if (socket == net_broadcastsocket) net_broadcastsocket = 0; @@ -298,14 +298,14 @@ static int PartialIPAddress (const char *in, struct qsockaddr *hostaddr) } //============================================================================= -int WINS_Connect (int socket, struct qsockaddr *addr) +int UDP_Connect (int socket, struct qsockaddr *addr) { return 0; } //============================================================================= -int WINS_CheckNewConnections (void) +int UDP_CheckNewConnections (void) { char buf[4096]; @@ -319,21 +319,21 @@ int WINS_CheckNewConnections (void) //============================================================================= -int WINS_Recv (qbyte *buf, int len, struct qsockaddr *addr) +int UDP_Recv (qbyte *buf, int len, struct qsockaddr *addr) { - return WINS_Read (net_acceptsocket, buf, len, addr); + return UDP_Read (net_acceptsocket, buf, len, addr); } //============================================================================= -int WINS_Send (qbyte *buf, int len, struct qsockaddr *addr) +int UDP_Send (qbyte *buf, int len, struct qsockaddr *addr) { - return WINS_Write (net_acceptsocket, buf, len, addr); + return UDP_Write (net_acceptsocket, buf, len, addr); } //============================================================================= -int WINS_Read (int socket, qbyte *buf, int len, struct qsockaddr *addr) +int UDP_Read (int socket, qbyte *buf, int len, struct qsockaddr *addr) { int addrlen = sizeof (struct qsockaddr); int ret; @@ -353,7 +353,7 @@ int WINS_Read (int socket, qbyte *buf, int len, struct qsockaddr *addr) //============================================================================= -int WINS_MakeSocketBroadcastCapable (int socket) +int UDP_MakeSocketBroadcastCapable (int socket) { int i = 1; @@ -367,7 +367,7 @@ int WINS_MakeSocketBroadcastCapable (int socket) //============================================================================= -int WINS_Broadcast (int socket, qbyte *buf, int len) +int UDP_Broadcast (int socket, qbyte *buf, int len) { int ret; @@ -375,8 +375,8 @@ int WINS_Broadcast (int socket, qbyte *buf, int len) { if (net_broadcastsocket != 0) Sys_Error("Attempted to use multiple broadcasts sockets\n"); - WINS_GetLocalAddress(); - ret = WINS_MakeSocketBroadcastCapable (socket); + UDP_GetLocalAddress(); + ret = UDP_MakeSocketBroadcastCapable (socket); if (ret == -1) { Con_Printf("Unable to make socket broadcast capable\n"); @@ -384,12 +384,12 @@ int WINS_Broadcast (int socket, qbyte *buf, int len) } } - return WINS_Write (socket, buf, len, &broadcastaddr); + return UDP_Write (socket, buf, len, &broadcastaddr); } //============================================================================= -int WINS_Write (int socket, qbyte *buf, int len, struct qsockaddr *addr) +int UDP_Write (int socket, qbyte *buf, int len, struct qsockaddr *addr) { int ret; @@ -403,7 +403,7 @@ int WINS_Write (int socket, qbyte *buf, int len, struct qsockaddr *addr) //============================================================================= -char *WINS_AddrToString (const struct qsockaddr *addr) +char *UDP_AddrToString (const struct qsockaddr *addr) { static char buffer[22]; int haddr; @@ -415,7 +415,7 @@ char *WINS_AddrToString (const struct qsockaddr *addr) //============================================================================= -int WINS_StringToAddr (const char *string, struct qsockaddr *addr) +int UDP_StringToAddr (const char *string, struct qsockaddr *addr) { int ha1, ha2, ha3, ha4, hp; int ipaddr; @@ -431,7 +431,7 @@ int WINS_StringToAddr (const char *string, struct qsockaddr *addr) //============================================================================= -int WINS_GetSocketAddr (int socket, struct qsockaddr *addr) +int UDP_GetSocketAddr (int socket, struct qsockaddr *addr) { int addrlen = sizeof(struct qsockaddr); unsigned int a; @@ -447,7 +447,7 @@ int WINS_GetSocketAddr (int socket, struct qsockaddr *addr) //============================================================================= -int WINS_GetNameFromAddr (const struct qsockaddr *addr, char *name) +int UDP_GetNameFromAddr (const struct qsockaddr *addr, char *name) { struct hostent *hostentry; @@ -458,13 +458,13 @@ int WINS_GetNameFromAddr (const struct qsockaddr *addr, char *name) return 0; } - strcpy (name, WINS_AddrToString (addr)); + strcpy (name, UDP_AddrToString (addr)); return 0; } //============================================================================= -int WINS_GetAddrFromName(const char *name, struct qsockaddr *addr) +int UDP_GetAddrFromName(const char *name, struct qsockaddr *addr) { struct hostent *hostentry; @@ -484,7 +484,7 @@ int WINS_GetAddrFromName(const char *name, struct qsockaddr *addr) //============================================================================= -int WINS_AddrCompare (const struct qsockaddr *addr1, const struct qsockaddr *addr2) +int UDP_AddrCompare (const struct qsockaddr *addr1, const struct qsockaddr *addr2) { if (addr1->sa_family != addr2->sa_family) return -1; @@ -500,13 +500,13 @@ int WINS_AddrCompare (const struct qsockaddr *addr1, const struct qsockaddr *add //============================================================================= -int WINS_GetSocketPort (struct qsockaddr *addr) +int UDP_GetSocketPort (struct qsockaddr *addr) { return ntohs(((struct sockaddr_in *)addr)->sin_port); } -int WINS_SetSocketPort (struct qsockaddr *addr, int port) +int UDP_SetSocketPort (struct qsockaddr *addr, int port) { ((struct sockaddr_in *)addr)->sin_port = htons((unsigned short)port); return 0; diff --git a/net_wins.h b/net_wins.h deleted file mode 100644 index 7f401ab0..00000000 --- a/net_wins.h +++ /dev/null @@ -1,47 +0,0 @@ -/* -Copyright (C) 1996-1997 Id Software, Inc. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ -// net_wins.h - -#ifndef NET_WINS_H -#define NET_WINS_H - -int WINS_Init (void); -void WINS_Shutdown (void); -void WINS_Listen (qboolean state); -int WINS_OpenSocket (int port); -int WINS_CloseSocket (int socket); -int WINS_Connect (int socket, struct qsockaddr *addr); -int WINS_CheckNewConnections (void); -int WINS_Recv (qbyte *buf, int len, struct qsockaddr *addr); -int WINS_Send (qbyte *buf, int len, struct qsockaddr *addr); -int WINS_Read (int socket, qbyte *buf, int len, struct qsockaddr *addr); -int WINS_Write (int socket, qbyte *buf, int len, struct qsockaddr *addr); -int WINS_Broadcast (int socket, qbyte *buf, int len); -char *WINS_AddrToString (const struct qsockaddr *addr); -int WINS_StringToAddr (const char *string, struct qsockaddr *addr); -int WINS_GetSocketAddr (int socket, struct qsockaddr *addr); -int WINS_GetNameFromAddr (const struct qsockaddr *addr, char *name); -int WINS_GetAddrFromName (const char *name, struct qsockaddr *addr); -int WINS_AddrCompare (const struct qsockaddr *addr1, const struct qsockaddr *addr2); -int WINS_GetSocketPort (struct qsockaddr *addr); -int WINS_SetSocketPort (struct qsockaddr *addr, int port); - -#endif - -- 2.39.2