fix refcount bugs when dev->set_state fails

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

diff --git a/system-dummy.c b/system-dummy.c
index f24f686..d1557f9 100644 (file)
--- a/system-dummy.c
+++ b/system-dummy.c
@@ -1,54 +1,66 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <arpa/inet.h>
+
+#ifndef DEBUG
+#define DEBUG
+#endif
+
 #include "netifd.h"
 #include "device.h"
+#include "system.h"
+
+int system_init(void)
+{
+       return 0;
+}
 
 int system_bridge_addbr(struct device *bridge)
 {
-       DPRINTF("brctl addbr %s\n", bridge->ifname);
+       D(SYSTEM, "brctl addbr %s\n", bridge->ifname);
        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)
 {
-       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)
 {
-       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)
 {
-       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)
 {
-       DPRINTF("vconfig rem %s\n", dev->ifname);
+       D(SYSTEM, "vconfig rem %s\n", dev->ifname);
        return 0;
 }
 
 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)
 {
-       DPRINTF("ifconfig %s down\n", dev->ifname);
+       D(SYSTEM, "ifconfig %s down\n", dev->ifname);
        return 0;
 }
 
@@ -57,7 +69,7 @@ int system_if_check(struct device *dev)
        dev->ifindex = 0;
 
        if (!strcmp(dev->ifname, "eth0"))
-               set_device_present(dev, true);
+               device_set_present(dev, true);
 
        return 0;
 }
@@ -65,11 +77,15 @@ int system_if_check(struct device *dev)
 int system_add_address(struct device *dev, struct device_addr *addr)
 {
        uint8_t *a = (uint8_t *) &addr->addr.in;
+       char ipaddr[64];
 
        if ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET4) {
-               DPRINTF("ifconfig %s add %d.%d.%d.%d/%d\n",
+               D(SYSTEM, "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));
+               D(SYSTEM, "ifconfig %s add %s/%d\n",
+                       dev->ifname, ipaddr, addr->mask);
                return -1;
        }
 
@@ -79,11 +95,15 @@ int system_add_address(struct device *dev, struct device_addr *addr)
 int system_del_address(struct device *dev, struct device_addr *addr)
 {
        uint8_t *a = (uint8_t *) &addr->addr.in;
+       char ipaddr[64];
 
        if ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET4) {
-               DPRINTF("ifconfig %s del %d.%d.%d.%d\n",
+               D(SYSTEM, "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));
+               D(SYSTEM, "ifconfig %s del %s/%d\n",
+                       dev->ifname, ipaddr, addr->mask);
                return -1;
        }
 
@@ -112,7 +132,7 @@ int system_add_route(struct device *dev, struct device_route *route)
        if (route->flags & DEVADDR_DEVICE)
                sprintf(devstr, " dev %s", dev->ifname);
 
-       DPRINTF("route add %s%s%s\n", addr, gw, devstr);
+       D(SYSTEM, "route add %s%s%s\n", addr, gw, devstr);
        return 0;
 }
 
@@ -138,6 +158,6 @@ int system_del_route(struct device *dev, struct device_route *route)
        if (route->flags & DEVADDR_DEVICE)
                sprintf(devstr, " dev %s", dev->ifname);
 
-       DPRINTF("route del %s%s%s\n", addr, gw, devstr);
+       D(SYSTEM, "route del %s%s%s\n", addr, gw, devstr);
        return 0;
 }