cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch p5-SNMP_Session to Socket (from base Perl) for v6, tested against

Browse Source 
snmpd (which, as an aside, could benefit from supporting multiple "listen on"
so that it could be made to listen to both v4+v6 at the same time..).
This commit is contained in:
sthen 2013-05-03 12:17:08 +00:00
parent 353379f334
commit 1c9c6b05d9
2 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/p5-SNMP_Session/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.18 2013/05/03 11:38:32 sthen Exp $
# $OpenBSD: Makefile,v 1.19 2013/05/03 12:17:08 sthen Exp $
COMMENT= provides rudimentary access to remote SNMP agents
MODULES= cpan
DISTNAME= SNMP_Session-1.13
REVISION= 3
REVISION= 4
CATEGORIES= net
HOMEPAGE= http://code.google.com/p/snmp-session/

42
net/p5-SNMP_Session/patches/patch-lib_SNMP_Session_pm
View File

@ -1,23 +1,45 @@
$OpenBSD: patch-lib_SNMP_Session_pm,v 1.4 2013/05/03 11:38:32 sthen Exp $
$OpenBSD: patch-lib_SNMP_Session_pm,v 1.5 2013/05/03 12:17:08 sthen Exp $
--- lib/SNMP_Session.pm.orig Fri Nov 21 05:25:17 2008
+++ lib/SNMP_Session.pm Fri May 3 12:18:55 2013
@@ -146,7 +146,8 @@ BEGIN {
+++ lib/SNMP_Session.pm Fri May 3 13:11:57 2013
@@ -144,9 +144,8 @@ BEGIN {
$SNMP_Session::ipv6available = 0;
$dont_wait_flags = 0;
if (eval {local $SIG{__DIE__};require Socket6;} &&
eval {local $SIG{__DIE__};require IO::Socket::INET6; IO::Socket::INET6->VERSION("1.26");}) {
- if (eval {local $SIG{__DIE__};require Socket6;} &&
- eval {local $SIG{__DIE__};require IO::Socket::INET6; IO::Socket::INET6->VERSION("1.26");}) {
- import Socket6;
+ Socket6->import(qw(getaddrinfo));
+ Socket->import(qw(inet_pton inet_ntop));
+ if (eval {local $SIG{__DIE__};require IO::Socket::INET6; IO::Socket::INET6->VERSION("1.26");}) {
+ Socket->import(qw(getaddrinfo inet_pton inet_ntop));
$ipv6_addr_len = length(pack_sockaddr_in6(161, inet_pton(AF_INET6(), "::1")));
$SNMP_Session::ipv6available = 1;
}
@@ -605,7 +606,8 @@ use Carp;
@@ -605,7 +604,7 @@ use Carp;
BEGIN {
if($SNMP_Session::ipv6available) {
import IO::Socket::INET6;
- import Socket6;
+ Socket6->import(qw(getaddrinfo));
+ Socket->import(qw(inet_pton inet_ntop));
+ Socket->import(qw(getaddrinfo inet_pton inet_ntop));
}
}
@@ -659,13 +658,13 @@ sub open {
$remote_hostname = $1;
}
- my (@res, $socktype_tmp, $proto_tmp, $canonname_tmp);
- @res = getaddrinfo($remote_hostname, $port, AF_UNSPEC, SOCK_DGRAM);
- ($sockfamily, $socktype_tmp, $proto_tmp, $remote_addr, $canonname_tmp) = @res;
- if (scalar(@res) < 5) {
- return $this->error_return ("can't resolve \"$remote_hostname\" to IPv6 address");
- }
-
+ my ($err, @res) = getaddrinfo($remote_hostname, $port, {socktype => SOCK_DGRAM});
+ return $this->error_return ("can't resolve \"$remote_hostname\" to IPv6 address - $err") if ($err);
+ # XXX only looks at first address returned
+ # XXX this should actually cycle through them
+ my $ai = shift @res;
+ $sockfamily = $ai->{family};
+ $remote_addr = $ai->{addr};
if ($SNMP_Session::recycle_socket && exists $the_socket{$sockfamily}) {
$socket = $the_socket{$sockfamily};
} elsif ($sockfamily == AF_INET) {