mirror of https://github.com/FRRouting/frr.git
*: 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 <rzalamena@opensourcerouting.org>
This commit is contained in:
parent
024e37fd87
commit
3682bd90f3
|
@ -31,6 +31,7 @@ THE SOFTWARE.
|
||||||
#include "plist.h"
|
#include "plist.h"
|
||||||
#include "lib_errors.h"
|
#include "lib_errors.h"
|
||||||
#include "network.h"
|
#include "network.h"
|
||||||
|
#include "if.h"
|
||||||
|
|
||||||
#include "babel_main.h"
|
#include "babel_main.h"
|
||||||
#include "babeld.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.
|
/* We failed to get a global EUI64 from the interfaces we were given.
|
||||||
Let's try to find an interface with a MAC address. */
|
Let's try to find an interface with a MAC address. */
|
||||||
for(i = 1; i < 256; i++) {
|
for(i = 1; i < 256; i++) {
|
||||||
char buf[IF_NAMESIZE], *ifname;
|
char buf[INTERFACE_NAMSIZ], *ifname;
|
||||||
unsigned char eui[8];
|
unsigned char eui[8];
|
||||||
ifname = if_indextoname(i, buf);
|
ifname = if_indextoname(i, buf);
|
||||||
if(ifname == NULL)
|
if(ifname == NULL)
|
||||||
|
|
|
@ -190,8 +190,8 @@ struct bfd_key {
|
||||||
uint16_t mhop;
|
uint16_t mhop;
|
||||||
struct in6_addr peer;
|
struct in6_addr peer;
|
||||||
struct in6_addr local;
|
struct in6_addr local;
|
||||||
char ifname[MAXNAMELEN];
|
char ifname[INTERFACE_NAMSIZ];
|
||||||
char vrfname[MAXNAMELEN];
|
char vrfname[VRF_NAMSIZ];
|
||||||
} __attribute__((packed));
|
} __attribute__((packed));
|
||||||
|
|
||||||
struct bfd_session_stats {
|
struct bfd_session_stats {
|
||||||
|
|
22
ldpd/ldpd.h
22
ldpd/ldpd.h
|
@ -352,7 +352,7 @@ struct iface_ldp_sync {
|
||||||
|
|
||||||
struct iface {
|
struct iface {
|
||||||
RB_ENTRY(iface) entry;
|
RB_ENTRY(iface) entry;
|
||||||
char name[IF_NAMESIZE];
|
char name[INTERFACE_NAMSIZ];
|
||||||
ifindex_t ifindex;
|
ifindex_t ifindex;
|
||||||
struct if_addr_head addr_list;
|
struct if_addr_head addr_list;
|
||||||
struct in6_addr linklocal;
|
struct in6_addr linklocal;
|
||||||
|
@ -458,7 +458,7 @@ struct ldp_entity_stats {
|
||||||
struct l2vpn_if {
|
struct l2vpn_if {
|
||||||
RB_ENTRY(l2vpn_if) entry;
|
RB_ENTRY(l2vpn_if) entry;
|
||||||
struct l2vpn *l2vpn;
|
struct l2vpn *l2vpn;
|
||||||
char ifname[IF_NAMESIZE];
|
char ifname[INTERFACE_NAMSIZ];
|
||||||
ifindex_t ifindex;
|
ifindex_t ifindex;
|
||||||
int operative;
|
int operative;
|
||||||
uint8_t mac[ETH_ALEN];
|
uint8_t mac[ETH_ALEN];
|
||||||
|
@ -475,7 +475,7 @@ struct l2vpn_pw {
|
||||||
int af;
|
int af;
|
||||||
union ldpd_addr addr;
|
union ldpd_addr addr;
|
||||||
uint32_t pwid;
|
uint32_t pwid;
|
||||||
char ifname[IF_NAMESIZE];
|
char ifname[INTERFACE_NAMSIZ];
|
||||||
ifindex_t ifindex;
|
ifindex_t ifindex;
|
||||||
bool enabled;
|
bool enabled;
|
||||||
uint32_t remote_group;
|
uint32_t remote_group;
|
||||||
|
@ -507,7 +507,7 @@ struct l2vpn {
|
||||||
int type;
|
int type;
|
||||||
int pw_type;
|
int pw_type;
|
||||||
int mtu;
|
int mtu;
|
||||||
char br_ifname[IF_NAMESIZE];
|
char br_ifname[INTERFACE_NAMSIZ];
|
||||||
ifindex_t br_ifindex;
|
ifindex_t br_ifindex;
|
||||||
struct l2vpn_if_head if_tree;
|
struct l2vpn_if_head if_tree;
|
||||||
struct l2vpn_pw_head pw_tree;
|
struct l2vpn_pw_head pw_tree;
|
||||||
|
@ -629,7 +629,7 @@ struct kroute {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct kaddr {
|
struct kaddr {
|
||||||
char ifname[IF_NAMESIZE];
|
char ifname[INTERFACE_NAMSIZ];
|
||||||
ifindex_t ifindex;
|
ifindex_t ifindex;
|
||||||
int af;
|
int af;
|
||||||
union ldpd_addr addr;
|
union ldpd_addr addr;
|
||||||
|
@ -638,7 +638,7 @@ struct kaddr {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct kif {
|
struct kif {
|
||||||
char ifname[IF_NAMESIZE];
|
char ifname[INTERFACE_NAMSIZ];
|
||||||
ifindex_t ifindex;
|
ifindex_t ifindex;
|
||||||
int flags;
|
int flags;
|
||||||
int operative;
|
int operative;
|
||||||
|
@ -656,7 +656,7 @@ struct acl_check {
|
||||||
/* control data structures */
|
/* control data structures */
|
||||||
struct ctl_iface {
|
struct ctl_iface {
|
||||||
int af;
|
int af;
|
||||||
char name[IF_NAMESIZE];
|
char name[INTERFACE_NAMSIZ];
|
||||||
ifindex_t ifindex;
|
ifindex_t ifindex;
|
||||||
int state;
|
int state;
|
||||||
enum iface_type type;
|
enum iface_type type;
|
||||||
|
@ -667,7 +667,7 @@ struct ctl_iface {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct ctl_disc_if {
|
struct ctl_disc_if {
|
||||||
char name[IF_NAMESIZE];
|
char name[INTERFACE_NAMSIZ];
|
||||||
int active_v4;
|
int active_v4;
|
||||||
int active_v6;
|
int active_v6;
|
||||||
int no_adj;
|
int no_adj;
|
||||||
|
@ -683,7 +683,7 @@ struct ctl_adj {
|
||||||
int af;
|
int af;
|
||||||
struct in_addr id;
|
struct in_addr id;
|
||||||
enum hello_type type;
|
enum hello_type type;
|
||||||
char ifname[IF_NAMESIZE];
|
char ifname[INTERFACE_NAMSIZ];
|
||||||
union ldpd_addr src_addr;
|
union ldpd_addr src_addr;
|
||||||
uint16_t holdtime;
|
uint16_t holdtime;
|
||||||
uint16_t holdtime_remaining;
|
uint16_t holdtime_remaining;
|
||||||
|
@ -723,7 +723,7 @@ struct ctl_rt {
|
||||||
struct ctl_pw {
|
struct ctl_pw {
|
||||||
uint16_t type;
|
uint16_t type;
|
||||||
char l2vpn_name[L2VPN_NAME_LEN];
|
char l2vpn_name[L2VPN_NAME_LEN];
|
||||||
char ifname[IF_NAMESIZE];
|
char ifname[INTERFACE_NAMSIZ];
|
||||||
uint32_t pwid;
|
uint32_t pwid;
|
||||||
struct in_addr lsr_id;
|
struct in_addr lsr_id;
|
||||||
uint32_t local_label;
|
uint32_t local_label;
|
||||||
|
@ -739,7 +739,7 @@ struct ctl_pw {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct ctl_ldp_sync {
|
struct ctl_ldp_sync {
|
||||||
char name[IF_NAMESIZE];
|
char name[INTERFACE_NAMSIZ];
|
||||||
ifindex_t ifindex;
|
ifindex_t ifindex;
|
||||||
bool in_sync;
|
bool in_sync;
|
||||||
bool timer_running;
|
bool timer_running;
|
||||||
|
|
|
@ -3551,7 +3551,7 @@ enum zclient_send_status zebra_send_pw(struct zclient *zclient, int command,
|
||||||
stream_reset(s);
|
stream_reset(s);
|
||||||
|
|
||||||
zclient_create_header(s, command, VRF_DEFAULT);
|
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);
|
stream_putl(s, pw->ifindex);
|
||||||
|
|
||||||
/* Put type */
|
/* Put type */
|
||||||
|
@ -3598,7 +3598,7 @@ int zebra_read_pw_status_update(ZAPI_CALLBACK_ARGS, struct zapi_pw_status *pw)
|
||||||
s = zclient->ibuf;
|
s = zclient->ibuf;
|
||||||
|
|
||||||
/* Get data. */
|
/* 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->ifindex);
|
||||||
STREAM_GETL(s, pw->status);
|
STREAM_GETL(s, pw->status);
|
||||||
|
|
||||||
|
|
|
@ -618,7 +618,7 @@ struct zapi_sr_policy {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct zapi_pw {
|
struct zapi_pw {
|
||||||
char ifname[IF_NAMESIZE];
|
char ifname[INTERFACE_NAMSIZ];
|
||||||
ifindex_t ifindex;
|
ifindex_t ifindex;
|
||||||
int type;
|
int type;
|
||||||
int af;
|
int af;
|
||||||
|
@ -631,7 +631,7 @@ struct zapi_pw {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct zapi_pw_status {
|
struct zapi_pw_status {
|
||||||
char ifname[IF_NAMESIZE];
|
char ifname[INTERFACE_NAMSIZ];
|
||||||
ifindex_t ifindex;
|
ifindex_t ifindex;
|
||||||
uint32_t status;
|
uint32_t status;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1040,7 +1040,7 @@ int zsend_pw_update(struct zserv *client, struct zebra_pw *pw)
|
||||||
struct stream *s = stream_new(ZEBRA_MAX_PACKET_SIZ);
|
struct stream *s = stream_new(ZEBRA_MAX_PACKET_SIZ);
|
||||||
|
|
||||||
zclient_create_header(s, ZEBRA_PW_STATUS_UPDATE, pw->vrf_id);
|
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->ifindex);
|
||||||
stream_putl(s, pw->status);
|
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)
|
static void zread_pseudowire(ZAPI_HANDLER_ARGS)
|
||||||
{
|
{
|
||||||
struct stream *s;
|
struct stream *s;
|
||||||
char ifname[IF_NAMESIZE];
|
char ifname[INTERFACE_NAMSIZ];
|
||||||
ifindex_t ifindex;
|
ifindex_t ifindex;
|
||||||
int type;
|
int type;
|
||||||
int af;
|
int af;
|
||||||
|
@ -3014,8 +3014,8 @@ static void zread_pseudowire(ZAPI_HANDLER_ARGS)
|
||||||
s = msg;
|
s = msg;
|
||||||
|
|
||||||
/* Get data. */
|
/* Get data. */
|
||||||
STREAM_GET(ifname, s, IF_NAMESIZE);
|
STREAM_GET(ifname, s, INTERFACE_NAMSIZ);
|
||||||
ifname[IF_NAMESIZE - 1] = '\0';
|
ifname[INTERFACE_NAMSIZ - 1] = '\0';
|
||||||
STREAM_GETL(s, ifindex);
|
STREAM_GETL(s, ifindex);
|
||||||
STREAM_GETL(s, type);
|
STREAM_GETL(s, type);
|
||||||
STREAM_GETL(s, af);
|
STREAM_GETL(s, af);
|
||||||
|
|
|
@ -38,7 +38,7 @@ extern "C" {
|
||||||
struct zebra_pw {
|
struct zebra_pw {
|
||||||
RB_ENTRY(zebra_pw) pw_entry, static_pw_entry;
|
RB_ENTRY(zebra_pw) pw_entry, static_pw_entry;
|
||||||
vrf_id_t vrf_id;
|
vrf_id_t vrf_id;
|
||||||
char ifname[IF_NAMESIZE];
|
char ifname[INTERFACE_NAMSIZ];
|
||||||
ifindex_t ifindex;
|
ifindex_t ifindex;
|
||||||
int type;
|
int type;
|
||||||
int af;
|
int af;
|
||||||
|
|
Loading…
Reference in New Issue