// Written by Forest Hale 2003-06-15 and placed into public domain.
+#ifndef STANDALONETEST
+#include "quakedef.h"
+#endif
+
#include <stdlib.h>
#include <stdio.h>
#include <time.h>
// for Z_Malloc/Z_Free in quake
#ifndef STANDALONETEST
-#include "quakedef.h"
#include "zone.h"
#include "sys.h"
#include "netconn.h"
#define SOCKETERRNO WSAGetLastError()
+#define IOC_VENDOR 0x18000000
+#define _WSAIOW(x,y) (IOC_IN|(x)|(y))
+#define SIO_UDP_CONNRESET _WSAIOW(IOC_VENDOR,12)
+
#define SOCKLEN_T int
#elif defined(__MORPHOS__)
#define ioctlsocket IoctlSocket
struct hostent *hostentry;
const char *colon;
char name[128];
- if (!address || !string)
+ if (!address || !string || !*string)
return 0;
memset(address, 0, sizeof(*address));
address->addresstype = LHNETADDRESSTYPE_NONE;
return 1;
}
// try to parse as dotted decimal ipv4 address first
- if (sscanf(name, "%d.%d.%d.%d", &d1, &d2, &d3, &d4) == 4 && (unsigned int)d1 < 256 && (unsigned int)d2 < 256 && (unsigned int)d3 < 256 && (unsigned int)d4 < 256)
+ // note this supports partial ip addresses
+ d1 = d2 = d3 = d4 = 0;
+#if _MSC_VER >= 1400
+#define sscanf sscanf_s
+#endif
+ if (sscanf(name, "%d.%d.%d.%d", &d1, &d2, &d3, &d4) >= 1 && (unsigned int)d1 < 256 && (unsigned int)d2 < 256 && (unsigned int)d3 < 256 && (unsigned int)d4 < 256)
{
// parsed a valid ipv4 address
address->addresstype = LHNETADDRESSTYPE_INET4;
#ifdef STANDALONETEST
if (i < MAX_NAMECACHE)
#else
- if (i < MAX_NAMECACHE && Sys_DoubleTime() < namecache[i].expirationtime)
+ if (i < MAX_NAMECACHE && realtime < namecache[i].expirationtime)
#endif
{
*address = namecache[i].address;
namecache[namecacheposition].name[i] = name[i];
namecache[namecacheposition].name[i] = 0;
#ifndef STANDALONETEST
- namecache[namecacheposition].expirationtime = Sys_DoubleTime() + 12 * 3600; // 12 hours
+ namecache[namecacheposition].expirationtime = realtime + 12 * 3600; // 12 hours
#endif
namecache[namecacheposition].address = *address;
namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE;
namecache[namecacheposition].name[i] = name[i];
namecache[namecacheposition].name[i] = 0;
#ifndef STANDALONETEST
- namecache[namecacheposition].expirationtime = Sys_DoubleTime() + 12 * 3600; // 12 hours
+ namecache[namecacheposition].expirationtime = realtime + 12 * 3600; // 12 hours
#endif
namecache[namecacheposition].address = *address;
namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE;
namecache[namecacheposition].name[i] = name[i];
namecache[namecacheposition].name[i] = 0;
#ifndef STANDALONETEST
- namecache[namecacheposition].expirationtime = Sys_DoubleTime() + 12 * 3600; // 12 hours
+ namecache[namecacheposition].expirationtime = realtime + 12 * 3600; // 12 hours
#endif
namecache[namecacheposition].address.addresstype = LHNETADDRESSTYPE_NONE;
namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE;
{
if (stringbuffersize >= 12)
{
- sprintf(string, "local:%d", (int)address->addressdata.loop.port);
+ dpsnprintf(string, stringbuffersize, "local:%d", (int)address->addressdata.loop.port);
return 1;
}
}
{
if (stringbuffersize >= 6)
{
- strcpy(string, "local");
+ memcpy(string, "local", 6);
return 1;
}
}
{
if (stringbuffersize >= 22)
{
- sprintf(string, "%d.%d.%d.%d:%d", (int)address->addressdata.inet4.address[0], (int)address->addressdata.inet4.address[1], (int)address->addressdata.inet4.address[2], (int)address->addressdata.inet4.address[3], (int)ntohs(address->addressdata.inet4.port));
+ dpsnprintf(string, stringbuffersize, "%d.%d.%d.%d:%d", (int)address->addressdata.inet4.address[0], (int)address->addressdata.inet4.address[1], (int)address->addressdata.inet4.address[2], (int)address->addressdata.inet4.address[3], (int)ntohs(address->addressdata.inet4.port));
return 1;
}
}
{
if (stringbuffersize >= 16)
{
- sprintf(string, "%d.%d.%d.%d", (int)address->addressdata.inet4.address[0], (int)address->addressdata.inet4.address[1], (int)address->addressdata.inet4.address[2], (int)address->addressdata.inet4.address[3]);
+ dpsnprintf(string, stringbuffersize, "%d.%d.%d.%d", (int)address->addressdata.inet4.address[0], (int)address->addressdata.inet4.address[1], (int)address->addressdata.inet4.address[2], (int)address->addressdata.inet4.address[3]);
return 1;
}
}
{
if (stringbuffersize >= 88)
{
- sprintf(string, "[%x:%x:%x:%x:%x:%x:%x:%x]:%d", (int)address->addressdata.inet6.address[0], (int)address->addressdata.inet6.address[1], (int)address->addressdata.inet6.address[2], (int)address->addressdata.inet6.address[3], (int)address->addressdata.inet6.address[4], (int)address->addressdata.inet6.address[5], (int)address->addressdata.inet6.address[6], (int)address->addressdata.inet6.address[7], (int)ntohs(address->addressdata.inet6.port));
+ dpsnprintf(string, stringbuffersize, "[%x:%x:%x:%x:%x:%x:%x:%x]:%d", (int)address->addressdata.inet6.address[0], (int)address->addressdata.inet6.address[1], (int)address->addressdata.inet6.address[2], (int)address->addressdata.inet6.address[3], (int)address->addressdata.inet6.address[4], (int)address->addressdata.inet6.address[5], (int)address->addressdata.inet6.address[6], (int)address->addressdata.inet6.address[7], (int)ntohs(address->addressdata.inet6.port));
return 1;
}
}
{
if (stringbuffersize >= 80)
{
- sprintf(string, "%x:%x:%x:%x:%x:%x:%x:%x", (int)address->addressdata.inet6.address[0], (int)address->addressdata.inet6.address[1], (int)address->addressdata.inet6.address[2], (int)address->addressdata.inet6.address[3], (int)address->addressdata.inet6.address[4], (int)address->addressdata.inet6.address[5], (int)address->addressdata.inet6.address[6], (int)address->addressdata.inet6.address[7]);
+ dpsnprintf(string, stringbuffersize, "%x:%x:%x:%x:%x:%x:%x:%x", (int)address->addressdata.inet6.address[0], (int)address->addressdata.inet6.address[1], (int)address->addressdata.inet6.address[2], (int)address->addressdata.inet6.address[3], (int)address->addressdata.inet6.address[4], (int)address->addressdata.inet6.address[5], (int)address->addressdata.inet6.address[6], (int)address->addressdata.inet6.address[7]);
return 1;
}
}
#endif
}
+void LHNET_SleepUntilPacket_Microseconds(int microseconds)
+{
+ fd_set fdreadset;
+ struct timeval tv;
+ int lastfd;
+ lhnetsocket_t *s;
+ FD_ZERO(&fdreadset);
+ lastfd = 0;
+ for (s = lhnet_socketlist.next;s != &lhnet_socketlist;s = s->next)
+ {
+ if (s->address.addresstype == LHNETADDRESSTYPE_INET4 || s->address.addresstype == LHNETADDRESSTYPE_INET6)
+ {
+ if (lastfd < s->inetsocket)
+ lastfd = s->inetsocket;
+ FD_SET((unsigned int)s->inetsocket, &fdreadset);
+ }
+ }
+ tv.tv_sec = microseconds / 1000000;
+ tv.tv_usec = microseconds % 1000000;
+ select(lastfd + 1, &fdreadset, NULL, NULL, &tv);
+}
+
lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address)
{
lhnetsocket_t *lhnetsocket, *s;
{
#ifdef WIN32
u_long _true = 1;
+ u_long _false = 0;
#else
char _true = 1;
#endif
lhnetsocket->prev = lhnetsocket->next->prev;
lhnetsocket->next->prev = lhnetsocket;
lhnetsocket->prev->next = lhnetsocket;
+#ifdef WIN32
+ if (ioctlsocket(lhnetsocket->inetsocket, SIO_UDP_CONNRESET, &_false) == -1)
+ Con_DPrintf("LHNET_OpenSocket_Connectionless: ioctlsocket SIO_UDP_CONNRESET returned error: %s\n", LHNETPRIVATE_StrError());
+#endif
return lhnetsocket;
}
else
continue;
}
#ifndef STANDALONETEST
- if (cl_netlocalping.value && (Sys_DoubleTime() - cl_netlocalping.value * (1.0 / 2000.0)) < p->sentdoubletime)
+ if (cl_netlocalping.value && (realtime - cl_netlocalping.value * (1.0 / 2000.0)) < p->sentdoubletime)
continue;
#endif
if (value == 0 && p->destinationport == lhnetsocket->address.addressdata.loop.port)
p->next->prev = p;
p->prev->next = p;
#ifndef STANDALONETEST
- p->sentdoubletime = Sys_DoubleTime();
+ p->sentdoubletime = realtime;
#endif
value = contentlength;
}
{
if (SOCKETERRNO == EWOULDBLOCK)
return 0;
- Con_Printf("LHNET_Read: sendto returned error: %s\n", LHNETPRIVATE_StrError());
+ Con_Printf("LHNET_Write: sendto returned error: %s\n", LHNETPRIVATE_StrError());
}
}
else if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET6)
{
if (SOCKETERRNO == EWOULDBLOCK)
return 0;
- Con_Printf("LHNET_Read: sendto returned error: %s\n", LHNETPRIVATE_StrError());
+ Con_Printf("LHNET_Write: sendto returned error: %s\n", LHNETPRIVATE_StrError());
}
}
return value;
int main(int argc, char **argv)
{
#if 1
- char *buffer = "socket to socket test successful", buffer2[1024];
+ char *buffer = "test", buffer2[1024];
int blen = strlen(buffer);
int b2len = 1024;
lhnetsocket_t *sock1;
int test1;
int test2;
- strcpy(buffer2, "socket to socket test failed");
-
printf("calling LHNET_Init\n");
LHNET_Init();
usleep (100000);
#endif
printf("calling LHNET_Read on the second socket to read the packet sent from the first socket\n");
- test2 = LHNET_Read(sock2, buffer2, b2len, &myaddy3);
- Con_Printf("%s\n", buffer2);
+ test2 = LHNET_Read(sock2, buffer2, b2len - 1, &myaddy3);
+ if (test2 > 0)
+ Con_Printf("socket to socket test succeeded\n");
+ else
+ Con_Printf("socket to socket test failed\n");
+
#ifdef WIN32
printf("press any key to exit\n");
getchar();