From 5b1c118c543bb2bde58878cadb509558c28acbb8 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sun, 20 Dec 2009 12:46:50 -0800 Subject: [PATCH] Add D-Bus interface for configuring IP addresses --- doc/service-api.txt | 6 +++ include/ipconfig.h | 2 + src/connman.h | 8 +-- src/ipconfig.c | 148 ++++++++++++++++++++++++++++++++++++++++++++++++---- src/service.c | 23 ++++++++ test/list-services | 2 +- test/set-address | 24 ++++++--- 7 files changed, 191 insertions(+), 22 deletions(-) diff --git a/doc/service-api.txt b/doc/service-api.txt index a725760..caf1dbe 100644 --- a/doc/service-api.txt +++ b/doc/service-api.txt @@ -287,6 +287,12 @@ Properties string State [readonly] The current configured IPv4 gateway. + dict IPv4.Configuration [readwrite] + + Same values as IPv4 property. The IPv4 represents + the actual system configuration while this allows + user configuration. + dict Ethernet [readonly] string Method [readonly] diff --git a/include/ipconfig.h b/include/ipconfig.h index 7266ea2..0e1a483 100644 --- a/include/ipconfig.h +++ b/include/ipconfig.h @@ -41,6 +41,8 @@ struct connman_ipaddress { struct connman_ipaddress *connman_ipaddress_alloc(void); void connman_ipaddress_free(struct connman_ipaddress *ipaddress); +void connman_ipaddress_set(struct connman_ipaddress *ipaddress, + const char *address, const char *netmask); void connman_ipaddress_clear(struct connman_ipaddress *ipaddress); void connman_ipaddress_copy(struct connman_ipaddress *ipaddress, struct connman_ipaddress *source); diff --git a/src/connman.h b/src/connman.h index 889cc6d..c4020b1 100644 --- a/src/connman.h +++ b/src/connman.h @@ -129,9 +129,11 @@ const char *__connman_ipconfig_method2string(enum connman_ipconfig_method method enum connman_ipconfig_method __connman_ipconfig_string2method(const char *method); void __connman_ipconfig_append_ipv4(struct connman_ipconfig *ipconfig, - DBusMessageIter *iter); -int __connman_ipconfig_set_ipv4(struct connman_ipconfig *ipconfig, - const char *key, DBusMessageIter *value); + DBusMessageIter *iter); +void __connman_ipconfig_append_ipv4config(struct connman_ipconfig *ipconfig, + DBusMessageIter *iter); +int __connman_ipconfig_set_ipv4config(struct connman_ipconfig *ipconfig, + DBusMessageIter *value); int __connman_ipconfig_append_ethernet(struct connman_ipconfig *ipconfig, DBusMessageIter *iter); diff --git a/src/ipconfig.c b/src/ipconfig.c index 7d2ae9d..df023c2 100644 --- a/src/ipconfig.c +++ b/src/ipconfig.c @@ -91,6 +91,37 @@ void connman_ipaddress_free(struct connman_ipaddress *ipaddress) g_free(ipaddress); } +static unsigned char netmask2prefixlen(const char *netmask) +{ + unsigned char bits = 0; + in_addr_t mask = inet_network(netmask); + in_addr_t host = ~mask; + + /* a valid netmask must be 2^n - 1 */ + if ((host & (host + 1)) != 0) + return -1; + + for (; mask; mask <<= 1) + ++bits; + + return bits; +} + +void connman_ipaddress_set(struct connman_ipaddress *ipaddress, + const char *address, const char *netmask) +{ + if (ipaddress == NULL) + return; + + if (netmask != NULL) + ipaddress->prefixlen = netmask2prefixlen(netmask); + else + ipaddress->prefixlen = 32; + + g_free(ipaddress->local); + ipaddress->local = g_strdup(address); +} + void connman_ipaddress_clear(struct connman_ipaddress *ipaddress) { if (ipaddress == NULL) @@ -920,7 +951,7 @@ enum connman_ipconfig_method __connman_ipconfig_string2method(const char *method } void __connman_ipconfig_append_ipv4(struct connman_ipconfig *ipconfig, - DBusMessageIter *iter) + DBusMessageIter *iter) { const char *str; @@ -949,25 +980,120 @@ void __connman_ipconfig_append_ipv4(struct connman_ipconfig *ipconfig, } } -int __connman_ipconfig_set_ipv4(struct connman_ipconfig *ipconfig, - const char *key, DBusMessageIter *value) +void __connman_ipconfig_append_ipv4config(struct connman_ipconfig *ipconfig, + DBusMessageIter *iter) +{ + const char *str; + + str = __connman_ipconfig_method2string(ipconfig->method); + if (str == NULL) + return; + + connman_dbus_dict_append_basic(iter, "Method", DBUS_TYPE_STRING, &str); + + switch (ipconfig->method) { + case CONNMAN_IPCONFIG_METHOD_UNKNOWN: + case CONNMAN_IPCONFIG_METHOD_OFF: + case CONNMAN_IPCONFIG_METHOD_DHCP: + return; + case CONNMAN_IPCONFIG_METHOD_MANUAL: + break; + } + + if (ipconfig->address == NULL) + return; + + if (ipconfig->address->local != NULL) { + in_addr_t addr; + struct in_addr netmask; + char *mask; + + connman_dbus_dict_append_basic(iter, "Address", + DBUS_TYPE_STRING, &ipconfig->address->local); + + addr = 0xffffffff << (32 - ipconfig->address->prefixlen); + netmask.s_addr = htonl(addr); + mask = inet_ntoa(netmask); + connman_dbus_dict_append_basic(iter, "Netmask", + DBUS_TYPE_STRING, &mask); + } +} + +int __connman_ipconfig_set_ipv4config(struct connman_ipconfig *ipconfig, + DBusMessageIter *array) { - int type = dbus_message_iter_get_arg_type(value); + enum connman_ipconfig_method method = CONNMAN_IPCONFIG_METHOD_UNKNOWN; + const char *address = NULL, *netmask = NULL; + DBusMessageIter dict; + + DBG("ipconfig %p", ipconfig); + + if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY) + return -EINVAL; - DBG("ipconfig %p key %s type %d", ipconfig, key, type); + dbus_message_iter_recurse(array, &dict); - if (g_strcmp0(key, "Method") == 0) { - const char *method; + while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) { + DBusMessageIter entry; + const char *key; + int type; - if (type != DBUS_TYPE_STRING) + dbus_message_iter_recurse(&dict, &entry); + + if (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_STRING) return -EINVAL; - dbus_message_iter_get_basic(value, &method); + dbus_message_iter_get_basic(&entry, &key); + dbus_message_iter_next(&entry); + + type = dbus_message_iter_get_arg_type(&entry); + + if (g_str_equal(key, "Method") == TRUE) { + const char *str; + + if (type != DBUS_TYPE_STRING) + return -EINVAL; + + dbus_message_iter_get_basic(&entry, &str); + method = __connman_ipconfig_string2method(str); + } else if (g_str_equal(key, "Address") == TRUE) { + if (type != DBUS_TYPE_STRING) + return -EINVAL; - ipconfig->method = __connman_ipconfig_string2method(method); - } else + dbus_message_iter_get_basic(&entry, &address); + } else if (g_str_equal(key, "Netmask") == TRUE) { + if (type != DBUS_TYPE_STRING) + return -EINVAL; + + dbus_message_iter_get_basic(&entry, &netmask); + } + + dbus_message_iter_next(&dict); + } + + DBG("method %d address %s netmask %s", method, address, netmask); + + switch (method) { + case CONNMAN_IPCONFIG_METHOD_UNKNOWN: + case CONNMAN_IPCONFIG_METHOD_OFF: return -EINVAL; + case CONNMAN_IPCONFIG_METHOD_MANUAL: + if (address == NULL) + return -EINVAL; + + ipconfig->method = method; + connman_ipaddress_set(ipconfig->address, address, netmask); + break; + + case CONNMAN_IPCONFIG_METHOD_DHCP: + if (ipconfig->method == method) + return 0; + + ipconfig->method = method; + break; + } + return 0; } diff --git a/src/service.c b/src/service.c index 21aaba4..dec8622 100644 --- a/src/service.c +++ b/src/service.c @@ -423,6 +423,14 @@ static void append_ipv4(DBusMessageIter *iter, void *user_data) __connman_ipconfig_append_ipv4(service->ipconfig, iter); } +static void append_ipv4config(DBusMessageIter *iter, void *user_data) +{ + struct connman_service *service = user_data; + + if (service->ipconfig != NULL) + __connman_ipconfig_append_ipv4config(service->ipconfig, iter); +} + static void settings_changed(struct connman_service *service) { connman_dbus_property_changed_dict(service->path, @@ -565,6 +573,9 @@ static DBusMessage *get_properties(DBusConnection *conn, connman_dbus_dict_append_dict(&dict, "IPv4", append_ipv4, service); + connman_dbus_dict_append_dict(&dict, "IPv4.Configuration", + append_ipv4config, service); + connman_dbus_dict_close(&array, &dict); return reply; @@ -693,6 +704,18 @@ static DBusMessage *set_property(DBusConnection *conn, "Cellular.Password", service->password); __connman_storage_save_service(service); + } else if (g_str_equal(name, "IPv4.Configuration") == TRUE) { + int err; + + if (service->ipconfig == NULL) + return __connman_error_invalid_property(msg); + + err = __connman_ipconfig_set_ipv4config(service->ipconfig, + &value); + if (err < 0) + return __connman_error_failed(msg, -err); + + __connman_storage_save_service(service); } else return __connman_error_invalid_property(msg); diff --git a/test/list-services b/test/list-services index 64439b5..8c0ecf9 100755 --- a/test/list-services +++ b/test/list-services @@ -26,7 +26,7 @@ for path in properties["Services"]: print "[ %s ]" % (path) for key in properties.keys(): - if key in ["IPv4", "Ethernet"]: + if key in ["IPv4", "IPv4.Configuration", "Ethernet"]: val = extract_values(properties[key]) elif key in ["Favorite", "AutoConnect", "SetupRequired", "PassphraseRequired"]: diff --git a/test/set-address b/test/set-address index ebff30a..cb3e203 100755 --- a/test/set-address +++ b/test/set-address @@ -4,7 +4,7 @@ import sys import dbus if (len(sys.argv) < 2): - print "Usage: %s
" % (sys.argv[0]) + print "Usage: %s
[netmask]" % (sys.argv[0]) sys.exit(1) bus = dbus.SystemBus() @@ -14,13 +14,23 @@ manager = dbus.Interface(bus.get_object('org.moblin.connman', "/"), properties = manager.GetProperties() -for path in properties["Devices"]: - device = dbus.Interface(bus.get_object('org.moblin.connman', path), - 'org.moblin.connman.Device') +for path in properties["Services"]: + service = dbus.Interface(bus.get_object('org.moblin.connman', path), + 'org.moblin.connman.Service') - print "Setting static address %s for %s" % (sys.argv[1], path) + properties = service.GetProperties() - device.SetProperty("IPv4.Method", "static") - device.SetProperty("IPv4.Address", sys.argv[1]) + if properties["State"] != "ready": + continue + + print "Setting address %s for %s" % (sys.argv[1], path) + + if len(sys.argv) > 2: + service.SetProperty("IPv4.Configuration", + { "Method": "manual", "Address": sys.argv[1], + "Netmask": sys.argv[2] }) + else: + service.SetProperty("IPv4.Configuration", + { "Method": "manual", "Address": sys.argv[1] }) print -- 2.7.4