Attachment 6090 Details for Bug 30066 – IPv6 patch

IPv6 patch

ddclient-3.8.1-ipv6.patch (text/plain), 5.71 KB, created by Denis G. Samsonenko on 2014-05-08 17:16:14 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Denis G. Samsonenko

Created: 2014-05-08 17:16:14 MSK

Size: 5.71 KB

patch

obsolete

>--- ddclient	2011-07-11 18:04:21.000000000 -0300
>+++ ddclient	2011-09-10 01:47:43.721029588 -0300
>@@ -55,6 +55,7 @@
> sub T_FQDNP	{'fully qualified host name and optional port number'};
> sub T_PROTO	{'protocol'}
> sub T_USE	{'ip strategy'}
>+sub T_USEV6	{'ipv6 strategy'}
> sub T_IF        {'interface'}
> sub T_PROG      {'program name'}
> sub T_IP        {'ip'}
>@@ -325,6 +326,7 @@
> 	'protocol'            => setv(T_PROTO, 0, 0, 1, 'dyndns2',            undef),
> 
> 	'use'                 => setv(T_USE,   0, 0, 1, 'ip',                 undef),
>+	'usev6'               => setv(T_USEV6, 0, 0, 1, undef,                undef),
> 	'ip'                  => setv(T_IP,    0, 0, 1, undef,                undef),
> 	'if'                  => setv(T_IF,    0, 0, 1, 'ppp0',               undef),
> 	'if-skip'             => setv(T_STRING,1, 0, 1, '',                   undef),
>@@ -365,6 +367,7 @@
> 	'host'                => setv(T_STRING, 1, 1, 1, '',                  undef),
> 
> 	'use'                 => setv(T_USE,   0, 0, 1, 'ip',                 undef),
>+	'usev6'               => setv(T_USE,   0, 0, 1, undef,                undef),
> 	'if'                  => setv(T_IF,    0, 0, 1, 'ppp0',               undef),
> 	'if-skip'             => setv(T_STRING,0, 0, 1, '',                   undef),
> 	'web'                 => setv(T_STRING,0, 0, 1, 'dyndns',             undef),
>@@ -583,6 +586,7 @@
>     [ "pid",         "=s", "-pid path             : record process id in 'path'" ],
>     "",			     
>     [ "use",         "=s", "-use which            : how the should IP address be obtained." ],
>+    [ "usev6",       "=s", "-usev6 which          : how the should IPv6 address be obtained." ],
>                                                   &ip_strategies_usage(),
>     "",			     
>     [ "ip",          "=s", "-ip address           : set the IP address to 'address'" ],
>@@ -769,11 +773,19 @@
> 		my (@hosts, %ips) = ();
> 		my $updateable = $services{$s}{'updateable'};
> 		my $update     = $services{$s}{'update'};
>+		my $ipv6 = 0;
> 
> 		foreach my $h (sort keys %config) {
> 			next if $config{$h}{'protocol'} ne lc($s);
> 			$examined{$h} = 1;
>-			my $use = $config{$h}{'use'} || opt('use');
>+			my $use = '';
>+		        $ipv6 = 1 if (defined $config{$h}{'usev6'});
>+			if ($ipv6) {
>+			    $use = $config{$h}{'usev6'} || opt('usev6');
>+			}
>+			else {
>+			    $use = $config{$h}{'use'} || opt('use');
>+			}
> 			local $opt{$use} = $config{$h}{$use} if $config{$h}{$use};
> 			# bug #13: we should only do this once
> 			# use isn't enough, we have to save the origin to.
>@@ -783,16 +795,21 @@
> 			if (defined $iplist{$use}) {
> 				$ip = $iplist{$use};
> 			} else {
>-				$ip = get_ip($use, $h);
>+				$ip = get_ip($use, $h) if !$ipv6;
>+				$ip = get_ipv6($use, $h) if $ipv6;
> 				if (!defined $ip || !$ip) {
> 					warning("unable to determine IP address")
> 						if !$daemon || opt('verbose');
> 					next;
> 				}
>-				if ($ip !~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) {
>+				if (!$ipv6 and $ip !~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) {
> 					warning("malformed IP address (%s)", $ip);
> 					next;
> 				}
>+				if ($ipv6 and $ip !~ /^[0-9a-f:]+$/) {
>+					warning("malformed IPv6 address (%s)", $ip);
>+					next;
>+				}
> 				$iplist{$use} = $ip;
> 			}
> 			$config{$h}{'wantip'} = $ip;
>@@ -933,7 +950,7 @@
>     my ($c, $name, $value);
>     my ($escape, $quote) = (0, '');
> 
>-    if ($rest =~ /^\s*([a-z][a-z_-]*)=(.*)/i) {
>+    if ($rest =~ /^\s*([a-z][0-9a-z_-]*)=(.*)/i) {
> 	($name, $rest, $value) = ($1, $2, '');
> 
> 	while (length($c = substr($rest,0,1))) {
>@@ -1111,6 +1128,11 @@
>     $opt{'use'} = 'if'  if !define($opt{'use'}) && defined($opt{'if'});
>     $opt{'use'} = 'web' if !define($opt{'use'}) && defined($opt{'web'});
> 
>+    ## infer the IPv6 strategy if possible
>+    $opt{'usev6'} = 'ip'  if !define($opt{'usev6'}) && defined($opt{'ip'});
>+    $opt{'usev6'} = 'if'  if !define($opt{'usev6'}) && defined($opt{'if'});
>+    $opt{'usev6'} = 'web' if !define($opt{'usev6'}) && defined($opt{'web'});
>+
>     ## sanity check
>     $opt{'max-interval'}       = min(interval(opt('max-interval')), interval(default('max-interval')));
>     $opt{'min-interval'}       = max(interval(opt('min-interval')), interval(default('min-interval')));
>@@ -1720,6 +1742,10 @@
> 	$value = lc $value;
> 	return undef if ! exists $ip_strategies{$value};
> 
>+    } elsif ($type eq T_USEV6) {
>+	$value = lc $value;
>+	return undef if ! exists $ip_strategies{$value};
>+
>     } elsif ($type eq T_FILE) {
> 	return undef if $value eq "";
> 
>@@ -1736,7 +1762,7 @@
> #	return undef if $value =~ /:/;
> 
>     } elsif ($type eq T_IP) {
>-	return undef if $value !~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/;
>+	return undef if $value !~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/ and $value !~ /^[0-9a-f:]+$/;
>     }
>     return $value;
> }
>@@ -2020,6 +2046,42 @@
> 	$ip = $1;
>     }
>     if (($use ne 'ip') && (define($ip,'') eq '0.0.0.0')) {
>+	$ip = undef;
>+    }
>+
>+    debug("get_ip: using %s, %s reports %s", $use, $arg, define($ip, "<undefined>"));
>+    return $ip;
>+}
>+
>+######################################################################
>+## get_ipv6
>+######################################################################
>+sub get_ipv6 {
>+    my $use = lc shift;
>+    my $h = shift;
>+    my ($ip, $arg, $reply, $url, $skip) = (undef, opt($use), '');
>+    $arg = '' unless $arg;
>+
>+    if ($use eq 'ip') {
>+	$ip  = opt('ip', $h);
>+	$arg = 'ip';
>+
>+    } elsif ($use eq 'if') {
>+	$skip  = opt('if-skip', $h)  || '';
>+	$reply = `ip -6 addr list dev $arg | grep "scope.global" 2> /dev/null`;
>+	$reply = '' if $?;
>+    }
>+    if (!defined $reply) {
>+	$reply = '';
>+    }
>+    if ($skip) {
>+	$skip  =~ s/ /\\s/is;
>+    	$reply =~ s/^.*?${skip}//is;
>+    }
>+    if ($reply =~ /.*? ([0-9:][^\/]*)/i) {
>+	$ip = $1;
>+    }
>+    if (($use ne 'ip') && (define($ip,'') eq '0.0.0.0')) {
> 	$ip = undef;
>     }
>

Actions: View

Attachments on bug 30066: 6090 | 6091 | 6092 | 6093 | 6094