fix some prototype warnings

[xonotic/darkplaces.git] / net_wipx.c

diff --git a/net_wipx.c b/net_wipx.c
index 3d5ec4feb0d0900dd306da8ae13066348888a368..7bed13c71152e87a2bdab635da02915df85c52ef 100644 (file)
--- a/net_wipx.c
+++ b/net_wipx.c
@@ -24,8 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <wsipx.h>
 #include "net_wipx.h"
 
-extern cvar_t hostname;
-
 #define MAXHOSTNAMELEN         256
 
 static int net_acceptsocket = -1;              // socket for fielding new connections
@@ -50,7 +48,7 @@ int WIPX_Init (void)
        int             r;
        WORD    wVersionRequested; 
 
-       if (COM_CheckParm ("-noipx"))
+       if (!COM_CheckParm ("-ipx")) // LordHavoc: changed -noipx to -ipx at Dabb's request, apparently crashs on computers without MS clients installed
                return -1;
 
 // make sure LoadLibrary has happened successfully
@@ -232,18 +230,33 @@ int WIPX_CheckNewConnections (void)
 
 //=============================================================================
 
-static byte packetBuffer[NET_DATAGRAMSIZE + 4];
+int WIPX_Recv (qbyte *buf, int len, struct qsockaddr *addr)
+{
+       return WIPX_Read (net_acceptsocket, buf, len, addr);
+}
+
+//=============================================================================
+
+int WIPX_Send (qbyte *buf, int len, struct qsockaddr *addr)
+{
+       return WIPX_Write (net_acceptsocket, buf, len, addr);
+}
+
+//=============================================================================
+
+static qbyte packetBuffer[NET_DATAGRAMSIZE + 4];
 
-int WIPX_Read (int handle, byte *buf, int len, struct qsockaddr *addr)
+int WIPX_Read (int handle, qbyte *buf, int len, struct qsockaddr *addr)
 {
        int addrlen = sizeof (struct qsockaddr);
        int socket = ipxsocket[handle];
        int ret;
+       int errno;
 
        ret = precvfrom (socket, packetBuffer, len+4, 0, (struct sockaddr *)addr, &addrlen);
        if (ret == -1)
        {
-               int errno = pWSAGetLastError();
+               errno = pWSAGetLastError();
 
                if (errno == WSAEWOULDBLOCK || errno == WSAECONNREFUSED)
                        return 0;
@@ -262,14 +275,14 @@ int WIPX_Read (int handle, byte *buf, int len, struct qsockaddr *addr)
 
 //=============================================================================
 
-int WIPX_Broadcast (int handle, byte *buf, int len)
+int WIPX_Broadcast (int handle, qbyte *buf, int len)
 {
        return WIPX_Write (handle, buf, len, &broadcastaddr);
 }
 
 //=============================================================================
 
-int WIPX_Write (int handle, byte *buf, int len, struct qsockaddr *addr)
+int WIPX_Write (int handle, qbyte *buf, int len, struct qsockaddr *addr)
 {
        int socket = ipxsocket[handle];
        int ret;
@@ -290,7 +303,7 @@ int WIPX_Write (int handle, byte *buf, int len, struct qsockaddr *addr)
 
 //=============================================================================
 
-char *WIPX_AddrToString (struct qsockaddr *addr)
+char *WIPX_AddrToString (const struct qsockaddr *addr)
 {
        static char buf[28];
 
@@ -312,7 +325,7 @@ char *WIPX_AddrToString (struct qsockaddr *addr)
 
 //=============================================================================
 
-int WIPX_StringToAddr (char *string, struct qsockaddr *addr)
+int WIPX_StringToAddr (const char *string, struct qsockaddr *addr)
 {
        int  val;
        char buf[3];
@@ -350,13 +363,14 @@ int WIPX_StringToAddr (char *string, struct qsockaddr *addr)
 
 int WIPX_GetSocketAddr (int handle, struct qsockaddr *addr)
 {
+       int errno;
        int socket = ipxsocket[handle];
        int addrlen = sizeof(struct qsockaddr);
 
        memset(addr, 0, sizeof(struct qsockaddr));
        if(pgetsockname(socket, (struct sockaddr *)addr, &addrlen) != 0)
        {
-               int errno = pWSAGetLastError();
+               errno = pWSAGetLastError();
        }
 
        return 0;
@@ -364,7 +378,7 @@ int WIPX_GetSocketAddr (int handle, struct qsockaddr *addr)
 
 //=============================================================================
 
-int WIPX_GetNameFromAddr (struct qsockaddr *addr, char *name)
+int WIPX_GetNameFromAddr (const struct qsockaddr *addr, char *name)
 {
        strcpy(name, WIPX_AddrToString(addr));
        return 0;
@@ -372,7 +386,7 @@ int WIPX_GetNameFromAddr (struct qsockaddr *addr, char *name)
 
 //=============================================================================
 
-int WIPX_GetAddrFromName(char *name, struct qsockaddr *addr)
+int WIPX_GetAddrFromName(const char *name, struct qsockaddr *addr)
 {
        int n;
        char buf[32];
@@ -397,7 +411,7 @@ int WIPX_GetAddrFromName(char *name, struct qsockaddr *addr)
 
 //=============================================================================
 
-int WIPX_AddrCompare (struct qsockaddr *addr1, struct qsockaddr *addr2)
+int WIPX_AddrCompare (const struct qsockaddr *addr1, const struct qsockaddr *addr2)
 {
        if (addr1->sa_family != addr2->sa_family)
                return -1;
@@ -428,4 +442,3 @@ int WIPX_SetSocketPort (struct qsockaddr *addr, int port)
        return 0;
 }
 
-//=============================================================================