matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

lib: Remove typedef from ipaddr

Browse source 
The ipaddr_t type was conflicting with code on omnios.

Remove the typedef

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-05-26 13:44:29 -04:00 committed by David Lamparter
parent 21bb7c8774
commit 7fb9d20fcf
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ipaddr.h
View file

@ -35,7 +35,7 @@ enum ipaddr_type_t
IPADDR_V6 = 2, /* IPv6 */ IPADDR_V6 = 2, /* IPv6 */
}; };
typedef struct ipaddr struct ipaddr
{ {
enum ipaddr_type_t ipa_type; enum ipaddr_type_t ipa_type;
union union
@ -46,7 +46,7 @@ typedef struct ipaddr
} ip; } ip;
#define ipaddr_v4 ip._v4_addr #define ipaddr_v4 ip._v4_addr
#define ipaddr_v6 ip._v6_addr #define ipaddr_v6 ip._v6_addr
} ipaddr_t; };
#define IS_IPADDR_NONE(p) ((p)->ipa_type == IPADDR_NONE) #define IS_IPADDR_NONE(p) ((p)->ipa_type == IPADDR_NONE)
#define IS_IPADDR_V4(p) ((p)->ipa_type == IPADDR_V4) #define IS_IPADDR_V4(p) ((p)->ipa_type == IPADDR_V4)
@ -56,11 +56,11 @@ typedef struct ipaddr
#define SET_IPADDR_V6(p) (p)->ipa_type = IPADDR_V6 #define SET_IPADDR_V6(p) (p)->ipa_type = IPADDR_V6
static inline int static inline int
str2ipaddr (const char *str, ipaddr_t *ip) str2ipaddr (const char *str, struct ipaddr *ip)
{ {
int ret; int ret;
memset (ip, 0, sizeof (ipaddr_t)); memset (ip, 0, sizeof (struct ipaddr));
ret = inet_pton (AF_INET, str, &ip->ipaddr_v4); ret = inet_pton (AF_INET, str, &ip->ipaddr_v4);
if (ret > 0) /* Valid IPv4 address. */ if (ret > 0) /* Valid IPv4 address. */
@ -79,7 +79,7 @@ str2ipaddr (const char *str, ipaddr_t *ip)
} }
static inline char * static inline char *
ipaddr2str (ipaddr_t *ip, char *buf, int size) ipaddr2str (struct ipaddr *ip, char *buf, int size)
{ {
buf[0] = '\0'; buf[0] = '\0';
if (ip) if (ip)

2
lib/prefix.h
View file

@ -66,7 +66,7 @@ struct evpn_addr
u_char ip_prefix_length; u_char ip_prefix_length;
struct ethaddr mac; struct ethaddr mac;
uint32_t eth_tag; uint32_t eth_tag;
ipaddr_t ip; struct ipaddr ip;
#if 0 #if 0
union union
{ {