This email list is read-only. Emails sent to this list will be discarded
----------------------------------
include/Makefile.am | 2 -
include/dhcp.h | 56 ---------------------------
include/resolver.h | 44 ----------------------
src/connman.h | 11 -----
src/dhcp.c | 103 ---------------------------------------------------
src/resolver.c | 67 ---------------------------------
6 files changed, 0 insertions(+), 283 deletions(-)
New commits:
commit a3817be2201b201fcf109d5ea627235e4239f49c
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Sun Aug 10 12:45:44 2008 +0200
Don't include old header files
commit 05710ff07036142552d249788d491f043e59f5a3
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Sun Aug 10 12:44:07 2008 +0200
Remove old header files from distribution
commit bbe573030af4dc38bd10e346228ee2eaa76cb7ea
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Sun Aug 10 12:41:42 2008 +0200
Remove old DHCP support
commit efcc940369f9f9e14bcd325a4a221eb94eb1f104
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Sun Aug 10 12:37:28 2008 +0200
Remove old resolver implementation
Diff in this email is a maximum of 400 lines.
diff --git a/include/Makefile.am b/include/Makefile.am
index 1844d98..89c5aa5 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -3,8 +3,6 @@ includedir = @includedir@/connman
include_HEADERS = log.h plugin.h driver.h element.h property.h rtnl.h dbus.h
-noinst_HEADERS = iface.h dhcp.h resolver.h
-
MAINTAINERCLEANFILES = Makefile.in
all-local:
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 <connman/iface.h>
-
-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/include/resolver.h b/include/resolver.h
deleted file mode 100644
index e3c368e..0000000
--- a/include/resolver.h
+++ /dev/null
@@ -1,44 +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_RESOLVER_H
-#define __CONNMAN_RESOLVER_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <connman/iface.h>
-
-struct connman_resolver_driver {
- const char *name;
- int (*append) (struct connman_iface *iface, const char *nameserver);
- int (*remove) (struct connman_iface *iface);
-};
-
-extern int connman_resolver_register(struct connman_resolver_driver *driver);
-extern void connman_resolver_unregister(struct connman_resolver_driver
*driver);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __CONNMAN_RESOLVER_H */
diff --git a/src/connman.h b/src/connman.h
index 4249f33..d33d0f3 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -118,14 +118,3 @@ int __connman_rtnl_init(void);
void __connman_rtnl_cleanup(void);
int __connman_rtnl_send(const void *buf, size_t len);
-
-#include <connman/dhcp.h>
-
-int __connman_dhcp_request(struct connman_iface *iface);
-int __connman_dhcp_release(struct connman_iface *iface);
-
-#include <connman/resolver.h>
-
-int __connman_resolver_append(struct connman_iface *iface,
- const char *nameserver);
-int __connman_resolver_remove(struct connman_iface *iface);
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 <config.h>
-#endif
-
-#include <arpa/inet.h>
-
-#include <glib.h>
-
-#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;
-}
diff --git a/src/resolver.c b/src/resolver.c
deleted file mode 100644
index 7c7d2f6..0000000
--- a/src/resolver.c
+++ /dev/null
@@ -1,67 +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 <config.h>
-#endif
-
-#include <glib.h>
-
-#include "connman.h"
-
-static GSList *drivers = NULL;
-
-int connman_resolver_register(struct connman_resolver_driver *driver)
-{
- DBG("driver %p", driver);
-
- drivers = g_slist_append(drivers, driver);
-
- return 0;
-}
-
-void connman_resolver_unregister(struct connman_resolver_driver *driver)
-{
- DBG("driver %p", driver);
-
- drivers = g_slist_remove(drivers, driver);
-}
-
-int __connman_resolver_append(struct connman_iface *iface,
- const char *nameserver)
-{
- struct connman_resolver_driver *driver = g_slist_nth_data(drivers, 0);
-
- if (driver && driver->append)
- return driver->append(iface, nameserver);
-
- return -1;
-}
-
-int __connman_resolver_remove(struct connman_iface *iface)
-{
- struct connman_resolver_driver *driver = g_slist_nth_data(drivers, 0);
-
- if (driver && driver->remove)
- return driver->remove(iface);
-
- return -1;
-}
_______________________________________________
Commits mailing list
[email protected]
https://www.moblin.org/mailman/listinfo/commits
