#include "quakedef.h"
#include "winquake.h"
-extern cvar_t hostname;
-
#define MAXHOSTNAMELEN 256
static int net_acceptsocket = -1; // socket for fielding new connections
MSG msg;
BOOL ret;
- if ((Sys_FloatTime() - blocktime) > 2.0)
+ if ((Sys_DoubleTime() - blocktime) > 2.0)
{
WSACancelBlockingCall();
- return FALSE;
+ return false;
}
/* get the next message, if any */
DispatchMessage(&msg);
}
- /* TRUE if we got a message */
+ /* true if we got a message */
return ret;
}
-void WINS_GetLocalAddress()
+void WINS_GetLocalAddress(void)
{
struct hostent *local = NULL;
char buff[MAXHOSTNAMELEN];
if (pgethostname(buff, MAXHOSTNAMELEN) == SOCKET_ERROR)
return;
- blocktime = Sys_FloatTime();
+ blocktime = Sys_DoubleTime();
WSASetBlockingHook(BlockingHook);
local = pgethostbyname(buff);
WSAUnhookBlockingHook();
myAddr = *(int *)local->h_addr_list[0];
addr = ntohl(myAddr);
- sprintf(my_tcpip_address, "%d.%d.%d.%d", (addr >> 24) & 0xff, (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff);
+ sprintf(my_tcpip_address, "%d.%d.%d.%d", (int) ((addr >> 24) & 0xff), (int) ((addr >> 16) & 0xff), (int) ((addr >> 8) & 0xff), (int) (addr & 0xff));
}
the local network components to fill in the rest
============
*/
-static int PartialIPAddress (char *in, struct qsockaddr *hostaddr)
+static int PartialIPAddress (const char *in, struct qsockaddr *hostaddr)
{
char buff[256];
char *b;
if (net_acceptsocket == -1)
return -1;
- if (precvfrom (net_acceptsocket, buf, sizeof(buf), MSG_PEEK, NULL, NULL) > 0)
+ if (precvfrom (net_acceptsocket, buf, sizeof(buf), MSG_PEEK, NULL, NULL) >= 0)
{
return net_acceptsocket;
}
//=============================================================================
-int WINS_Read (int socket, byte *buf, int len, struct qsockaddr *addr)
+int WINS_Recv (qbyte *buf, int len, struct qsockaddr *addr)
+{
+ return WINS_Read (net_acceptsocket, buf, len, addr);
+}
+
+//=============================================================================
+
+int WINS_Send (qbyte *buf, int len, struct qsockaddr *addr)
+{
+ return WINS_Write (net_acceptsocket, buf, len, addr);
+}
+
+//=============================================================================
+
+int WINS_Read (int socket, qbyte *buf, int len, struct qsockaddr *addr)
{
int addrlen = sizeof (struct qsockaddr);
int ret;
//=============================================================================
-int WINS_Broadcast (int socket, byte *buf, int len)
+int WINS_Broadcast (int socket, qbyte *buf, int len)
{
int ret;
//=============================================================================
-int WINS_Write (int socket, byte *buf, int len, struct qsockaddr *addr)
+int WINS_Write (int socket, qbyte *buf, int len, struct qsockaddr *addr)
{
int ret;
//=============================================================================
-char *WINS_AddrToString (struct qsockaddr *addr)
+char *WINS_AddrToString (const struct qsockaddr *addr)
{
static char buffer[22];
int haddr;
//=============================================================================
-int WINS_StringToAddr (char *string, struct qsockaddr *addr)
+int WINS_StringToAddr (const char *string, struct qsockaddr *addr)
{
int ha1, ha2, ha3, ha4, hp;
int ipaddr;
//=============================================================================
-int WINS_GetNameFromAddr (struct qsockaddr *addr, char *name)
+int WINS_GetNameFromAddr (const struct qsockaddr *addr, char *name)
{
struct hostent *hostentry;
//=============================================================================
-int WINS_GetAddrFromName(char *name, struct qsockaddr *addr)
+int WINS_GetAddrFromName(const char *name, struct qsockaddr *addr)
{
struct hostent *hostentry;
//=============================================================================
-int WINS_AddrCompare (struct qsockaddr *addr1, struct qsockaddr *addr2)
+int WINS_AddrCompare (const struct qsockaddr *addr1, const struct qsockaddr *addr2)
{
if (addr1->sa_family != addr2->sa_family)
return -1;
return 0;
}
-//=============================================================================