Attachment 583512 Details for Bug 785180 – patch

[patch] patch

openswan-2.6.37-net-tools.patch (text/plain), 1.43 KB, created by Jiri Popelka on 2012-05-10 11:29:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Popelka

Created: 2012-05-10 11:29:23 UTC

Size: 1.43 KB

patch

obsolete

>diff -up openswan-2.6.37/programs/_startklips/_startklips.in.net-tools openswan-2.6.37/programs/_startklips/_startklips.in
>--- openswan-2.6.37/programs/_startklips/_startklips.in.net-tools	2011-10-28 23:11:53.000000000 +0200
>+++ openswan-2.6.37/programs/_startklips/_startklips.in	2012-05-10 13:05:15.396667906 +0200
>@@ -183,7 +183,7 @@ getinterfaceinfo() {
> 
> # get default route info
> getdefaultrouteinfo() {
>-        netstat -nr | awk '$1 == "0.0.0.0" && $3 == "0.0.0.0" { print "phys=" $NF; print "next=" $2; exit 0 }'
>+        ip route list | awk '$1 == "default" { print "phys=" $NF; print "next=" $3; exit 0 }'
> }
> 
> # set up a Klips interface
>diff -up openswan-2.6.37/programs/verify/verify.in.net-tools openswan-2.6.37/programs/verify/verify.in
>--- openswan-2.6.37/programs/verify/verify.in.net-tools	2011-10-28 23:11:53.000000000 +0200
>+++ openswan-2.6.37/programs/verify/verify.in	2012-05-10 13:08:01.423510595 +0200
>@@ -488,12 +488,11 @@ sub dnschecks {
>     checkdnshost $hostname;
>     
>     # Check all the public IP addresses...
>-    run "/sbin/ifconfig -a";
>-    foreach (grep /inet addr/,@out)
>+    run "ip -4 -o addr show";
>+    for (@out)
>     {
>-	$_=~ s/^\s*//;
>-        @temp=split(/[:\ ]+/, $_);
>-	push(@address,$temp[2]);
>+	@temp=split(/[\/\ ]+/, $_);
>+	push(@address,$temp[3]);
>     }
>     # Purge all non-routeable IPs...
>     @address=grep !/^(127.*|10.*|172.1[6789]+.*.*|172.2+.*.*|172.3[01]+.*.*|192.168.*.*|169.254.*.*)/,@address;

Actions: View | Diff

Attachments on bug 785180: 557873 | 583512