#ifdef WIN32
#include <winsock.h>
#else
-#include <netdb.h>
-//#include <netinet/in.h>
-//#include <arpa/inet.h>
#include <unistd.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <errno.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#endif
+
+#ifdef __MORPHOS__
+#include <proto/socket.h>
#endif
// for Z_Malloc/Z_Free in quake
-#if 1
+#ifndef STANDALONETEST
+#include "quakedef.h"
#include "zone.h"
+#include "sys.h"
+#include "netconn.h"
#else
+#define Con_Print printf
+#define Con_Printf printf
#define Z_Malloc malloc
#define Z_Free free
#endif
#include "lhnet.h"
+#if defined(WIN32)
+#define EWOULDBLOCK WSAEWOULDBLOCK
+#define ECONNREFUSED WSAECONNREFUSED
+
+#define SOCKETERRNO WSAGetLastError()
+
+#define SOCKLEN_T int
+#elif defined(__MORPHOS__)
+#define ioctlsocket IoctlSocket
+#define closesocket CloseSocket
+#define SOCKETERRNO Errno()
+
+#define SOCKLEN_T int
+#else
+#define ioctlsocket ioctl
+#define closesocket close
+#define SOCKETERRNO errno
+
+#define SOCKLEN_T socklen_t
+#endif
+
+// to make LHNETADDRESS_FromString resolve repeated hostnames faster, cache them
+#define MAX_NAMECACHE 64
+static struct namecache_s
+{
+ lhnetaddress_t address;
+ double expirationtime;
+ char name[64];
+}
+namecache[MAX_NAMECACHE];
+static int namecacheposition = 0;
+
int LHNETADDRESS_FromPort(lhnetaddress_t *address, int addresstype, int port)
{
+ if (!address)
+ return 0;
switch(addresstype)
{
case LHNETADDRESSTYPE_LOOP:
int LHNETADDRESS_FromString(lhnetaddress_t *address, const char *string, int defaultport)
{
- int i, port, namelen, number;
+ int i, port, namelen, d1, d2, d3, d4;
struct hostent *hostentry;
const char *colon;
char name[128];
+ if (!address || !string || !*string)
+ return 0;
memset(address, 0, sizeof(*address));
address->addresstype = LHNETADDRESSTYPE_NONE;
port = 0;
address->addressdata.loop.port = port;
return 1;
}
- // try to parse with gethostbyname first, because it can handle ipv4 and
- // ipv6 (in various address formats), as well as dns names
- for (i = 0;i < 3;i++)
+ // try to parse as dotted decimal ipv4 address first
+ // 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)
{
- if (i == 0)
- hostentry = gethostbyaddr(name, namelen, LHNETADDRESSTYPE_INET6_FAMILY);
- else if (i == 1)
- hostentry = gethostbyaddr(name, namelen, LHNETADDRESSTYPE_INET4_FAMILY);
- else
- hostentry = gethostbyname(name);
- if (hostentry)
- {
- if (hostentry->h_addrtype == LHNETADDRESSTYPE_INET6_FAMILY)
- {
- // great it worked
- address->addresstype = LHNETADDRESSTYPE_INET6;
- address->addressdata.inet6.family = hostentry->h_addrtype;
- address->addressdata.inet6.port = htons((unsigned short)port);
- memcpy(address->addressdata.inet6.address, hostentry->h_addr_list[0], sizeof(address->addressdata.inet6.address));
-#ifdef STANDALONETEST
- printf("gethostbyname(\"%s\") returned ipv6 address [%x:%x:%x:%x:%x:%x:%x:%x]:%d\n", name, (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));
-#endif
- return 1;
- }
- else if (hostentry->h_addrtype == LHNETADDRESSTYPE_INET4_FAMILY)
- {
- // great it worked
- address->addresstype = LHNETADDRESSTYPE_INET4;
- address->addressdata.inet4.family = hostentry->h_addrtype;
- address->addressdata.inet4.port = htons((unsigned short)port);
- memcpy(address->addressdata.inet4.address, hostentry->h_addr_list[0], sizeof(address->addressdata.inet4.address));
+ // parsed a valid ipv4 address
+ address->addresstype = LHNETADDRESSTYPE_INET4;
+ address->addressdata.inet4.family = LHNETADDRESSTYPE_INET4_FAMILY;
+ address->addressdata.inet4.port = htons((unsigned short)port);
+ address->addressdata.inet4.address[0] = (unsigned char)d1;
+ address->addressdata.inet4.address[1] = (unsigned char)d2;
+ address->addressdata.inet4.address[2] = (unsigned char)d3;
+ address->addressdata.inet4.address[3] = (unsigned char)d4;
#ifdef STANDALONETEST
- printf("gethostbyname(\"%s\") returned ipv4 address %d.%d.%d.%d:%d\n", name, (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));
+ printf("manual parsing of ipv4 dotted decimal address \"%s\" successful: %d.%d.%d.%d:%d\n", string, (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));
#endif
- return 1;
- }
- }
+ return 1;
}
- // failed, try to parse as an ipv4 address as a fallback (is this needed?)
+ for (i = 0;i < MAX_NAMECACHE;i++)
+ if (!strcmp(namecache[i].name, name))
+ break;
#ifdef STANDALONETEST
- printf("gethostbyname and gethostbyaddr failed on address \"%s\"\n", name);
+ if (i < MAX_NAMECACHE)
+#else
+ if (i < MAX_NAMECACHE && Sys_DoubleTime() < namecache[i].expirationtime)
#endif
- for (i = 0, number = 0;i < 4;string++)
{
- if (*string >= '0' && *string <= '9')
- number = number * 10 + (*string - '0');
- else if (number < 256 && (*string == '.' || *string == ':'))
+ *address = namecache[i].address;
+ if (address->addresstype == LHNETADDRESSTYPE_INET6)
{
- address->addressdata.inet4.address[i++] = number;
- number = 0;
+ address->addressdata.inet6.port = htons((unsigned short)port);
+ return 1;
}
- else
- break;
- if (*string == 0 || *string == ':')
- break;
+ else if (address->addresstype == LHNETADDRESSTYPE_INET4)
+ {
+ address->addressdata.inet4.port = htons((unsigned short)port);
+ return 1;
+ }
+ return 0;
}
- if (i == 4)
+ // try gethostbyname (handles dns and other ip formats)
+ hostentry = gethostbyname(name);
+ if (hostentry)
{
- // parsed a valid ipv4 address
- address->addresstype = LHNETADDRESSTYPE_INET4;
- address->addressdata.inet4.family = LHNETADDRESSTYPE_INET4_FAMILY;
- address->addressdata.inet4.port = htons((unsigned short)port);
+ if (hostentry->h_addrtype == LHNETADDRESSTYPE_INET6_FAMILY)
+ {
+ // great it worked
+ address->addresstype = LHNETADDRESSTYPE_INET6;
+ address->addressdata.inet6.family = hostentry->h_addrtype;
+ address->addressdata.inet6.port = htons((unsigned short)port);
+ memcpy(address->addressdata.inet6.address, hostentry->h_addr_list[0], sizeof(address->addressdata.inet6.address));
+ for (i = 0;i < (int)sizeof(namecache[namecacheposition].name)-1 && name[i];i++)
+ namecache[namecacheposition].name[i] = name[i];
+ namecache[namecacheposition].name[i] = 0;
+#ifndef STANDALONETEST
+ namecache[namecacheposition].expirationtime = Sys_DoubleTime() + 12 * 3600; // 12 hours
+#endif
+ namecache[namecacheposition].address = *address;
+ namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE;
#ifdef STANDALONETEST
- printf("manual parsing of ipv4 dotted decimal address \"%s\" successful: %d.%d.%d.%d:%d\n", string, (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));
+ printf("gethostbyname(\"%s\") returned ipv6 address [%x:%x:%x:%x:%x:%x:%x:%x]:%d\n", name, (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));
#endif
- return 1;
+ return 1;
+ }
+ else if (hostentry->h_addrtype == LHNETADDRESSTYPE_INET4_FAMILY)
+ {
+ // great it worked
+ address->addresstype = LHNETADDRESSTYPE_INET4;
+ address->addressdata.inet4.family = hostentry->h_addrtype;
+ address->addressdata.inet4.port = htons((unsigned short)port);
+ memcpy(address->addressdata.inet4.address, hostentry->h_addr_list[0], sizeof(address->addressdata.inet4.address));
+ for (i = 0;i < (int)sizeof(namecache[namecacheposition].name)-1 && name[i];i++)
+ namecache[namecacheposition].name[i] = name[i];
+ namecache[namecacheposition].name[i] = 0;
+#ifndef STANDALONETEST
+ namecache[namecacheposition].expirationtime = Sys_DoubleTime() + 12 * 3600; // 12 hours
+#endif
+ namecache[namecacheposition].address = *address;
+ namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE;
+#ifdef STANDALONETEST
+ printf("gethostbyname(\"%s\") returned ipv4 address %d.%d.%d.%d:%d\n", name, (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));
+#endif
+ return 1;
+ }
}
+#ifdef STANDALONETEST
+ printf("gethostbyname failed on address \"%s\"\n", name);
+#endif
+ for (i = 0;i < (int)sizeof(namecache[namecacheposition].name)-1 && name[i];i++)
+ namecache[namecacheposition].name[i] = name[i];
+ namecache[namecacheposition].name[i] = 0;
+#ifndef STANDALONETEST
+ namecache[namecacheposition].expirationtime = Sys_DoubleTime() + 12 * 3600; // 12 hours
+#endif
+ namecache[namecacheposition].address.addresstype = LHNETADDRESSTYPE_NONE;
+ namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE;
return 0;
}
int LHNETADDRESS_ToString(const lhnetaddress_t *address, char *string, int stringbuffersize, int includeport)
{
*string = 0;
+ if (!address || !string || stringbuffersize < 1)
+ return 0;
switch(address->addresstype)
{
default:
{
if (stringbuffersize >= 6)
{
- strcpy(string, "local");
+ memcpy(string, "local", 6);
return 1;
}
}
int LHNETADDRESS_GetAddressType(const lhnetaddress_t *address)
{
- return address->addresstype;
+ if (address)
+ return address->addresstype;
+ else
+ return LHNETADDRESSTYPE_NONE;
}
int LHNETADDRESS_GetPort(const lhnetaddress_t *address)
{
+ if (!address)
+ return -1;
switch(address->addresstype)
{
case LHNETADDRESSTYPE_LOOP:
int LHNETADDRESS_SetPort(lhnetaddress_t *address, int port)
{
+ if (!address)
+ return 0;
switch(address->addresstype)
{
case LHNETADDRESSTYPE_LOOP:
int LHNETADDRESS_Compare(const lhnetaddress_t *address1, const lhnetaddress_t *address2)
{
+ if (!address1 || !address2)
+ return 1;
if (address1->addresstype != address2->addresstype)
return 1;
switch(address1->addresstype)
int sourceport;
int destinationport;
time_t timeout;
+#ifndef STANDALONETEST
+ double sentdoubletime;
+#endif
struct lhnetpacket_s *next, *prev;
}
lhnetpacket_t;
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;
}
+static const char *LHNETPRIVATE_StrError(void)
+{
+#ifdef WIN32
+ int i = WSAGetLastError();
+ switch (i)
+ {
+ case WSAEINTR: return "WSAEINTR";
+ case WSAEBADF: return "WSAEBADF";
+ case WSAEACCES: return "WSAEACCES";
+ case WSAEFAULT: return "WSAEFAULT";
+ case WSAEINVAL: return "WSAEINVAL";
+ case WSAEMFILE: return "WSAEMFILE";
+ case WSAEWOULDBLOCK: return "WSAEWOULDBLOCK";
+ case WSAEINPROGRESS: return "WSAEINPROGRESS";
+ case WSAEALREADY: return "WSAEALREADY";
+ case WSAENOTSOCK: return "WSAENOTSOCK";
+ case WSAEDESTADDRREQ: return "WSAEDESTADDRREQ";
+ case WSAEMSGSIZE: return "WSAEMSGSIZE";
+ case WSAEPROTOTYPE: return "WSAEPROTOTYPE";
+ case WSAENOPROTOOPT: return "WSAENOPROTOOPT";
+ case WSAEPROTONOSUPPORT: return "WSAEPROTONOSUPPORT";
+ case WSAESOCKTNOSUPPORT: return "WSAESOCKTNOSUPPORT";
+ case WSAEOPNOTSUPP: return "WSAEOPNOTSUPP";
+ case WSAEPFNOSUPPORT: return "WSAEPFNOSUPPORT";
+ case WSAEAFNOSUPPORT: return "WSAEAFNOSUPPORT";
+ case WSAEADDRINUSE: return "WSAEADDRINUSE";
+ case WSAEADDRNOTAVAIL: return "WSAEADDRNOTAVAIL";
+ case WSAENETDOWN: return "WSAENETDOWN";
+ case WSAENETUNREACH: return "WSAENETUNREACH";
+ case WSAENETRESET: return "WSAENETRESET";
+ case WSAECONNABORTED: return "WSAECONNABORTED";
+ case WSAECONNRESET: return "WSAECONNRESET";
+ case WSAENOBUFS: return "WSAENOBUFS";
+ case WSAEISCONN: return "WSAEISCONN";
+ case WSAENOTCONN: return "WSAENOTCONN";
+ case WSAESHUTDOWN: return "WSAESHUTDOWN";
+ case WSAETOOMANYREFS: return "WSAETOOMANYREFS";
+ case WSAETIMEDOUT: return "WSAETIMEDOUT";
+ case WSAECONNREFUSED: return "WSAECONNREFUSED";
+ case WSAELOOP: return "WSAELOOP";
+ case WSAENAMETOOLONG: return "WSAENAMETOOLONG";
+ case WSAEHOSTDOWN: return "WSAEHOSTDOWN";
+ case WSAEHOSTUNREACH: return "WSAEHOSTUNREACH";
+ case WSAENOTEMPTY: return "WSAENOTEMPTY";
+ case WSAEPROCLIM: return "WSAEPROCLIM";
+ case WSAEUSERS: return "WSAEUSERS";
+ case WSAEDQUOT: return "WSAEDQUOT";
+ case WSAESTALE: return "WSAESTALE";
+ case WSAEREMOTE: return "WSAEREMOTE";
+ case WSAEDISCON: return "WSAEDISCON";
+ case 0: return "no error";
+ default: return "unknown WSAE error";
+ }
+#else
+ return strerror(errno);
+#endif
+}
+
lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address)
{
lhnetsocket_t *lhnetsocket, *s;
- lhnetsocket = Z_Malloc(sizeof(*lhnetsocket));
+ if (!address)
+ return NULL;
+ lhnetsocket = (lhnetsocket_t *)Z_Malloc(sizeof(*lhnetsocket));
if (lhnetsocket)
{
memset(lhnetsocket, 0, sizeof(*lhnetsocket));
case LHNETADDRESSTYPE_INET4:
case LHNETADDRESSTYPE_INET6:
#ifdef WIN32
- if (!lhnet_didWSAStartup && !WSAStartup(MAKEWORD(1, 1), &lhnet_winsockdata))
- {
- lhnet_didWSAStartup = 1;
-#else
+ if (lhnet_didWSAStartup)
{
#endif
- if (address->addresstype == LHNETADDRESSTYPE_INET6)
- lhnetsocket->inetsocket = socket(LHNETADDRESSTYPE_INET6_FAMILY, SOCK_DGRAM, IPPROTO_UDP);
- else
- lhnetsocket->inetsocket = socket(LHNETADDRESSTYPE_INET4_FAMILY, SOCK_DGRAM, IPPROTO_UDP);
- if (lhnetsocket->inetsocket != -1)
+ 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;
- if (ioctlsocket(lhnetsocket->inetsocket, FIONBIO, &_true) != -1)
#else
char _true = 1;
- if (ioctl(lhnetsocket->inetsocket, FIONBIO, &_true) != -1)
#endif
+ if (ioctlsocket(lhnetsocket->inetsocket, FIONBIO, &_true) != -1)
{
- if (bind(lhnetsocket->inetsocket, (void *)&lhnetsocket->address.addressdata, address->addresstype == LHNETADDRESSTYPE_INET6 ? sizeof(lhnetsocket->address.addressdata.inet6) : sizeof(lhnetsocket->address.addressdata.inet4)) != -1)
+ SOCKLEN_T namelen;
+ namelen = address->addresstype == LHNETADDRESSTYPE_INET6 ? sizeof(lhnetsocket->address.addressdata.inet6) : sizeof(lhnetsocket->address.addressdata.inet4);
+ if (bind(lhnetsocket->inetsocket, (struct sockaddr *)&lhnetsocket->address.addressdata, namelen) != -1)
{
+ int i = 1;
+ getsockname(lhnetsocket->inetsocket, (struct sockaddr *)&lhnetsocket->address.addressdata, &namelen);
+ // enable broadcast on this socket
+ setsockopt(lhnetsocket->inetsocket, SOL_SOCKET, SO_BROADCAST, (char *)&i, sizeof(i));
lhnetsocket->next = &lhnet_socketlist;
lhnetsocket->prev = lhnetsocket->next->prev;
lhnetsocket->next->prev = lhnetsocket;
lhnetsocket->prev->next = lhnetsocket;
return lhnetsocket;
}
+ else
+ Con_Printf("LHNET_OpenSocket_Connectionless: bind returned error: %s\n", LHNETPRIVATE_StrError());
}
-#ifdef WIN32
+ else
+ Con_Printf("LHNET_OpenSocket_Connectionless: ioctlsocket returned error: %s\n", LHNETPRIVATE_StrError());
closesocket(lhnetsocket->inetsocket);
-#else
- close(lhnetsocket->inetsocket);
-#endif
}
+ else
+ Con_Printf("LHNET_OpenSocket_Connectionless: socket returned error: %s\n", LHNETPRIVATE_StrError());
+#ifdef WIN32
}
+ else
+ Con_Print("LHNET_OpenSocket_Connectionless: can't open a socket (WSAStartup failed during LHNET_Init)\n");
+#endif
break;
default:
break;
// no special close code for loopback, just inet
if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET4 || lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET6)
{
-#ifdef WIN32
closesocket(lhnetsocket->inetsocket);
-#else
- close(lhnetsocket->inetsocket);
-#endif
- }
-#ifdef WIN32
- if (lhnet_socketlist.next == &lhnet_socketlist && lhnet_didWSAStartup)
- {
- lhnet_didWSAStartup = 0;
- WSACleanup();
}
-#endif
Z_Free(lhnetsocket);
}
}
lhnetaddress_t *LHNET_AddressFromSocket(lhnetsocket_t *sock)
{
- return &sock->address;
+ if (sock)
+ return &sock->address;
+ else
+ return NULL;
}
int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength, lhnetaddress_t *address)
{
int value = 0;
+ if (!lhnetsocket || !address || !content || maxcontentlength < 1)
+ return -1;
if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_LOOP)
{
time_t currenttime;
for (p = lhnet_packetlist.next;p != &lhnet_packetlist;p = pnext)
{
pnext = p->next;
+ if (p->timeout < currenttime)
+ {
+ // unlink and free
+ p->next->prev = p->prev;
+ p->prev->next = p->next;
+ Z_Free(p);
+ continue;
+ }
+#ifndef STANDALONETEST
+ if (cl_netlocalping.value && (Sys_DoubleTime() - cl_netlocalping.value * (1.0 / 2000.0)) < p->sentdoubletime)
+ continue;
+#endif
if (value == 0 && p->destinationport == lhnetsocket->address.addressdata.loop.port)
{
if (p->length <= maxcontentlength)
p->prev->next = p->next;
Z_Free(p);
}
- else if (p->timeout < currenttime)
- {
- // unlink and free
- p->next->prev = p->prev;
- p->prev->next = p->next;
- Z_Free(p);
- }
}
}
else if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET4)
{
- int inetaddresslength;
+ unsigned int inetaddresslength;
address->addresstype = LHNETADDRESSTYPE_NONE;
inetaddresslength = sizeof(address->addressdata.inet4);
value = recvfrom(lhnetsocket->inetsocket, content, maxcontentlength, 0, (struct sockaddr *)&address->addressdata.inet4, &inetaddresslength);
}
else if (value == -1)
{
-#ifdef WIN32
- int e = WSAGetLastError();
- if (e == WSAEWOULDBLOCK || e == WSAECONNREFUSED)
+ int e = SOCKETERRNO;
+ if (e == EWOULDBLOCK)
return 0;
-#else
- if (errno == EWOULDBLOCK || errno == ECONNREFUSED)
- return 0;
-#endif
+ switch (e)
+ {
+ case ECONNREFUSED:
+ 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)
{
- int inetaddresslength;
+ unsigned int inetaddresslength;
address->addresstype = LHNETADDRESSTYPE_NONE;
inetaddresslength = sizeof(address->addressdata.inet6);
value = recvfrom(lhnetsocket->inetsocket, content, maxcontentlength, 0, (struct sockaddr *)&address->addressdata.inet6, &inetaddresslength);
}
else if (value == -1)
{
-#ifdef WIN32
- int e = WSAGetLastError();
- if (e == WSAEWOULDBLOCK || e == WSAECONNREFUSED)
- return 0;
-#else
- if (errno == EWOULDBLOCK || errno == ECONNREFUSED)
+ int e = SOCKETERRNO;
+ if (e == EWOULDBLOCK)
return 0;
-#endif
+ switch (e)
+ {
+ case ECONNREFUSED:
+ Con_Print("Connection refused\n");
+ return 0;
+ }
+ Con_Printf("LHNET_Read: recvfrom returned error: %s\n", LHNETPRIVATE_StrError());
}
}
return value;
int LHNET_Write(lhnetsocket_t *lhnetsocket, const void *content, int contentlength, const lhnetaddress_t *address)
{
int value = -1;
+ if (!lhnetsocket || !address || !content || contentlength < 1)
+ return -1;
if (lhnetsocket->address.addresstype != address->addresstype)
return -1;
if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_LOOP)
{
lhnetpacket_t *p;
- p = Z_Malloc(sizeof(*p) + contentlength);
+ p = (lhnetpacket_t *)Z_Malloc(sizeof(*p) + contentlength);
p->data = (void *)(p + 1);
memcpy(p->data, content, contentlength);
p->length = contentlength;
p->prev = p->next->prev;
p->next->prev = p;
p->prev->next = p;
+#ifndef STANDALONETEST
+ p->sentdoubletime = Sys_DoubleTime();
+#endif
value = contentlength;
}
else if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET4)
value = sendto(lhnetsocket->inetsocket, content, contentlength, 0, (struct sockaddr *)&address->addressdata.inet4, sizeof(address->addressdata.inet4));
if (value == -1)
{
-#ifdef WIN32
- int e = WSAGetLastError();
- if (e == WSAEWOULDBLOCK)
- return 0;
-#else
- if (errno == EWOULDBLOCK)
+ if (SOCKETERRNO == EWOULDBLOCK)
return 0;
-#endif
+ Con_Printf("LHNET_Read: sendto returned error: %s\n", LHNETPRIVATE_StrError());
}
}
else if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET6)
value = sendto(lhnetsocket->inetsocket, content, contentlength, 0, (struct sockaddr *)&address->addressdata.inet6, sizeof(address->addressdata.inet6));
if (value == -1)
{
-#ifdef WIN32
- int e = WSAGetLastError();
- if (e == WSAEWOULDBLOCK)
+ if (SOCKETERRNO == EWOULDBLOCK)
return 0;
-#else
- if (errno == EWOULDBLOCK)
- return 0;
-#endif
+ Con_Printf("LHNET_Read: 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
projects / xonotic / darkplaces.git / blobdiff