proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-17 02:22:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: add define of compilation for EVPN in prefix.c

Browse Source 
Because the prefix structure may include or not evpn sub structure, then
HAVE_EVPN compilation define is also used in prefix.c, because it
references the sub field evpn of prefix structure.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
This commit is contained in:
Philippe Guibert 2017-01-17 22:21:40 +01:00
parent b18825ebc7
commit 25098f9b97
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/prefix.c
View File

@ -304,19 +304,17 @@ prefix_copy (struct prefix *dest, const struct prefix *src)
dest->u.prefix4 = src->u.prefix4; dest->u.prefix4 = src->u.prefix4;
else if (src->family == AF_INET6) else if (src->family == AF_INET6)
dest->u.prefix6 = src->u.prefix6; dest->u.prefix6 = src->u.prefix6;
#if defined(HAVE_EVPN)
else if (src->family == AF_ETHERNET) else if (src->family == AF_ETHERNET)
{ {
memcpy (&dest->u.prefix_evpn, &src->u.prefix_evpn, sizeof (struct evpn_addr)); memcpy (&dest->u.prefix_evpn, &src->u.prefix_evpn, sizeof (struct evpn_addr));
} }
#endif /* (HAVE_EVPN) */
else if (src->family == AF_UNSPEC) else if (src->family == AF_UNSPEC)
{ {
dest->u.lp.id = src->u.lp.id; dest->u.lp.id = src->u.lp.id;
dest->u.lp.adv_router = src->u.lp.adv_router; dest->u.lp.adv_router = src->u.lp.adv_router;
} }
else if (src->family == AF_ETHERNET)
{
dest->u.prefix_eth = src->u.prefix_eth;
}
else else
{ {
zlog (NULL, LOG_ERR, "prefix_copy(): Unknown address family %d", zlog (NULL, LOG_ERR, "prefix_copy(): Unknown address family %d",
@ -350,9 +348,11 @@ prefix_same (const struct prefix *p1, const struct prefix *p2)
if (p1->family == AF_INET6 ) if (p1->family == AF_INET6 )
if (IPV6_ADDR_SAME (&p1->u.prefix6.s6_addr, &p2->u.prefix6.s6_addr)) if (IPV6_ADDR_SAME (&p1->u.prefix6.s6_addr, &p2->u.prefix6.s6_addr))
return 1; return 1;
#if defined(HAVE_EVPN)
if (p1->family == AF_ETHERNET ) if (p1->family == AF_ETHERNET )
if (!memcmp (&p1->u.prefix_evpn, &p2->u.prefix_evpn, sizeof (struct evpn_addr))) if (!memcmp (&p1->u.prefix_evpn, &p2->u.prefix_evpn, sizeof (struct evpn_addr)))
return 1; return 1;
#endif /* (HAVE_EVPN) */
} }
return 0; return 0;
} }
@ -866,8 +866,6 @@ prefix2str (union prefixconstptr pu, char *str, int size)
switch (p->family) switch (p->family)
{ {
u_char family;
case AF_INET: case AF_INET:
case AF_INET6: case AF_INET6:
snprintf (str, size, "%s/%d", snprintf (str, size, "%s/%d",
@ -875,9 +873,11 @@ prefix2str (union prefixconstptr pu, char *str, int size)
p->prefixlen); p->prefixlen);
break; break;
#if defined(HAVE_EVPN)
case AF_ETHERNET: case AF_ETHERNET:
if (p->u.prefix_evpn.route_type == 5) if (p->u.prefix_evpn.route_type == 5)
{ {
u_char family;
family = (p->u.prefix_evpn.flags & (IP_ADDR_V4 | IP_PREFIX_V4)) ? family = (p->u.prefix_evpn.flags & (IP_ADDR_V4 | IP_PREFIX_V4)) ?
AF_INET : AF_INET6; AF_INET : AF_INET6;
snprintf (str, size, "[%d]:[%u][%s]/%d", snprintf (str, size, "[%d]:[%u][%s]/%d",
@ -888,7 +888,7 @@ prefix2str (union prefixconstptr pu, char *str, int size)
p->prefixlen); p->prefixlen);
} }
break; break;
#endif /* (HAVE_EVPN) */
default: default:
sprintf (str, "UNK prefix"); sprintf (str, "UNK prefix");
break; break;