changing hwaddr to sigar_net_address_t
This commit is contained in:
1 parent
a2597443b7
commit
287af5e947
5 files changed
+20
-8
No files matched your search
+4
-2
@@ -395,11 +395,13 @@ typedef struct {
|
||||
enum {
|
||||
SIGAR_AF_UNSPEC,
|
||||
SIGAR_AF_INET,
|
||||
SIGAR_AF_INET6
|
||||
SIGAR_AF_INET6,
|
||||
SIGAR_AF_LINK
|
||||
} family;
|
||||
union {
|
||||
sigar_uint32_t in;
|
||||
sigar_uint32_t in6[4];
|
||||
unsigned char mac[8];
|
||||
} addr;
|
||||
} sigar_net_address_t;
|
||||
|
||||
@@ -478,9 +480,9 @@ SIGAR_DECLARE(int) sigar_net_route_list_destroy(sigar_t *sigar,
|
||||
|
||||
typedef struct {
|
||||
char name[16];
|
||||
char hwaddr[64];
|
||||
char type[64];
|
||||
char description[256];
|
||||
sigar_net_address_t hwaddr;
|
||||
sigar_net_address_t address;
|
||||
sigar_net_address_t destination;
|
||||
sigar_net_address_t broadcast;
|
||||
|
||||
@@ -196,10 +196,15 @@ int sigar_net_connection_list_grow(sigar_net_connection_list_t *connlist);
|
||||
(a).addr.in = val; \
|
||||
(a).family = SIGAR_AF_INET
|
||||
|
||||
#define sigar_net_address6_set(addr, val) \
|
||||
#define sigar_net_address6_set(a, val) \
|
||||
memcpy(&((a).addr.in6), val, sizeof((a).addr.in6)); \
|
||||
(a).family = SIGAR_AF_INET6
|
||||
|
||||
#define sigar_net_address_mac_set(a, val, len) \
|
||||
if (len == 0) SIGAR_ZERO(&((a).addr.mac); \
|
||||
else memcpy(&((a).addr.mac), val, len); \
|
||||
(a).family = SIGAR_AF_LINK
|
||||
|
||||
int sigar_who_list_create(sigar_who_list_t *wholist);
|
||||
|
||||
int sigar_who_list_grow(sigar_who_list_t *wholist);
|
||||
@@ -209,7 +214,7 @@ int sigar_who_list_grow(sigar_who_list_t *wholist);
|
||||
sigar_who_list_grow(wholist); \
|
||||
}
|
||||
|
||||
void sigar_hwaddr_format(char *buff, unsigned char *ptr);
|
||||
int sigar_hwaddr_format(char *buff, unsigned char *ptr);
|
||||
|
||||
#define sigar_hwaddr_set_null(ifconfig) \
|
||||
memcpy(ifconfig->hwaddr, SIGAR_NULL_HWADDR, sizeof(SIGAR_NULL_HWADDR))
|
||||
|
||||
Reference in new issue
Block a user