From e0a4c1e5febfb3a056bef634d45fd6a8f6e3f71a Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 14 Aug 2006 15:06:34 +0000 Subject: [PATCH] 2006-08-14 Dan Williams Patch from Alex Smith * configure.in src/backends/Makefile.am src/backends/NetworkManagerFrugalware.c - Add support for Frugalware git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1958 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 8 + configure.in | 4 +- src/backends/Makefile.am | 9 +- src/backends/NetworkManagerFrugalware.c | 584 ++++++++++++++++++++++++ 4 files changed, 603 insertions(+), 2 deletions(-) create mode 100644 src/backends/NetworkManagerFrugalware.c diff --git a/ChangeLog b/ChangeLog index 5d470a0fdc..a1c4858d8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-08-14 Dan Williams + + Patch from Alex Smith + * configure.in + src/backends/Makefile.am + src/backends/NetworkManagerFrugalware.c + - Add support for Frugalware + 2006-08-13 Dan Williams Patch from Valentine Sinitsyn diff --git a/configure.in b/configure.in index 6b7e3e035e..0b39eddc28 100644 --- a/configure.in +++ b/configure.in @@ -64,6 +64,7 @@ if test "z$with_distro" = "z"; then AC_CHECK_FILE(/etc/debian_version,with_distro="debian") AC_CHECK_FILE(/etc/arch-release,with_distro="arch") AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware") + AC_CHECK_FILE(/etc/frugalware-release,with_distro="frugalware") if test "z$with_distro" = "z"; then with_distro=`lsb_release -is` fi @@ -75,7 +76,7 @@ if test "z$with_distro" = "z"; then exit 1 else case $with_distro in - redhat|suse|gentoo|debian|slackware|arch|paldo) ;; + redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware) ;; *) echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)" exit 1 @@ -89,6 +90,7 @@ AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian) AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware) AM_CONDITIONAL(TARGET_ARCH, test x"$with_distro" = xarch) AM_CONDITIONAL(TARGET_PALDO, test x"$with_distro" = xpaldo) +AM_CONDITIONAL(TARGET_FRUGALWARE, test x"$with_distro" = xfrugalware) AC_MSG_CHECKING([for wireless-tools >= 28pre9]) AC_TRY_COMPILE([#include ], diff --git a/src/backends/Makefile.am b/src/backends/Makefile.am index f2200dc439..cce15b3364 100644 --- a/src/backends/Makefile.am +++ b/src/backends/Makefile.am @@ -11,6 +11,8 @@ noinst_LTLIBRARIES = libnmbackend.la libnmbackend_la_SOURCES = NetworkManagerGeneric.c \ NetworkManagerGeneric.h +libnmbackend_la_LIBADD = + if TARGET_REDHAT libnmbackend_la_SOURCES += NetworkManagerRedHat.c \ shvar.c \ @@ -47,7 +49,12 @@ if TARGET_PALDO libnmbackend_la_SOURCES += NetworkManagerPaldo.c endif -libnmbackend_la_LIBADD = $(DBUS_LIBS) $(GTHREAD_LIBS) +if TARGET_FRUGALWARE +libnmbackend_la_SOURCES += NetworkManagerFrugalware.c +libnmbackend_la_LIBADD += -lfwnetconfig -lfwutil +endif + +libnmbackend_la_LIBADD += $(DBUS_LIBS) $(GTHREAD_LIBS) libnmbackend_la_CPPFLAGS = $(DBUS_CFLAGS) \ $(GTHREAD_CFLAGS) \ $(HAL_CFLAGS) \ diff --git a/src/backends/NetworkManagerFrugalware.c b/src/backends/NetworkManagerFrugalware.c new file mode 100644 index 0000000000..acb39bf038 --- /dev/null +++ b/src/backends/NetworkManagerFrugalware.c @@ -0,0 +1,584 @@ +/* NetworkManager -- Network link manager + * + * Implementation for the Frugalware Linux distro - http://www.frugalware.org + * + * Alex Smith + * + * Based on NetworkManagerSlackware.c by Narayan Newton + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * (C) Copyright 2006 Alex Smith + */ + +#include +#include +#include +#include "NetworkManagerSystem.h" +#include "NetworkManagerUtils.h" +#include "nm-device.h" +#include "nm-device-802-3-ethernet.h" +#include "nm-device-802-11-wireless.h" +#include "nm-utils.h" + +// Provided by the frugalwareutils package on Frugalware +#include + +typedef struct FWDeviceConfigData +{ + NMIP4Config * config; + gboolean use_dhcp; +} FWDeviceConfigData; + +/* + * nm_system_init + * + * Initializes the distribution-specific system backend + * + */ +void nm_system_init (void) +{ +} + +/* + * nm_system_device_flush_routes + * + * Flush all routes associated with a network device + * + */ +void nm_system_device_flush_routes (NMDevice *dev) +{ + g_return_if_fail (dev != NULL); + + /* Not really applicable for test devices */ + if (nm_device_is_test_device (dev)) + return; + + nm_system_device_flush_routes_with_iface (nm_device_get_iface (dev)); +} + +/* + * nm_system_device_flush_routes_with_iface + * + * Flush all routes associated with a network device + * + */ +void nm_system_device_flush_routes_with_iface (const char *iface) +{ + char *buf; + + g_return_if_fail (iface != NULL); + + /* Remove routing table entries */ + buf = g_strdup_printf ("/sbin/ip route flush dev %s", iface); + nm_spawn_process (buf); + g_free (buf); +} + + +/* + * nm_system_device_flush_addresses + * + * Flush all network addresses associated with a network device + * + */ +void nm_system_device_flush_addresses (NMDevice *dev) +{ + g_return_if_fail (dev != NULL); + + /* Not really applicable for test devices */ + if (nm_device_is_test_device (dev)) + return; + + nm_system_device_flush_addresses_with_iface (nm_device_get_iface (dev)); +} + +/* + * nm_system_device_flush_addresses_with_iface + * + * Flush all network addresses associated with a network device + * + */ +void nm_system_device_flush_addresses_with_iface (const char *iface) +{ + char *buf; + + g_return_if_fail (iface != NULL); + + /* Remove all IP addresses for a device */ + buf = g_strdup_printf ("/sbin/ip addr flush dev %s", iface); + nm_spawn_process (buf); + g_free (buf); +} + +/* + * nm_system_device_setup_static_ip4_config + * + * Set up the device with a particular IPv4 address/netmask/gateway. + * + * Returns: TRUE on success + * FALSE on error + * + */ +gboolean nm_system_device_setup_static_ip4_config (NMDevice *dev) +{ + nm_warning ("nm_system_device_setup_static_ip4_config() is not implemented yet for this distribution.\n"); + return FALSE; +} + +/* + * nm_system_device_has_active_routes + * + * Find out whether the specified device has any routes in the routing + * table. + * + */ +gboolean nm_system_device_has_active_routes (NMDevice *dev) +{ + return FALSE; +} + + +/* + * nm_system_enable_loopback + * + * Bring up the loopback interface + * + */ +void nm_system_enable_loopback (void) +{ + fwnet_loup (); +} + + +/* + * nm_system_delete_default_route + * + * Remove the old default route in preparation for a new one + * + */ +void nm_system_delete_default_route (void) +{ + nm_spawn_process ("/sbin/ip route del default"); +} + + +/* + * nm_system_kill_all_dhcp_daemons + * + * Kill all DHCP daemons currently running, done at startup. + * + */ +void nm_system_kill_all_dhcp_daemons (void) +{ + nm_spawn_process ("/bin/killall -q dhclient"); +} + + +/* + * nm_system_update_dns + * + * Make glibc/nscd aware of any changes to the resolv.conf file by + * restarting nscd. + * + */ +void nm_system_update_dns (void) +{ + /* I'm not running nscd */ +} + +/* + * nm_system_restart_mdns_responder + * + * Restart the multicast DNS responder so that it knows about new + * network interfaces and IP addresses. + * + */ +void nm_system_restart_mdns_responder (void) +{ + /* Check if the daemon was already running - do not start a new instance */ + if (g_file_test("/var/run/avahi-daemon/pid", G_FILE_TEST_EXISTS)) + { + nm_spawn_process ("/etc/rc.d/avahi-daemon restart"); + } +} + + +/* + * nm_system_device_add_ip6_link_address + * + * Add a default link-local IPv6 address to a device. + * + */ +void nm_system_device_add_ip6_link_address (NMDevice *dev) +{ + char *buf; + struct ether_addr hw_addr; + unsigned char eui[8]; + + if (nm_device_is_802_3_ethernet (dev)) + nm_device_802_3_ethernet_get_address (NM_DEVICE_802_3_ETHERNET (dev), &hw_addr); + else if (nm_device_is_802_11_wireless (dev)) + nm_device_802_11_wireless_get_address (NM_DEVICE_802_11_WIRELESS (dev), &hw_addr); + + memcpy (eui, &(hw_addr.ether_addr_octet), sizeof (hw_addr.ether_addr_octet)); + memmove (eui+5, eui+3, 3); + eui[3] = 0xff; + eui[4] = 0xfe; + eui[0] ^= 2; + + /* Add the default link-local IPv6 address to a device */ + buf = g_strdup_printf ("/sbin/ip -6 addr add fe80::%x%02x:%x%02x:%x%02x:%x%02x/64 dev %s", + eui[0], eui[1], eui[2], eui[3], eui[4], eui[5], + eui[6], eui[7], nm_device_get_iface (dev)); + nm_spawn_process (buf); + g_free (buf); +} + +/* + * nm_system_device_add_route_via_device_with_iface + * + * Add route to the given device + * + */ +void nm_system_device_add_route_via_device_with_iface (const char *iface, const char *route) +{ + char *buf; + + g_return_if_fail (iface != NULL); + + /* Add default gateway */ + buf = g_strdup_printf ("/sbin/ip route add %s dev %s", route, iface); + nm_spawn_process (buf); + g_free (buf); +} + +/* + * nm_system_device_add_default_route_via_device + * + * Flush all routes associated with a network device + * + */ +void nm_system_device_add_default_route_via_device (NMDevice *dev) +{ + g_return_if_fail (dev != NULL); + + /* Not really applicable for test devices */ + if (nm_device_is_test_device (dev)) + return; + + nm_system_device_add_default_route_via_device_with_iface (nm_device_get_iface (dev)); +} + +/* + * nm_system_device_add_default_route_via_device_with_iface + * + * Add default route to the given device + * + */ +void nm_system_device_add_default_route_via_device_with_iface (const char *iface) +{ + char *buf; + + g_return_if_fail (iface != NULL); + + /* Add default gateway */ + buf = g_strdup_printf ("/sbin/ip route add default dev %s", iface); + nm_spawn_process (buf); + g_free (buf); +} + + +/* + * nm_system_flush_loopback_routes + * + * Flush all routes associated with the loopback device, because it + * sometimes gets the first route for ZeroConf/Link-Local traffic. + * + */ +void nm_system_flush_loopback_routes (void) +{ + nm_system_device_flush_routes_with_iface ("lo"); +} + + +/* + * nm_system_flush_arp_cache + * + * Flush all entries in the arp cache. + * + */ +void nm_system_flush_arp_cache (void) +{ + nm_spawn_process ("/sbin/ip neigh flush all"); +} + +void nm_system_deactivate_all_dialup (GSList *list) +{ +} + +gboolean nm_system_deactivate_dialup (GSList *list, const char *dialup) +{ + return FALSE; +} + +gboolean nm_system_activate_dialup (GSList *list, const char *dialup) +{ + return FALSE; +} + +/* + * nm_system_get_dialup_config + * + * Enumerate dial up options on this system, allocate NMDialUpConfig's, + * fill them out, and return. + * + */ +GSList * nm_system_get_dialup_config (void) +{ + return NULL; +} + +void nm_system_device_free_system_config (NMDevice *dev, void *system_config_data) +{ +} + +NMIP4Config *nm_system_device_new_ip4_system_config (NMDevice *dev) +{ + return NULL; +} + +gboolean nm_system_device_get_use_dhcp (NMDevice *dev) +{ + FWDeviceConfigData *sys_data; + + g_return_val_if_fail (dev != NULL, TRUE); + + if ((sys_data = nm_device_get_system_config_data(dev))) + { + return sys_data->use_dhcp; + } + + return TRUE; +} + +/* + * get_current_profile_name + * + * Retrieve the current network profile, if any + * + */ +static char *get_current_profile_name (void) +{ + char * buf; + + buf = fwnet_lastprofile(); + return buf; +} + +/* + * nm_system_device_get_disabled + * + * Return whether the distro-specific system config tells us to use + * dhcp for this device. + * + */ +gboolean nm_system_device_get_disabled (NMDevice *dev) +{ + return FALSE; +} + + +/* + * nm_system_activate_nis + * + * set up the nis domain and write a yp.conf + * + */ +void nm_system_activate_nis (NMIP4Config *config) +{ +} + +/* + * nm_system_shutdown_nis + * + * shutdown ypbind + * + */ +void nm_system_shutdown_nis (void) +{ +} + +/* + * nm_system_set_hostname + * + * set the hostname + * + */ +void nm_system_set_hostname (NMIP4Config *config) +{ +} + +/* + * nm_system_should_modify_resolv_conf + * + * Can NM update resolv.conf, or is it locked down? + */ +gboolean nm_system_should_modify_resolv_conf (void) +{ + return TRUE; +} + + +/* + * nm_system_get_mtu + * + * Return a user-provided or system-mandated MTU for this device or zero if + * no such MTU is provided. + */ +guint32 nm_system_get_mtu (NMDevice *dev) +{ + return 0; +} + +/* + * nm_system_device_get_system_config + * + * Read in the config file for a device. + * + */ +void *nm_system_device_get_system_config (NMDevice *dev, NMData *app_data) +{ + fwnet_profile_t *profile; + fwnet_interface_t *interface; + FWDeviceConfigData *sys_data = NULL; + int dhcp, i; + char *buf = NULL; + char *data = NULL; + gboolean error = FALSE; + + sys_data = g_malloc0 (sizeof (FWDeviceConfigData)); + sys_data->use_dhcp = TRUE; + + profile = fwnet_parseprofile(get_current_profile_name()); + + for (i=0; iinterfaces); i++) + { + interface = g_list_nth_data(profile->interfaces, i); + if(!strcmp(interface->name, nm_device_get_iface (dev))) + break; + interface = NULL; + } + + if (!interface) + return NULL; + + dhcp = fwnet_is_dhcp(interface); + + if (!dhcp) + sys_data->use_dhcp = FALSE; + else + goto out; + + sys_data->config = nm_ip4_config_new (); + + if (!(sys_data->use_dhcp)) + { + data = g_list_nth_data(interface->options, 0); + + if ((buf = strsep(&data, " "))) + { + nm_ip4_config_set_address (sys_data->config, inet_addr (buf)); + free (buf); + } + else + { + nm_warning ("Network configuration for device '%s' was invalid (non-DHCP configuration, " + "but no IP address specified. Will use DHCP instead.", nm_device_get_iface (dev)); + error = TRUE; + goto out; + } + + // This is just to get rid of the 'netmask' string from the options line + buf = strsep(&data, " "); + free (buf); + + if ((buf = strsep(&data, " "))) + { + nm_ip4_config_set_netmask (sys_data->config, inet_addr (buf)); + free (buf); + } + else + { + guint32 addr = nm_ip4_config_get_address (sys_data->config); + + /* Make a default netmask if we have an IP address */ + if (((ntohl (addr) & 0xFF000000) >> 24) <= 127) + nm_ip4_config_set_netmask (sys_data->config, htonl (0xFF000000)); + else if (((ntohl (addr) & 0xFF000000) >> 24) <= 191) + nm_ip4_config_set_netmask (sys_data->config, htonl (0xFFFF0000)); + else + nm_ip4_config_set_netmask (sys_data->config, htonl (0xFFFFFF00)); + } + + // This is just to get rid of the 'broadcast' string from the options line + buf = strsep(&data, " "); + free (buf); + + if ((buf = strsep(&data, " "))) + { + nm_ip4_config_set_broadcast (sys_data->config, inet_addr (buf)); + free (buf); + } + else + { + guint32 broadcast = ((nm_ip4_config_get_address (sys_data->config) & nm_ip4_config_get_netmask (sys_data->config)) + | ~nm_ip4_config_get_netmask (sys_data->config)); + nm_ip4_config_set_broadcast (sys_data->config, broadcast); + } + + if (interface->gateway != NULL) + { + nm_ip4_config_set_gateway (sys_data->config, inet_addr (interface->gateway)); + } + else + { + nm_warning ("Network configuration for device '%s' was invalid (non-DHCP configuration, " + "but no gateway specified. Will use DHCP instead.", nm_device_get_iface (dev)); + error = TRUE; + goto out; + } + } + +//#if 0 + nm_debug ("------ Config (%s)", nm_device_get_iface (dev)); + nm_debug (" DHCP=%d\n", sys_data->use_dhcp); + nm_debug (" ADDR=%d\n", nm_ip4_config_get_address (sys_data->config)); + nm_debug (" GW=%d\n", nm_ip4_config_get_gateway (sys_data->config)); + nm_debug (" NM=%d\n", nm_ip4_config_get_netmask (sys_data->config)); + nm_debug ("---------------------\n"); +//#endif + +out: + if (error) + { + sys_data->use_dhcp = TRUE; + /* Clear out the config */ + nm_ip4_config_unref (sys_data->config); + sys_data->config = NULL; + } + + return (void *)sys_data; +}