|
Lines 5-21
Link Here
|
| 5 |
if (eval {local $SIG{__DIE__};require Socket6;} && |
5 |
if (eval {local $SIG{__DIE__};require Socket6;} && |
| 6 |
eval {local $SIG{__DIE__};require IO::Socket::INET6; IO::Socket::INET6->VERSION("1.26");}) { |
6 |
eval {local $SIG{__DIE__};require IO::Socket::INET6; IO::Socket::INET6->VERSION("1.26");}) { |
| 7 |
- import Socket6; |
7 |
- import Socket6; |
| 8 |
+ Socket6->import(qw(pack_sockaddr_in6 inet_pton inet_ntop unpack_sockaddr_in6 getaddrinfo)); |
8 |
+ Socket6->import(qw(inet_pton inet_ntop getaddrinfo)); |
| 9 |
$ipv6_addr_len = length(pack_sockaddr_in6(161, inet_pton(AF_INET6(), "::1"))); |
9 |
$ipv6_addr_len = length(pack_sockaddr_in6(161, inet_pton(AF_INET6(), "::1"))); |
| 10 |
$SNMP_Session::ipv6available = 1; |
10 |
$SNMP_Session::ipv6available = 1; |
| 11 |
} |
11 |
} |
| 12 |
@@ -601,7 +601,7 @@ |
12 |
@@ -549,7 +549,7 @@ |
|
|
13 |
# complaining about AF_INET6 when Socket6 is not available |
| 14 |
|
| 15 |
if( (defined $ipv6_addr_len) && (length $addr == $ipv6_addr_len)) { |
| 16 |
- ($port,$addrunpack) = unpack_sockaddr_in6 ($addr); |
| 17 |
+ ($port,$addrunpack) = Socket6::unpack_sockaddr_in6 ($addr); |
| 18 |
$addrstr = inet_ntop (AF_INET6(), $addrunpack); |
| 19 |
} else { |
| 20 |
($port,$addrunpack) = unpack_sockaddr_in ($addr); |
| 21 |
@@ -605,7 +605,7 @@ |
| 13 |
BEGIN { |
22 |
BEGIN { |
| 14 |
if($SNMP_Session::ipv6available) { |
23 |
if($SNMP_Session::ipv6available) { |
| 15 |
import IO::Socket::INET6; |
24 |
import IO::Socket::INET6; |
| 16 |
- import Socket6; |
25 |
- import Socket6; |
| 17 |
+ Socket6->import(qw(pack_sockaddr_in6 inet_pton inet_ntop unpack_sockaddr_in6 getaddrinfo)); |
26 |
+ Socket6->import(qw(inet_pton inet_ntop getaddrinfo)); |
| 18 |
} |
27 |
} |
| 19 |
} |
28 |
} |
| 20 |
|
29 |
|
| 21 |
|
30 |
@@ -825,8 +825,8 @@ |
|
|
31 |
($p2,$a2) = unpack_sockaddr_in ($sa2); |
| 32 |
} elsif($this->{'sockfamily'} == AF_INET6()) { |
| 33 |
# IPv6 addresses |
| 34 |
- ($p1,$a1) = unpack_sockaddr_in6 ($sa1); |
| 35 |
- ($p2,$a2) = unpack_sockaddr_in6 ($sa2); |
| 36 |
+ ($p1,$a1) = Socket6::unpack_sockaddr_in6 ($sa1); |
| 37 |
+ ($p2,$a2) = Socket6::unpack_sockaddr_in6 ($sa2); |
| 38 |
} else { |
| 39 |
return 0; |
| 40 |
} |
| 41 |
@@ -899,7 +899,7 @@ |
| 42 |
return undef unless $remote_addr; |
| 43 |
|
| 44 |
if( (defined $ipv6_addr_len) && (length $remote_addr == $ipv6_addr_len)) { |
| 45 |
- ($port,$iaddr) = unpack_sockaddr_in6($remote_addr); |
| 46 |
+ ($port,$iaddr) = Socket6::unpack_sockaddr_in6($remote_addr); |
| 47 |
} else { |
| 48 |
($port,$iaddr) = unpack_sockaddr_in($remote_addr); |
| 49 |
} |
| 50 |
@@ -948,7 +948,7 @@ |
| 51 |
return undef unless $remote_addr; |
| 52 |
|
| 53 |
if( (defined $ipv6_addr_len) && (length $remote_addr == $ipv6_addr_len)) { |
| 54 |
- ($port,$iaddr) = unpack_sockaddr_in6($remote_addr); |
| 55 |
+ ($port,$iaddr) = Socket6::unpack_sockaddr_in6($remote_addr); |
| 56 |
} else { |
| 57 |
($port,$iaddr) = unpack_sockaddr_in($remote_addr); |
| 58 |
} |