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

[Kalle Valo]

ipv4 implementation for libconnman. If this is ok, I'm planning to duplicate for ipv6 as well.

ipv6 is almost same the, but not quite, so I'm planning to make ipv6 just a copy of ipv4 implementation.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Looks good. Really nice work Kalle!

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2011-01-25 10:10:02 +0000
+++ .bzrignore	2011-02-03 11:39:11 +0000
@@ -114,3 +114,4 @@
 tests/libconnman-vala/libconnman-vala
 tests/libconnman-vala/libconnman-vala.c
 tests/libconnman-vala/libconnman_vala_vala.stamp
+src/libconnman/libconnman_la-connman-ipv4.lo

=== modified file 'src/libconnman/Connman-1.0.vapi'
--- src/libconnman/Connman-1.0.vapi	2011-01-31 17:40:06 +0000
+++ src/libconnman/Connman-1.0.vapi	2011-02-03 11:39:11 +0000
@@ -1,13 +1,25 @@
 /*
   Connman-1.0.vapi generated by vapigen, but modified manually by kvalo.
-
-  Changes:
-    o correct cheader_filename attributes
-
 */
 
 [CCode (cprefix = "Connman", lower_case_cprefix = "connman_")]
 namespace Connman {
+	[CCode (cheader_filename = "connman-ipv4.h")]
+	public class IPv4 : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public IPv4 (Connman.IPv4Method method, string address, string netmask, string gateway) throws GLib.Error;
+		public unowned string get_address ();
+		public unowned string get_gateway ();
+		public Connman.IPv4Method get_method ();
+		public unowned string get_method_as_string ();
+		public unowned string get_netmask ();
+		[CCode (has_construct_function = false)]
+		public IPv4.with_strings (string method, string address, string netmask, string gateway) throws GLib.Error;
+		public string address { get; construct; }
+		public string gateway { get; construct; }
+		public uint method { get; construct; }
+		public string netmask { get; construct; }
+	}
 	[CCode (cheader_filename = "connman-manager.h")]
 	public class Manager : GLib.Object {
 		public weak GLib.Object parent;
@@ -40,6 +52,8 @@
 		public unowned string get_error ();
 		public bool get_favorite ();
 		public bool get_immutable ();
+		public unowned Connman.IPv4 get_ipv4 ();
+		public unowned Connman.IPv4 get_ipv4_configuration ();
 		public bool get_login_required ();
 		public unowned string get_mcc ();
 		public unowned string get_mnc ();
@@ -63,6 +77,7 @@
 		public void set_apn (string apn);
 		public void set_autoconnect (bool autoconnect);
 		public void set_domains_configuration ([CCode (array_length = false, array_null_terminated = true)] string[] domains);
+		public void set_ipv4_configuration (Connman.IPv4 ipv4);
 		public void set_nameservers_configuration ([CCode (array_length = false, array_null_terminated = true)] string[] nameservers);
 		public void set_passphrase (string passphrase);
 		public static unowned string state2str (Connman.ServiceState state);
@@ -78,6 +93,8 @@
 		public string error { get; }
 		public bool favorite { get; }
 		public bool immutable { get; }
+		public Connman.IPv4 ipv4 { get; }
+		public Connman.IPv4 ipv4_configuration { get; set; }
 		public bool login_required { get; }
 		public string mcc { get; }
 		public string mnc { get; }
@@ -99,6 +116,13 @@
 		[NoAccessorMethod]
 		public uint type { get; }
 	}
+	[CCode (cprefix = "CONNMAN_IPV4_METHOD_", cheader_filename = "connman-service.h")]
+	public enum IPv4Method {
+		OFF,
+		MANUAL,
+		FIXED,
+		AUTO
+	}
 	[CCode (cprefix = "CONNMAN_SERVICE_MODE_", cheader_filename = "connman-service.h")]
 	public enum ServiceMode {
 		MANAGED,

=== modified file 'src/libconnman/Makefile.am'
--- src/libconnman/Makefile.am	2011-02-01 07:51:20 +0000
+++ src/libconnman/Makefile.am	2011-02-03 11:39:11 +0000
@@ -5,7 +5,9 @@
 	connman-manager.c \
 	connman-manager.h \
 	connman-service.c \
-	connman-service.h
+	connman-service.h \
+	connman-ipv4.c \
+	connman-ipv4.h
 
 libconnman_la_LIBADD = \
 	$(GLIB_LIBS) \

=== added file 'src/libconnman/connman-ipv4.c'
--- src/libconnman/connman-ipv4.c	1970-01-01 00:00:00 +0000
+++ src/libconnman/connman-ipv4.c	2011-02-03 11:39:11 +0000
@@ -0,0 +1,315 @@
+/*
+ * indicator-network - user interface for connman
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * Kalle Valo <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "connman-ipv4.h"
+
+#include <string.h>
+
+G_DEFINE_TYPE(ConnmanIPv4, connman_ipv4, G_TYPE_OBJECT)
+
+#define GET_PRIVATE(o) \
+  (G_TYPE_INSTANCE_GET_PRIVATE((o), CONNMAN_TYPE_IPV4, \
+			       ConnmanIPv4Private))
+
+typedef struct _ConnmanIPv4Private ConnmanIPv4Private;
+
+struct _ConnmanIPv4Private {
+  ConnmanIPv4Method method;
+  gchar *address;
+  gchar *netmask;
+  gchar *gateway;
+};
+
+enum
+{
+  /* reserved */
+  PROP_0,
+
+  PROP_METHOD,
+  PROP_ADDRESS,
+  PROP_NETMASK,
+  PROP_GATEWAY,
+};
+
+struct ipv4_method_entry
+{
+  const gchar *str;
+  ConnmanIPv4Method method;
+};
+
+static const struct ipv4_method_entry method_map[] = {
+  { "off",		CONNMAN_IPV4_METHOD_OFF },
+  { "manual",		CONNMAN_IPV4_METHOD_MANUAL },
+  { "fixed",		CONNMAN_IPV4_METHOD_FIXED },
+  { "dhcp",		CONNMAN_IPV4_METHOD_DHCP },
+};
+
+static ConnmanIPv4Method str2method(const gchar *state)
+{
+  const struct ipv4_method_entry *s;
+  guint i;
+
+  for (i = 0; i < G_N_ELEMENTS(method_map); i++) {
+    s = &method_map[i];
+    if (g_strcmp0(s->str, state) == 0)
+      return s->method;
+  }
+
+  g_warning("unknown ipv4 method: %s", state);
+
+  return CONNMAN_IPV4_METHOD_DHCP;
+}
+
+static const gchar *method2str(ConnmanIPv4Method method)
+{
+  const struct ipv4_method_entry *s;
+  guint i;
+
+  for (i = 0; i < G_N_ELEMENTS(method_map); i++) {
+    s = &method_map[i];
+    if (s->method == method)
+      return s->str;
+  }
+
+  g_warning("%s(): unknown method %d", __func__, method);
+
+  return "dhcp";
+}
+
+ConnmanIPv4Method connman_ipv4_get_method(ConnmanIPv4 *self)
+{
+  ConnmanIPv4Private *priv = GET_PRIVATE(self);
+
+  g_return_val_if_fail(CONNMAN_IS_IPV4(self), CONNMAN_IPV4_METHOD_OFF);
+  g_return_val_if_fail(priv != NULL, CONNMAN_IPV4_METHOD_OFF);
+
+  return priv->method;
+}
+
+const gchar *connman_ipv4_get_method_as_string(ConnmanIPv4 *self)
+{
+  ConnmanIPv4Private *priv = GET_PRIVATE(self);
+
+  g_return_val_if_fail(CONNMAN_IS_IPV4(self), CONNMAN_IPV4_METHOD_OFF);
+  g_return_val_if_fail(priv != NULL, CONNMAN_IPV4_METHOD_OFF);
+
+  return method2str(priv->method);
+}
+
+
+const gchar *connman_ipv4_get_address(ConnmanIPv4 *self)
+{
+  ConnmanIPv4Private *priv = GET_PRIVATE(self);
+
+  g_return_val_if_fail(CONNMAN_IS_IPV4(self), NULL);
+  g_return_val_if_fail(priv != NULL, NULL);
+
+  return priv->address;
+}
+
+const gchar *connman_ipv4_get_netmask(ConnmanIPv4 *self)
+{
+  ConnmanIPv4Private *priv = GET_PRIVATE(self);
+
+  g_return_val_if_fail(CONNMAN_IS_IPV4(self), NULL);
+  g_return_val_if_fail(priv != NULL, NULL);
+
+  return priv->netmask;
+}
+
+const gchar *connman_ipv4_get_gateway(ConnmanIPv4 *self)
+{
+  ConnmanIPv4Private *priv = GET_PRIVATE(self);
+
+  g_return_val_if_fail(CONNMAN_IS_IPV4(self), NULL);
+  g_return_val_if_fail(priv != NULL, NULL);
+
+  return priv->gateway;
+}
+
+static void connman_ipv4_set_property(GObject *object, guint property_id,
+				      const GValue *value, GParamSpec *pspec)
+{
+  ConnmanIPv4 *self = CONNMAN_IPV4(object);
+  ConnmanIPv4Private *priv = GET_PRIVATE(self);
+
+  g_return_if_fail(priv != NULL);
+
+  switch(property_id) {
+  case PROP_METHOD:
+    priv->method = g_value_get_uint(value);
+    break;
+  case PROP_ADDRESS:
+    g_free(priv->address);
+    priv->address = g_value_dup_string(value);
+    break;
+  case PROP_NETMASK:
+    g_free(priv->netmask);
+    priv->netmask = g_value_dup_string(value);
+    break;
+  case PROP_GATEWAY:
+    g_free(priv->gateway);
+    priv->gateway = g_value_dup_string(value);
+    break;
+  default:
+    /* We don't have any other property... */
+    G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+    break;
+  }
+}
+
+static void connman_ipv4_get_property(GObject *object, guint property_id,
+				       GValue *value, GParamSpec *pspec)
+{
+  ConnmanIPv4 *self = CONNMAN_IPV4(object);
+  ConnmanIPv4Private *priv = GET_PRIVATE(self);
+
+  g_return_if_fail(priv != NULL);
+
+  switch(property_id) {
+  case PROP_METHOD:
+    g_value_set_uint(value, priv->method);
+    break;
+  case PROP_ADDRESS:
+    g_value_set_string(value, priv->address);
+    break;
+  case PROP_NETMASK:
+    g_value_set_string(value, priv->netmask);
+    break;
+  case PROP_GATEWAY:
+    g_value_set_string(value, priv->gateway);
+    break;
+  default:
+    /* We don't have any other property... */
+    G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
+    break;
+  }
+}
+
+static void connman_ipv4_dispose(GObject *object)
+{
+  G_OBJECT_CLASS(connman_ipv4_parent_class)->dispose(object);
+}
+
+static void connman_ipv4_finalize(GObject *object)
+{
+  ConnmanIPv4 *self = CONNMAN_IPV4(object);
+  ConnmanIPv4Private *priv = GET_PRIVATE(self);
+
+  g_free(priv->address);
+  g_free(priv->netmask);
+  g_free(priv->gateway);
+
+  G_OBJECT_CLASS(connman_ipv4_parent_class)->finalize(object);
+}
+
+static void connman_ipv4_class_init(ConnmanIPv4Class *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+  GParamSpec *pspec;
+
+  g_type_class_add_private(klass, sizeof(ConnmanIPv4Private));
+
+  gobject_class->dispose = connman_ipv4_dispose;
+  gobject_class->finalize = connman_ipv4_finalize;
+  gobject_class->set_property = connman_ipv4_set_property;
+  gobject_class->get_property = connman_ipv4_get_property;
+
+  pspec = g_param_spec_uint("method",
+			    "ConnmanIPv4's method property",
+			    "The ipv4 method",
+			    0, G_MAXUINT,
+			    CONNMAN_IPV4_METHOD_OFF,
+			    G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+  g_object_class_install_property(gobject_class, PROP_METHOD, pspec);
+
+  pspec = g_param_spec_string("address",
+			      "ConnmanIPv4's address",
+			      "IPv4 address",
+			      NULL,
+			      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+  g_object_class_install_property(gobject_class, PROP_ADDRESS, pspec);
+
+  pspec = g_param_spec_string("netmask",
+			      "ConnmanIPv4's netmask",
+			      "IPv4 netmask",
+			      NULL,
+			      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+  g_object_class_install_property(gobject_class, PROP_NETMASK, pspec);
+
+  pspec = g_param_spec_string("gateway",
+			      "ConnmanIPv4's gateway",
+			      "IPv4 gateway",
+			      NULL,
+			      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+  g_object_class_install_property(gobject_class, PROP_GATEWAY, pspec);
+}
+
+static void connman_ipv4_init(ConnmanIPv4 *self)
+{
+}
+
+ConnmanIPv4 *connman_ipv4_new(ConnmanIPv4Method method,
+			      const gchar *address,
+			      const gchar *netmask,
+			      const gchar *gateway,
+			      GError **error)
+{
+  g_return_val_if_fail(error == NULL || *error == NULL, NULL);
+
+  return g_object_new(CONNMAN_TYPE_IPV4,
+		      "method", method,
+		      "address", address,
+		      "netmask", netmask,
+		      "gateway", gateway,
+		      NULL);
+}
+
+ConnmanIPv4 *connman_ipv4_new_with_strings(const gchar *method,
+					   const gchar *address,
+					   const gchar *netmask,
+					   const gchar *gateway,
+					   GError **error)
+{
+  const struct ipv4_method_entry *s;
+  gboolean valid = FALSE;
+  guint i;
+
+  g_return_val_if_fail(error == NULL || *error == NULL, NULL);
+
+  /* check that method is valid and if not, throw an error */
+  for (i = 0; i < G_N_ELEMENTS(method_map); i++) {
+    s = &method_map[i];
+    if (g_strcmp0(s->str, method) == 0) {
+      valid = TRUE;
+      break;
+    }
+  }
+
+  if (valid == FALSE) {
+      g_set_error(error, CONNMAN_IPV4_ERROR,
+		  CONNMAN_IPV4_ERROR_INVALID_METHOD,
+		  "Invalid ipv4 method: %s", method);
+      return NULL;
+  }
+
+  return connman_ipv4_new(str2method(method), address, netmask, gateway,
+			  error);
+}

=== added file 'src/libconnman/connman-ipv4.h'
--- src/libconnman/connman-ipv4.h	1970-01-01 00:00:00 +0000
+++ src/libconnman/connman-ipv4.h	2011-02-03 11:39:11 +0000
@@ -0,0 +1,93 @@
+/*
+ * indicator-network - user interface for connman
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * Kalle Valo <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _CONNMAN_IPV4_H_
+#define _CONNMAN_IPV4_H_
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define CONNMAN_TYPE_IPV4 connman_ipv4_get_type()
+
+#define CONNMAN_IPV4(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), CONNMAN_TYPE_IPV4, \
+			      ConnmanIPv4))
+
+#define CONNMAN_IPV4_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), CONNMAN_TYPE_IPV4, \
+			   ConnmanIPv4Class))
+
+#define CONNMAN_IS_IPV4(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), CONNMAN_TYPE_IPV4))
+
+#define CONNMAN_IS_IPV4_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), CONNMAN_TYPE_IPV4))
+
+#define CONNMAN_IPV4_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS((obj), CONNMAN_TYPE_IPV4, \
+			     ConnmanIPv4Class))
+
+typedef struct {
+  GObject parent;
+} ConnmanIPv4;
+
+typedef struct {
+  GObjectClass parent_class;
+} ConnmanIPv4Class;
+
+#define CONNMAN_IPV4_ERROR connman_ipv4_error_quark()
+
+static inline GQuark connman_ipv4_error_quark(void)
+{
+  return g_quark_from_static_string ("connman-ipv4-error-quark");
+}
+
+typedef enum {
+  CONNMAN_IPV4_ERROR_INVALID_METHOD,
+  CONNMAN_IPV4_ERROR_INVALID_SETTINGS,
+} ConnmanIPv4Error;
+
+typedef enum {
+  CONNMAN_IPV4_METHOD_OFF,
+  CONNMAN_IPV4_METHOD_MANUAL,
+  CONNMAN_IPV4_METHOD_FIXED,
+  CONNMAN_IPV4_METHOD_DHCP,
+} ConnmanIPv4Method;
+
+GType connman_ipv4_get_type(void);
+
+ConnmanIPv4Method connman_ipv4_get_method(ConnmanIPv4 *self);
+const gchar *connman_ipv4_get_method_as_string(ConnmanIPv4 *self);
+const gchar *connman_ipv4_get_address(ConnmanIPv4 *self);
+const gchar *connman_ipv4_get_netmask(ConnmanIPv4 *self);
+const gchar *connman_ipv4_get_gateway(ConnmanIPv4 *self);
+ConnmanIPv4 *connman_ipv4_new(ConnmanIPv4Method method,
+			      const gchar *address,
+			      const gchar *netmask,
+			      const gchar *gateway,
+			      GError **error);
+ConnmanIPv4 *connman_ipv4_new_with_strings(const gchar *method,
+					   const gchar *address,
+					   const gchar *netmask,
+					   const gchar *gateway,
+					   GError **error);
+
+#endif

=== modified file 'src/libconnman/connman-manager.c'
--- src/libconnman/connman-manager.c	2011-01-31 19:01:47 +0000
+++ src/libconnman/connman-manager.c	2011-02-03 11:39:11 +0000
@@ -185,7 +185,7 @@
 /**
  * connman_manager_get_services:
  *
- * @self:: self
+ * @self: self
  *
  * Returns: (array zero-terminated=1) (array length=false) (element-type Connman.Service) (transfer none): Null terminated list of services,
  * owned by ConnmanManager. Caller must create a reference if it uses them.
@@ -242,8 +242,8 @@
 /**
  * connman_manager_get_service:
  *
- * @self:: self
- * @path:: path
+ * @self: self
+ * @path: path
  *
  * Returns: (transfer none): The service or null if not found.
  */
@@ -258,6 +258,13 @@
   return g_hash_table_lookup(priv->services, path);
 }
 
+/**
+ * connman_manager_get_default_service:
+ *
+ * @self: self
+ *
+ * Returns: (transfer none): The service or null if not found.
+ */
 ConnmanService *connman_manager_get_default_service(ConnmanManager *self)
 {
   ConnmanManagerPrivate *priv = GET_PRIVATE(self);

=== modified file 'src/libconnman/connman-service.c'
--- src/libconnman/connman-service.c	2011-02-01 08:36:43 +0000
+++ src/libconnman/connman-service.c	2011-02-03 11:39:11 +0000
@@ -63,6 +63,8 @@
   gchar **nameservers_configuration;
   gchar **domains;
   gchar **domains_configuration;
+  ConnmanIPv4 *ipv4;
+  ConnmanIPv4 *ipv4_configuration;
 };
 
 enum
@@ -95,8 +97,8 @@
   PROP_NAMESERVERS_CONFIGURATION, /* rw */
   PROP_DOMAINS,
   PROP_DOMAINS_CONFIGURATION, /* rw */
-  /* PROP_IPV4, */
-  /* PROP_IPV4_CONFIGURATION, /\* rw *\/ */
+  PROP_IPV4,
+  PROP_IPV4_CONFIGURATION, /* rw */
   /* PROP_IPV6, */
   /* PROP_IPV6_CONFIGURATION, /\* rw *\/ */
   /* PROP_PROXY, */
@@ -478,7 +480,7 @@
 /**
  * connman_service_get_nameservers:
  *
- * @self:: self
+ * @self: self
  *
  * Returns: (array zero-terminated=1) (array length=false) (transfer none):
  * Null terminated list of strings, owned by ConnmanService. Caller must
@@ -497,7 +499,7 @@
 /**
  * connman_service_get_nameservers_configuration:
  *
- * @self:: self
+ * @self: self
  *
  * Returns: (array zero-terminated=1) (array length=false) (transfer none):
  * Null terminated list of strings, owned by ConnmanService. Caller must
@@ -516,7 +518,7 @@
 /**
  * connman_service_set_nameservers_configuration:
  *
- * @self:: self
+ * @self: self
  * @nameservers: (array zero-terminated=1) (transfer none): Null terminated list of strings, owned by caller.
  */
 void connman_service_set_nameservers_configuration(ConnmanService *self,
@@ -537,7 +539,7 @@
 /**
  * connman_service_get_domains:
  *
- * @self:: self
+ * @self: self
  *
  * Returns: (array zero-terminated=1) (array length=false) (transfer none): Null terminated list of strings,
  * owned by ConnmanManager. Caller must copy if it uses them.
@@ -555,7 +557,7 @@
 /**
  * connman_service_get_domains_configuration:
  *
- * @self:: self
+ * @self: self
  *
  * Returns: (array zero-terminated=1) (array length=false) (transfer none):
  * Null terminated list of strings, owned by ConnmanService. Caller must
@@ -574,7 +576,7 @@
 /**
  * connman_service_set_domains_configuration:
  *
- * @self:: self
+ * @self: self
  * @domains: (array zero-terminated=1) (transfer none): Null terminated list of strings, owned by caller.
  */
 void connman_service_set_domains_configuration(ConnmanService *self,
@@ -592,6 +594,52 @@
   g_object_set(self, "domains-configuration", domains, NULL);
 }
 
+/**
+ * connman_service_get_ipv4:
+ *
+ * @self: self
+ *
+ * Returns: (transfer none): Current ipv4 settings. The caller must
+ * take a reference.
+ */
+ConnmanIPv4 *connman_service_get_ipv4(ConnmanService *self)
+{
+  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->ipv4;
+}
+
+/**
+ * connman_service_get_ipv4_configuration:
+ *
+ * @self: self
+ *
+ * Returns: (transfer none): Current configured ipv4 settings. The caller must
+ * take a reference.
+ */
+ConnmanIPv4 *connman_service_get_ipv4_configuration(ConnmanService *self)
+{
+  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->ipv4_configuration;
+}
+
+void connman_service_set_ipv4_configuration(ConnmanService *self,
+					    ConnmanIPv4 *ipv4)
+{
+  ConnmanServicePrivate *priv = GET_PRIVATE(self);
+
+  g_return_if_fail(CONNMAN_IS_SERVICE(self));
+  g_return_if_fail(priv != NULL);
+
+  g_object_set(self, "ipv4-configuration", ipv4, NULL);
+}
 
 const gchar *connman_service_get_path(ConnmanService *self)
 {
@@ -994,6 +1042,85 @@
   g_object_notify(G_OBJECT(self), "domains-configuration");
 }
 
+static void ipv4_updated(ConnmanService *self, GVariant *variant)
+{
+  ConnmanServicePrivate *priv = GET_PRIVATE(self);
+  gchar *method = NULL, *address = NULL, *netmask = NULL, *gateway = NULL,
+    *key;
+  GError *error = NULL;
+  GVariantIter iter;
+  GVariant *value;
+
+  g_variant_iter_init(&iter, variant);
+
+  while (g_variant_iter_next(&iter, "{sv}", &key, &value)) {
+    if (g_strcmp0(key, "Method") == 0)
+      method = g_variant_dup_string(value, NULL);
+    else if (g_strcmp0(key, "Address") == 0)
+      address = g_variant_dup_string(value, NULL);
+    else if (g_strcmp0(key, "Netmask") == 0)
+      netmask = g_variant_dup_string(value, NULL);
+    else if (g_strcmp0(key, "Gateway") == 0)
+      gateway = g_variant_dup_string(value, NULL);
+    else
+      g_warning("Unknown ipv4 property: %s", key);
+
+    g_free(key);
+    g_variant_unref(value);
+  }
+
+  priv->ipv4 = connman_ipv4_new_with_strings(method, address, netmask,
+					     gateway, &error);
+  if (error != NULL) {
+    g_warning("Received invalid ipv4 settings: %s", error->message);
+    g_error_free(error);
+    return;
+  }
+
+  g_object_notify(G_OBJECT(self), "ipv4");
+}
+
+static void ipv4_configuration_updated(ConnmanService *self, GVariant *variant)
+{
+  ConnmanServicePrivate *priv = GET_PRIVATE(self);
+  gchar *method = NULL, *address = NULL, *netmask = NULL, *gateway = NULL,
+    *key;
+  GError *error = NULL;
+  GVariantIter iter;
+  GVariant *value;
+
+  g_variant_iter_init(&iter, variant);
+
+  while (g_variant_iter_next(&iter, "{sv}", &key, &value)) {
+    if (g_strcmp0(key, "Method") == 0)
+      method = g_variant_dup_string(value, NULL);
+    else if (g_strcmp0(key, "Address") == 0)
+      address = g_variant_dup_string(value, NULL);
+    else if (g_strcmp0(key, "Netmask") == 0)
+      netmask = g_variant_dup_string(value, NULL);
+    else if (g_strcmp0(key, "Gateway") ==  0)
+      gateway = g_variant_dup_string(value, NULL);
+    else
+      g_warning("Unknown ipv4 property: %s", key);
+
+    g_free(key);
+    g_variant_unref(value);
+  }
+
+  priv->ipv4_configuration = connman_ipv4_new_with_strings(method,
+							   address,
+							   netmask,
+							   gateway,
+							   &error);
+  if (error != NULL) {
+    g_warning("Received invalid ipv4 configuration settings: %s",
+	      error->message);
+    g_error_free(error);
+    return;
+  }
+  g_object_notify(G_OBJECT(self), "ipv4-configuration");
+}
+
 struct property_map
 {
   const gchar *property;
@@ -1023,6 +1150,8 @@
   { CONNMAN_PROPERTY_NAMESERVERS_CONFIGURATION, nameservers_configuration_updated },
   { CONNMAN_PROPERTY_DOMAINS,		domains_updated },
   { CONNMAN_PROPERTY_DOMAINS_CONFIGURATION, domains_configuration_updated },
+  { CONNMAN_PROPERTY_IPV4,		ipv4_updated },
+  { CONNMAN_PROPERTY_IPV4_CONFIGURATION, ipv4_configuration_updated },
 };
 
 static void property_updated(ConnmanService *self, const gchar *property,
@@ -1308,6 +1437,34 @@
   set_service_property(self, "Domains.Configuration", value);
 }
 
+static void update_ipv4_configuration(ConnmanService *self)
+{
+  ConnmanServicePrivate *priv = GET_PRIVATE(self);
+  GVariantBuilder builder;
+  ConnmanIPv4 *ipv4;
+  GVariant *value;
+
+  if (priv->ipv4_configuration == NULL)
+    return;
+
+  ipv4 = priv->ipv4_configuration;
+
+  g_variant_builder_init(&builder, G_VARIANT_TYPE("a{sv}"));
+
+  g_variant_builder_add(&builder, "{sv}", "Method",
+			g_variant_new_string(connman_ipv4_get_method_as_string(ipv4)));
+  g_variant_builder_add(&builder, "{sv}", "Address",
+			g_variant_new_string(connman_ipv4_get_address(ipv4)));
+  g_variant_builder_add(&builder, "{sv}", "Netmask",
+			g_variant_new_string(connman_ipv4_get_netmask(ipv4)));
+  g_variant_builder_add(&builder, "{sv}", "Gateway",
+			g_variant_new_string(connman_ipv4_get_gateway(ipv4)));
+
+  value = g_variant_new("a{sv}", &builder);
+
+  set_service_property(self, "IPv4.Configuration", value);
+}
+
 static void connman_service_set_property(GObject *object,
 					       guint property_id,
 					       const GValue *value,
@@ -1403,6 +1560,17 @@
     priv->domains_configuration = g_strdupv(g_value_get_boxed(value));
     update_domains_configuration(self);
     break;
+  case PROP_IPV4:
+    if (priv->ipv4 != NULL)
+      g_object_unref(priv->ipv4);
+    priv->ipv4 = g_value_dup_object(value);
+    break;
+  case PROP_IPV4_CONFIGURATION:
+    if (priv->ipv4_configuration != NULL)
+      g_object_unref(priv->ipv4_configuration);
+    priv->ipv4_configuration = g_value_dup_object(value);
+    update_ipv4_configuration(self);
+    break;
   default:
     /* We don't have any other property... */
     G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
@@ -1505,29 +1673,39 @@
 
   G_OBJECT_CLASS(connman_service_parent_class)->dispose(object);
 
-  if (priv->path != NULL) {
-    g_free(priv->path);
-    priv->path = NULL;
-  }
-
-  if (priv->error != NULL) {
-    g_free(priv->error);
-    priv->error = NULL;
-  }
-
-  if (priv->name != NULL) {
-    g_free(priv->name);
-    priv->name = NULL;
-  }
-
   if (priv->proxy != NULL) {
     g_object_unref(priv->proxy);
     priv->proxy = NULL;
   }
+
+  if (priv->ipv4 != NULL) {
+    g_object_unref(priv->ipv4);
+    priv->ipv4 = NULL;
+  }
+
+  if (priv->ipv4_configuration != NULL) {
+    g_object_unref(priv->ipv4_configuration);
+    priv->ipv4_configuration = NULL;
+  }
 }
 
 static void connman_service_finalize(GObject *object)
 {
+  ConnmanService *self = CONNMAN_SERVICE(object);
+  ConnmanServicePrivate *priv = GET_PRIVATE(self);
+
+  g_free(priv->path);
+  g_free(priv->error);
+  g_free(priv->name);
+  g_free(priv->passphrase);
+  g_free(priv->apn);
+  g_free(priv->mcc);
+  g_free(priv->mnc);
+  g_strfreev(priv->nameservers);
+  g_strfreev(priv->nameservers_configuration);
+  g_strfreev(priv->domains);
+  g_strfreev(priv->domains_configuration);
+
   G_OBJECT_CLASS(connman_service_parent_class)->finalize(object);
 }
 
@@ -1723,6 +1901,21 @@
 			     G_PARAM_READWRITE);
   g_object_class_install_property(gobject_class, PROP_DOMAINS_CONFIGURATION,
 				  pspec);
+
+  pspec = g_param_spec_object("ipv4",
+			     "ConnmanService's ipv4 property",
+			     "ConnmanIPv4 object",
+			     CONNMAN_TYPE_IPV4,
+			     G_PARAM_READABLE);
+  g_object_class_install_property(gobject_class, PROP_IPV4, pspec);
+
+  pspec = g_param_spec_object("ipv4-configuration",
+			     "ConnmanService's ipv4-configuration property",
+			     "ConnmanIPv4 object",
+			     CONNMAN_TYPE_IPV4,
+			     G_PARAM_READWRITE);
+  g_object_class_install_property(gobject_class, PROP_IPV4_CONFIGURATION,
+				  pspec);
 }
 
 static void connman_service_init(ConnmanService *self)

=== modified file 'src/libconnman/connman-service.h'
--- src/libconnman/connman-service.h	2011-01-31 17:40:06 +0000
+++ src/libconnman/connman-service.h	2011-02-03 11:39:11 +0000
@@ -21,6 +21,8 @@
 #ifndef _CONNMAN_SERVICE_H_
 #define _CONNMAN_SERVICE_H_
 
+#include "connman-ipv4.h"
+
 #include <glib-object.h>
 #include <gio/gio.h>
 
@@ -119,6 +121,10 @@
 gchar **connman_service_get_domains_configuration(ConnmanService *self);
 void connman_service_set_domains_configuration(ConnmanService *self,
 					       gchar **domains);
+ConnmanIPv4 *connman_service_get_ipv4(ConnmanService *self);
+ConnmanIPv4 *connman_service_get_ipv4_configuration(ConnmanService *self);
+void connman_service_set_ipv4_configuration(ConnmanService *self,
+					    ConnmanIPv4 *ipv4);
 
 /* methods */
 void connman_service_connect(ConnmanService *self,

=== modified file 'src/libconnman/connman.h'
--- src/libconnman/connman.h	2011-01-28 11:02:51 +0000
+++ src/libconnman/connman.h	2011-02-03 11:39:11 +0000
@@ -72,6 +72,8 @@
 #define CONNMAN_PROPERTY_NAMESERVERS_CONFIGURATION "Nameservers.Configuration"
 #define CONNMAN_PROPERTY_DOMAINS		"Domains"
 #define CONNMAN_PROPERTY_DOMAINS_CONFIGURATION	"Domains.Configuration"
+#define CONNMAN_PROPERTY_IPV4			"IPv4"
+#define CONNMAN_PROPERTY_IPV4_CONFIGURATION	"IPv4.Configuration"
 
 #define CONNMAN_STATE_ONLINE			"online"
 #define CONNMAN_STATE_CONNECTING		"connecting"

=== modified file 'src/libconnman/generate_vapi'
--- src/libconnman/generate_vapi	2011-01-13 18:38:16 +0000
+++ src/libconnman/generate_vapi	2011-02-03 11:39:11 +0000
@@ -3,6 +3,8 @@
 # output to Test-1.0.vapi because for now we need to maintain
 # Connman-1.0.vapi manually :(
 
+set -x
+
 g-ir-scanner \
     --add-include-path=. \
     --namespace=Connman \
@@ -12,8 +14,11 @@
     --include=Gio-2.0  \
     --library=libconnman.la \
     --output Test-1.0.gir \
+    --warn-all \
     connman.h connman-manager.c connman-manager.h \
-    connman-service.c connman-service.h libconnman.la
+    connman-service.c connman-service.h \
+    connman-ipv4.c connman-ipv4.h \
+    libconnman.la
 
 vapigen \
     --library=Test-1.0 \

=== modified file 'tests/connman-mock/connman-mock'
--- tests/connman-mock/connman-mock	2010-12-10 12:15:31 +0000
+++ tests/connman-mock/connman-mock	2011-02-03 11:39:11 +0000
@@ -90,14 +90,18 @@
             self.properties["Nameservers.Configuration"] = [ "127.0.0.1" ]
             self.properties["Domains"] = [ "example.com" ]
             self.properties["Domains.Configuration"] = [ "example.com" ]
-            self.properties["IPv4"] =  {
+            self.properties["IPv4"] =  dbus.Dictionary({
                   "Method" : "dhcp",
                   "Address" : "192.168.1.2",
                   "Netmask" : "255.255.255.0",
-                  "Gateway" : "192.168.1.1"  }
-            self.properties["IPv4.Configuration"] = { "Method" : "dhcp" }
-            self.properties["IPv6"] = { "Method" : "off" }
-            self.properties["IPv6.Configuration"] = { "Method" : "off" }
+                  "Gateway" : "192.168.1.1"  },
+                                                       signature='sv')
+            self.properties["IPv4.Configuration"] = dbus.Dictionary(
+                  { "Method" : "dhcp" }, signature='sv')
+            self.properties["IPv6"] = dbus.Dictionary({ "Method" : "off" },
+                                                      signature='sv')
+            self.properties["IPv6.Configuration"] = dbus.Dictionary(
+                  { "Method" : "off" }, signature='sv')
             self.properties["Proxy"] = { "Method" : "direct" }
             self.properties["Provider"] = dbus.Dictionary(signature='sv')
             self.properties["Ethernet"] =  {

=== modified file 'tests/libconnman-vala/libconnman-vala.vala'
--- tests/libconnman-vala/libconnman-vala.vala	2011-02-01 08:40:45 +0000
+++ tests/libconnman-vala/libconnman-vala.vala	2011-02-03 11:39:11 +0000
@@ -99,6 +99,17 @@
 		stdout.printf("  MNC = %s\n", service.mnc);
 	}
 
+	var ipv4 = service.ipv4;
+	stdout.printf("  IPv4 = { Method=%s Address=%s Netmask=%s Gateway=%s\n }\n",
+				  ipv4.get_method_as_string(), ipv4.address, ipv4.netmask,
+				  ipv4.gateway);
+
+	ipv4 = service.ipv4_configuration;
+	stdout.printf("  IPv4.Configuration = " +
+				  "{ Method=%s Address=%s Netmask=%s Gateway=%s\n }\n",
+				  ipv4.get_method_as_string(), ipv4.address, ipv4.netmask,
+				  ipv4.gateway);
+
 	stdout.printf("  Nameservers = %s\n",
 				  string.joinv(" ", service.get_nameservers()));
 	stdout.printf("  Nameservers.Configuration = %s\n",
@@ -162,6 +173,45 @@
 	service.set_domains_configuration(domains);
 }
 
+static void edit_ipv4(Service service, string[] args) {
+	string method, address, netmask, gateway;
+
+	if (args.length < 1) {
+		stdout.printf("Invalid number of arguments: %d\n", args.length);
+		return;
+	}
+
+	method = args[0];
+
+	switch (method) {
+	case "dhcp":
+	case "off":
+		address = "";
+	    netmask = "";
+	    gateway = "";
+		break;
+	case "manual":
+		if (args.length < 4) {
+			stdout.printf("Invalid number of ipv4 arguments: %d\n", args.length);			return;
+		}
+		address = args[1];
+		netmask = args[2];
+		gateway = args[3];
+		break;
+	default:
+		stdout.printf("Unknown ipv4 method: %s\n", method);
+		return;
+	}
+	
+	try {
+		var ipv4 = new IPv4.with_strings(method, address, netmask, gateway);
+		service.set_ipv4_configuration(ipv4);
+	} catch(GLib.Error e) {
+		stdout.printf("Failed to set ipv4 address: %s", e.message);
+		return;
+	}
+}
+
 static void edit(string[] args) {
 
 	if (args.length < 2) {
@@ -177,9 +227,9 @@
 		edit_args += args[2];
 	}
 	else if (args.length > 3) {
-		edit_args = args[2: args.length - 1];
+		edit_args = args[2: args.length];
 	}
-	
+
 	var service = manager.get_service(path);
 
 	if (service == null) {
@@ -197,6 +247,9 @@
 	case "domains":
 		edit_domains(service, edit_args);
 		break;
+	case "ipv4":
+		edit_ipv4(service, edit_args);
+		break;
 	}
 }