Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

net/linux/addrs: use list instead of fixed array for interface up #1251

Merged
merged 3 commits into from
Jan 3, 2025
Merged

net/linux/addrs: use list instead of fixed array for interface up #1251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7848dd7
net/linux/addrs: use list instead of fixed array for interface up
sreimers Jan 3, 2025
7d9ae45
net/linux/addrs: rewrite error handling
sreimers Jan 3, 2025
7c8ac07
net/if: fix net_if_apply return err handling
sreimers Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/net/if.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,13 @@ int net_if_getname(char *ifname, size_t sz, int af, const struct sa *ip)
ife.found = false;

err = net_if_apply(if_getname_handler, &ife);
if (err)
return err;

return ife.found ? err : ENODEV;
if (!ife.found)
return ENODEV;

return 0;
}


Expand Down
77 changes: 54 additions & 23 deletions src/net/linux/addrs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

#include <re_types.h>
#include <re_fmt.h>
#include <re_list.h>
#include <re_mem.h>
#include <re_sa.h>
#include <re_net.h>
#include "macros.h"
Expand All @@ -20,7 +22,12 @@
#define DEBUG_LEVEL 5
#include <re_dbg.h>

enum { BUFSZ = 8192, MAXIF = 255 };
enum { BUFSZ = 8192 };

struct iff_up_e {
struct le le;
uint32_t ifi_index;
};


static void parse_rtattr(struct rtattr *tb[], struct rtattr *rta, int len)
Expand All @@ -45,51 +52,56 @@ static bool is_ipv6_deprecated(uint32_t flags)
}


static bool parse_msg_link(struct nlmsghdr *msg, ssize_t len, int *iff_up)
static int parse_msg_link(struct nlmsghdr *msg, ssize_t len,
struct list *iff_up_l)
{
struct nlmsghdr *nlh;
struct ifinfomsg *ifi;

for (nlh = msg; NLMSG_OK(nlh, len); nlh = NLMSG_NEXT(nlh, len)) {
if (nlh->nlmsg_type == NLMSG_DONE) {
return true;
return 0;
}
if (nlh->nlmsg_type == NLMSG_ERROR) {
DEBUG_WARNING("netlink recv error\n");
return true;
return EBADMSG;
}

ifi = NLMSG_DATA(nlh);

if (ifi->ifi_index >= MAXIF) {
DEBUG_WARNING("Max interface index [%d] reached!\n",
MAXIF);
return false;
}
if (!(ifi->ifi_flags & IFF_UP))
continue;

iff_up[ifi->ifi_index] = ifi->ifi_flags & IFF_UP;
struct iff_up_e *e = mem_zalloc(sizeof(struct iff_up_e), NULL);
if (!e)
return ENOMEM;

e->ifi_index = ifi->ifi_index;

list_append(iff_up_l, &e->le, e);
}

return false;
return EALREADY;
}


static bool parse_msg_addr(struct nlmsghdr *msg, ssize_t len,
net_ifaddr_h *ifh, int *iff_up, void *arg)
static int parse_msg_addr(struct nlmsghdr *msg, ssize_t len, net_ifaddr_h *ifh,
struct list *iff_up_l, void *arg)
{
struct nlmsghdr *nlh;
for (nlh = msg; NLMSG_OK(nlh, len); nlh = NLMSG_NEXT(nlh, len)) {
struct sa sa;
uint32_t flags;
bool iff_up = false;
void *addr;
char if_name[IF_NAMESIZE];

if (nlh->nlmsg_type == NLMSG_DONE) {
return true;
return 0;
}
if (nlh->nlmsg_type == NLMSG_ERROR) {
DEBUG_WARNING("netlink recv error\n");
return true;
return EBADMSG;
}

struct ifaddrmsg *ifa = NLMSG_DATA(nlh);
Expand All @@ -101,7 +113,17 @@ static bool parse_msg_addr(struct nlmsghdr *msg, ssize_t len,
if (!rta_tb[IFA_ADDRESS])
continue;

if (ifa->ifa_index < MAXIF && !iff_up[ifa->ifa_index])
struct le *le;
LIST_FOREACH(iff_up_l, le)
{
struct iff_up_e *e = le->data;
if (ifa->ifa_index == e->ifi_index) {
iff_up = true;
break;
}
}

if (!iff_up)
continue;

if (rta_tb[IFA_FLAGS] && ifa->ifa_family == AF_INET6) {
Expand Down Expand Up @@ -132,10 +154,10 @@ static bool parse_msg_addr(struct nlmsghdr *msg, ssize_t len,
continue;

if (ifh(if_name, &sa, arg))
return true;
return 0;
}

return false;
return EALREADY;
}


Expand All @@ -145,11 +167,12 @@ int net_netlink_addrs(net_ifaddr_h *ifh, void *arg)
char buffer[BUFSZ];
re_sock_t sock;
ssize_t len;
int iff_up[MAXIF] = {0};
struct list iff_up_l = LIST_INIT;

struct {
struct nlmsghdr nlh;
union {
union
{
struct ifinfomsg ifi;
struct ifaddrmsg ifa;
} u;
Expand Down Expand Up @@ -180,9 +203,13 @@ int net_netlink_addrs(net_ifaddr_h *ifh, void *arg)
}

while ((len = recv(sock, buffer, sizeof(buffer), 0)) > 0) {
if (parse_msg_link((struct nlmsghdr *)buffer, len, iff_up))
err = parse_msg_link((struct nlmsghdr *)buffer, len,
&iff_up_l);
if (err != EALREADY)
break;
}
if (err)
goto out;

if (len < 0) {
err = errno;
Expand All @@ -203,10 +230,13 @@ int net_netlink_addrs(net_ifaddr_h *ifh, void *arg)
}

while ((len = recv(sock, buffer, sizeof(buffer), 0)) > 0) {
if (parse_msg_addr((struct nlmsghdr *)buffer, len, ifh, iff_up,
arg))
err = (parse_msg_addr((struct nlmsghdr *)buffer, len, ifh,
&iff_up_l, arg));
if (err != EALREADY)
break;
}
if (err)
goto out;

if (len < 0) {
err = errno;
Expand All @@ -215,6 +245,7 @@ int net_netlink_addrs(net_ifaddr_h *ifh, void *arg)

out:
close(sock);
list_flush(&iff_up_l);

return err;
}
Loading