Merge lp:~kvalo/indicator-network/libconnman-sort-services into lp:~indicator-applet-developers/indicator-network/indicator-network

[Kalle Valo]

[Mikkel Kamstrup Erlandsen (kamstrup)]

Looks good to me, although I must confess I have been slightly less thorough than usually as I have quite a bit on my stack

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2010-11-17 14:07:04 +0000
+++ .bzrignore	2010-12-03 09:51:48 +0000
@@ -84,7 +84,7 @@
 src/common/ofono-manager-xml.h
 src/common/ofono-modem-xml.h
 src/common/ofono-simmanager-xml.h
-src/common/libconnman.la
-src/common/libconnman_la-connman-manager.lo
+src/libconnman/libconnman.la
+src/libconnman/libconnman_la-connman-manager.lo
 tests/libconnman-tool
-src/common/libconnman_la-connman-service.lo
+src/libconnman/libconnman_la-connman-service.lo

=== modified file 'configure.ac'
--- configure.ac	2010-11-30 15:10:47 +0000
+++ configure.ac	2010-12-03 09:51:48 +0000
@@ -120,8 +120,8 @@
 		AC_DEFINE_UNQUOTED($1, "$ac_define_path", $3))
 ])
 
-CONNMAN_CFLAGS="-I\$(top_srcdir)/src/common"
-CONNMAN_LIBS="\$(top_builddir)/src/common/libconnman.la"
+CONNMAN_CFLAGS="-I\$(top_srcdir)/src/libconnman"
+CONNMAN_LIBS="\$(top_builddir)/src/libconnman/libconnman.la"
 
 AC_SUBST(CONNMAN_CFLAGS)
 AC_SUBST(CONNMAN_LIBS)
@@ -146,6 +146,7 @@
 src/Makefile
 src/indicator/Makefile
 src/common/Makefile
+src/libconnman/Makefile
 src/backend/Makefile
 src/agent/Makefile
 data/Makefile

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-09-23 07:43:40 +0000
+++ src/Makefile.am	2010-12-03 09:51:48 +0000
@@ -1,5 +1,6 @@
 SUBDIRS = \
 	common \
+	libconnman \
 	indicator \
 	backend \
 	agent

=== modified file 'src/backend/manager.c'
--- src/backend/manager.c	2010-11-25 15:12:47 +0000
+++ src/backend/manager.c	2010-12-03 09:51:48 +0000
@@ -95,7 +95,6 @@
   gint connecting_stage;
   gint connecting_state;
   gchar *connecting_icons[CONNECTING_ICON_STAGES][CONNECTING_ICON_STATES];
-  gchar *default_service_path;
   gint signal_strength;
   ManagerState manager_state;
   NetworkMenu *network_menu;
@@ -342,23 +341,18 @@
   update_icon(self);
 }
 
-static void default_service_changed(ServiceManager *sm, gpointer user_data)
+static void default_service_changed(Manager *self)
 {
-  Manager *self = MANAGER(user_data);
   ManagerPrivate *priv = GET_PRIVATE(self);
   Service *service;
 
   g_return_if_fail(self != NULL);
   g_return_if_fail(priv != NULL);
 
-  g_free(priv->default_service_path);
-  priv->default_service_path = NULL;
-
   service = service_manager_get_default_service(priv->service_manager);
   if (service == NULL)
     goto done;
 
-  priv->default_service_path = g_strdup(service_get_path(service));
   priv->signal_strength = service_get_strength(service);
 
  done:
@@ -376,6 +370,19 @@
   update_icon(self);
 }
 
+static void default_service_notify(ConnmanManager *connman, GParamSpec *pspec,
+				   gpointer user_data)
+{
+  Manager *self = MANAGER(user_data);
+  ManagerPrivate *priv = GET_PRIVATE(self);
+  ConnmanService *cs;
+
+  cs = connman_manager_get_default_service(priv->connman);
+  service_manager_update_default_service(priv->service_manager, cs);
+
+  default_service_changed(self);
+}
+
 static void update_services(Manager *self)
 {
   ManagerPrivate *priv = GET_PRIVATE(self);
@@ -466,6 +473,10 @@
 		   G_CALLBACK(connman_service_removed),
 		   self);
 
+  g_signal_connect(priv->connman, "notify::default-service",
+		   G_CALLBACK(default_service_notify),
+		   self);
+
   if (connman_manager_is_connected(priv->connman))
     connman_connected(self);
 
@@ -590,9 +601,6 @@
 		   G_CALLBACK(state_changed), self);
   g_signal_connect(G_OBJECT(priv->service_manager), "strength-updated",
 		   G_CALLBACK(strength_updated), self);
-  g_signal_connect(G_OBJECT(priv->service_manager),
-		   "default-service-changed",
-		   G_CALLBACK(default_service_changed), self);
 
   create_ui_proxy(self);
   create_connman(self);

=== modified file 'src/backend/service-manager.c'
--- src/backend/service-manager.c	2010-11-23 11:29:29 +0000
+++ src/backend/service-manager.c	2010-12-03 09:51:48 +0000
@@ -217,14 +217,6 @@
 
   g_signal_emit(self, signals[SERVICES_UPDATED], 0);
 
-  link = g_list_first(priv->services);
-  if (link != NULL)
-    priv->default_service = link->data;
-  else
-    priv->default_service = NULL;
-
-  g_signal_emit(self, signals[DEFAULT_SERVICE_CHANGED], 0);
-
   /* remove unavailable services, we don't want to show them anymore */
   service_manager_free_all(old_services);
   old_services = NULL;
@@ -348,19 +340,37 @@
 Service *service_manager_get_default_service(ServiceManager *self)
 {
   ServiceManagerPrivate *priv = GET_PRIVATE(self);
-  Service *service;
-  GList *iter;
 
   g_return_val_if_fail(IS_SERVICE_MANAGER(self), NULL);
   g_return_val_if_fail(priv != NULL, NULL);
 
-  iter = g_list_first(priv->services);
-  if (iter == NULL)
-    return NULL;
-
-  service = iter->data;
-
-  return service;
+  return priv->default_service;
+}
+
+void service_manager_update_default_service(ServiceManager *self,
+					    ConnmanService *cs)
+{
+  ServiceManagerPrivate *priv = GET_PRIVATE(self);
+  GList *l;
+
+  g_return_if_fail(IS_SERVICE_MANAGER(self));
+  g_return_if_fail(priv != NULL);
+
+  if (cs == NULL) {
+    priv->default_service = NULL;
+    goto out;
+  }
+
+  l = service_manager_find(priv->services, connman_service_get_path(cs));
+  if (l == NULL) {
+    priv->default_service = NULL;
+    goto out;
+  }
+
+  priv->default_service = l->data;
+
+ out:
+  g_signal_emit(self, signals[DEFAULT_SERVICE_CHANGED], 0);
 }
 
 guint service_manager_get_strength(ServiceManager *self)

=== modified file 'src/backend/service-manager.h'
--- src/backend/service-manager.h	2010-11-23 11:29:29 +0000
+++ src/backend/service-manager.h	2010-12-03 09:51:48 +0000
@@ -23,6 +23,8 @@
 
 #include <glib-object.h>
 
+#include "connman-service.h"
+
 G_BEGIN_DECLS
 
 #define TYPE_SERVICE_MANAGER service_manager_get_type()
@@ -69,6 +71,8 @@
 gboolean service_manager_is_connected(ServiceManager *self);
 guint service_manager_get_connected(ServiceManager *self);
 ConnmanServiceType service_manager_get_default_technology(ServiceManager *self);
+void service_manager_update_default_service(ServiceManager *self,
+					    ConnmanService *cs);
 Service *service_manager_get_default_service(ServiceManager *self);
 guint service_manager_get_strength(ServiceManager *self);
 

=== modified file 'src/common/Makefile.am'
--- src/common/Makefile.am	2010-11-18 11:33:00 +0000
+++ src/common/Makefile.am	2010-12-03 09:51:48 +0000
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libmarshal.la liblog.la libconnman.la
+noinst_LTLIBRARIES = libmarshal.la liblog.la
 
 libmarshal_la_SOURCES = \
 	marshal-main.c
@@ -25,20 +25,6 @@
 liblog_la_CPPFLAGS = \
 	$(GLIB_CFLAGS)
 
-libconnman_la_SOURCES = \
-	connman-manager.c \
-	connman-manager.h \
-	connman-service.c \
-	connman-service.h
-
-libconnman_la_LIBADD = \
-	$(GLIB_LIBS) \
-	$(GIO_LIBS)
-
-libconnman_la_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(GIO_CFLAGS)
-
 DBUS_GLIB_INTERFACES = \
 	connman-agent.xml \
 	connman-manager.xml \
@@ -100,6 +86,5 @@
 EXTRA_DIST = \
 	marshal.list \
 	dbus-shared-names.h \
-	connman.h \
 	ofono.h \
 	$(DBUS_GLIB_INTERFACES)

=== added directory 'src/libconnman'
=== added file 'src/libconnman/Makefile.am'
--- src/libconnman/Makefile.am	1970-01-01 00:00:00 +0000
+++ src/libconnman/Makefile.am	2010-12-03 09:51:48 +0000
@@ -0,0 +1,17 @@
+noinst_LTLIBRARIES = libconnman.la
+
+libconnman_la_SOURCES = \
+	connman.h \
+	connman-manager.c \
+	connman-manager.h \
+	connman-service.c \
+	connman-service.h
+
+libconnman_la_LIBADD = \
+	$(GLIB_LIBS) \
+	$(GIO_LIBS)
+
+libconnman_la_CPPFLAGS = \
+	$(GLIB_CFLAGS) \
+	$(GIO_CFLAGS) \
+	-I${top_builddir}/src/common

=== renamed file 'src/common/connman-manager.c' => 'src/libconnman/connman-manager.c'
--- src/common/connman-manager.c	2010-11-19 12:12:06 +0000
+++ src/libconnman/connman-manager.c	2010-12-03 09:51:48 +0000
@@ -51,6 +51,15 @@
 
   /* used only by get_services() */
   ConnmanService **array;
+
+  /* current default service, visible to clients */
+  ConnmanService *default_service;
+
+  /*
+   * the new default service but waiting for it to be ready, not visible to
+   * clients
+   */
+  ConnmanService *pending_default_service;
 };
 
 enum {
@@ -67,6 +76,7 @@
   PROP_0,
 
   PROP_CONNECTED,
+  PROP_DEFAULT_SERVICE,
 };
 
 static void connect_service_cb(GObject *object, GAsyncResult *res,
@@ -223,6 +233,99 @@
   return priv->array;
 }
 
+ConnmanService *connman_manager_get_default_service(ConnmanManager *self)
+{
+  ConnmanManagerPrivate *priv = GET_PRIVATE(self);
+
+  g_return_val_if_fail(CONNMAN_IS_MANAGER(self), NULL);
+  g_return_val_if_fail(priv != NULL, NULL);
+
+  return priv->default_service;
+}
+
+static void update_default_service(ConnmanManager *self)
+{
+  ConnmanManagerPrivate *priv = GET_PRIVATE(self);
+  gboolean changed = FALSE;
+  ConnmanService *pending;
+
+  g_return_if_fail(priv != NULL);
+
+  pending = priv->pending_default_service;
+
+  if (pending == NULL) {
+    if (priv->default_service == NULL)
+      goto out;
+
+    /* remove current default service because there aren't any services */
+    g_object_unref(priv->default_service);
+    priv->default_service = NULL;
+    changed = TRUE;
+    goto check;
+  }
+
+  /* no need to do anything if the service is already the default */
+  if (priv->default_service == pending)
+    goto check;
+
+  if (!connman_service_is_ready(pending))
+    /* wait for the ready signal from the service */
+    goto check;
+
+  switch(connman_service_get_state(pending)) {
+  case CONNMAN_SERVICE_STATE_IDLE:
+  case CONNMAN_SERVICE_STATE_FAILURE:
+  case CONNMAN_SERVICE_STATE_ASSOCIATION:
+  case CONNMAN_SERVICE_STATE_CONFIGURATION:
+  case CONNMAN_SERVICE_STATE_DISCONNECT:
+    /* pending isn't connected and we can't use it as default, yet  */
+    goto check;
+  case CONNMAN_SERVICE_STATE_READY:
+  case CONNMAN_SERVICE_STATE_LOGIN:
+  case CONNMAN_SERVICE_STATE_ONLINE:
+    break;
+  }
+
+  /* pending service is now ready, let's switch to it */
+  if (priv->default_service != NULL)
+    g_object_unref(priv->default_service);
+
+  /* the ownership moves from pending_default_service to default_service */
+  priv->default_service = pending;
+  priv->pending_default_service = NULL;
+  changed = TRUE;
+
+ check:
+  if (priv->default_service == NULL)
+    goto out;
+
+  /*
+   * Let's check the state of the default service and whether it needs to
+   * be removed.
+   */
+  switch(connman_service_get_state(priv->default_service)) {
+  case CONNMAN_SERVICE_STATE_IDLE:
+  case CONNMAN_SERVICE_STATE_FAILURE:
+  case CONNMAN_SERVICE_STATE_ASSOCIATION:
+  case CONNMAN_SERVICE_STATE_CONFIGURATION:
+  case CONNMAN_SERVICE_STATE_DISCONNECT:
+    /* remove the default service because it's not valid anymore */
+    g_object_unref(priv->default_service);
+    priv->default_service = NULL;
+    changed = TRUE;
+    break;
+  case CONNMAN_SERVICE_STATE_READY:
+  case CONNMAN_SERVICE_STATE_LOGIN:
+  case CONNMAN_SERVICE_STATE_ONLINE:
+    break;
+  }
+
+ out:
+  /* don't send any signals until connected to connmand */
+  if (priv->connected && changed)
+    g_object_notify(G_OBJECT(self), "default-service");
+}
+
 static void iterate_service_ready(gpointer key, gpointer value,
 				  gpointer user_data)
 {
@@ -252,6 +355,10 @@
   if (!connman_service_is_ready(service))
     return;
 
+  if (priv->pending_default_service != NULL &&
+      priv->pending_default_service == service)
+    update_default_service(self);
+
   /*
    * Send service added signals only after we are connected. The client
    * needs to call get_services() when it has received the connected
@@ -269,13 +376,73 @@
   g_signal_emit(self, signals[SERVICE_ADDED_SIGNAL], 0, service);
 }
 
+static void service_state_notify(ConnmanService *service, GParamSpec *pspec,
+				 gpointer user_data)
+{
+  ConnmanManager *self = CONNMAN_MANAGER(user_data);
+  ConnmanManagerPrivate *priv = GET_PRIVATE(self);
+
+  if (priv->pending_default_service == service ||
+      priv->default_service == service)
+    update_default_service(self);
+}
+
+static ConnmanService *create_service(ConnmanManager *self,
+				      const gchar *path)
+{
+  ConnmanManagerPrivate *priv = GET_PRIVATE(self);
+  ConnmanService *service;
+
+  service = connman_service_new(path);
+
+  g_hash_table_insert(priv->services, g_strdup(path), service);
+
+  /* FIXME: disconnect ready handler */
+  g_signal_connect(service, "notify::ready", G_CALLBACK(service_ready),
+		   self);
+  g_signal_connect(service, "notify::state",
+		   G_CALLBACK(service_state_notify), self);
+
+  return service;
+}
+
+static void remove_service(ConnmanManager *self, ConnmanService *service)
+{
+  ConnmanManagerPrivate *priv = GET_PRIVATE(self);
+  const gchar *path = connman_service_get_path(service);
+
+  /*
+   * Send service removed signals only when connected, connected
+   * property with false value implies that services are lost.
+   */
+  if (priv->connected)
+    g_signal_emit(self, signals[SERVICE_REMOVED_SIGNAL], 0, path);
+
+  g_signal_handlers_disconnect_by_func(service,
+				       G_CALLBACK(service_state_notify),
+				       self);
+
+  g_object_unref(service);
+}
+
+static GHashTable *create_services_list(ConnmanManager *self)
+{
+  return g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
+}
+
 static void notify_service_removal(gpointer key, gpointer value,
-				  gpointer user_data)
+				   gpointer user_data)
 {
   ConnmanManager *self = CONNMAN_MANAGER(user_data);
-  gchar *path = key;
-
-  g_signal_emit(self, signals[SERVICE_REMOVED_SIGNAL], 0, path);
+  ConnmanService *service = CONNMAN_SERVICE(value);
+
+  remove_service(self, service);
+}
+
+static void remove_services_list(ConnmanManager *self, GHashTable *list)
+{
+  g_hash_table_foreach(list, notify_service_removal, self);
+  g_hash_table_destroy(list);
 }
 
 static void update_services(ConnmanManager *self, GVariant *variant)
@@ -285,12 +452,13 @@
   ConnmanService *service;
   gchar *path;
   GVariantIter iter;
+  gint count;
 
   old_services = priv->services;
-  priv->services = g_hash_table_new_full(g_str_hash, g_str_equal,
-					 g_free, g_object_unref);
+  priv->services = create_services_list(self);
 
   g_variant_iter_init(&iter, variant);
+  count = 0;
 
   while (g_variant_iter_next(&iter, "o", &path)) {
     /* try find an existing service */
@@ -299,27 +467,28 @@
 
       if (service != NULL) {
 	/* there's already an object for this service */
-	g_object_ref(service);
 	g_hash_table_remove(old_services, path);
 	g_hash_table_insert(priv->services, path, service);
-	continue;
+	goto next;
       }
     }
 
-    /* need to create a new object */
-    service = connman_service_new(path);
-    g_hash_table_insert(priv->services, path, service);
-
-    g_signal_connect(service, "notify::ready", G_CALLBACK(service_ready),
-		     self);
+    service = create_service(self, path);
+    g_free(path);
+
+  next:
+    if (count++ == 0) {
+      if (priv->pending_default_service != NULL)
+	g_object_unref(priv->pending_default_service);
+
+      priv->pending_default_service = g_object_ref(service);
+      update_default_service(self);
+    }
   }
 
   /* remove services which are not visible anymore */
   if (old_services != NULL) {
-    if (priv->initialised)
-      g_hash_table_foreach(old_services, notify_service_removal, self);
-
-    g_hash_table_destroy(old_services);
+    remove_services_list(self, old_services);
     old_services = NULL;
   }
 }
@@ -464,19 +633,16 @@
   if (priv->initialised && !priv->connected)
     return;
 
+  priv->connected = FALSE;
+
   if (priv->services != NULL) {
-    /*
-     * Don't send services removed signals, connected property with false
-     * value implies that services are lost.
-     */
-    g_hash_table_destroy(priv->services);
+    remove_services_list(self, priv->services);
     priv->services = NULL;
   }
 
   if (!priv->initialised)
     priv->initialised = TRUE;
 
-  priv->connected = FALSE;
   g_object_notify(G_OBJECT(self), "connected");
 }
 
@@ -535,6 +701,9 @@
   case PROP_CONNECTED:
       priv->connected = g_value_get_boolean(value);
       break;
+  case PROP_DEFAULT_SERVICE:
+      priv->default_service = g_value_get_object(value);
+      break;
   default:
     /* We don't have any other property... */
     G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
@@ -552,6 +721,9 @@
   case PROP_CONNECTED:
     g_value_set_boolean(value, priv->connected);
     break;
+  case PROP_DEFAULT_SERVICE:
+    g_value_set_object(value, priv->default_service);
+    break;
   default:
     /* We don't have any other property... */
     G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
@@ -565,7 +737,7 @@
   ConnmanManagerPrivate *priv = GET_PRIVATE(self);
 
   if (priv->services != NULL) {
-    g_hash_table_destroy(priv->services);
+    remove_services_list(self, priv->services);
     priv->services = NULL;
   }
 
@@ -579,6 +751,16 @@
     priv->watch_id = 0;
   }
 
+  if (priv->default_service != NULL) {
+    g_object_unref(priv->default_service);
+    priv->default_service = NULL;
+  }
+
+  if (priv->pending_default_service != NULL) {
+    g_object_unref(priv->pending_default_service);
+    priv->pending_default_service = NULL;
+  }
+
   G_OBJECT_CLASS(connman_manager_parent_class)->dispose(object);
 }
 
@@ -627,6 +809,13 @@
 			       "Set connected state", FALSE,
 			       G_PARAM_READABLE);
   g_object_class_install_property(gobject_class, PROP_CONNECTED, pspec);
+
+  pspec = g_param_spec_object("default-service",
+			     "ConnmanManager's default service",
+			     "Set default service",
+			     CONNMAN_TYPE_SERVICE,
+			     G_PARAM_READABLE);
+  g_object_class_install_property(gobject_class, PROP_DEFAULT_SERVICE, pspec);
 }
 
 static void connman_manager_init(ConnmanManager *self)
@@ -638,6 +827,9 @@
   priv->connected = FALSE;
   priv->initialised = FALSE;
 
+  priv->default_service = NULL;
+  priv->pending_default_service = NULL;
+
   g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE,
 			   NULL, CONNMAN_SERVICE_NAME, CONNMAN_MANAGER_PATH,
 			   CONNMAN_MANAGER_INTERFACE, NULL,

=== renamed file 'src/common/connman-manager.h' => 'src/libconnman/connman-manager.h'
--- src/common/connman-manager.h	2010-11-19 12:05:05 +0000
+++ src/libconnman/connman-manager.h	2010-12-03 09:51:48 +0000
@@ -69,6 +69,7 @@
 					    GError **error);
 gboolean connman_manager_is_connected(ConnmanManager *self);
 ConnmanService **connman_manager_get_services(ConnmanManager *self);
+ConnmanService *connman_manager_get_default_service(ConnmanManager *self);
 ConnmanManager *connman_manager_new(void);
 
 #endif

=== renamed file 'src/common/connman-service.c' => 'src/libconnman/connman-service.c'
--- src/common/connman-service.c	2010-11-19 12:12:06 +0000
+++ src/libconnman/connman-service.c	2010-12-03 09:51:48 +0000
@@ -234,6 +234,9 @@
 {
   ConnmanServicePrivate *priv = GET_PRIVATE(self);
 
+  g_return_val_if_fail(CONNMAN_IS_SERVICE(self), CONNMAN_SERVICE_STATE_FAILURE);
+  g_return_val_if_fail(priv != NULL, CONNMAN_SERVICE_STATE_FAILURE);
+
   return priv->state;
 }
 
@@ -241,6 +244,9 @@
 {
   ConnmanServicePrivate *priv = GET_PRIVATE(self);
 
+  g_return_val_if_fail(CONNMAN_IS_SERVICE(self), NULL);
+  g_return_val_if_fail(priv != NULL, NULL);
+
   return priv->error;
 }
 
@@ -248,6 +254,9 @@
 {
   ConnmanServicePrivate *priv = GET_PRIVATE(self);
 
+  g_return_val_if_fail(CONNMAN_IS_SERVICE(self), NULL);
+  g_return_val_if_fail(priv != NULL, NULL);
+
   return priv->name;
 }
 
@@ -255,6 +264,9 @@
 {
   ConnmanServicePrivate *priv = GET_PRIVATE(self);
 
+  g_return_val_if_fail(CONNMAN_IS_SERVICE(self), CONNMAN_SERVICE_TYPE_ETHERNET);
+  g_return_val_if_fail(priv != NULL, CONNMAN_SERVICE_TYPE_ETHERNET);
+
   return priv->type;
 }
 
@@ -262,6 +274,9 @@
 {
   ConnmanServicePrivate *priv = GET_PRIVATE(self);
 
+  g_return_val_if_fail(CONNMAN_IS_SERVICE(self), CONNMAN_SERVICE_SECURITY_NONE);
+  g_return_val_if_fail(priv != NULL, CONNMAN_SERVICE_SECURITY_NONE);
+
   return priv->security;
 }
 
@@ -269,6 +284,9 @@
 {
   ConnmanServicePrivate *priv = GET_PRIVATE(self);
 
+  g_return_val_if_fail(CONNMAN_IS_SERVICE(self), 0);
+  g_return_val_if_fail(priv != NULL, 0);
+
   return priv->strength;
 }
 
@@ -276,6 +294,9 @@
 {
   ConnmanServicePrivate *priv = GET_PRIVATE(self);
 
+  g_return_val_if_fail(CONNMAN_IS_SERVICE(self), FALSE);
+  g_return_val_if_fail(priv != NULL, FALSE);
+
   return priv->setup_required;
 }
 
@@ -624,7 +645,6 @@
   }
 }
 
-
 static void get_properties(ConnmanService *self)
 {
   ConnmanServicePrivate *priv = GET_PRIVATE(self);

=== renamed file 'src/common/connman-service.h' => 'src/libconnman/connman-service.h'
=== renamed file 'src/common/connman.h' => 'src/libconnman/connman.h'
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2010-11-25 15:12:47 +0000
+++ tests/Makefile.am	2010-12-03 09:51:48 +0000
@@ -21,6 +21,7 @@
 	$(DBUSGLIB_CFLAGS) \
 	$(DBUSMENUGLIB_CFLAGS) \
 	$(LIBNOTIFY_CFLAGS) \
+	$(CONNMAN_CFLAGS) \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-DBINDIR=\"$(bindir)\" \
 	$(GCOV_FLAGS)

=== modified file 'tests/libconnman-tool.c'
--- tests/libconnman-tool.c	2010-11-19 12:05:05 +0000
+++ tests/libconnman-tool.c	2010-12-03 09:51:48 +0000
@@ -29,14 +29,20 @@
 static GMainLoop *loop;
 static ConnmanManager *connman;
 
+static const gchar *connect_path;
+
 static enum {
   TEST_LIST_SERVICES,
   TEST_CONNECT_SERVICE,
+  TEST_CONNECT,
 } test;
 
 static void usage(const gchar *name)
 {
-  g_print("%s: list-services|connect-service\n", name);
+  g_print("%s:\n", name);
+  g_print("connect-service\n");
+  g_print("list-services\n");
+  g_print("connect <path>\n");
 }
 
 static void connect_hidden_ssid_cb(GObject *object, GAsyncResult *res,
@@ -166,14 +172,15 @@
   g_signal_connect(service, "notify::setup-required",
 		   G_CALLBACK(setup_required_updated), NULL);
 
-  if (g_strcmp0(connman_service_get_name(service), "/ethernet_1") == 0)
+  if (test == TEST_CONNECT &&
+      g_strcmp0(connman_service_get_name(service), connect_path) == 0)
     connman_service_connect(service, connect_cb, NULL);
 }
 
 static void connected_cb(ConnmanManager *proxy, GParamSpec *pspec,
 			 gpointer user_data)
 {
-  ConnmanService **services;
+  ConnmanService **services, *service;
   gboolean connected;
   guint count;
 
@@ -212,6 +219,23 @@
   }
 
   g_print("%d services received\n", count);
+
+  if (connman_manager_is_connected(connman)) {
+    service = connman_manager_get_default_service(connman);
+    g_print("connected, default service %s\n",
+	    service ? connman_service_get_path(service) : "none");
+  } else {
+    g_print("not connected\n");
+  }
+}
+
+static void default_service_notify(ConnmanManager *proxy, GParamSpec *pspec,
+				   gpointer user_data)
+{
+  ConnmanService *service = connman_manager_get_default_service(connman);
+
+  g_print("new default service %s\n",
+	  service ? connman_service_get_path(service) : "none");
 }
 
 static void service_added(ConnmanManager *proxy, ConnmanService *service,
@@ -234,7 +258,7 @@
 {
   g_type_init();
 
-  if (argc != 2) {
+  if (argc < 2) {
     usage(argv[0]);
     return 1;
   }
@@ -243,14 +267,36 @@
 
   connman = connman_manager_new();
 
-  if (g_strcmp0(argv[1], "list-services") == 0)
+  if (g_strcmp0(argv[1], "list-services") == 0) {
     test = TEST_LIST_SERVICES;
-  else if (g_strcmp0(argv[1], "connect-service") == 0)
+    if (argc != 2) {
+      usage(argv[0]);
+      return 1;
+    }
+  }
+  else if (g_strcmp0(argv[1], "connect-service") == 0) {
     test = TEST_CONNECT_SERVICE;
+    if (argc != 2) {
+      usage(argv[0]);
+      return 1;
+    }
+  }
+  else if (g_strcmp0(argv[1], "connect") == 0) {
+    test = TEST_CONNECT;
+    if (argc != 3) {
+      usage(argv[0]);
+      return 1;
+    }
+    connect_path = argv[2];
+  }
 
   g_signal_connect(connman, "notify::connected", G_CALLBACK(connected_cb),
 		   NULL);
 
+  g_signal_connect(connman, "notify::default-service",
+		   G_CALLBACK(default_service_notify),
+		   NULL);
+
   if (test == TEST_LIST_SERVICES) {
     g_signal_connect(connman, "service-added", G_CALLBACK(service_added),
 		     NULL);

=== modified file 'tests/mock-connman-manager.c'
--- tests/mock-connman-manager.c	2010-11-24 13:26:10 +0000
+++ tests/mock-connman-manager.c	2010-12-03 09:51:48 +0000
@@ -192,3 +192,8 @@
   priv->connected = connected;
   g_object_notify(G_OBJECT(self), "connected");
 }
+
+ConnmanService *connman_manager_get_default_service(ConnmanManager *self)
+{
+  return NULL;
+}

=== modified file 'tests/mock-service-manager.c'
--- tests/mock-service-manager.c	2010-11-24 12:35:47 +0000
+++ tests/mock-service-manager.c	2010-12-03 09:51:48 +0000
@@ -161,3 +161,7 @@
   return 0;
 }
 
+void service_manager_update_default_service(ServiceManager *self,
+					    ConnmanService *cs)
+{
+}