bridge: fix retrying member enable when the bridge is otherwise empty

[project/netifd.git] / system-dummy.c

diff --git a/system-dummy.c b/system-dummy.c
index 5aa51c0..76c6ffa 100644 (file)
--- a/system-dummy.c
+++ b/system-dummy.c
@@ -1,3 +1,17 @@
+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#include <sys/time.h>

 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
 


@@ -11,105 +25,134 @@
 #include "device.h"
 #include "system.h"
 
 #include "device.h"
 #include "system.h"
 

-int system_bridge_addbr(struct device *bridge)
+int system_init(void)

 {
 {

-       DPRINTF("brctl addbr %s\n", bridge->ifname);
+       return 0;
+}
+
+int system_bridge_addbr(struct device *bridge, struct bridge_config *cfg)
+{
+       D(SYSTEM, "brctl addbr %s\n", bridge->ifname);

        return 0;
 }
 
 int system_bridge_delbr(struct device *bridge)
 {
        return 0;
 }
 
 int system_bridge_delbr(struct device *bridge)
 {

-       DPRINTF("brctl delbr %s\n", bridge->ifname);
+       D(SYSTEM, "brctl delbr %s\n", bridge->ifname);

        return 0;
 }
 
 int system_bridge_addif(struct device *bridge, struct device *dev)
 {
        return 0;
 }
 
 int system_bridge_addif(struct device *bridge, struct device *dev)
 {

-       DPRINTF("brctl addif %s %s\n", bridge->ifname, dev->ifname);
+       D(SYSTEM, "brctl addif %s %s\n", bridge->ifname, dev->ifname);

        return 0;
 }
 
 int system_bridge_delif(struct device *bridge, struct device *dev)
 {
        return 0;
 }
 
 int system_bridge_delif(struct device *bridge, struct device *dev)
 {

-       DPRINTF("brctl delif %s %s\n", bridge->ifname, dev->ifname);
+       D(SYSTEM, "brctl delif %s %s\n", bridge->ifname, dev->ifname);

        return 0;
 }
 
 int system_vlan_add(struct device *dev, int id)
 {
        return 0;
 }
 
 int system_vlan_add(struct device *dev, int id)
 {

-       DPRINTF("vconfig add %s %d\n", dev->ifname, id);
+       D(SYSTEM, "vconfig add %s %d\n", dev->ifname, id);

        return 0;
 }
 
 int system_vlan_del(struct device *dev)
 {
        return 0;
 }
 
 int system_vlan_del(struct device *dev)
 {

-       DPRINTF("vconfig rem %s\n", dev->ifname);
+       D(SYSTEM, "vconfig rem %s\n", dev->ifname);

        return 0;
 }
 
        return 0;
 }
 

+bool system_if_force_external(const char *ifname)
+{
+       return false;
+}
+

 int system_if_up(struct device *dev)
 {
 int system_if_up(struct device *dev)
 {

-       DPRINTF("ifconfig %s up\n", dev->ifname);
+       D(SYSTEM, "ifconfig %s up\n", dev->ifname);

        return 0;
 }
 
 int system_if_down(struct device *dev)
 {
        return 0;
 }
 
 int system_if_down(struct device *dev)
 {

-       DPRINTF("ifconfig %s down\n", dev->ifname);
+       D(SYSTEM, "ifconfig %s down\n", dev->ifname);

        return 0;
 }
 
        return 0;
 }
 

+void system_if_clear_state(struct device *dev)
+{
+}
+

 int system_if_check(struct device *dev)
 {
        dev->ifindex = 0;
 int system_if_check(struct device *dev)
 {
        dev->ifindex = 0;

+       device_set_present(dev, true);
+       device_set_link(dev, true);

 
 

-       if (!strcmp(dev->ifname, "eth0"))
-               device_set_present(dev, true);
+       return 0;
+}

 
 

+int system_if_resolve(struct device *dev)
+{

        return 0;
 }
 
        return 0;
 }
 

-int system_add_address(struct device *dev, struct device_addr *addr)
+struct device *
+system_if_get_parent(struct device *dev)

 {
 {

-       uint8_t *a = (uint8_t *) &addr->addr.in;
-       char ipaddr[64];
+       return NULL;
+}

 
 

-       if ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET4) {
-               DPRINTF("ifconfig %s add %d.%d.%d.%d/%d\n",
-                       dev->ifname, a[0], a[1], a[2], a[3], addr->mask);
-       } else {
-               inet_ntop(AF_INET6, &addr->addr.in6, ipaddr, sizeof(struct in6_addr));
-               DPRINTF("ifconfig %s add %s/%d\n",
-                       dev->ifname, ipaddr, addr->mask);
-               return -1;
-       }
+int
+system_if_dump_info(struct device *dev, struct blob_buf *b)
+{
+       blobmsg_add_u8(b, "link", dev->present);
+       return 0;
+}

 
 

+int
+system_if_dump_stats(struct device *dev, struct blob_buf *b)
+{

        return 0;
 }
 
        return 0;
 }
 

-int system_del_address(struct device *dev, struct device_addr *addr)
+void
+system_if_apply_settings(struct device *dev, struct device_settings *s, unsigned int apply_mask)
+{
+}
+
+static int system_address_msg(struct device *dev, struct device_addr *addr, const char *type)

 {
 {

-       uint8_t *a = (uint8_t *) &addr->addr.in;

        char ipaddr[64];
        char ipaddr[64];

+       int af = system_get_addr_family(addr->flags);

 
 

-       if ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET4) {
-               DPRINTF("ifconfig %s del %d.%d.%d.%d\n",
-                       dev->ifname, a[0], a[1], a[2], a[3]);
-       } else {
-               inet_ntop(AF_INET6, &addr->addr.in6, ipaddr, sizeof(struct in6_addr));
-               DPRINTF("ifconfig %s del %s/%d\n",
-                       dev->ifname, ipaddr, addr->mask);
-               return -1;
-       }
+       D(SYSTEM, "ifconfig %s %s %s/%d\n",
+               dev->ifname, type, inet_ntop(af, &addr->addr.in, ipaddr, sizeof(ipaddr)),
+               addr->mask);

 
        return 0;
 }
 
 
        return 0;
 }
 

-int system_add_route(struct device *dev, struct device_route *route)
+int system_add_address(struct device *dev, struct device_addr *addr)

 {
 {

-       uint8_t *a1 = (uint8_t *) &route->addr.in;
-       uint8_t *a2 = (uint8_t *) &route->nexthop.in;
-       char addr[40], gw[40] = "", devstr[64] = "";
+       return system_address_msg(dev, addr, "add");
+}
+
+int system_del_address(struct device *dev, struct device_addr *addr)
+{
+       return system_address_msg(dev, addr, "del");
+}
+
+static int system_route_msg(struct device *dev, struct device_route *route, const char *type)
+{
+       char addr[64], gw[64] = " gw ", devstr[64] = "";
+       int af = system_get_addr_family(route->flags);
+       int alen = system_get_addr_len(route->flags);
+       static uint32_t zero_addr[4];

 
        if ((route->flags & DEVADDR_FAMILY) != DEVADDR_INET4)
                return -1;
 
        if ((route->flags & DEVADDR_FAMILY) != DEVADDR_INET4)
                return -1;


@@ -117,42 +160,123 @@ int system_add_route(struct device *dev, struct device_route *route)
        if (!route->mask)
                sprintf(addr, "default");
        else
        if (!route->mask)
                sprintf(addr, "default");
        else

-               sprintf(addr, "%d.%d.%d.%d/%d",
-                       a1[0], a1[1], a1[2], a1[3], route->mask);
+               inet_ntop(af, &route->addr.in, addr, sizeof(addr));

 
 

-       if (memcmp(a2, "\x00\x00\x00\x00", 4) != 0)
-               sprintf(gw, " gw %d.%d.%d.%d",
-                       a2[0], a2[1], a2[2], a2[3]);
+       if (memcmp(&route->nexthop.in, (void *) zero_addr, alen) != 0)
+               inet_ntop(af, &route->nexthop.in, gw + 4, sizeof(gw) - 4);
+       else
+               gw[0] = 0;

 
 

-       if (route->flags & DEVADDR_DEVICE)
+       if (dev)

                sprintf(devstr, " dev %s", dev->ifname);
 
                sprintf(devstr, " dev %s", dev->ifname);
 

-       DPRINTF("route add %s%s%s\n", addr, gw, devstr);
+       if (route->metric > 0)
+               sprintf(devstr, " metric %d", route->metric);
+
+       D(SYSTEM, "route %s %s%s%s\n", type, addr, gw, devstr);

        return 0;
 }
 
        return 0;
 }
 

+int system_add_route(struct device *dev, struct device_route *route)
+{
+       return system_route_msg(dev, route, "add");
+}
+

 int system_del_route(struct device *dev, struct device_route *route)
 {
 int system_del_route(struct device *dev, struct device_route *route)
 {

-       uint8_t *a1 = (uint8_t *) &route->addr.in;
-       uint8_t *a2 = (uint8_t *) &route->nexthop.in;
-       char addr[40], gw[40] = "", devstr[64] = "";
+       return system_route_msg(dev, route, "del");
+}

 
 

-       if ((route->flags & DEVADDR_FAMILY) != DEVADDR_INET4)
-               return -1;
+int system_flush_routes(void)
+{
+       return 0;
+}

 
 

-       if (!route->mask)
-               sprintf(addr, "default");
-       else
-               sprintf(addr, "%d.%d.%d.%d/%d",
-                       a1[0], a1[1], a1[2], a1[3], route->mask);
+bool system_resolve_rt_type(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;
+}

 
 

-       if (memcmp(a2, "\x00\x00\x00\x00", 4) != 0)
-               sprintf(gw, " gw %d.%d.%d.%d",
-                       a2[0], a2[1], a2[2], a2[3]);
+bool system_is_default_rt_table(unsigned int id)
+{
+       return true;
+}

 
 

-       if (route->flags & DEVADDR_DEVICE)
-               sprintf(devstr, " dev %s", dev->ifname);
+bool system_resolve_rpfilter(const char *filter, unsigned int *id)
+{
+       *id = 0;
+       return true;
+}

 
 

-       DPRINTF("route del %s%s%s\n", addr, gw, devstr);
+int system_add_iprule(struct iprule *rule)
+{
+       return 0;
+}
+
+int system_del_iprule(struct iprule *rule)
+{
+       return 0;
+}
+
+int system_flush_iprules(void)
+{
+       return 0;
+}
+
+bool system_resolve_iprule_action(const char *action, unsigned int *id)
+{
+       *id = 0;
+       return true;
+}
+
+time_t system_get_rtime(void)
+{
+       struct timeval tv;
+
+       if (gettimeofday(&tv, NULL) == 0)
+               return tv.tv_sec;
+
+       return 0;
+}
+
+int system_del_ip_tunnel(const char *name, struct blob_attr *attr)
+{
+       return 0;
+}
+
+int system_add_ip_tunnel(const char *name, struct blob_attr *attr)
+{
+       return 0;
+}
+
+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_vlandev_add(struct device *vlandev, struct device *dev, struct vlandev_config *cfg)
+{
+       return 0;
+}
+
+int system_vlandev_del(struct device *vlandev)
+{

        return 0;
 }
        return 0;
 }