From 3682bd90f3c57657c3e04dffd9810b109ba6c5f3 Mon Sep 17 00:00:00 2001 From: Rafael Zalamena Date: Mon, 2 May 2022 13:00:12 -0300 Subject: [PATCH] *: use FRR interface name definition everywhere Don't rely on the OS interface name length definition and use the FRR definition instead. Signed-off-by: Rafael Zalamena --- babeld/babeld.c | 3 ++- bfdd/bfd.h | 4 ++-- ldpd/ldpd.h | 22 +++++++++++----------- lib/zclient.c | 4 ++-- lib/zclient.h | 4 ++-- zebra/zapi_msg.c | 8 ++++---- zebra/zebra_pw.h | 2 +- 7 files changed, 24 insertions(+), 23 deletions(-) diff --git a/babeld/babeld.c b/babeld/babeld.c index a1e00bfb85..dfdc924cbd 100644 --- a/babeld/babeld.c +++ b/babeld/babeld.c @@ -31,6 +31,7 @@ THE SOFTWARE. #include "plist.h" #include "lib_errors.h" #include "network.h" +#include "if.h" #include "babel_main.h" #include "babeld.h" @@ -251,7 +252,7 @@ babel_get_myid(void) /* We failed to get a global EUI64 from the interfaces we were given. Let's try to find an interface with a MAC address. */ for(i = 1; i < 256; i++) { - char buf[IF_NAMESIZE], *ifname; + char buf[INTERFACE_NAMSIZ], *ifname; unsigned char eui[8]; ifname = if_indextoname(i, buf); if(ifname == NULL) diff --git a/bfdd/bfd.h b/bfdd/bfd.h index 00cc431e10..c861753704 100644 --- a/bfdd/bfd.h +++ b/bfdd/bfd.h @@ -190,8 +190,8 @@ struct bfd_key { uint16_t mhop; struct in6_addr peer; struct in6_addr local; - char ifname[MAXNAMELEN]; - char vrfname[MAXNAMELEN]; + char ifname[INTERFACE_NAMSIZ]; + char vrfname[VRF_NAMSIZ]; } __attribute__((packed)); struct bfd_session_stats { diff --git a/ldpd/ldpd.h b/ldpd/ldpd.h index fd0097ca5e..02eaf10eb7 100644 --- a/ldpd/ldpd.h +++ b/ldpd/ldpd.h @@ -352,7 +352,7 @@ struct iface_ldp_sync { struct iface { RB_ENTRY(iface) entry; - char name[IF_NAMESIZE]; + char name[INTERFACE_NAMSIZ]; ifindex_t ifindex; struct if_addr_head addr_list; struct in6_addr linklocal; @@ -458,7 +458,7 @@ struct ldp_entity_stats { struct l2vpn_if { RB_ENTRY(l2vpn_if) entry; struct l2vpn *l2vpn; - char ifname[IF_NAMESIZE]; + char ifname[INTERFACE_NAMSIZ]; ifindex_t ifindex; int operative; uint8_t mac[ETH_ALEN]; @@ -475,7 +475,7 @@ struct l2vpn_pw { int af; union ldpd_addr addr; uint32_t pwid; - char ifname[IF_NAMESIZE]; + char ifname[INTERFACE_NAMSIZ]; ifindex_t ifindex; bool enabled; uint32_t remote_group; @@ -507,7 +507,7 @@ struct l2vpn { int type; int pw_type; int mtu; - char br_ifname[IF_NAMESIZE]; + char br_ifname[INTERFACE_NAMSIZ]; ifindex_t br_ifindex; struct l2vpn_if_head if_tree; struct l2vpn_pw_head pw_tree; @@ -629,7 +629,7 @@ struct kroute { }; struct kaddr { - char ifname[IF_NAMESIZE]; + char ifname[INTERFACE_NAMSIZ]; ifindex_t ifindex; int af; union ldpd_addr addr; @@ -638,7 +638,7 @@ struct kaddr { }; struct kif { - char ifname[IF_NAMESIZE]; + char ifname[INTERFACE_NAMSIZ]; ifindex_t ifindex; int flags; int operative; @@ -656,7 +656,7 @@ struct acl_check { /* control data structures */ struct ctl_iface { int af; - char name[IF_NAMESIZE]; + char name[INTERFACE_NAMSIZ]; ifindex_t ifindex; int state; enum iface_type type; @@ -667,7 +667,7 @@ struct ctl_iface { }; struct ctl_disc_if { - char name[IF_NAMESIZE]; + char name[INTERFACE_NAMSIZ]; int active_v4; int active_v6; int no_adj; @@ -683,7 +683,7 @@ struct ctl_adj { int af; struct in_addr id; enum hello_type type; - char ifname[IF_NAMESIZE]; + char ifname[INTERFACE_NAMSIZ]; union ldpd_addr src_addr; uint16_t holdtime; uint16_t holdtime_remaining; @@ -723,7 +723,7 @@ struct ctl_rt { struct ctl_pw { uint16_t type; char l2vpn_name[L2VPN_NAME_LEN]; - char ifname[IF_NAMESIZE]; + char ifname[INTERFACE_NAMSIZ]; uint32_t pwid; struct in_addr lsr_id; uint32_t local_label; @@ -739,7 +739,7 @@ struct ctl_pw { }; struct ctl_ldp_sync { - char name[IF_NAMESIZE]; + char name[INTERFACE_NAMSIZ]; ifindex_t ifindex; bool in_sync; bool timer_running; diff --git a/lib/zclient.c b/lib/zclient.c index 0c34214151..a933b6bb2b 100644 --- a/lib/zclient.c +++ b/lib/zclient.c @@ -3551,7 +3551,7 @@ enum zclient_send_status zebra_send_pw(struct zclient *zclient, int command, stream_reset(s); zclient_create_header(s, command, VRF_DEFAULT); - stream_write(s, pw->ifname, IF_NAMESIZE); + stream_write(s, pw->ifname, INTERFACE_NAMSIZ); stream_putl(s, pw->ifindex); /* Put type */ @@ -3598,7 +3598,7 @@ int zebra_read_pw_status_update(ZAPI_CALLBACK_ARGS, struct zapi_pw_status *pw) s = zclient->ibuf; /* Get data. */ - stream_get(pw->ifname, s, IF_NAMESIZE); + stream_get(pw->ifname, s, INTERFACE_NAMSIZ); STREAM_GETL(s, pw->ifindex); STREAM_GETL(s, pw->status); diff --git a/lib/zclient.h b/lib/zclient.h index 78eb73c530..9756923a69 100644 --- a/lib/zclient.h +++ b/lib/zclient.h @@ -618,7 +618,7 @@ struct zapi_sr_policy { }; struct zapi_pw { - char ifname[IF_NAMESIZE]; + char ifname[INTERFACE_NAMSIZ]; ifindex_t ifindex; int type; int af; @@ -631,7 +631,7 @@ struct zapi_pw { }; struct zapi_pw_status { - char ifname[IF_NAMESIZE]; + char ifname[INTERFACE_NAMSIZ]; ifindex_t ifindex; uint32_t status; }; diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c index e996f6c956..9972d32fb7 100644 --- a/zebra/zapi_msg.c +++ b/zebra/zapi_msg.c @@ -1040,7 +1040,7 @@ int zsend_pw_update(struct zserv *client, struct zebra_pw *pw) struct stream *s = stream_new(ZEBRA_MAX_PACKET_SIZ); zclient_create_header(s, ZEBRA_PW_STATUS_UPDATE, pw->vrf_id); - stream_write(s, pw->ifname, IF_NAMESIZE); + stream_write(s, pw->ifname, INTERFACE_NAMSIZ); stream_putl(s, pw->ifindex); stream_putl(s, pw->status); @@ -2998,7 +2998,7 @@ static void zread_srv6_manager_request(ZAPI_HANDLER_ARGS) static void zread_pseudowire(ZAPI_HANDLER_ARGS) { struct stream *s; - char ifname[IF_NAMESIZE]; + char ifname[INTERFACE_NAMSIZ]; ifindex_t ifindex; int type; int af; @@ -3014,8 +3014,8 @@ static void zread_pseudowire(ZAPI_HANDLER_ARGS) s = msg; /* Get data. */ - STREAM_GET(ifname, s, IF_NAMESIZE); - ifname[IF_NAMESIZE - 1] = '\0'; + STREAM_GET(ifname, s, INTERFACE_NAMSIZ); + ifname[INTERFACE_NAMSIZ - 1] = '\0'; STREAM_GETL(s, ifindex); STREAM_GETL(s, type); STREAM_GETL(s, af); diff --git a/zebra/zebra_pw.h b/zebra/zebra_pw.h index 0da8203802..9800c5853a 100644 --- a/zebra/zebra_pw.h +++ b/zebra/zebra_pw.h @@ -38,7 +38,7 @@ extern "C" { struct zebra_pw { RB_ENTRY(zebra_pw) pw_entry, static_pw_entry; vrf_id_t vrf_id; - char ifname[IF_NAMESIZE]; + char ifname[INTERFACE_NAMSIZ]; ifindex_t ifindex; int type; int af;