static bool check_route(struct nlmsghdr *hdr, int ifindex)
{
+ struct rtmsg *r = NLMSG_DATA(hdr);
struct nlattr *tb[__RTA_MAX];
+ if (r->rtm_protocol == RTPROT_KERNEL &&
+ r->rtm_family == AF_INET6)
+ return false;
+
nlmsg_parse(hdr, sizeof(struct rtmsg), tb, __RTA_MAX - 1, NULL);
if (!tb[RTA_OIF])
return false;
}
}
-static void
+void
system_if_apply_settings(struct device *dev, struct device_settings *s)
{
struct ifreq ifr;
if (ioctl(sock_ioctl, SIOCSIFTXQLEN, &ifr) < 0)
s->flags &= ~DEV_OPT_TXQUEUELEN;
}
- if (s->flags & DEV_OPT_MACADDR) {
+ if ((s->flags & DEV_OPT_MACADDR) && !dev->external) {
ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
memcpy(&ifr.ifr_hwaddr.sa_data, s->macaddr, sizeof(s->macaddr));
if (ioctl(sock_ioctl, SIOCSIFHWADDR, &ifr) < 0)
}
static bool
-read_int_file(int dir_fd, const char *file, int *val)
+read_uint64_file(int dir_fd, const char *file, uint64_t *val)
{
char buf[64];
bool ret = false;
ret = read_string_file(dir_fd, file, buf, sizeof(buf));
if (ret)
- *val = strtoul(buf, NULL, 0);
+ *val = strtoull(buf, NULL, 0);
return ret;
}
struct ifreq ifr;
char buf[64], *s;
void *c;
- int dir_fd, val = 0;
+ int dir_fd;
+ uint64_t val = 0;
snprintf(buf, sizeof(buf), "/sys/class/net/%s", dev->ifname);
dir_fd = open(buf, O_DIRECTORY);
- if (read_int_file(dir_fd, "carrier", &val))
+ if (read_uint64_file(dir_fd, "carrier", &val))
blobmsg_add_u8(b, "link", !!val);
memset(&ecmd, 0, sizeof(ecmd));
};
char buf[64];
int stats_dir;
- int i, val = 0;
+ int i;
+ uint64_t val = 0;
snprintf(buf, sizeof(buf), "/sys/class/net/%s/statistics", dev->ifname);
stats_dir = open(buf, O_DIRECTORY);
return -1;
for (i = 0; i < ARRAY_SIZE(counters); i++)
- if (read_int_file(stats_dir, counters[i], &val))
- blobmsg_add_u32(b, counters[i], val);
+ if (read_uint64_file(stats_dir, counters[i], &val))
+ blobmsg_add_u64(b, counters[i], val);
close(stats_dir);
return 0;
{
bool v4 = ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET4);
int alen = v4 ? 4 : 16;
+ unsigned int flags = 0;
struct ifaddrmsg ifa = {
.ifa_family = (alen == 4) ? AF_INET : AF_INET6,
.ifa_prefixlen = addr->mask,
};
struct nl_msg *msg;
+ if (cmd == RTM_NEWADDR)
+ flags |= NLM_F_CREATE | NLM_F_REPLACE;
- msg = nlmsg_alloc_simple(cmd, 0);
+ msg = nlmsg_alloc_simple(cmd, flags);
if (!msg)
return -1;
nla_put_u32(msg, IFA_BROADCAST, addr->broadcast);
if (addr->point_to_point)
nla_put_u32(msg, IFA_ADDRESS, addr->point_to_point);
+ } else {
+ time_t now = system_get_rtime();
+ struct ifa_cacheinfo cinfo = {0xffffffffU, 0xffffffffU, 0, 0};
+
+ if (addr->preferred_until) {
+ int preferred = addr->preferred_until - now;
+ if (preferred < 0)
+ preferred = 0;
+
+ cinfo.ifa_prefered = preferred;
+ }
+
+ if (addr->valid_until) {
+ int valid = addr->valid_until - now;
+ if (valid <= 0)
+ return -1;
+
+ cinfo.ifa_valid = valid;
+ }
+
+ nla_put(msg, IFA_CACHEINFO, sizeof(cinfo), &cinfo);
}
return system_rtnl_call(msg);
int alen = ((route->flags & DEVADDR_FAMILY) == DEVADDR_INET4) ? 4 : 16;
bool have_gw;
unsigned int flags = 0;
- int ifindex = dev->ifindex;
if (alen == 4)
have_gw = !!route->nexthop.in.s_addr;
unsigned char scope = (cmd == RTM_DELROUTE) ? RT_SCOPE_NOWHERE :
(have_gw) ? RT_SCOPE_UNIVERSE : RT_SCOPE_LINK;
+ unsigned int table = (route->flags & DEVROUTE_TABLE) ? route->table : RT_TABLE_MAIN;
+
struct rtmsg rtm = {
.rtm_family = (alen == 4) ? AF_INET : AF_INET6,
.rtm_dst_len = route->mask,
- .rtm_table = RT_TABLE_MAIN,
- .rtm_protocol = (route->flags & DEVADDR_KERNEL) ? RTPROT_KERNEL : RTPROT_BOOT,
+ .rtm_table = (table < 256) ? table : RT_TABLE_UNSPEC,
+ .rtm_protocol = (route->flags & DEVADDR_KERNEL) ? RTPROT_KERNEL : RTPROT_STATIC,
.rtm_scope = scope,
.rtm_type = (cmd == RTM_DELROUTE) ? 0: RTN_UNICAST,
};
struct nl_msg *msg;
- if (cmd == RTM_NEWROUTE)
+ if (cmd == RTM_NEWROUTE) {
flags |= NLM_F_CREATE | NLM_F_REPLACE;
+ if (!dev) { // Add null-route
+ rtm.rtm_scope = RT_SCOPE_UNIVERSE;
+ rtm.rtm_type = RTN_UNREACHABLE;
+ }
+ }
+
msg = nlmsg_alloc_simple(cmd, flags);
if (!msg)
return -1;
if (have_gw)
nla_put(msg, RTA_GATEWAY, alen, &route->nexthop);
- nla_put_u32(msg, RTA_OIF, ifindex);
+ if (dev)
+ nla_put_u32(msg, RTA_OIF, dev->ifindex);
+
+ if (table >= 256)
+ nla_put_u32(msg, RTA_TABLE, table);
return system_rtnl_call(msg);
}
return 0;
}
+bool system_resolve_rt_table(const char *name, unsigned int *id)
+{
+ FILE *f;
+ char *e, buf[128];
+ unsigned int n, table = RT_TABLE_UNSPEC;
+
+ /* first try to parse table as number */
+ if ((n = strtoul(name, &e, 0)) > 0 && !*e)
+ table = n;
+
+ /* handle well known aliases */
+ else if (!strcmp(name, "default"))
+ table = RT_TABLE_DEFAULT;
+ else if (!strcmp(name, "main"))
+ table = RT_TABLE_MAIN;
+ else if (!strcmp(name, "local"))
+ table = RT_TABLE_LOCAL;
+
+ /* try to look up name in /etc/iproute2/rt_tables */
+ else if ((f = fopen("/etc/iproute2/rt_tables", "r")) != NULL)
+ {
+ while (fgets(buf, sizeof(buf) - 1, f) != NULL)
+ {
+ if ((e = strtok(buf, " \t\n")) == NULL || *e == '#')
+ continue;
+
+ n = strtoul(e, NULL, 10);
+ e = strtok(NULL, " \t\n");
+
+ if (e && !strcmp(e, name))
+ {
+ table = n;
+ break;
+ }
+ }
+
+ fclose(f);
+ }
+
+ if (table == RT_TABLE_UNSPEC)
+ return false;
+
+ /* do not consider main table special */
+ if (table == RT_TABLE_MAIN)
+ table = RT_TABLE_UNSPEC;
+
+ *id = table;
+ return true;
+}
+
time_t system_get_rtime(void)
{
struct timespec ts;
return tunnel_ioctl(name, SIOCDELTUNNEL, &p);
}
+int system_update_ipv6_mtu(struct device *dev, int mtu)
+{
+ int ret = -1;
+ char buf[64];
+ snprintf(buf, sizeof(buf), "/proc/sys/net/ipv6/conf/%s/mtu",
+ dev->ifname);
+
+ int fd = open(buf, O_RDWR);
+ ssize_t len = read(fd, buf, sizeof(buf) - 1);
+ if (len < 0)
+ goto out;
+
+ buf[len] = 0;
+ ret = atoi(buf);
+
+ if (!mtu || ret <= mtu)
+ goto out;
+
+ lseek(fd, 0, SEEK_SET);
+ if (write(fd, buf, snprintf(buf, sizeof(buf), "%i", mtu)) <= 0)
+ ret = -1;
+
+out:
+ close(fd);
+ return ret;
+}
+
static int parse_ipaddr(struct blob_attr *attr, __be32 *addr)
{
if (!attr)
projects / project / netifd.git / blobdiff