diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2023-11-22 09:13:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-22 09:13:58 +0200 |
| commit | b84476e0bb46ea7f6d6b6d180f06602b27a34ecd (patch) | |
| tree | 0e3c7fbed0b2af64511696af62793143feae782b /zebra/kernel_socket.c | |
| parent | 01af05fbd55edf444d2e39d9de44f5aef2b37719 (diff) | |
| parent | 07b91ca0967fb898e4060367d485b85f965856e2 (diff) | |
Merge pull request #14850 from donaldsharp/IFNAMSIZ_GET_YOUR_SHIT_TOGETHER
*: Let's use the native IFNAMSIZ instead of INTERFACE_NAMSIZ
Diffstat (limited to 'zebra/kernel_socket.c')
| -rw-r--r-- | zebra/kernel_socket.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c index 62adbc0c3e..4b42c134f5 100644 --- a/zebra/kernel_socket.c +++ b/zebra/kernel_socket.c @@ -830,12 +830,12 @@ int ifam_read(struct ifa_msghdr *ifam) struct interface *ifp = NULL; union sockunion addr, mask, brd; bool dest_same = false; - char ifname[INTERFACE_NAMSIZ]; + char ifname[IFNAMSIZ]; short ifnlen = 0; bool isalias = false; uint32_t flags = 0; - ifname[0] = ifname[INTERFACE_NAMSIZ - 1] = '\0'; + ifname[0] = ifname[IFNAMSIZ - 1] = '\0'; /* Allocate and read address information. */ ifam_read_mesg(ifam, &addr, &mask, &brd, ifname, &ifnlen); @@ -847,7 +847,7 @@ int ifam_read(struct ifa_msghdr *ifam) return -1; } - if (ifnlen && strncmp(ifp->name, ifname, INTERFACE_NAMSIZ)) + if (ifnlen && strncmp(ifp->name, ifname, IFNAMSIZ)) isalias = true; /* @@ -991,7 +991,7 @@ void rtm_read(struct rt_msghdr *rtm) int flags; uint32_t zebra_flags; union sockunion dest, mask, gate; - char ifname[INTERFACE_NAMSIZ + 1]; + char ifname[IFNAMSIZ + 1]; short ifnlen = 0; struct nexthop nh; struct prefix p; |