Re: dependency on ip still necessary?

["Benoit Boissinot" <bboissin gmail com>]

On Thu, May 29, 2008 at 1:15 AM, Michael Biebl <biebl debian org> wrote:
> Dan Williams schrieb:
>> On Fri, 2008-05-23 at 15:16 +0200, Michael Biebl wrote:
>>> Hi,
>>>
>>> after todays merges of Benoit's patches to use libnl directly instead of
>>> ip, I was wondering why nm_generic_device_flush_ip4_routes_with_iface in
>>> src/backends/NetworkManagerGeneric.c still calls ip and wasn't ported to
>>> use libnl.
>>
>> Because there were issues with that patch and VPN connections that I'm
>> sending more info to Benoit about.  The routing table is different with
>> that code than without it, and caused any traffic over VPN to return
>> EINVAL (even a ping to 4.2.2.1).
>>
>> But the plan is to fix that up and kill usage of /sbin/ip entirely.
>>
>
> I guess with r3698, it's safe to remove the configure check for ip now.
> Patch attached.
>

And the attached patches are needed for further cleanups too.

regards,

Benoit

diff -r 2418caf52564 src/backends/NetworkManagerGeneric.h
--- a/src/backends/NetworkManagerGeneric.h	Thu May 29 09:30:58 2008 +0200
+++ b/src/backends/NetworkManagerGeneric.h	Thu May 29 14:04:14 2008 +0200
@@ -35,12 +35,6 @@
 
 void			nm_generic_init (void);
 
-void			nm_generic_device_flush_ip4_routes				(NMDevice *dev);
-void			nm_generic_device_flush_ip4_routes_with_iface	(const char *iface);
-
-void			nm_generic_device_flush_ip4_addresses			(NMDevice *dev);
-void			nm_generic_device_flush_ip4_addresses_with_iface	(const char *iface);
-
 void			nm_generic_enable_loopback				(void);
 void			nm_generic_kill_all_dhcp_daemons			(void);
 void			nm_generic_update_dns					(void);

diff -r f01f4af9cb4c initscript/Arch/networkmanager.in
--- a/initscript/Arch/networkmanager.in	Thu May 29 09:31:27 2008 +0200
+++ b/initscript/Arch/networkmanager.in	Thu May 29 14:10:29 2008 +0200
@@ -12,9 +12,6 @@ NETWORKMANAGER_BIN=${sbindir}/NetworkMan
 
 # Sanity checks.
 [ -x $NETWORKMANAGER_BIN ] || exit 0
-
-# We need /usr/sbin/ip
-[ -x /usr/sbin/ip ] || exit 0
 
 PID=`pidof -o %PPID $NETWORKMANAGER_BIN`
 case "$1" in
diff -r f01f4af9cb4c initscript/Debian/NetworkManager
--- a/initscript/Debian/NetworkManager	Thu May 29 09:31:27 2008 +0200
+++ b/initscript/Debian/NetworkManager	Thu May 29 14:10:29 2008 +0200
@@ -25,9 +25,6 @@ USER=root
 # Gracefully exit if the package has been removed.
 test -x $DAEMON || exit 0
 
-# We need /sbin/ip
-[ -x /sbin/ip ] || exit 1
-
 #
 #	Function that starts the daemon/service.
 #
diff -r f01f4af9cb4c initscript/Mandriva/networkmanager.in
--- a/initscript/Mandriva/networkmanager.in	Thu May 29 09:31:27 2008 +0200
+++ b/initscript/Mandriva/networkmanager.in	Thu May 29 14:10:29 2008 +0200
@@ -27,9 +27,6 @@ NETWORKMANAGER_BIN=${sbindir}/NetworkMan
 
 # Sanity checks.
 [ -x $NETWORKMANAGER_BIN ] || exit 1
-
-# We need /sbin/ip
-[ -x /sbin/ip ] || exit 1
 
 # Source function library.
 . /etc/rc.d/init.d/functions
diff -r f01f4af9cb4c initscript/RedHat/NetworkManager.in
--- a/initscript/RedHat/NetworkManager.in	Thu May 29 09:31:27 2008 +0200
+++ b/initscript/RedHat/NetworkManager.in	Thu May 29 14:10:29 2008 +0200
@@ -27,9 +27,6 @@ NETWORKMANAGER_BIN=${sbindir}/NetworkMan
 
 # Sanity checks.
 [ -x $NETWORKMANAGER_BIN ] || exit 1
-
-# We need /sbin/ip
-[ -x /sbin/ip ] || exit 1
 
 # Source function library.
 . /etc/rc.d/init.d/functions
diff -r f01f4af9cb4c initscript/Slackware/rc.networkmanager.in
--- a/initscript/Slackware/rc.networkmanager.in	Thu May 29 09:31:27 2008 +0200
+++ b/initscript/Slackware/rc.networkmanager.in	Thu May 29 14:10:29 2008 +0200
@@ -17,9 +17,6 @@ NETWORKMANAGER_BIN=${sbindir}/NetworkMan
 
 # Sanity checks.
 [ -x $NETWORKMANAGER_BIN ] || exit 0
-
-# We need /sbin/ip
-[ -x /sbin/ip ] || exit 0
 
 PIDFILE=/var/run/NetworkManager.pid