diff options
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | include/utsname.h | 49 | ||||
| -rw-r--r-- | plugins/loopback.c | 41 | ||||
| -rw-r--r-- | src/connman.h | 5 | ||||
| -rw-r--r-- | src/dhcp.c | 2 | ||||
| -rw-r--r-- | src/utsname.c | 111 |
6 files changed, 212 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index d8fecd64..67934d0d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,8 @@ nodist_include_HEADERS = include/version.h noinst_HEADERS = include/driver.h include/element.h include/property.h \ include/rtnl.h include/wifi.h include/task.h \ include/dbus.h include/rfkill.h include/option.h \ - include/profile.h include/provider.h include/dhcp.h + include/profile.h include/provider.h include/dhcp.h \ + include/utsname.h local_headers = $(foreach file,$(include_HEADERS) $(nodist_include_HEADERS) \ $(noinst_HEADERS), include/connman/$(notdir $(file))) @@ -49,7 +50,8 @@ src_connmand_SOURCES = $(gdbus_sources) $(builtin_sources) \ src/agent.c src/notifier.c src/provider.c \ src/security.c src/resolver.c src/ipconfig.c \ src/ipv4.c src/dhcp.c src/rtnl.c src/inet.c \ - src/rfkill.c src/wifi.c src/storage.c src/dbus.c + src/utsname.c src/rfkill.c src/wifi.c \ + src/storage.c src/dbus.c if UDEV src_connmand_SOURCES += src/udev.c diff --git a/include/utsname.h b/include/utsname.h new file mode 100644 index 00000000..6e489c50 --- /dev/null +++ b/include/utsname.h @@ -0,0 +1,49 @@ +/* + * + * Connection Manager + * + * Copyright (C) 2007-2009 Intel Corporation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 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 warranty of + * MERCHANTABILITY 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifndef __CONNMAN_UTSNAME_H +#define __CONNMAN_UTSNAME_H + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * SECTION:utsname + * @title: utsname premitives + * @short_description: Functions for handling utsname + */ + +struct connman_utsname_driver { + const char *name; + int priority; + int (*set_hostname) (const char *hostname); + int (*set_domainname) (const char *domainname); +}; + +int connman_utsname_driver_register(struct connman_utsname_driver *driver); +void connman_utsname_driver_unregister(struct connman_utsname_driver *driver); + +#ifdef __cplusplus +} +#endif + +#endif /* __CONNMAN_UTSNAME_H */ diff --git a/plugins/loopback.c b/plugins/loopback.c index 446d1849..668165c0 100644 --- a/plugins/loopback.c +++ b/plugins/loopback.c @@ -37,6 +37,7 @@ #define CONNMAN_API_SUBJECT_TO_CHANGE #include <connman/plugin.h> +#include <connman/utsname.h> #include <connman/log.h> static in_addr_t loopback_address; @@ -278,6 +279,42 @@ done: return err; } +static int loopback_set_hostname(const char *hostname) +{ + int err; + + if (sethostname(hostname, strlen(hostname)) < 0) { + err = -errno; + connman_error("Failed to set hostname to %s", hostname); + return err; + } + + connman_info("Setting hostname to %s", hostname); + + return 0; +} + +static int loopback_set_domainname(const char *domainname) +{ + int err; + + if (setdomainname(domainname, strlen(domainname)) < 0) { + err = -errno; + connman_error("Failed to set domainname to %s", domainname); + return err; + } + + connman_info("Setting domainname to %s", domainname); + + return 0; +} + +static struct connman_utsname_driver loopback_driver = { + .name = "loopback", + .set_hostname = loopback_set_hostname, + .set_domainname = loopback_set_domainname, +}; + static int loopback_init(void) { loopback_address = inet_addr("127.0.0.1"); @@ -289,11 +326,15 @@ static int loopback_init(void) //create_watch(); + connman_utsname_driver_register(&loopback_driver); + return 0; } static void loopback_exit(void) { + connman_utsname_driver_unregister(&loopback_driver); + //remove_watch(); } diff --git a/src/connman.h b/src/connman.h index 9b833fa3..7ca7cd90 100644 --- a/src/connman.h +++ b/src/connman.h @@ -225,6 +225,11 @@ int __connman_element_set_ipv4(struct connman_element *element, gboolean __connman_element_device_isfiltered(const char *devname); +#include <connman/utsname.h> + +int __connman_utsname_set_hostname(const char *hostname); +int __connman_utsname_set_domainname(const char *domainname); + #include <connman/dhcp.h> int __connman_dhcp_init(void); @@ -115,7 +115,9 @@ void connman_dhcp_set_value(struct connman_dhcp *dhcp, g_free(dhcp->element->ipv4.nameserver); dhcp->element->ipv4.nameserver = g_strdup(value); } else if (g_strcmp0(key, "Domainname") == 0) { + __connman_utsname_set_domainname(value); } else if (g_strcmp0(key, "Hostname") == 0) { + __connman_utsname_set_hostname(value); } else if (g_strcmp0(key, "Timeserver") == 0) { } else if (g_strcmp0(key, "MTU") == 0) { } diff --git a/src/utsname.c b/src/utsname.c new file mode 100644 index 00000000..2da08a73 --- /dev/null +++ b/src/utsname.c @@ -0,0 +1,111 @@ +/* + * + * Connection Manager + * + * Copyright (C) 2007-2009 Intel Corporation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 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 warranty of + * MERCHANTABILITY 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <glib.h> + +#include "connman.h" + +static GSList *driver_list = NULL; + +static gint compare_priority(gconstpointer a, gconstpointer b) +{ + const struct connman_utsname_driver *driver1 = a; + const struct connman_utsname_driver *driver2 = b; + + return driver2->priority - driver1->priority; +} + +/** + * connman_utsname_driver_register: + * @driver: utsname driver definition + * + * Register a new utsname driver + * + * Returns: %0 on success + */ +int connman_utsname_driver_register(struct connman_utsname_driver *driver) +{ + DBG("driver %p name %s", driver, driver->name); + + driver_list = g_slist_insert_sorted(driver_list, driver, + compare_priority); + + return 0; +} + +/** + * connman_utsname_driver_unregister: + * @driver: utsname driver definition + * + * Remove a previously registered utsname driver + */ +void connman_utsname_driver_unregister(struct connman_utsname_driver *driver) +{ + DBG("driver %p name %s", driver, driver->name); + + driver_list = g_slist_remove(driver_list, driver); +} + +int __connman_utsname_set_hostname(const char *hostname) +{ + GSList *list; + + DBG("hostname %s", hostname); + + for (list = driver_list; list; list = list->next) { + struct connman_utsname_driver *driver = list->data; + + DBG("driver %p name %s", driver, driver->name); + + if (driver->set_hostname == NULL) + continue; + + if (driver->set_hostname(hostname) == 0) + break; + } + + return 0; +} + +int __connman_utsname_set_domainname(const char *domainname) +{ + GSList *list; + + DBG("domainname %s", domainname); + + for (list = driver_list; list; list = list->next) { + struct connman_utsname_driver *driver = list->data; + + DBG("driver %p name %s", driver, driver->name); + + if (driver->set_domainname == NULL) + continue; + + if (driver->set_domainname(domainname) == 0) + break; + } + + return 0; +} |