Prepare for adding connman support to figure out dns etc...

Signed-off-by: Philippe De Swert <philippe.deswert@jollamobile.com>
sailfishos · Dec 2, 2013 · 4173e7d · 4173e7d
1 parent 41d1622
commit 4173e7d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/dbus-send-test.txt b/dbus-send-test.txt
@@ -7,3 +7,7 @@ dbus-send --system --type=method_call --print-reply --dest=com.meego.usb_moded /
 security extra:
 aegis-exec -a usb-moded::USBControl
 
+#connman mess
+dbus-send --system --type=method_call --print-reply --dest=net.connman / net.connman.Manager.GetProperties
+dbus-send --system --type=method_call --print-reply --dest=net.connman / net.connman.Manager.GetService /* get all network connections */
+dbus-send --system --type=method_call --print-reply --dest=net.connman /service_path/from/previous/command/ net.connman.Service.GetProperties
diff --git a/src/usb_moded-network.c b/src/usb_moded-network.c
@@ -103,7 +103,7 @@ int usb_network_up(struct mode_list_elem *data)
   char command[128];
   int ret = -1;
 
-#if CONNMAN
+#if CONNMAN_IS_EVER_FIXED_FOR_USB
   DBusConnection *dbus_conn_connman = NULL;
   DBusMessage *msg = NULL, *reply = NULL;
   DBusError error;
@@ -174,7 +174,7 @@ int usb_network_up(struct mode_list_elem *data)
   free((char *)ip);
 
   return(0);
-#endif /* CONNMAN */
+#endif /* CONNMAN_IS_EVER_FIXED_FOR_USB */
 }
 
 /**
@@ -183,7 +183,7 @@ int usb_network_up(struct mode_list_elem *data)
  */
 int usb_network_down(struct mode_list_elem *data)
 {
-#if CONNMAN
+#if CONNMAN_IS_EVER_FIXED_FOR_USB
 #else
   const char *interface;
   char command[128];
@@ -198,7 +198,7 @@ int usb_network_down(struct mode_list_elem *data)
   free((char *)interface);
 
   return(0);
-#endif /* CONNMAN */
+#endif /* CONNMAN_IS_EVER_FIXED_FOR_USB */
 }
 
 /**