diff options
| author | Philippe Guibert <philippe.guibert@6wind.com> | 2017-02-03 09:10:08 +0100 |
|---|---|---|
| committer | Philippe Guibert <philippe.guibert@6wind.com> | 2017-02-14 13:59:00 +0100 |
| commit | 7acff3e73536f9f5afc3d7ffbbe1d72c2cbfc38e (patch) | |
| tree | 12decaf40af345d7b31be936f2b5b86ddff0cd78 | |
| parent | d5c8a0cecfe22a5073db66801b492eb2f3aafcae (diff) | |
bgpd: reflect mac handling change of apis to bgpd
As the prefix call function for mac handling has prefix_ prepended
before, the change must be propagated to all locations where those
functions are called.
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
| -rw-r--r-- | bgpd/bgp_attr_evpn.c | 2 | ||||
| -rw-r--r-- | bgpd/bgp_route.c | 6 | ||||
| -rw-r--r-- | bgpd/rfapi/rfapi_vty.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/bgpd/bgp_attr_evpn.c b/bgpd/bgp_attr_evpn.c index 929b4c17c3..f60784e708 100644 --- a/bgpd/bgp_attr_evpn.c +++ b/bgpd/bgp_attr_evpn.c @@ -171,7 +171,7 @@ char *ecom_mac2str(char *ecom_mac) en = ecom_mac; en += 2; - return mac2str(en, NULL, 0); + return prefix_mac2str(en, NULL, 0); } /* dst prefix must be AF_INET or AF_INET6 prefix, to forge EVPN prefix */ diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 3d23fa4ca6..55823a272f 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -4502,7 +4502,7 @@ bgp_static_set_safi (safi_t safi, struct vty *vty, const char *ip_str, vty_out (vty, "%% Malformed ESI%s", VTY_NEWLINE); return CMD_WARNING; } - if( routermac && str2mac (routermac, NULL) == 0) + if( routermac && prefix_str2mac (routermac, NULL) == 0) { vty_out (vty, "%% Malformed Router MAC%s", VTY_NEWLINE); return CMD_WARNING; @@ -4568,7 +4568,7 @@ bgp_static_set_safi (safi_t safi, struct vty *vty, const char *ip_str, if( routermac) { bgp_static->router_mac = XCALLOC (MTYPE_ATTR, ETHER_ADDR_LEN+1); - str2mac (routermac, bgp_static->router_mac); + prefix_str2mac (routermac, bgp_static->router_mac); } if (gwip) prefix_copy (&bgp_static->gatewayIp, &gw_ip); @@ -10531,7 +10531,7 @@ bgp_config_write_network_evpn (struct vty *vty, struct bgp *bgp, char *esi = NULL; if(bgp_static->router_mac) - macrouter = mac2str(bgp_static->router_mac, NULL, 0); + macrouter = prefix_mac2str(bgp_static->router_mac, NULL, 0); if(bgp_static->eth_s_id) esi = esi2str(bgp_static->eth_s_id); p = &rn->p; diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c index be7fbc63a2..22489e87e2 100644 --- a/bgpd/rfapi/rfapi_vty.c +++ b/bgpd/rfapi/rfapi_vty.c @@ -314,7 +314,7 @@ rfapiL2o2Qprefix (struct rfapi_l2address_option *l2o, struct prefix *pfx) char * rfapiEthAddr2Str (const struct ethaddr *ea, char *buf, int bufsize) { - return mac2str (ea->octet, buf, bufsize); + return prefix_mac2str (ea->octet, buf, bufsize); } int |