Add callbacks for loading known networks

[connman] / src / rtnl.c

diff --git a/src/rtnl.c b/src/rtnl.c
index e4996fb..b18465d 100644 (file)
--- a/src/rtnl.c
+++ b/src/rtnl.c
@@ -23,7 +23,6 @@
 #include <config.h>
 #endif
 
-#include <stdio.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/socket.h>
@@ -57,30 +56,30 @@ static inline void print_inet(struct rtattr *attr, const char *name, int family)
        if (family == AF_INET) {
                struct in_addr addr;
                addr = *((struct in_addr *) RTA_DATA(attr));
-               printf("  attr %s (len %jd) %s\n",
+               DBG("  attr %s (len %jd) %s\n",
                                name, RTA_PAYLOAD(attr), inet_ntoa(addr));
        } else
-               printf("  attr %s (len %jd)\n", name, RTA_PAYLOAD(attr));
+               DBG("  attr %s (len %jd)\n", name, RTA_PAYLOAD(attr));
 }
 
 static inline void print_char(struct rtattr *attr, const char *name)
 {
-       printf("  attr %s (len %jd) %s\n", name, RTA_PAYLOAD(attr),
+       DBG("  attr %s (len %jd) %s\n", name, RTA_PAYLOAD(attr),
                                                (char *) RTA_DATA(attr));
 }
 
 static inline void print_byte(struct rtattr *attr, const char *name)
 {
-       printf("  attr %s (len %jd) 0x%02x\n", name, RTA_PAYLOAD(attr),
+       DBG("  attr %s (len %jd) 0x%02x\n", name, RTA_PAYLOAD(attr),
                                        *((unsigned char *) RTA_DATA(attr)));
 }
 
 static inline void print_attr(struct rtattr *attr, const char *name)
 {
        if (name)
-               printf("  attr %s (len %jd)\n", name, RTA_PAYLOAD(attr));
+               DBG("  attr %s (len %jd)\n", name, RTA_PAYLOAD(attr));
        else
-               printf("  attr %d (len %jd)\n",
+               DBG("  attr %d (len %jd)\n",
                                        attr->rta_type, RTA_PAYLOAD(attr));
 }
 
@@ -106,21 +105,25 @@ static void rtnl_link(struct nlmsghdr *hdr)
                return;
 
        if ((data->ifi_flags & IFF_RUNNING) != (msg->ifi_flags & IFF_RUNNING)) {
-               if (msg->ifi_flags & IFF_RUNNING)
-                       connman_iface_indicate_carrier_on(iface);
-               else
-                       connman_iface_indicate_carrier_off(iface);
+               if (!(iface->flags & CONNMAN_IFACE_FLAG_NOCARRIER)) {
+                       if (msg->ifi_flags & IFF_RUNNING)
+                               connman_iface_indicate_carrier_on(iface);
+                       else
+                               connman_iface_indicate_carrier_off(iface);
+               }
        }
 
        if ((data->ifi_flags & IFF_UP) != (msg->ifi_flags & IFF_UP)) {
                if (msg->ifi_flags & IFF_UP)
-                       connman_iface_indicate_enabled(iface);
+                       connman_iface_indicate_ifup(iface);
                else
-                       connman_iface_indicate_disabled(iface);
+                       connman_iface_indicate_ifdown(iface);
        }
 
        data->ifi_flags = msg->ifi_flags;
 
+       return;
+
        for (attr = IFLA_RTA(msg); RTA_OK(attr, bytes);
                                        attr = RTA_NEXT(attr, bytes)) {
                switch (attr->rta_type) {