diff options
author | Daniel Wagner <daniel.wagner@bmw-carit.de> | 2011-02-25 14:51:14 +0100 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-02-25 14:51:14 +0100 |
commit | 21dcc676a11701d0013d20c45636d2809b439db9 (patch) | |
tree | 084feaaafee2fc4d3d5b077ffcae6abab5997f8d | |
parent | 048e3476ab461fccba0880d657b0b2c90edaa82a (diff) | |
download | connman-21dcc676a11701d0013d20c45636d2809b439db9.tar.gz connman-21dcc676a11701d0013d20c45636d2809b439db9.tar.bz2 connman-21dcc676a11701d0013d20c45636d2809b439db9.zip |
element: Remove IPV4 element
ipv4.c is also removed.
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | include/element.h | 1 | ||||
-rw-r--r-- | src/element.c | 66 | ||||
-rw-r--r-- | src/ipv4.c | 176 |
4 files changed, 1 insertions, 244 deletions
diff --git a/Makefile.am b/Makefile.am index 144fcc55..3ad1ee93 100644 --- a/Makefile.am +++ b/Makefile.am @@ -72,7 +72,7 @@ src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) \ src/manager.c src/profile.c src/service.c \ src/agent.c src/notifier.c src/provider.c \ src/resolver.c src/ipconfig.c src/detect.c src/inet.c \ - src/ipv4.c src/dhcp.c src/rtnl.c src/proxy.c \ + src/dhcp.c src/rtnl.c src/proxy.c \ src/utsname.c src/timeserver.c src/rfkill.c \ src/wifi.c src/storage.c src/dbus.c src/config.c \ src/technology.c src/counter.c src/location.c \ diff --git a/include/element.h b/include/element.h index 99af1aa2..d25564be 100644 --- a/include/element.h +++ b/include/element.h @@ -46,7 +46,6 @@ enum connman_element_type { CONNMAN_ELEMENT_TYPE_DEVICE = 3, CONNMAN_ELEMENT_TYPE_NETWORK = 4, CONNMAN_ELEMENT_TYPE_SERVICE = 5, - CONNMAN_ELEMENT_TYPE_IPV4 = 7, CONNMAN_ELEMENT_TYPE_IPV6 = 8, CONNMAN_ELEMENT_TYPE_BOOTP = 10, CONNMAN_ELEMENT_TYPE_ZEROCONF = 11, diff --git a/src/element.c b/src/element.c index 9b39b73f..40b1d7dd 100644 --- a/src/element.c +++ b/src/element.c @@ -56,8 +56,6 @@ static const char *type2string(enum connman_element_type type) return "network"; case CONNMAN_ELEMENT_TYPE_SERVICE: return "service"; - case CONNMAN_ELEMENT_TYPE_IPV4: - return "ipv4"; case CONNMAN_ELEMENT_TYPE_IPV6: return "ipv6"; case CONNMAN_ELEMENT_TYPE_BOOTP: @@ -639,14 +637,6 @@ void connman_element_unref(struct connman_element *element) free_properties(element); g_free(element->hostname); g_free(element->domainname); - g_free(element->ipv4.address); - g_free(element->ipv4.netmask); - g_free(element->ipv4.gateway); - g_free(element->ipv4.network); - g_free(element->ipv4.broadcast); - g_free(element->ipv4.nameserver); - g_free(element->ipv4.timeserver); - g_free(element->ipv4.pac); g_free(element->ipv6.address); g_free(element->ipv6.network); g_free(element->devname); @@ -747,60 +737,6 @@ int connman_element_get_value(struct connman_element *element, id, value); *((char **) value) = element->domainname; break; - case CONNMAN_PROPERTY_ID_IPV4_METHOD: - if (element->ipv4.method == CONNMAN_IPCONFIG_METHOD_UNKNOWN) - return connman_element_get_value(element->parent, - id, value); - *((const char **) value) = __connman_ipconfig_method2string(element->ipv4.method); - break; - case CONNMAN_PROPERTY_ID_IPV4_ADDRESS: - if (element->ipv4.address == NULL) - return connman_element_get_value(element->parent, - id, value); - *((char **) value) = element->ipv4.address; - break; - case CONNMAN_PROPERTY_ID_IPV4_PEER: - if (element->ipv4.peer == NULL) - return connman_element_get_value(element->parent, - id, value); - *((char **) value) = element->ipv4.peer; - break; - case CONNMAN_PROPERTY_ID_IPV4_NETMASK: - if (element->ipv4.netmask == NULL) - return connman_element_get_value(element->parent, - id, value); - *((char **) value) = element->ipv4.netmask; - break; - case CONNMAN_PROPERTY_ID_IPV4_GATEWAY: - if (element->ipv4.gateway == NULL) - return connman_element_get_value(element->parent, - id, value); - *((char **) value) = element->ipv4.gateway; - break; - case CONNMAN_PROPERTY_ID_IPV4_BROADCAST: - if (element->ipv4.broadcast == NULL) - return connman_element_get_value(element->parent, - id, value); - *((char **) value) = element->ipv4.broadcast; - break; - case CONNMAN_PROPERTY_ID_IPV4_NAMESERVER: - if (element->ipv4.nameserver == NULL) - return connman_element_get_value(element->parent, - id, value); - *((char **) value) = element->ipv4.nameserver; - break; - case CONNMAN_PROPERTY_ID_IPV4_TIMESERVER: - if (element->ipv4.timeserver == NULL) - return connman_element_get_value(element->parent, - id, value); - *((char **) value) = element->ipv4.timeserver; - break; - case CONNMAN_PROPERTY_ID_IPV4_PAC: - if (element->ipv4.pac == NULL) - return connman_element_get_value(element->parent, - id, value); - *((char **) value) = element->ipv4.pac; - break; case CONNMAN_PROPERTY_ID_IPV6_GATEWAY: if (element->ipv6.gateway == NULL) return connman_element_get_value(element->parent, @@ -1393,7 +1329,6 @@ void __connman_element_start(void) __connman_rtnl_start(); - __connman_ipv4_init(); __connman_dhcp_init(); __connman_wpad_init(); __connman_wispr_init(); @@ -1410,7 +1345,6 @@ void __connman_element_stop(void) __connman_wispr_cleanup(); __connman_wpad_cleanup(); __connman_dhcp_cleanup(); - __connman_ipv4_cleanup(); __connman_provider_cleanup(); } diff --git a/src/ipv4.c b/src/ipv4.c deleted file mode 100644 index e77b8ee2..00000000 --- a/src/ipv4.c +++ /dev/null @@ -1,176 +0,0 @@ -/* - * - * Connection Manager - * - * Copyright (C) 2007-2010 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 <unistd.h> -#include <string.h> -#include <sys/ioctl.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> -#include <net/if.h> -#include <asm/types.h> -#include <linux/netlink.h> -#include <linux/rtnetlink.h> - -#include "connman.h" - -static int ipv4_probe(struct connman_element *element) -{ - struct connman_service *service; - const char *address = NULL, *netmask = NULL, *broadcast = NULL; - const char *peer = NULL, *nameserver = NULL, *pac = NULL; - const char *domainname = NULL, *ipv4_gw = NULL, *ipv6_gw = NULL; - char *timeserver = NULL; - unsigned char prefixlen; - int err; - - 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_PEER, &peer); - - connman_element_get_value(element, - CONNMAN_PROPERTY_ID_IPV4_NAMESERVER, &nameserver); - connman_element_get_value(element, - CONNMAN_PROPERTY_ID_IPV4_TIMESERVER, ×erver); - connman_element_get_value(element, - CONNMAN_PROPERTY_ID_IPV4_PAC, &pac); - - connman_element_get_value(element, - CONNMAN_PROPERTY_ID_DOMAINNAME, &domainname); - - connman_element_get_value(element, - CONNMAN_PROPERTY_ID_IPV4_GATEWAY, &ipv4_gw); - connman_element_get_value(element, - CONNMAN_PROPERTY_ID_IPV6_GATEWAY, &ipv6_gw); - - DBG("address %s", address); - DBG("peer %s", peer); - DBG("netmask %s", netmask); - DBG("broadcast %s", broadcast); - - if (address == NULL) - return -EINVAL; - - prefixlen = __connman_ipconfig_netmask_prefix_len(netmask); - - if ((__connman_inet_modify_address(RTM_NEWADDR, - NLM_F_REPLACE | NLM_F_ACK, element->index, - AF_INET, address, peer, prefixlen, broadcast)) < 0) - DBG("address setting failed"); - - service = __connman_element_get_service(element); - - if (pac != NULL) - __connman_service_set_proxy_autoconfig(service, pac); - - if (nameserver != NULL) - __connman_service_nameserver_append(service, nameserver); - - if (domainname != NULL) - __connman_service_set_domainname(service, domainname); - - connman_timeserver_append(timeserver); - - err = __connman_connection_gateway_add(service, ipv4_gw, ipv6_gw, peer); - if (err < 0) - return err; - - return 0; -} - -static void ipv4_remove(struct connman_element *element) -{ - struct connman_service *service; - const char *address = NULL, *netmask = NULL, *broadcast = NULL; - const char *peer = NULL, *nameserver = NULL; - char *timeserver = NULL; - unsigned char prefixlen; - - 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_PEER, &peer); - - connman_element_get_value(element, - CONNMAN_PROPERTY_ID_IPV4_NAMESERVER, &nameserver); - connman_element_get_value(element, - CONNMAN_PROPERTY_ID_IPV4_TIMESERVER, ×erver); - - connman_timeserver_remove(timeserver); - - DBG("address %s", address); - DBG("peer %s", peer); - DBG("netmask %s", netmask); - DBG("broadcast %s", broadcast); - - service = __connman_element_get_service(element); - - __connman_service_set_domainname(service, NULL); - - __connman_connection_gateway_remove(service); - - if (nameserver != NULL) - __connman_service_nameserver_remove(service, nameserver); - - prefixlen = __connman_ipconfig_netmask_prefix_len(netmask); - - if ((__connman_inet_modify_address(RTM_DELADDR, 0, element->index, - AF_INET, address, peer, prefixlen, broadcast) < 0)) - DBG("address removal failed"); - - connman_element_unref(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) -{ - DBG(""); - - return connman_driver_register(&ipv4_driver); -} - -void __connman_ipv4_cleanup(void) -{ - connman_driver_unregister(&ipv4_driver); -} |