#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 (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;
for (i = 0;i < MAX_NAMECACHE;i++)
if (!strcmp(namecache[i].name, name))
break;
- if (i < MAX_NAMECACHE && Sys_DoubleTime() < namecache[i].expirationtime)
+#ifdef STANDALONETEST
+ if (i < MAX_NAMECACHE)
+#else
+ if (i < MAX_NAMECACHE && realtime < namecache[i].expirationtime)
+#endif
{
*address = namecache[i].address;
if (address->addresstype == LHNETADDRESSTYPE_INET6)
address->addressdata.inet4.port = htons((unsigned short)port);
return 1;
}
- return false;
+ return 0;
}
// try gethostbyname (handles dns and other ip formats)
hostentry = gethostbyname(name);
for (i = 0;i < (int)sizeof(namecache[namecacheposition].name)-1 && name[i];i++)
namecache[namecacheposition].name[i] = name[i];
namecache[namecacheposition].name[i] = 0;
- namecache[namecacheposition].expirationtime = Sys_DoubleTime() + 12 * 3600; // 12 hours
+#ifndef STANDALONETEST
+ namecache[namecacheposition].expirationtime = realtime + 12 * 3600; // 12 hours
+#endif
namecache[namecacheposition].address = *address;
namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE;
#ifdef STANDALONETEST
for (i = 0;i < (int)sizeof(namecache[namecacheposition].name)-1 && name[i];i++)
namecache[namecacheposition].name[i] = name[i];
namecache[namecacheposition].name[i] = 0;
- namecache[namecacheposition].expirationtime = Sys_DoubleTime() + 12 * 3600; // 12 hours
+#ifndef STANDALONETEST
+ namecache[namecacheposition].expirationtime = realtime + 12 * 3600; // 12 hours
+#endif
namecache[namecacheposition].address = *address;
namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE;
#ifdef STANDALONETEST
for (i = 0;i < (int)sizeof(namecache[namecacheposition].name)-1 && name[i];i++)
namecache[namecacheposition].name[i] = name[i];
namecache[namecacheposition].name[i] = 0;
- namecache[namecacheposition].expirationtime = Sys_DoubleTime() + 12 * 3600; // 12 hours
+#ifndef STANDALONETEST
+ namecache[namecacheposition].expirationtime = realtime + 12 * 3600; // 12 hours
+#endif
namecache[namecacheposition].address.addresstype = LHNETADDRESSTYPE_NONE;
namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE;
return 0;
{
if (stringbuffersize >= 6)
{
- strcpy(string, "local");
+ memcpy(string, "local", 6);
return 1;
}
}
lhnet_socketlist.next = lhnet_socketlist.prev = &lhnet_socketlist;
lhnet_packetlist.next = lhnet_packetlist.prev = &lhnet_packetlist;
lhnet_active = 1;
+#ifdef WIN32
+ lhnet_didWSAStartup = !WSAStartup(MAKEWORD(1, 1), &lhnet_winsockdata);
+ if (!lhnet_didWSAStartup)
+ Con_Print("LHNET_Init: WSAStartup failed, networking disabled\n");
+#endif
}
void LHNET_Shutdown(void)
p->next->prev = p->prev;
Z_Free(p);
}
+#ifdef WIN32
+ if (lhnet_didWSAStartup)
+ {
+ lhnet_didWSAStartup = 0;
+ WSACleanup();
+ }
+#endif
lhnet_active = 0;
}
#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(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;
case LHNETADDRESSTYPE_INET4:
case LHNETADDRESSTYPE_INET6:
#ifdef WIN32
- if (lhnet_didWSAStartup || (lhnet_didWSAStartup = !WSAStartup(MAKEWORD(1, 1), &lhnet_winsockdata)))
+ if (lhnet_didWSAStartup)
{
#endif
if ((lhnetsocket->inetsocket = socket(address->addresstype == LHNETADDRESSTYPE_INET6 ? LHNETADDRESSTYPE_INET6_FAMILY : LHNETADDRESSTYPE_INET4_FAMILY, SOCK_DGRAM, IPPROTO_UDP)) != -1)
{
#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
#ifdef WIN32
}
else
- Con_Print("LHNET_OpenSocket_Connectionless: WSAStartup failed\n");
+ Con_Print("LHNET_OpenSocket_Connectionless: can't open a socket (WSAStartup failed during LHNET_Init)\n");
#endif
break;
default:
{
closesocket(lhnetsocket->inetsocket);
}
-#ifdef WIN32
- if (lhnet_socketlist.next == &lhnet_socketlist && lhnet_didWSAStartup)
- {
- lhnet_didWSAStartup = 0;
- WSACleanup();
- }
-#endif
Z_Free(lhnetsocket);
}
}
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)
Con_Print("Connection refused\n");
return 0;
}
+ Con_Printf("LHNET_Read: recvfrom returned error: %s\n", LHNETPRIVATE_StrError());
}
}
else if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET6)
Con_Print("Connection refused\n");
return 0;
}
+ Con_Printf("LHNET_Read: recvfrom returned error: %s\n", LHNETPRIVATE_StrError());
}
}
return value;
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_Write: sendto returned error: %s\n", LHNETPRIVATE_StrError());
}
}
else if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET6)
{
if (SOCKETERRNO == EWOULDBLOCK)
return 0;
+ Con_Printf("LHNET_Write: sendto returned error: %s\n", LHNETPRIVATE_StrError());
}
}
return value;
#ifdef STANDALONETEST
int main(int argc, char **argv)
{
+#if 1
+ char *buffer = "test", buffer2[1024];
+ int blen = strlen(buffer);
+ int b2len = 1024;
+ lhnetsocket_t *sock1;
+ lhnetsocket_t *sock2;
+ lhnetaddress_t myaddy1;
+ lhnetaddress_t myaddy2;
+ lhnetaddress_t myaddy3;
+ lhnetaddress_t localhostaddy1;
+ lhnetaddress_t localhostaddy2;
+ int test1;
+ int test2;
+
+ printf("calling LHNET_Init\n");
+ LHNET_Init();
+
+ printf("calling LHNET_FromPort twice to create two local addresses\n");
+ LHNETADDRESS_FromPort(&myaddy1, LHNETADDRESSTYPE_INET4, 4000);
+ LHNETADDRESS_FromPort(&myaddy2, LHNETADDRESSTYPE_INET4, 4001);
+ LHNETADDRESS_FromString(&localhostaddy1, "127.0.0.1", 4000);
+ LHNETADDRESS_FromString(&localhostaddy2, "127.0.0.1", 4001);
+
+ printf("calling LHNET_OpenSocket_Connectionless twice to create two local sockets\n");
+ sock1 = LHNET_OpenSocket_Connectionless(&myaddy1);
+ sock2 = LHNET_OpenSocket_Connectionless(&myaddy2);
+
+ printf("calling LHNET_Write to send a packet from the first socket to the second socket\n");
+ test1 = LHNET_Write(sock1, buffer, blen, &localhostaddy2);
+ printf("sleeping briefly\n");
+#ifdef WIN32
+ Sleep (100);
+#else
+ 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 - 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();
+#endif
+
+ printf("calling LHNET_Shutdown\n");
+ LHNET_Shutdown();
+ printf("exiting\n");
+ return 0;
+#else
lhnetsocket_t *sock[16], *sendsock;
int i;
int numsockets;
}
printf("Testing code for lhnet.c\nusage: lhnettest <localportnumber> [<sendnumberoftimes> <sendaddress:port> <sendmessage>]\n");
return -1;
+#endif
}
#endif