X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=lhnet.h;h=e7ac0e48294dc79878e01b17c5f2bb16b48552b7;hb=6ddb09ae21b379f7b921a9f1f9216d87df86ae8a;hp=e66e5a5d8f9ca8068d037a00ae943a51edf573e1;hpb=3368a3b1dd0e71f33bc40c8fe47ad5b2a0255d2f;p=xonotic%2Fdarkplaces.git diff --git a/lhnet.h b/lhnet.h index e66e5a5d..e7ac0e48 100644 --- a/lhnet.h +++ b/lhnet.h @@ -1,9 +1,12 @@ -// Written by Forest Hale 2003-06-15 and placed into public domain. +// Written by Ashley Rose Hale (LadyHavoc) 2003-06-15 and placed into public domain. #ifndef LHNET_H #define LHNET_H +#include +#include "com_list.h" + typedef enum lhnetaddresstype_e { LHNETADDRESSTYPE_NONE, @@ -24,7 +27,13 @@ lhnetaddress_t; int LHNETADDRESS_FromPort(lhnetaddress_t *address, lhnetaddresstype_t addresstype, int port); int LHNETADDRESS_FromString(lhnetaddress_t *address, const char *string, int defaultport); int LHNETADDRESS_ToString(const lhnetaddress_t *address, char *string, int stringbuffersize, int includeport); -int LHNETADDRESS_GetAddressType(const lhnetaddress_t *address); +static inline lhnetaddresstype_t LHNETADDRESS_GetAddressType(const lhnetaddress_t *address) +{ + if (address) + return address->addresstype; + else + return LHNETADDRESSTYPE_NONE; +} const char *LHNETADDRESS_GetInterfaceName(const lhnetaddress_t *address, char *ifname, size_t ifnamelength); int LHNETADDRESS_GetPort(const lhnetaddress_t *address); int LHNETADDRESS_SetPort(lhnetaddress_t *address, int port); @@ -34,9 +43,10 @@ typedef struct lhnetsocket_s { lhnetaddress_t address; int inetsocket; - struct lhnetsocket_s *next, *prev; + llist_t list; } lhnetsocket_t; +extern lhnetsocket_t lhnet_socketlist; void LHNET_Init(void); void LHNET_Shutdown(void);