diff -Naur NetworkManager-0.6.4/configure.in NetworkManager-0.6.4-new/configure.in --- NetworkManager-0.6.4/configure.in 2006-06-08 08:39:16.000000000 +1200 +++ NetworkManager-0.6.4-new/configure.in 2006-06-10 23:51:12.000000000 +1200 @@ -50,7 +50,7 @@ AC_PROG_INTLTOOL([0.27.2]) AM_GLIB_GNU_GETTEXT -AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch or slackware])) +AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, lfs or slackware])) if test "z$with_distro" = "z"; then AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat") AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse") @@ -58,6 +58,7 @@ AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo") AC_CHECK_FILE(/etc/debian_version,with_distro="debian") AC_CHECK_FILE(/etc/arch-release,with_distro="arch") + AC_CHECK_FILE(/etc/lfs-release,with_distro="lfs") AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware") fi with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' ` @@ -67,7 +68,7 @@ exit 1 else case $with_distro in - redhat|suse|gentoo|debian|slackware|arch) ;; + redhat|suse|gentoo|debian|slackware|arch|lfs) ;; *) echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)" exit 1 @@ -80,6 +81,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_LFS, test x"$with_distro" = xlfs) AC_MSG_CHECKING([for wireless-tools >= 28pre9]) AC_TRY_COMPILE([#include ], @@ -357,6 +359,9 @@ initscript/Arch/Makefile initscript/Arch/networkmanager initscript/Arch/networkmanager-dispatcher +initscript/LFS/Makefile +initscript/LFS/NetworkManager +initscript/LFS/NetworkManagerDispatcher man/Makefile man/NetworkManager.1 man/NetworkManagerDispatcher.1 diff -Naur NetworkManager-0.6.4/initscript/LFS/Makefile.am NetworkManager-0.6.4-new/initscript/LFS/Makefile.am --- NetworkManager-0.6.4/initscript/LFS/Makefile.am 1970-01-01 12:00:00.000000000 +1200 +++ NetworkManager-0.6.4-new/initscript/LFS/Makefile.am 2006-06-10 23:52:41.000000000 +1200 @@ -0,0 +1,5 @@ +EXTRA_DIST = NetworkManager NetworkManagerDispatcher + +initddir = $(sysconfdir)/rc.d/init.d +initd_SCRIPTS = NetworkManager NetworkManagerDispatcher + diff -Naur NetworkManager-0.6.4/initscript/LFS/NetworkManagerDispatcher.in NetworkManager-0.6.4-new/initscript/LFS/NetworkManagerDispatcher.in --- NetworkManager-0.6.4/initscript/LFS/NetworkManagerDispatcher.in 1970-01-01 12:00:00.000000000 +1200 +++ NetworkManager-0.6.4-new/initscript/LFS/NetworkManagerDispatcher.in 2006-06-10 23:54:55.000000000 +1200 @@ -0,0 +1,49 @@ +#!/bin/sh +# +# NetworkManager: NetworkManagerDispatcher daemon +# +# This daemon automatically runs scripts when NetworkManager +# changes the network state. +# + +prefix=@prefix@ +exec_prefix=@prefix@ +sbindir=@sbindir@ + +# Source function library. +. /etc/sysconfig/rc +. ${rc_functions} + +pidfile=/var/run/NetworkManager/NetworkManagerDispatcher.pid + +case "${1}" in + start) + boot_mesg "Starting NetworkManagerDispatcher..." + loadproc ${sbindir}/NetworkManagerDispatcher --pid-file=${pidfile} + ;; + + stop) + boot_mesg "Stopping NetworkManagerDispatcher..." + killproc ${sbindir}/NetworkManagerDispatcher + ;; + + reload) + boot_mesg "Reloading NetworkManagerDispatcher..." + reloadproc ${sbindir}/NetworkManagerDispatcher + ;; + + restart) + ${0} stop + sleep 1 + ${0} start + ;; + + status) + statusproc ${sbindir}/NetworkManagerDispatcher + ;; + + *) + echo "Usage: ${0} {start|stop|reload|restart|status}" + exit 1 + ;; +esac diff -Naur NetworkManager-0.6.4/initscript/LFS/NetworkManager.in NetworkManager-0.6.4-new/initscript/LFS/NetworkManager.in --- NetworkManager-0.6.4/initscript/LFS/NetworkManager.in 1970-01-01 12:00:00.000000000 +1200 +++ NetworkManager-0.6.4-new/initscript/LFS/NetworkManager.in 2006-06-10 23:55:22.000000000 +1200 @@ -0,0 +1,50 @@ +#!/bin/sh +# +# NetworkManager: NetworkManager daemon +# +# This is a daemon for automatically switching network +# connections to the best available connection. +# + +prefix=@prefix@ +exec_prefix=@prefix@ +sbindir=@sbindir@ + +# Source function library. +. /etc/sysconfig/rc +. ${rc_functions} + +pidfile=/var/run/NetworkManager/NetworkManager.pid + +case "${1}" in + start) + boot_mesg "Starting NetworkManager..." + loadproc ${sbindir}/NetworkManager --pid-file=${pidfile} + ;; + + stop) + boot_mesg "Stopping NetworkManager..." + killproc ${sbindir}/NetworkManager + ;; + + reload) + boot_mesg "Reloading NetworkManager..." + reloadproc ${sbindir}/NetworkManager + ;; + + restart) + ${0} stop + sleep 1 + ${0} start + ;; + + status) + statusproc ${sbindir}/NetworkManager + ;; + + *) + echo "Usage: ${0} {start|stop|reload|restart|status}" + exit 1 + ;; +esac + diff -Naur NetworkManager-0.6.4/initscript/Makefile.am NetworkManager-0.6.4-new/initscript/Makefile.am --- NetworkManager-0.6.4/initscript/Makefile.am 2006-03-28 06:30:55.000000000 +1200 +++ NetworkManager-0.6.4-new/initscript/Makefile.am 2006-06-10 23:51:24.000000000 +1200 @@ -17,3 +17,6 @@ if TARGET_ARCH SUBDIRS += Arch endif +if TARGET_LFS +SUBDIRS += LFS +endif diff -Naur NetworkManager-0.6.4/src/backends/Makefile.am NetworkManager-0.6.4-new/src/backends/Makefile.am --- NetworkManager-0.6.4/src/backends/Makefile.am 2006-03-28 06:30:57.000000000 +1200 +++ NetworkManager-0.6.4-new/src/backends/Makefile.am 2006-06-10 23:49:21.000000000 +1200 @@ -42,6 +42,12 @@ libnmbackend_la_SOURCES += NetworkManagerArch.c endif +if TARGET_LFS +libnmbackend_la_SOURCES += NetworkManagerLFS.c \ + shvar.c \ + shvar.h +endif + libnmbackend_la_LIBADD = $(DBUS_LIBS) $(GTHREAD_LIBS) libnmbackend_la_CPPFLAGS = $(DBUS_CFLAGS) \ $(GTHREAD_CFLAGS) \ diff -Naur NetworkManager-0.6.4/src/backends/NetworkManagerLFS.c NetworkManager-0.6.4-new/src/backends/NetworkManagerLFS.c --- NetworkManager-0.6.4/src/backends/NetworkManagerLFS.c 1970-01-01 12:00:00.000000000 +1200 +++ NetworkManager-0.6.4-new/src/backends/NetworkManagerLFS.c 2006-06-10 23:59:37.000000000 +1200 @@ -0,0 +1,609 @@ +/* NetworkManager -- Network link manager + * + * Dan Williams + * + * 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 2004 Red Hat, Inc. + */ + +#include +#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 "NetworkManagerDialup.h" +#include "nm-utils.h" +#include "shvar.h" + +/* + * nm_system_init + * + * Initializes the distribution-specific system backend + * + */ +void nm_system_init (void) +{ + /* Kill any dhclients lying around */ + nm_system_kill_all_dhcp_daemons (); +} + + +/* + * 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_add_default_route_via_device + * + * Add default route to the given 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_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_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_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_enable_loopback + * + * Bring up the loopback interface + * + */ +void nm_system_enable_loopback (void) +{ + nm_spawn_process ("/sbin/ip link set dev lo up"); + nm_spawn_process ("/sbin/ip addr add 127.0.0.1/8 brd 127.255.255.255 dev lo scope host label loopback"); +} + + +/* + * 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) +{ + /* Remove routing table entries for lo */ + nm_spawn_process ("/sbin/ip route flush dev lo"); +} + + +/* + * 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_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"); +} + + +/* + * nm_system_kill_all_dhcp_daemons + * + * Kill all DHCP daemons currently running, done at startup. + * + */ +void nm_system_kill_all_dhcp_daemons (void) +{ +} + + +/* + * nm_system_update_dns + * + * Invalidate the nscd host cache, if it exists, since + * we changed resolv.conf. + * + */ +void nm_system_update_dns (void) +{ +#ifdef NM_NO_NAMED + if (nm_spawn_process ("/etc/init.d/nscd status") != 0) + nm_spawn_process ("/etc/init.d/nscd restart"); + + nm_info ("Clearing nscd hosts cache."); + nm_spawn_process ("/usr/sbin/nscd -i hosts"); +#else + nm_spawn_process ("/usr/bin/killall -q nscd"); +#endif +} + + +/* + * 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) +{ + nm_warning ("No NetworkManager support for mdns responder"); +} + + +/* + * 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); +} + + + +typedef struct LFSSystemConfigData +{ + NMIP4Config * config; + gboolean use_dhcp; + gboolean system_disabled; +} LFSSystemConfigData; + + +/* + * 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) +{ + char * cfg_file_path = NULL; + shvarFile * file; + char * buf = NULL; + LFSSystemConfigData * sys_data = NULL; + gboolean error = FALSE; + + g_return_val_if_fail (dev != NULL, NULL); + + /* LFS systems store this information in files within + * /etc/sysconfig/network-devices/ifconfig-* where * is the + * interface name. + */ + + sys_data = g_malloc0 (sizeof (LFSSystemConfigData)); + sys_data->use_dhcp = TRUE; + + cfg_file_path = g_strdup_printf (SYSCONFDIR"/sysconfig/network-devices/ifconfig-%s/ipv4", nm_device_get_iface (dev)); + if (!cfg_file_path) + return sys_data; + + if (!(file = svNewFile (cfg_file_path))) + { + g_free (cfg_file_path); + return sys_data; + } + g_free (cfg_file_path); + + if ((buf = svGetValue (file, "BOOTPROTO"))) + { + if (strcasecmp (buf, "dhcp")) + sys_data->use_dhcp = FALSE; + free (buf); + } + + if ((buf = svGetValue (file, "NM_CONTROLLED"))) + { + nm_debug ("NM_CONTROLLED=%s", buf); + if (!strcasecmp (buf, "no")) + { + nm_info ("System configuration disables device %s", nm_device_get_iface (dev)); + sys_data->system_disabled = TRUE; + } + free (buf); + } + + sys_data->config = nm_ip4_config_new (); + + if (!(sys_data->use_dhcp)) + { + if ((buf = svGetValue (file, "IP"))) + { + 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; + } + + if ((buf = svGetValue (file, "GATEWAY"))) + { + nm_ip4_config_set_gateway (sys_data->config, inet_addr (buf)); + free (buf); + } + 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; + } + + /* TODO - need to generate netmask from prefix instead, e.g 24 -> 0xFFFFFF00 */ + if ((buf = svGetValue (file, "NETMASK"))) + { + 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)); + } + + if ((buf = svGetValue (file, "BROADCAST"))) + { + 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); + } + } + +out: + svCloseFile (file); + + 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; +} + + +/* + * nm_system_device_free_system_config + * + * Free stored system config data + * + */ +void nm_system_device_free_system_config (NMDevice *dev, void *system_config_data) +{ + LFSSystemConfigData *sys_data = (LFSSystemConfigData *)system_config_data; + + g_return_if_fail (dev != NULL); + + if (!sys_data) + return; + + if (sys_data->config) + nm_ip4_config_unref (sys_data->config); +} + + +/* + * nm_system_device_get_use_dhcp + * + * Return whether the distro-specific system config tells us to use + * dhcp for this device. + * + */ +gboolean nm_system_device_get_use_dhcp (NMDevice *dev) +{ + LFSSystemConfigData *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; +} + + +/* + * 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) +{ + LFSSystemConfigData *sys_data; + + g_return_val_if_fail (dev != NULL, FALSE); + + if ((sys_data = nm_device_get_system_config_data (dev))) + return sys_data->system_disabled; + + return FALSE; +} + + +NMIP4Config *nm_system_device_new_ip4_system_config (NMDevice *dev) +{ + LFSSystemConfigData *sys_data; + NMIP4Config *new_config = NULL; + + g_return_val_if_fail (dev != NULL, NULL); + + if ((sys_data = nm_device_get_system_config_data (dev))) + new_config = nm_ip4_config_copy (sys_data->config); + + return new_config; +} + + +void nm_system_deactivate_all_dialup (GSList *list) +{ + nm_warning ("No NetworkManager support for dialup devices"); +} + + +gboolean nm_system_deactivate_dialup (GSList *list, const char *dialup) +{ + nm_warning ("No NetworkManager support for dialup device %s", dialup); + return FALSE; +} + + +gboolean nm_system_activate_dialup (GSList *list, const char *dialup) +{ + nm_warning ("No NetworkManager support for dialup device %s", dialup); + return FALSE; +} + + +GSList * nm_system_get_dialup_config (void) +{ + nm_warning ("No NetworkManager support for dialup devices"); + return NULL; +} + +/* + * 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; +}