X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=system-dummy.c;h=f4eac87e75961f91ea19c1b5d303233cf139e32c;hb=HEAD;hp=95546bf5200a6d043d885c63a0d1235f4526cb31;hpb=68bb041b6ce4cde28186557262bee7b766c77b2d;p=project%2Fnetifd.git

diff --git a/system-dummy.c b/system-dummy.c
index 95546bf..f4eac87 100644
--- a/system-dummy.c
+++ b/system-dummy.c
@@ -32,37 +32,86 @@ int system_init(void)
 
 int system_bridge_addbr(struct device *bridge, struct bridge_config *cfg)
 {
-	D(SYSTEM, "brctl addbr %s\n", bridge->ifname);
+	D(SYSTEM, "brctl addbr %s vlan_filtering=%d",
+	  bridge->ifname, cfg->vlan_filtering);
 	return 0;
 }
 
 int system_bridge_delbr(struct device *bridge)
 {
-	D(SYSTEM, "brctl delbr %s\n", bridge->ifname);
+	D(SYSTEM, "brctl delbr %s", bridge->ifname);
 	return 0;
 }
 
 int system_bridge_addif(struct device *bridge, struct device *dev)
 {
-	D(SYSTEM, "brctl addif %s %s\n", bridge->ifname, dev->ifname);
+	D(SYSTEM, "brctl addif %s %s", bridge->ifname, dev->ifname);
 	return 0;
 }
 
 int system_bridge_delif(struct device *bridge, struct device *dev)
 {
-	D(SYSTEM, "brctl delif %s %s\n", bridge->ifname, dev->ifname);
+	D(SYSTEM, "brctl delif %s %s", bridge->ifname, dev->ifname);
+	return 0;
+}
+
+int system_bridge_vlan(const char *iface, uint16_t vid, int16_t vid_end, bool add, unsigned int vflags)
+{
+	D(SYSTEM, "brctl vlan %s %s %s vid=%d vid_end=%d pvid=%d untag=%d",
+	  add ? "add" : "remove",
+	  (vflags & BRVLAN_F_SELF) ? "self" : "master",
+	  iface, vid, vid_end,
+	  !!(vflags & BRVLAN_F_PVID),
+	  !!(vflags & BRVLAN_F_UNTAGGED));
+	return 0;
+}
+
+void system_bridge_set_stp_state(struct device *dev, bool val)
+{
+}
+
+int system_bridge_vlan_check(struct device *dev, char *ifname)
+{
+	return 0;
+}
+
+int system_bonding_set_device(struct device *dev, struct bonding_config *cfg)
+{
+	return 0;
+}
+
+int system_bonding_set_port(struct device *dev, struct device *port, bool add, bool primary)
+{
+	return 0;
+}
+
+int system_link_netns_move(struct device *dev, int netns_fd, const char *target_ifname)
+{
+	D(SYSTEM, "ip link set %s name %s netns %d", dev->ifname, target_ifname, netns_fd);
+	return 0;
+}
+
+int system_netns_open(const pid_t target_ns)
+{
+	D(SYSTEM, "open netns of pid %d", target_ns);
+	return 1;
+}
+
+int system_netns_set(int netns_fd)
+{
+	D(SYSTEM, "set netns %d", netns_fd);
 	return 0;
 }
 
 int system_vlan_add(struct device *dev, int id)
 {
-	D(SYSTEM, "vconfig add %s %d\n", dev->ifname, id);
+	D(SYSTEM, "vconfig add %s %d", dev->ifname, id);
 	return 0;
 }
 
 int system_vlan_del(struct device *dev)
 {
-	D(SYSTEM, "vconfig rem %s\n", dev->ifname);
+	D(SYSTEM, "vconfig rem %s", dev->ifname);
 	return 0;
 }
 
@@ -73,36 +122,43 @@ bool system_if_force_external(const char *ifname)
 
 int system_if_up(struct device *dev)
 {
-	D(SYSTEM, "ifconfig %s up\n", dev->ifname);
+	D(SYSTEM, "ifconfig %s up", dev->ifname);
 	return 0;
 }
 
 int system_if_down(struct device *dev)
 {
-	D(SYSTEM, "ifconfig %s down\n", dev->ifname);
+	D(SYSTEM, "ifconfig %s down", dev->ifname);
 	return 0;
 }
 
+void system_if_get_settings(struct device *dev, struct device_settings *s)
+{
+}
+
 void system_if_clear_state(struct device *dev)
 {
+	device_set_ifindex(dev, system_if_resolve(dev));
 }
 
 int system_if_check(struct device *dev)
 {
-	dev->ifindex = 0;
-
-	if (!strcmp(dev->ifname, "eth0"))
+	if (dev->type == &simple_device_type)
 		device_set_present(dev, true);
 
+	device_set_link(dev, true);
+
 	return 0;
 }
 
+int system_if_resolve(struct device *dev)
+{
+	return 1;
+}
+
 struct device *
 system_if_get_parent(struct device *dev)
 {
-	if (!strcmp(dev->ifname, "eth0"))
-		return device_get("eth1", true);
-
 	return NULL;
 }
 
@@ -120,8 +176,14 @@ system_if_dump_stats(struct device *dev, struct blob_buf *b)
 }
 
 void
-system_if_apply_settings(struct device *dev, struct device_settings *s)
+system_if_apply_settings(struct device *dev, struct device_settings *s, uint64_t apply_mask)
 {
+	apply_mask &= s->flags;
+
+	if ((apply_mask & (DEV_OPT_MACADDR | DEV_OPT_DEFAULT_MACADDR)) && !dev->external) {
+		D(SYSTEM, "ifconfig %s hw ether %s",
+		  dev->ifname, format_macaddr(s->macaddr));
+	}
 }
 
 static int system_address_msg(struct device *dev, struct device_addr *addr, const char *type)
@@ -129,7 +191,7 @@ static int system_address_msg(struct device *dev, struct device_addr *addr, cons
 	char ipaddr[64];
 	int af = system_get_addr_family(addr->flags);
 
-	D(SYSTEM, "ifconfig %s %s %s/%d\n",
+	D(SYSTEM, "ifconfig %s %s %s/%u",
 		dev->ifname, type, inet_ntop(af, &addr->addr.in, ipaddr, sizeof(ipaddr)),
 		addr->mask);
 
@@ -172,10 +234,32 @@ static int system_route_msg(struct device *dev, struct device_route *route, cons
 	if (route->metric > 0)
 		sprintf(devstr, " metric %d", route->metric);
 
-	D(SYSTEM, "route %s %s%s%s\n", type, addr, gw, devstr);
+	D(SYSTEM, "route %s %s%s%s", type, addr, gw, devstr);
 	return 0;
 }
 
+static int system_neighbor_msg(struct device *dev, struct device_neighbor *neighbor, const char *type)
+{
+	char addr[64];
+	int af = system_get_addr_family(neighbor->flags);
+	inet_ntop(af, &neighbor->addr.in , addr, sizeof(addr));
+
+	D(SYSTEM, "neigh %s %s%s%s %s", type, addr, neighbor->proxy ? "proxy " : "",
+		(neighbor->flags & DEVNEIGH_MAC) ? format_macaddr(neighbor->macaddr) : "",
+		neighbor->router ? "router": "");
+	return 0;
+}
+
+int system_add_neighbor(struct device *dev, struct device_neighbor *neighbor)
+{
+	return system_neighbor_msg(dev, neighbor, "add");
+}
+
+int system_del_neighbor(struct device *dev, struct device_neighbor *neighbor)
+{
+	return system_neighbor_msg(dev, neighbor, "del");
+}
+
 int system_add_route(struct device *dev, struct device_route *route)
 {
 	return system_route_msg(dev, route, "add");
@@ -191,12 +275,35 @@ int system_flush_routes(void)
 	return 0;
 }
 
+bool system_resolve_rt_type(const char *type, unsigned int *id)
+{
+	*id = 0;
+	return true;
+}
+
+bool system_resolve_rt_proto(const char *type, unsigned int *id)
+{
+	*id = 0;
+	return true;
+}
+
 bool system_resolve_rt_table(const char *name, unsigned int *id)
 {
 	*id = 0;
 	return true;
 }
 
+bool system_is_default_rt_table(unsigned int id)
+{
+	return true;
+}
+
+bool system_resolve_rpfilter(const char *filter, unsigned int *id)
+{
+	*id = 0;
+	return true;
+}
+
 int system_add_iprule(struct iprule *rule)
 {
 	return 0;
@@ -228,12 +335,12 @@ time_t system_get_rtime(void)
 	return 0;
 }
 
-int system_del_ip_tunnel(const char *name)
+int system_del_ip_tunnel(const struct device *dev)
 {
 	return 0;
 }
 
-int system_add_ip_tunnel(const char *name, struct blob_attr *attr)
+int system_add_ip_tunnel(const struct device *dev, struct blob_attr *attr)
 {
 	return 0;
 }
@@ -242,3 +349,33 @@ int system_update_ipv6_mtu(struct device *dev, int mtu)
 {
 	return 0;
 }
+
+int system_macvlan_add(struct device *macvlan, struct device *dev, struct macvlan_config *cfg)
+{
+	return 0;
+}
+
+int system_macvlan_del(struct device *macvlan)
+{
+	return 0;
+}
+
+int system_veth_add(struct device *veth, struct veth_config *cfg)
+{
+	return 0;
+}
+
+int system_veth_del(struct device *veth)
+{
+	return 0;
+}
+
+int system_vlandev_add(struct device *vlandev, struct device *dev, struct vlandev_config *cfg)
+{
+	return 0;
+}
+
+int system_vlandev_del(struct device *vlandev)
+{
+	return 0;
+}