+#define _GNU_SOURCE
+
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
+#include <sys/syscall.h>
#include <linux/rtnetlink.h>
#include <linux/sockios.h>
#include <linux/if_vlan.h>
+#include <linux/if_bridge.h>
#include <unistd.h>
#include <string.h>
return ioctl(sock_ioctl, SIOCBRDELBR, bridge->ifname);
}
-static int system_bridge_if(const char *bridge, struct device *dev, int cmd)
+static int system_bridge_if(const char *bridge, struct device *dev, int cmd, void *data)
{
struct ifreq ifr;
- ifr.ifr_ifindex = dev->ifindex;
+ if (dev)
+ ifr.ifr_ifindex = dev->ifindex;
+ else
+ ifr.ifr_data = data;
strncpy(ifr.ifr_name, bridge, sizeof(ifr.ifr_name));
return ioctl(sock_ioctl, cmd, &ifr);
}
int system_bridge_addif(struct device *bridge, struct device *dev)
{
- return system_bridge_if(bridge->ifname, dev, SIOCBRADDIF);
+ return system_bridge_if(bridge->ifname, dev, SIOCBRADDIF, NULL);
}
int system_bridge_delif(struct device *bridge, struct device *dev)
{
- return system_bridge_if(bridge->ifname, dev, SIOCBRDELIF);
+ return system_bridge_if(bridge->ifname, dev, SIOCBRDELIF, NULL);
}
static bool system_is_bridge(const char *name, char *buf, int buflen)
/*
* Clear bridge (membership) state and bring down device
*/
-static void system_if_clear_state(struct device *dev)
+void system_if_clear_state(struct device *dev)
{
char buf[256];
char *bridge;
bridge = system_get_bridge(dev->ifname, buf, sizeof(buf));
if (bridge) {
D(SYSTEM, "Remove device '%s' from bridge '%s'\n", dev->ifname, bridge);
- system_bridge_if(bridge, dev, SIOCBRDELIF);
+ system_bridge_if(bridge, dev, SIOCBRDELIF, NULL);
}
}
-int system_bridge_addbr(struct device *bridge)
+static inline unsigned long
+sec_to_jiffies(int val)
{
- system_if_clear_state(bridge);
- return ioctl(sock_ioctl, SIOCBRADDBR, bridge->ifname);
+ return (unsigned long) val * 100;
+}
+
+int system_bridge_addbr(struct device *bridge, struct bridge_config *cfg)
+{
+ unsigned long args[4] = {};
+
+ if (ioctl(sock_ioctl, SIOCBRADDBR, bridge->ifname) < 0)
+ return -1;
+
+ args[0] = BRCTL_SET_BRIDGE_STP_STATE;
+ args[1] = !!cfg->stp;
+ system_bridge_if(bridge->ifname, NULL, SIOCDEVPRIVATE, &args);
+
+ args[0] = BRCTL_SET_BRIDGE_FORWARD_DELAY;
+ args[1] = sec_to_jiffies(cfg->forward_delay);
+ system_bridge_if(bridge->ifname, NULL, SIOCDEVPRIVATE, &args);
+
+ if (cfg->flags & BRIDGE_OPT_AGEING_TIME) {
+ args[0] = BRCTL_SET_AGEING_TIME;
+ args[1] = sec_to_jiffies(cfg->ageing_time);
+ system_bridge_if(bridge->ifname, NULL, SIOCDEVPRIVATE, &args);
+ }
+
+ if (cfg->flags & BRIDGE_OPT_HELLO_TIME) {
+ args[0] = BRCTL_SET_BRIDGE_HELLO_TIME;
+ args[1] = sec_to_jiffies(cfg->hello_time);
+ system_bridge_if(bridge->ifname, NULL, SIOCDEVPRIVATE, &args);
+ }
+
+ if (cfg->flags & BRIDGE_OPT_MAX_AGE) {
+ args[0] = BRCTL_SET_BRIDGE_MAX_AGE;
+ args[1] = sec_to_jiffies(cfg->max_age);
+ system_bridge_if(bridge->ifname, NULL, SIOCDEVPRIVATE, &args);
+ }
+
+ return 0;
}
static int system_vlan(struct device *dev, int id)
{
struct vlan_ioctl_args ifr = {
- .cmd = (id == 0) ? DEL_VLAN_CMD : ADD_VLAN_CMD,
- .u = {.VID = id},
+ .cmd = SET_VLAN_NAME_TYPE_CMD,
+ .u.name_type = VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD,
};
+
+ ioctl(sock_ioctl, SIOCSIFVLAN, &ifr);
+
+ if (id < 0) {
+ ifr.cmd = DEL_VLAN_CMD;
+ ifr.u.VID = 0;
+ } else {
+ ifr.cmd = ADD_VLAN_CMD;
+ ifr.u.VID = id;
+ }
strncpy(ifr.device1, dev->ifname, sizeof(ifr.device1));
return ioctl(sock_ioctl, SIOCSIFVLAN, &ifr);
}
int system_vlan_add(struct device *dev, int id)
{
- system_if_clear_state(dev);
return system_vlan(dev, id);
}
int system_vlan_del(struct device *dev)
{
- return system_vlan(dev, 0);
+ return system_vlan(dev, -1);
}
int system_if_up(struct device *dev)
int system_if_check(struct device *dev)
{
- system_if_clear_state(dev);
device_set_present(dev, (system_if_resolve(dev) >= 0));
return 0;
}
+int system_if_dump_stats(struct device *dev, struct blob_buf *b)
+{
+ const char *const counters[] = {
+ "collisions", "rx_frame_errors", "tx_compressed",
+ "multicast", "rx_length_errors", "tx_dropped",
+ "rx_bytes", "rx_missed_errors", "tx_errors",
+ "rx_compressed", "rx_over_errors", "tx_fifo_errors",
+ "rx_crc_errors", "rx_packets", "tx_heartbeat_errors",
+ "rx_dropped", "tx_aborted_errors", "tx_packets",
+ "rx_errors", "tx_bytes", "tx_window_errors",
+ "rx_fifo_errors", "tx_carrier_errors",
+ };
+ char buf[64];
+ int stats_dir;
+ int i, fd, len;
+
+ snprintf(buf, sizeof(buf), "/sys/class/net/%s/statistics", dev->ifname);
+ stats_dir = open(buf, O_DIRECTORY);
+ if (stats_dir < 0)
+ return -1;
+
+ for (i = 0; i < ARRAY_SIZE(counters); i++) {
+ fd = openat(stats_dir, counters[i], O_RDONLY);
+ if (fd < 0)
+ continue;
+
+retry:
+ len = read(fd, buf, sizeof(buf));
+ if (len < 0) {
+ if (errno == EINTR)
+ goto retry;
+ continue;
+ }
+
+ buf[len] = 0;
+ blobmsg_add_u32(b, counters[i], strtoul(buf, NULL, 0));
+ close(fd);
+ }
+
+ close(stats_dir);
+ return 0;
+}
+
static int system_addr(struct device *dev, struct device_addr *addr, int cmd)
{
int alen = ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET4) ? 4 : 16;
{
return system_rt(dev, route, RTM_DELROUTE);
}
+
+time_t system_get_rtime(void)
+{
+ struct timespec ts;
+ struct timeval tv;
+
+ if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, &ts) == 0)
+ return ts.tv_sec;
+
+ if (gettimeofday(&tv, NULL) == 0)
+ return tv.tv_sec;
+
+ return 0;
+}
projects / project / netifd.git / blobdiff