YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-18 19:10:37 +00:00
Code Issues Projects Releases Wiki Activity

common: update netadr_t structure to include IPv6 addresses

Browse Source
This commit is contained in:
Alibek Omarov 2022-03-10 04:43:26 +03:00
parent ae6ad74994
commit 9ae72dbc47
1 changed files with 49 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
common/netadr.h
View File

@ -16,6 +16,9 @@
#ifndef NETADR_H #ifndef NETADR_H
#define NETADR_H #define NETADR_H
#include "build.h"
#include STDINT_H
typedef enum typedef enum
{ {
NA_UNUSED, NA_UNUSED,
@ -23,15 +26,56 @@ typedef enum
NA_BROADCAST, NA_BROADCAST,
NA_IP, NA_IP,
NA_IPX, NA_IPX,
NA_BROADCAST_IPX NA_BROADCAST_IPX,
NA_IP6,
NA_MULTICAST_IP6, // all nodes multicast
} netadrtype_t; } netadrtype_t;
#define NETADR_T_SIZE 20
// Original structure:
// typedef struct netadr_s
// {
// netadrtype_t type;
// unsigned char ip[4];
// unsigned char ipx[10];
// unsigned short port;
// } netadr_t;
typedef struct netadr_s typedef struct netadr_s
{ {
netadrtype_t type; union
unsigned char ip[4]; {
unsigned char ipx[10]; struct
unsigned short port; {
#if XASH_LITTLE_ENDIAN
uint16_t type6;
uint16_t port6;
#elif XASH_BIG_ENDIAN
uint16_t port6;
uint16_t type6;
#else
#error
#endif
};
uint32_t type;
};
union
{
struct
{
uint16_t ip6[8];
};
struct
{
uint8_t ip[4];
uint8_t ipx[10];
uint16_t port;
};
};
} netadr_t; } netadr_t;
extern int _check_netadr_t_size[sizeof( netadr_t ) == NETADR_T_SIZE ? 1 : -1];
#endif//NETADR_H #endif//NETADR_H