From bbe573030af4dc38bd10e346228ee2eaa76cb7ea Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sun, 10 Aug 2008 12:41:42 +0200 Subject: [PATCH] Remove old DHCP support --- include/dhcp.h | 56 ------------------------------- src/dhcp.c | 103 --------------------------------------------------------- 2 files changed, 159 deletions(-) delete mode 100644 include/dhcp.h delete mode 100644 src/dhcp.c diff --git a/include/dhcp.h b/include/dhcp.h deleted file mode 100644 index 7863af1..0000000 --- a/include/dhcp.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * - * Connection Manager - * - * Copyright (C) 2007-2008 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_DHCP_H -#define __CONNMAN_DHCP_H - -#ifdef __cplusplus -extern "C" { -#endif - -#include - -enum connman_dhcp_state { - CONNMAN_DHCP_STATE_UNKNOWN = 0, - CONNMAN_DHCP_STATE_INIT = 1, - CONNMAN_DHCP_STATE_BOUND = 2, - CONNMAN_DHCP_STATE_RENEW = 3, - CONNMAN_DHCP_STATE_FAILED = 4, -}; - -struct connman_dhcp_driver { - const char *name; - int (*request) (struct connman_iface *iface); - int (*release) (struct connman_iface *iface); -}; - -extern int connman_dhcp_register(struct connman_dhcp_driver *driver); -extern void connman_dhcp_unregister(struct connman_dhcp_driver *driver); - -extern int connman_dhcp_update(struct connman_iface *iface, - enum connman_dhcp_state state, - struct connman_ipv4 *ipv4); - -#ifdef __cplusplus -} -#endif - -#endif /* __CONNMAN_DHCP_H */ diff --git a/src/dhcp.c b/src/dhcp.c deleted file mode 100644 index 1b7bd87..0000000 --- a/src/dhcp.c +++ /dev/null @@ -1,103 +0,0 @@ -/* - * - * Connection Manager - * - * Copyright (C) 2007-2008 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 "connman.h" - -static GSList *drivers = NULL; - -int connman_dhcp_register(struct connman_dhcp_driver *driver) -{ - DBG("driver %p", driver); - - drivers = g_slist_append(drivers, driver); - - return 0; -} - -void connman_dhcp_unregister(struct connman_dhcp_driver *driver) -{ - DBG("driver %p", driver); - - drivers = g_slist_remove(drivers, driver); -} - -int connman_dhcp_update(struct connman_iface *iface, - enum connman_dhcp_state state, - struct connman_ipv4 *ipv4) -{ - DBG("iface %p state %d", iface, state); - - if (state == CONNMAN_DHCP_STATE_BOUND) { - DBG("address %s", inet_ntoa(ipv4->address)); - DBG("netmask %s", inet_ntoa(ipv4->netmask)); - DBG("gateway %s", inet_ntoa(ipv4->gateway)); - DBG("network %s", inet_ntoa(ipv4->network)); - DBG("broadcast %s", inet_ntoa(ipv4->broadcast)); - DBG("nameserver %s", inet_ntoa(ipv4->nameserver)); - - ipv4->method = CONNMAN_IPV4_METHOD_DHCP; - - connman_iface_set_ipv4(iface, ipv4); - iface->ipv4 = *ipv4; - - connman_iface_indicate_configured(iface); - } - - return 0; -} - -int __connman_dhcp_request(struct connman_iface *iface) -{ - struct connman_dhcp_driver *driver = g_slist_nth_data(drivers, 0); - - if (iface->flags & CONNMAN_IFACE_FLAG_DHCP) - return -1; - - if (driver && driver->request) { - iface->flags |= CONNMAN_IFACE_FLAG_DHCP; - return driver->request(iface); - } - - return -1; -} - -int __connman_dhcp_release(struct connman_iface *iface) -{ - struct connman_dhcp_driver *driver = g_slist_nth_data(drivers, 0); - - if (!(iface->flags & CONNMAN_IFACE_FLAG_DHCP)) - return -1; - - if (driver && driver->release) { - iface->flags &= ~CONNMAN_IFACE_FLAG_DHCP; - return driver->release(iface); - } - - return -1; -} -- 2.7.4