From: Marcel Holtmann Date: Mon, 5 Jan 2009 17:15:15 +0000 (+0100) Subject: Move IPv4 handling into daemon core X-Git-Tag: 0.7~46 X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=ef365b56fb876d1e02bbb7259f77c1945524df06;p=connman Move IPv4 handling into daemon core --- diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 71ae0cf..de4b58b 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,7 +1,7 @@ plugindir = $(libdir)/connman/plugins -plugin_LTLIBRARIES = ipv4.la +plugin_LTLIBRARIES = if LOOPBACK plugin_LTLIBRARIES += loopback.la @@ -53,8 +53,6 @@ plugin_LTLIBRARIES += hso.la hso_la_SOURCES = hso.c modem.h modem.c endif -ipv4_la_SOURCES = ipv4.c inet.h inet.c - if UDHCP plugin_LTLIBRARIES += udhcp.la diff --git a/plugins/ipv4.c b/plugins/ipv4.c deleted file mode 100644 index c73c729..0000000 --- a/plugins/ipv4.c +++ /dev/null @@ -1,225 +0,0 @@ -/* - * - * 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 -#endif - -#include -#include -#include -#include -#include -#include -#include - -#define CONNMAN_API_SUBJECT_TO_CHANGE -#include -#include -#include -#include -#include - -#include "inet.h" - -enum connman_ipv4_method { - CONNMAN_IPV4_METHOD_UNKNOWN = 0, - CONNMAN_IPV4_METHOD_OFF = 1, - CONNMAN_IPV4_METHOD_STATIC = 2, - CONNMAN_IPV4_METHOD_DHCP = 3, -}; - -struct connman_ipv4 { - enum connman_ipv4_method method; - struct in_addr address; - struct in_addr netmask; - struct in_addr broadcast; -}; - -static int set_ipv4(struct connman_element *element, - struct connman_ipv4 *ipv4, const char *nameserver) -{ - struct ifreq ifr; - struct sockaddr_in *addr; - int sk, err; - - DBG("element %p ipv4 %p", element, ipv4); - - sk = socket(PF_INET, SOCK_DGRAM, 0); - if (sk < 0) - return -1; - - memset(&ifr, 0, sizeof(ifr)); - ifr.ifr_ifindex = element->index; - - if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) { - close(sk); - return -1; - } - - DBG("ifname %s", ifr.ifr_name); - - addr = (struct sockaddr_in *) &ifr.ifr_addr; - addr->sin_family = AF_INET; - addr->sin_addr = ipv4->address; - - err = ioctl(sk, SIOCSIFADDR, &ifr); - - if (err < 0) - DBG("address setting failed (%s)", strerror(errno)); - - addr = (struct sockaddr_in *) &ifr.ifr_netmask; - addr->sin_family = AF_INET; - addr->sin_addr = ipv4->netmask; - - err = ioctl(sk, SIOCSIFNETMASK, &ifr); - - if (err < 0) - DBG("netmask setting failed (%s)", strerror(errno)); - - addr = (struct sockaddr_in *) &ifr.ifr_broadaddr; - addr->sin_family = AF_INET; - addr->sin_addr = ipv4->broadcast; - - err = ioctl(sk, SIOCSIFBRDADDR, &ifr); - - if (err < 0) - DBG("broadcast setting failed (%s)", strerror(errno)); - - close(sk); - - connman_resolver_append(ifr.ifr_name, NULL, nameserver); - - return 0; -} - -static int clear_ipv4(struct connman_element *element) -{ - struct ifreq ifr; - struct sockaddr_in *addr; - int sk, err; - - DBG("element %p", element); - - sk = socket(PF_INET, SOCK_DGRAM, 0); - if (sk < 0) - return -1; - - memset(&ifr, 0, sizeof(ifr)); - ifr.ifr_ifindex = element->index; - - if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) { - close(sk); - return -1; - } - - DBG("ifname %s", ifr.ifr_name); - - connman_resolver_remove_all(ifr.ifr_name); - - addr = (struct sockaddr_in *) &ifr.ifr_addr; - addr->sin_family = AF_INET; - addr->sin_addr.s_addr = INADDR_ANY; - - //err = ioctl(sk, SIOCDIFADDR, &ifr); - err = ioctl(sk, SIOCSIFADDR, &ifr); - - close(sk); - - if (err < 0 && errno != EADDRNOTAVAIL) { - DBG("address removal failed (%s)", strerror(errno)); - return -1; - } - - return 0; -} - -static int ipv4_probe(struct connman_element *element) -{ - struct connman_element *connection; - struct connman_ipv4 ipv4; - const char *address = NULL, *netmask = NULL, *broadcast = NULL; - const char *nameserver = NULL; - - DBG("element %p name %s", element, element->name); - - connman_element_get_value(element, - CONNMAN_PROPERTY_ID_IPV4_ADDRESS, &address); - connman_element_get_value(element, - CONNMAN_PROPERTY_ID_IPV4_NETMASK, &netmask); - connman_element_get_value(element, - CONNMAN_PROPERTY_ID_IPV4_BROADCAST, &broadcast); - - connman_element_get_value(element, - CONNMAN_PROPERTY_ID_IPV4_NAMESERVER, &nameserver); - - DBG("address %s", address); - DBG("netmask %s", netmask); - DBG("broadcast %s", broadcast); - - if (address == NULL || netmask == NULL) - return -EINVAL; - - memset(&ipv4, 0, sizeof(ipv4)); - ipv4.address.s_addr = inet_addr(address); - ipv4.netmask.s_addr = inet_addr(netmask); - ipv4.broadcast.s_addr = inet_addr(broadcast); - - set_ipv4(element, &ipv4, nameserver); - - connection = connman_element_create(NULL); - - connection->type = CONNMAN_ELEMENT_TYPE_CONNECTION; - connection->index = element->index; - connection->devname = inet_index2name(element->index); - - if (connman_element_register(connection, element) < 0) - connman_element_unref(connection); - - return 0; -} - -static void ipv4_remove(struct connman_element *element) -{ - DBG("element %p name %s", element, element->name); - - clear_ipv4(element); -} - -static struct connman_driver ipv4_driver = { - .name = "ipv4", - .type = CONNMAN_ELEMENT_TYPE_IPV4, - .probe = ipv4_probe, - .remove = ipv4_remove, -}; - -static int ipv4_init(void) -{ - return connman_driver_register(&ipv4_driver); -} - -static void ipv4_exit(void) -{ - connman_driver_unregister(&ipv4_driver); -} - -CONNMAN_PLUGIN_DEFINE(ipv4, "IPv4 configuration plugin", VERSION, - ipv4_init, ipv4_exit) diff --git a/src/Makefile.am b/src/Makefile.am index 54c06d8..a1cfcc2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,7 +8,7 @@ sbin_PROGRAMS = connmand connmand_SOURCES = main.c connman.h log.c selftest.c error.c plugin.c \ profile.c element.c device.c network.c connection.c \ security.c resolver.c storage.c manager.c agent.c \ - detect.c rtnl.c dbus.c + ipv4.c detect.c rtnl.c dbus.c if UDEV connmand_SOURCES += udev.c diff --git a/src/connman.h b/src/connman.h index b97d835..698c007 100644 --- a/src/connman.h +++ b/src/connman.h @@ -131,6 +131,9 @@ static inline void __connman_element_unlock(struct connman_element *element) int __connman_detect_init(void); void __connman_detect_cleanup(void); +int __connman_ipv4_init(void); +void __connman_ipv4_cleanup(void); + int __connman_connection_init(void); void __connman_connection_cleanup(void); diff --git a/src/element.c b/src/element.c index 2c7e755..eb26ae6 100644 --- a/src/element.c +++ b/src/element.c @@ -1556,6 +1556,7 @@ void __connman_element_start(void) started = TRUE; __connman_connection_init(); + __connman_ipv4_init(); __connman_detect_init(); } @@ -1564,6 +1565,7 @@ void __connman_element_stop(void) DBG(""); __connman_detect_cleanup(); + __connman_ipv4_cleanup(); __connman_connection_cleanup(); } diff --git a/src/ipv4.c b/src/ipv4.c new file mode 100644 index 0000000..4518d97 --- /dev/null +++ b/src/ipv4.c @@ -0,0 +1,234 @@ +/* + * + * 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 +#endif + +#include +#include +#include +#include +#include +#include +#include + +#include "connman.h" + +struct connman_ipv4 { + enum connman_ipv4_method method; + struct in_addr address; + struct in_addr netmask; + struct in_addr broadcast; +}; + +static int set_ipv4(struct connman_element *element, + struct connman_ipv4 *ipv4, const char *nameserver) +{ + struct ifreq ifr; + struct sockaddr_in *addr; + int sk, err; + + DBG("element %p ipv4 %p", element, ipv4); + + sk = socket(PF_INET, SOCK_DGRAM, 0); + if (sk < 0) + return -1; + + memset(&ifr, 0, sizeof(ifr)); + ifr.ifr_ifindex = element->index; + + if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) { + close(sk); + return -1; + } + + DBG("ifname %s", ifr.ifr_name); + + addr = (struct sockaddr_in *) &ifr.ifr_addr; + addr->sin_family = AF_INET; + addr->sin_addr = ipv4->address; + + err = ioctl(sk, SIOCSIFADDR, &ifr); + + if (err < 0) + DBG("address setting failed (%s)", strerror(errno)); + + addr = (struct sockaddr_in *) &ifr.ifr_netmask; + addr->sin_family = AF_INET; + addr->sin_addr = ipv4->netmask; + + err = ioctl(sk, SIOCSIFNETMASK, &ifr); + + if (err < 0) + DBG("netmask setting failed (%s)", strerror(errno)); + + addr = (struct sockaddr_in *) &ifr.ifr_broadaddr; + addr->sin_family = AF_INET; + addr->sin_addr = ipv4->broadcast; + + err = ioctl(sk, SIOCSIFBRDADDR, &ifr); + + if (err < 0) + DBG("broadcast setting failed (%s)", strerror(errno)); + + close(sk); + + connman_resolver_append(ifr.ifr_name, NULL, nameserver); + + return 0; +} + +static int clear_ipv4(struct connman_element *element) +{ + struct ifreq ifr; + struct sockaddr_in *addr; + int sk, err; + + DBG("element %p", element); + + sk = socket(PF_INET, SOCK_DGRAM, 0); + if (sk < 0) + return -1; + + memset(&ifr, 0, sizeof(ifr)); + ifr.ifr_ifindex = element->index; + + if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) { + close(sk); + return -1; + } + + DBG("ifname %s", ifr.ifr_name); + + connman_resolver_remove_all(ifr.ifr_name); + + addr = (struct sockaddr_in *) &ifr.ifr_addr; + addr->sin_family = AF_INET; + addr->sin_addr.s_addr = INADDR_ANY; + + //err = ioctl(sk, SIOCDIFADDR, &ifr); + err = ioctl(sk, SIOCSIFADDR, &ifr); + + close(sk); + + if (err < 0 && errno != EADDRNOTAVAIL) { + DBG("address removal failed (%s)", strerror(errno)); + return -1; + } + + return 0; +} + +static char *index2name(int index) +{ + struct ifreq ifr; + int sk, err; + + if (index < 0) + return NULL; + + sk = socket(PF_INET, SOCK_DGRAM, 0); + if (sk < 0) + return NULL; + + memset(&ifr, 0, sizeof(ifr)); + ifr.ifr_ifindex = index; + + err = ioctl(sk, SIOCGIFNAME, &ifr); + + close(sk); + + if (err < 0) + return NULL; + + return strdup(ifr.ifr_name); +} + +static int ipv4_probe(struct connman_element *element) +{ + struct connman_element *connection; + struct connman_ipv4 ipv4; + const char *address = NULL, *netmask = NULL, *broadcast = NULL; + const char *nameserver = NULL; + + DBG("element %p name %s", element, element->name); + + connman_element_get_value(element, + CONNMAN_PROPERTY_ID_IPV4_ADDRESS, &address); + connman_element_get_value(element, + CONNMAN_PROPERTY_ID_IPV4_NETMASK, &netmask); + connman_element_get_value(element, + CONNMAN_PROPERTY_ID_IPV4_BROADCAST, &broadcast); + + connman_element_get_value(element, + CONNMAN_PROPERTY_ID_IPV4_NAMESERVER, &nameserver); + + DBG("address %s", address); + DBG("netmask %s", netmask); + DBG("broadcast %s", broadcast); + + if (address == NULL || netmask == NULL) + return -EINVAL; + + memset(&ipv4, 0, sizeof(ipv4)); + ipv4.address.s_addr = inet_addr(address); + ipv4.netmask.s_addr = inet_addr(netmask); + ipv4.broadcast.s_addr = inet_addr(broadcast); + + set_ipv4(element, &ipv4, nameserver); + + connection = connman_element_create(NULL); + + connection->type = CONNMAN_ELEMENT_TYPE_CONNECTION; + connection->index = element->index; + connection->devname = index2name(element->index); + + if (connman_element_register(connection, element) < 0) + connman_element_unref(connection); + + return 0; +} + +static void ipv4_remove(struct connman_element *element) +{ + DBG("element %p name %s", element, element->name); + + clear_ipv4(element); +} + +static struct connman_driver ipv4_driver = { + .name = "ipv4", + .type = CONNMAN_ELEMENT_TYPE_IPV4, + .priority = CONNMAN_DRIVER_PRIORITY_LOW, + .probe = ipv4_probe, + .remove = ipv4_remove, +}; + +int __connman_ipv4_init(void) +{ + return connman_driver_register(&ipv4_driver); +} + +void __connman_ipv4_cleanup(void) +{ + connman_driver_unregister(&ipv4_driver); +}