diff options
Diffstat (limited to 'tests/DHCPv6')
24 files changed, 306 insertions, 330 deletions
diff --git a/tests/DHCPv6/000-badmsgtype.pl b/tests/DHCPv6/000-badmsgtype.pl index d0c35ee4..95f517c2 100644 --- a/tests/DHCPv6/000-badmsgtype.pl +++ b/tests/DHCPv6/000-badmsgtype.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -80,10 +80,10 @@ do { socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die; my $addr = inet_pton(AF_INET6, $All_DHCP_Servers); my $packet = $msg->packet(); - my $send_ret = send(SOCK, $packet, 0, + my $send_ret = send(SOCK, $packet, 0, pack_sockaddr_in6($server_port, $addr)); if (not defined($send_ret)) { - printf STDERR + printf STDERR "Error \%d sending DHCPv6 message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -104,7 +104,7 @@ do { } my $rt_end_time = time() + $RT; - if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { + if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { $rt_end_time = $mrd_end_time; } @@ -119,11 +119,11 @@ do { if (@ready) { my $reply; my $recv_ret; - + $recv_ret = recv(SOCK, $reply, 1500, 0); if (not defined $recv_ret) { - printf STDERR - "Error \%d receiving DHCPv6 " . + printf STDERR + "Error \%d receiving DHCPv6 " . "message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -137,16 +137,16 @@ do { } } -} until ($reply_msg || +} until ($reply_msg || (($MRC != 0) && ($count > $MRC)) || (defined($mrd_end_time) && ($mrd_end_time > time()))); unless ($reply_msg) { if (($MRC != 0) && ($count >= $MRC)) { - print STDERR + print STDERR "No reply after maximum retransmission count.\n"; } else { - print STDERR + print STDERR "No reply after maximum retransmission duration.\n"; } } @@ -161,4 +161,3 @@ if ($reply_msg && ($reply_msg->{msg_type} == $MSG_REPLY)) { #print Dumper($msg->packet()), "\n"; # #print "packet length: ", length($msg->packet()), "\n"; - diff --git a/tests/DHCPv6/010-solicit-noclientid.pl b/tests/DHCPv6/010-solicit-noclientid.pl index 6bb5d6ee..45e829f1 100644 --- a/tests/DHCPv6/010-solicit-noclientid.pl +++ b/tests/DHCPv6/010-solicit-noclientid.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -91,7 +91,7 @@ my @docsis_oro = ( $DOCSIS_OPT_TFTP_SERVERS ); $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro); # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS) -my $tlv5_data = "\x01\x02\x03\x0"; +my $tlv5_data = "\x01\x02\x03\x0"; $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data; # DOCSIS Device (required by DOCSIS) @@ -126,10 +126,10 @@ do { socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die; my $addr = inet_pton(AF_INET6, $All_DHCP_Servers); my $packet = $msg->packet(); - my $send_ret = send(SOCK, $packet, 0, + my $send_ret = send(SOCK, $packet, 0, pack_sockaddr_in6($server_port, $addr)); if (not defined($send_ret)) { - printf STDERR + printf STDERR "Error \%d sending DHCPv6 Solicit message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -150,7 +150,7 @@ do { } my $rt_end_time = time() + $RT; - if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { + if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { $rt_end_time = $mrd_end_time; } @@ -167,11 +167,11 @@ do { if (@ready) { my $reply; my $recv_ret; - + $recv_ret = recv(SOCK, $reply, 1500, 0); if (not defined $recv_ret) { - printf STDERR - "Error \%d receiving DHCPv6 " . + printf STDERR + "Error \%d receiving DHCPv6 " . "message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -185,16 +185,16 @@ do { } } -} until ($reply_msg || +} until ($reply_msg || (($MRC != 0) && ($count > $MRC)) || (defined($mrd_end_time) && ($mrd_end_time > time()))); unless ($reply_msg) { if (($MRC != 0) && ($count >= $MRC)) { - print STDERR + print STDERR "No reply after maximum retransmission count.\n"; } else { - print STDERR + print STDERR "No reply after maximum retransmission duration.\n"; } } @@ -209,4 +209,3 @@ if ($reply_msg && ($reply_msg->{msg_type} == $MSG_REPLY)) { #print Dumper($msg->packet()), "\n"; # #print "packet length: ", length($msg->packet()), "\n"; - diff --git a/tests/DHCPv6/011-solicit-serverid.pl b/tests/DHCPv6/011-solicit-serverid.pl index cee4ddb3..a6462f98 100644 --- a/tests/DHCPv6/011-solicit-serverid.pl +++ b/tests/DHCPv6/011-solicit-serverid.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -94,7 +94,7 @@ my @docsis_oro = ( $DOCSIS_OPT_TFTP_SERVERS ); $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro); # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS) -my $tlv5_data = "\x01\x02\x03\x0"; +my $tlv5_data = "\x01\x02\x03\x0"; $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data; # DOCSIS Device (required by DOCSIS) @@ -129,10 +129,10 @@ do { socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die; my $addr = inet_pton(AF_INET6, $All_DHCP_Servers); my $packet = $msg->packet(); - my $send_ret = send(SOCK, $packet, 0, + my $send_ret = send(SOCK, $packet, 0, pack_sockaddr_in6($server_port, $addr)); if (not defined($send_ret)) { - printf STDERR + printf STDERR "Error \%d sending DHCPv6 Solicit message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -153,7 +153,7 @@ do { } my $rt_end_time = time() + $RT; - if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { + if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { $rt_end_time = $mrd_end_time; } @@ -170,11 +170,11 @@ do { if (@ready) { my $reply; my $recv_ret; - + $recv_ret = recv(SOCK, $reply, 1500, 0); if (not defined $recv_ret) { - printf STDERR - "Error \%d receiving DHCPv6 " . + printf STDERR + "Error \%d receiving DHCPv6 " . "message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -188,16 +188,16 @@ do { } } -} until ($reply_msg || +} until ($reply_msg || (($MRC != 0) && ($count > $MRC)) || (defined($mrd_end_time) && ($mrd_end_time > time()))); unless ($reply_msg) { if (($MRC != 0) && ($count >= $MRC)) { - print STDERR + print STDERR "No reply after maximum retransmission count.\n"; } else { - print STDERR + print STDERR "No reply after maximum retransmission duration.\n"; } } @@ -212,4 +212,3 @@ if ($reply_msg && ($reply_msg->{msg_type} == $MSG_REPLY)) { #print Dumper($msg->packet()), "\n"; # #print "packet length: ", length($msg->packet()), "\n"; - diff --git a/tests/DHCPv6/020-advertise-mcast.pl b/tests/DHCPv6/020-advertise-mcast.pl index c5c4ade7..39cc6d8e 100644 --- a/tests/DHCPv6/020-advertise-mcast.pl +++ b/tests/DHCPv6/020-advertise-mcast.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -80,10 +80,10 @@ do { socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die; my $addr = inet_pton(AF_INET6, $All_DHCP_Servers); my $packet = $msg->packet(); - my $send_ret = send(SOCK, $packet, 0, + my $send_ret = send(SOCK, $packet, 0, pack_sockaddr_in6($server_port, $addr)); if (not defined($send_ret)) { - printf STDERR + printf STDERR "Error \%d sending DHCPv6 message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -104,7 +104,7 @@ do { } my $rt_end_time = time() + $RT; - if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { + if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { $rt_end_time = $mrd_end_time; } @@ -119,11 +119,11 @@ do { if (@ready) { my $reply; my $recv_ret; - + $recv_ret = recv(SOCK, $reply, 1500, 0); if (not defined $recv_ret) { - printf STDERR - "Error \%d receiving DHCPv6 " . + printf STDERR + "Error \%d receiving DHCPv6 " . "message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -137,16 +137,16 @@ do { } } -} until ($reply_msg || +} until ($reply_msg || (($MRC != 0) && ($count > $MRC)) || (defined($mrd_end_time) && ($mrd_end_time > time()))); unless ($reply_msg) { if (($MRC != 0) && ($count >= $MRC)) { - print STDERR + print STDERR "No reply after maximum retransmission count.\n"; } else { - print STDERR + print STDERR "No reply after maximum retransmission duration.\n"; } } @@ -161,4 +161,3 @@ if ($reply_msg && ($reply_msg->{msg_type} == $MSG_REPLY)) { #print Dumper($msg->packet()), "\n"; # #print "packet length: ", length($msg->packet()), "\n"; - diff --git a/tests/DHCPv6/030-request-noclientid.pl b/tests/DHCPv6/030-request-noclientid.pl index d5af0770..68aa2539 100644 --- a/tests/DHCPv6/030-request-noclientid.pl +++ b/tests/DHCPv6/030-request-noclientid.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -91,7 +91,7 @@ my @docsis_oro = ( $DOCSIS_OPT_TFTP_SERVERS ); $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro); # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS) -my $tlv5_data = "\x01\x02\x03\x0"; +my $tlv5_data = "\x01\x02\x03\x0"; $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data; # DOCSIS Device (required by DOCSIS) @@ -126,10 +126,10 @@ do { socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die; my $addr = inet_pton(AF_INET6, $All_DHCP_Servers); my $packet = $msg->packet(); - my $send_ret = send(SOCK, $packet, 0, + my $send_ret = send(SOCK, $packet, 0, pack_sockaddr_in6($server_port, $addr)); if (not defined($send_ret)) { - printf STDERR + printf STDERR "Error \%d sending DHCPv6 Solicit message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -150,7 +150,7 @@ do { } my $rt_end_time = time() + $RT; - if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { + if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { $rt_end_time = $mrd_end_time; } @@ -167,11 +167,11 @@ do { if (@ready) { my $reply; my $recv_ret; - + $recv_ret = recv(SOCK, $reply, 1500, 0); if (not defined $recv_ret) { - printf STDERR - "Error \%d receiving DHCPv6 " . + printf STDERR + "Error \%d receiving DHCPv6 " . "message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -185,16 +185,16 @@ do { } } -} until ($reply_msg || +} until ($reply_msg || (($MRC != 0) && ($count > $MRC)) || (defined($mrd_end_time) && ($mrd_end_time > time()))); unless ($reply_msg) { if (($MRC != 0) && ($count >= $MRC)) { - print STDERR + print STDERR "No reply after maximum retransmission count.\n"; } else { - print STDERR + print STDERR "No reply after maximum retransmission duration.\n"; } } @@ -209,4 +209,3 @@ if ($reply_msg && ($reply_msg->{msg_type} == $MSG_REPLY)) { #print Dumper($msg->packet()), "\n"; # #print "packet length: ", length($msg->packet()), "\n"; - diff --git a/tests/DHCPv6/031-request-noserverid.pl b/tests/DHCPv6/031-request-noserverid.pl index 1f730388..3a860190 100644 --- a/tests/DHCPv6/031-request-noserverid.pl +++ b/tests/DHCPv6/031-request-noserverid.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -91,7 +91,7 @@ my @docsis_oro = ( $DOCSIS_OPT_TFTP_SERVERS ); $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro); # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS) -my $tlv5_data = "\x01\x02\x03\x0"; +my $tlv5_data = "\x01\x02\x03\x0"; $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data; # DOCSIS Device (required by DOCSIS) @@ -126,10 +126,10 @@ do { socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die; my $addr = inet_pton(AF_INET6, $All_DHCP_Servers); my $packet = $msg->packet(); - my $send_ret = send(SOCK, $packet, 0, + my $send_ret = send(SOCK, $packet, 0, pack_sockaddr_in6($server_port, $addr)); if (not defined($send_ret)) { - printf STDERR + printf STDERR "Error \%d sending DHCPv6 Solicit message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -150,7 +150,7 @@ do { } my $rt_end_time = time() + $RT; - if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { + if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { $rt_end_time = $mrd_end_time; } @@ -167,11 +167,11 @@ do { if (@ready) { my $reply; my $recv_ret; - + $recv_ret = recv(SOCK, $reply, 1500, 0); if (not defined $recv_ret) { - printf STDERR - "Error \%d receiving DHCPv6 " . + printf STDERR + "Error \%d receiving DHCPv6 " . "message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -185,16 +185,16 @@ do { } } -} until ($reply_msg || +} until ($reply_msg || (($MRC != 0) && ($count > $MRC)) || (defined($mrd_end_time) && ($mrd_end_time > time()))); unless ($reply_msg) { if (($MRC != 0) && ($count >= $MRC)) { - print STDERR + print STDERR "No reply after maximum retransmission count.\n"; } else { - print STDERR + print STDERR "No reply after maximum retransmission duration.\n"; } } @@ -209,4 +209,3 @@ if ($reply_msg && ($reply_msg->{msg_type} == $MSG_REPLY)) { #print Dumper($msg->packet()), "\n"; # #print "packet length: ", length($msg->packet()), "\n"; - diff --git a/tests/DHCPv6/032-request-badduid.pl b/tests/DHCPv6/032-request-badduid.pl index 30e5040a..7964977b 100644 --- a/tests/DHCPv6/032-request-badduid.pl +++ b/tests/DHCPv6/032-request-badduid.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -95,7 +95,7 @@ my @docsis_oro = ( $DOCSIS_OPT_TFTP_SERVERS ); $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro); # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS) -my $tlv5_data = "\x01\x02\x03\x0"; +my $tlv5_data = "\x01\x02\x03\x0"; $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data; # DOCSIS Device (required by DOCSIS) @@ -130,10 +130,10 @@ do { socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die; my $addr = inet_pton(AF_INET6, $All_DHCP_Servers); my $packet = $msg->packet(); - my $send_ret = send(SOCK, $packet, 0, + my $send_ret = send(SOCK, $packet, 0, pack_sockaddr_in6($server_port, $addr)); if (not defined($send_ret)) { - printf STDERR + printf STDERR "Error \%d sending DHCPv6 Solicit message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -154,7 +154,7 @@ do { } my $rt_end_time = time() + $RT; - if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { + if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { $rt_end_time = $mrd_end_time; } @@ -171,11 +171,11 @@ do { if (@ready) { my $reply; my $recv_ret; - + $recv_ret = recv(SOCK, $reply, 1500, 0); if (not defined $recv_ret) { - printf STDERR - "Error \%d receiving DHCPv6 " . + printf STDERR + "Error \%d receiving DHCPv6 " . "message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -189,16 +189,16 @@ do { } } -} until ($reply_msg || +} until ($reply_msg || (($MRC != 0) && ($count > $MRC)) || (defined($mrd_end_time) && ($mrd_end_time > time()))); unless ($reply_msg) { if (($MRC != 0) && ($count >= $MRC)) { - print STDERR + print STDERR "No reply after maximum retransmission count.\n"; } else { - print STDERR + print STDERR "No reply after maximum retransmission duration.\n"; } } @@ -213,4 +213,3 @@ if ($reply_msg && ($reply_msg->{msg_type} == $MSG_REPLY)) { #print Dumper($msg->packet()), "\n"; # #print "packet length: ", length($msg->packet()), "\n"; - diff --git a/tests/DHCPv6/110-information-request-ia_na.pl b/tests/DHCPv6/110-information-request-ia_na.pl index 5dc68898..a5171f20 100644 --- a/tests/DHCPv6/110-information-request-ia_na.pl +++ b/tests/DHCPv6/110-information-request-ia_na.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -91,7 +91,7 @@ my @docsis_oro = ( $DOCSIS_OPT_TFTP_SERVERS ); $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro); # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS) -my $tlv5_data = "\x01\x02\x03\x0"; +my $tlv5_data = "\x01\x02\x03\x0"; $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data; # DOCSIS Device (required by DOCSIS) @@ -126,10 +126,10 @@ do { socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die; my $addr = inet_pton(AF_INET6, $All_DHCP_Servers); my $packet = $msg->packet(); - my $send_ret = send(SOCK, $packet, 0, + my $send_ret = send(SOCK, $packet, 0, pack_sockaddr_in6($server_port, $addr)); if (not defined($send_ret)) { - printf STDERR + printf STDERR "Error \%d sending DHCPv6 Solicit message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -150,7 +150,7 @@ do { } my $rt_end_time = time() + $RT; - if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { + if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { $rt_end_time = $mrd_end_time; } @@ -167,11 +167,11 @@ do { if (@ready) { my $reply; my $recv_ret; - + $recv_ret = recv(SOCK, $reply, 1500, 0); if (not defined $recv_ret) { - printf STDERR - "Error \%d receiving DHCPv6 " . + printf STDERR + "Error \%d receiving DHCPv6 " . "message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -185,16 +185,16 @@ do { } } -} until ($reply_msg || +} until ($reply_msg || (($MRC != 0) && ($count > $MRC)) || (defined($mrd_end_time) && ($mrd_end_time > time()))); unless ($reply_msg) { if (($MRC != 0) && ($count >= $MRC)) { - print STDERR + print STDERR "No reply after maximum retransmission count.\n"; } else { - print STDERR + print STDERR "No reply after maximum retransmission duration.\n"; } } @@ -209,4 +209,3 @@ if ($reply_msg && ($reply_msg->{msg_type} == $MSG_REPLY)) { #print Dumper($msg->packet()), "\n"; # #print "packet length: ", length($msg->packet()), "\n"; - diff --git a/tests/DHCPv6/111-information-request-ia_ta.pl b/tests/DHCPv6/111-information-request-ia_ta.pl index dc3cf1c2..ab67f517 100644 --- a/tests/DHCPv6/111-information-request-ia_ta.pl +++ b/tests/DHCPv6/111-information-request-ia_ta.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -91,7 +91,7 @@ my @docsis_oro = ( $DOCSIS_OPT_TFTP_SERVERS ); $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro); # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS) -my $tlv5_data = "\x01\x02\x03\x0"; +my $tlv5_data = "\x01\x02\x03\x0"; $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data; # DOCSIS Device (required by DOCSIS) @@ -126,10 +126,10 @@ do { socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die; my $addr = inet_pton(AF_INET6, $All_DHCP_Servers); my $packet = $msg->packet(); - my $send_ret = send(SOCK, $packet, 0, + my $send_ret = send(SOCK, $packet, 0, pack_sockaddr_in6($server_port, $addr)); if (not defined($send_ret)) { - printf STDERR + printf STDERR "Error \%d sending DHCPv6 Solicit message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -150,7 +150,7 @@ do { } my $rt_end_time = time() + $RT; - if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { + if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { $rt_end_time = $mrd_end_time; } @@ -167,11 +167,11 @@ do { if (@ready) { my $reply; my $recv_ret; - + $recv_ret = recv(SOCK, $reply, 1500, 0); if (not defined $recv_ret) { - printf STDERR - "Error \%d receiving DHCPv6 " . + printf STDERR + "Error \%d receiving DHCPv6 " . "message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -185,16 +185,16 @@ do { } } -} until ($reply_msg || +} until ($reply_msg || (($MRC != 0) && ($count > $MRC)) || (defined($mrd_end_time) && ($mrd_end_time > time()))); unless ($reply_msg) { if (($MRC != 0) && ($count >= $MRC)) { - print STDERR + print STDERR "No reply after maximum retransmission count.\n"; } else { - print STDERR + print STDERR "No reply after maximum retransmission duration.\n"; } } @@ -209,4 +209,3 @@ if ($reply_msg && ($reply_msg->{msg_type} == $MSG_REPLY)) { #print Dumper($msg->packet()), "\n"; # #print "packet length: ", length($msg->packet()), "\n"; - diff --git a/tests/DHCPv6/112-badduid.pl b/tests/DHCPv6/112-badduid.pl index 3be9261e..c069886a 100644 --- a/tests/DHCPv6/112-badduid.pl +++ b/tests/DHCPv6/112-badduid.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -87,7 +87,7 @@ my @docsis_oro = ( $DOCSIS_OPT_TFTP_SERVERS ); $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro); # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS) -my $tlv5_data = "\x01\x02\x03\x0"; +my $tlv5_data = "\x01\x02\x03\x0"; $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data; # DOCSIS Device (required by DOCSIS) @@ -122,10 +122,10 @@ do { socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die; my $addr = inet_pton(AF_INET6, $All_DHCP_Servers); my $packet = $msg->packet(); - my $send_ret = send(SOCK, $packet, 0, + my $send_ret = send(SOCK, $packet, 0, pack_sockaddr_in6($server_port, $addr)); if (not defined($send_ret)) { - printf STDERR + printf STDERR "Error \%d sending DHCPv6 Solicit message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -146,7 +146,7 @@ do { } my $rt_end_time = time() + $RT; - if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { + if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { $rt_end_time = $mrd_end_time; } @@ -163,11 +163,11 @@ do { if (@ready) { my $reply; my $recv_ret; - + $recv_ret = recv(SOCK, $reply, 1500, 0); if (not defined $recv_ret) { - printf STDERR - "Error \%d receiving DHCPv6 " . + printf STDERR + "Error \%d receiving DHCPv6 " . "message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -181,16 +181,16 @@ do { } } -} until ($reply_msg || +} until ($reply_msg || (($MRC != 0) && ($count > $MRC)) || (defined($mrd_end_time) && ($mrd_end_time > time()))); unless ($reply_msg) { if (($MRC != 0) && ($count >= $MRC)) { - print STDERR + print STDERR "No reply after maximum retransmission count.\n"; } else { - print STDERR + print STDERR "No reply after maximum retransmission duration.\n"; } } @@ -205,4 +205,3 @@ if ($reply_msg && ($reply_msg->{msg_type} == $MSG_REPLY)) { #print Dumper($msg->packet()), "\n"; # #print "packet length: ", length($msg->packet()), "\n"; - diff --git a/tests/DHCPv6/210-solicit-nohost.pl b/tests/DHCPv6/210-solicit-nohost.pl index be9538cd..20b3771f 100644 --- a/tests/DHCPv6/210-solicit-nohost.pl +++ b/tests/DHCPv6/210-solicit-nohost.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -91,7 +91,7 @@ my @docsis_oro = ( $DOCSIS_OPT_TFTP_SERVERS ); $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro); # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS) -my $tlv5_data = "\x01\x02\x03\x0"; +my $tlv5_data = "\x01\x02\x03\x0"; $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data; # DOCSIS Device (required by DOCSIS) @@ -126,10 +126,10 @@ do { socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die; my $addr = inet_pton(AF_INET6, $All_DHCP_Servers); my $packet = $msg->packet(); - my $send_ret = send(SOCK, $packet, 0, + my $send_ret = send(SOCK, $packet, 0, pack_sockaddr_in6($server_port, $addr)); if (not defined($send_ret)) { - printf STDERR + printf STDERR "Error \%d sending DHCPv6 Solicit message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -150,7 +150,7 @@ do { } my $rt_end_time = time() + $RT; - if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { + if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { $rt_end_time = $mrd_end_time; } @@ -167,11 +167,11 @@ do { if (@ready) { my $reply; my $recv_ret; - + $recv_ret = recv(SOCK, $reply, 1500, 0); if (not defined $recv_ret) { - printf STDERR - "Error \%d receiving DHCPv6 " . + printf STDERR + "Error \%d receiving DHCPv6 " . "message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -185,16 +185,16 @@ do { } } -} until ($reply_msg || +} until ($reply_msg || (($MRC != 0) && ($count > $MRC)) || (defined($mrd_end_time) && ($mrd_end_time > time()))); unless ($reply_msg) { if (($MRC != 0) && ($count >= $MRC)) { - print STDERR + print STDERR "No reply after maximum retransmission count.\n"; } else { - print STDERR + print STDERR "No reply after maximum retransmission duration.\n"; } } @@ -209,4 +209,3 @@ if ($reply_msg && ($reply_msg->{msg_type} == $MSG_REPLY)) { #print Dumper($msg->packet()), "\n"; # #print "packet length: ", length($msg->packet()), "\n"; - diff --git a/tests/DHCPv6/211-solicit-opt-in-na.pl b/tests/DHCPv6/211-solicit-opt-in-na.pl index 33f69512..c180c7f5 100644 --- a/tests/DHCPv6/211-solicit-opt-in-na.pl +++ b/tests/DHCPv6/211-solicit-opt-in-na.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -97,7 +97,7 @@ my @docsis_oro = ( $DOCSIS_OPT_TFTP_SERVERS ); $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro); # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS) -my $tlv5_data = "\x01\x02\x03\x0"; +my $tlv5_data = "\x01\x02\x03\x0"; $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data; # DOCSIS Device (required by DOCSIS) @@ -132,10 +132,10 @@ do { socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die; my $addr = inet_pton(AF_INET6, $All_DHCP_Servers); my $packet = $msg->packet(); - my $send_ret = send(SOCK, $packet, 0, + my $send_ret = send(SOCK, $packet, 0, pack_sockaddr_in6($server_port, $addr)); if (not defined($send_ret)) { - printf STDERR + printf STDERR "Error \%d sending DHCPv6 Solicit message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -156,7 +156,7 @@ do { } my $rt_end_time = time() + $RT; - if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { + if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { $rt_end_time = $mrd_end_time; } @@ -173,11 +173,11 @@ do { if (@ready) { my $reply; my $recv_ret; - + $recv_ret = recv(SOCK, $reply, 1500, 0); if (not defined $recv_ret) { - printf STDERR - "Error \%d receiving DHCPv6 " . + printf STDERR + "Error \%d receiving DHCPv6 " . "message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -191,16 +191,16 @@ do { } } -} until ($reply_msg || +} until ($reply_msg || (($MRC != 0) && ($count > $MRC)) || (defined($mrd_end_time) && ($mrd_end_time > time()))); unless ($reply_msg) { if (($MRC != 0) && ($count >= $MRC)) { - print STDERR + print STDERR "No reply after maximum retransmission count.\n"; } else { - print STDERR + print STDERR "No reply after maximum retransmission duration.\n"; } } @@ -215,4 +215,3 @@ if ($reply_msg && ($reply_msg->{msg_type} == $MSG_REPLY)) { #print Dumper($msg->packet()), "\n"; # #print "packet length: ", length($msg->packet()), "\n"; - diff --git a/tests/DHCPv6/212-solicit-opt-in-na-norapidcommit.pl b/tests/DHCPv6/212-solicit-opt-in-na-norapidcommit.pl index a8d81490..179cf0d0 100644 --- a/tests/DHCPv6/212-solicit-opt-in-na-norapidcommit.pl +++ b/tests/DHCPv6/212-solicit-opt-in-na-norapidcommit.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -97,7 +97,7 @@ my @docsis_oro = ( $DOCSIS_OPT_TFTP_SERVERS ); $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro); # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS) -my $tlv5_data = "\x01\x02\x03\x0"; +my $tlv5_data = "\x01\x02\x03\x0"; $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data; # DOCSIS Device (required by DOCSIS) @@ -132,10 +132,10 @@ do { socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die; my $addr = inet_pton(AF_INET6, $All_DHCP_Servers); my $packet = $msg->packet(); - my $send_ret = send(SOCK, $packet, 0, + my $send_ret = send(SOCK, $packet, 0, pack_sockaddr_in6($server_port, $addr)); if (not defined($send_ret)) { - printf STDERR + printf STDERR "Error \%d sending DHCPv6 Solicit message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -156,7 +156,7 @@ do { } my $rt_end_time = time() + $RT; - if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { + if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { $rt_end_time = $mrd_end_time; } @@ -173,11 +173,11 @@ do { if (@ready) { my $reply; my $recv_ret; - + $recv_ret = recv(SOCK, $reply, 1500, 0); if (not defined $recv_ret) { - printf STDERR - "Error \%d receiving DHCPv6 " . + printf STDERR + "Error \%d receiving DHCPv6 " . "message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -191,16 +191,16 @@ do { } } -} until ($reply_msg || +} until ($reply_msg || (($MRC != 0) && ($count > $MRC)) || (defined($mrd_end_time) && ($mrd_end_time > time()))); unless ($reply_msg) { if (($MRC != 0) && ($count >= $MRC)) { - print STDERR + print STDERR "No reply after maximum retransmission count.\n"; } else { - print STDERR + print STDERR "No reply after maximum retransmission duration.\n"; } } @@ -215,4 +215,3 @@ if ($reply_msg && ($reply_msg->{msg_type} == $MSG_REPLY)) { #print Dumper($msg->packet()), "\n"; # #print "packet length: ", length($msg->packet()), "\n"; - diff --git a/tests/DHCPv6/280-release-nohost.pl b/tests/DHCPv6/280-release-nohost.pl index 9758cd83..3f8805bc 100644 --- a/tests/DHCPv6/280-release-nohost.pl +++ b/tests/DHCPv6/280-release-nohost.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -89,10 +89,10 @@ do { socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die; my $addr = inet_pton(AF_INET6, $All_DHCP_Servers); my $packet = $msg->packet(); - my $send_ret = send(SOCK, $packet, 0, + my $send_ret = send(SOCK, $packet, 0, pack_sockaddr_in6($server_port, $addr)); if (not defined($send_ret)) { - printf STDERR + printf STDERR "Error \%d sending DHCPv6 message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -113,7 +113,7 @@ do { } my $rt_end_time = time() + $RT; - if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { + if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { $rt_end_time = $mrd_end_time; } @@ -130,11 +130,11 @@ do { if (@ready) { my $reply; my $recv_ret; - + $recv_ret = recv(SOCK, $reply, 1500, 0); if (not defined $recv_ret) { - printf STDERR - "Error \%d receiving DHCPv6 " . + printf STDERR + "Error \%d receiving DHCPv6 " . "message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -148,16 +148,16 @@ do { } } -} until ($reply_msg || +} until ($reply_msg || (($MRC != 0) && ($count > $MRC)) || (defined($mrd_end_time) && ($mrd_end_time > time()))); unless ($reply_msg) { if (($MRC != 0) && ($count >= $MRC)) { - print STDERR + print STDERR "No reply after maximum retransmission count.\n"; } else { - print STDERR + print STDERR "No reply after maximum retransmission duration.\n"; } } @@ -172,4 +172,3 @@ if ($reply_msg && ($reply_msg->{msg_type} == $MSG_REPLY)) { #print Dumper($msg->packet()), "\n"; # #print "packet length: ", length($msg->packet()), "\n"; - diff --git a/tests/DHCPv6/281-release-bad-address.pl b/tests/DHCPv6/281-release-bad-address.pl index d130812e..c5371d75 100644 --- a/tests/DHCPv6/281-release-bad-address.pl +++ b/tests/DHCPv6/281-release-bad-address.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -101,10 +101,10 @@ do { socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die; my $addr = inet_pton(AF_INET6, $All_DHCP_Servers); my $packet = $msg->packet(); - my $send_ret = send(SOCK, $packet, 0, + my $send_ret = send(SOCK, $packet, 0, pack_sockaddr_in6($server_port, $addr)); if (not defined($send_ret)) { - printf STDERR + printf STDERR "Error \%d sending DHCPv6 Solicit message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -125,7 +125,7 @@ do { } my $rt_end_time = time() + $RT; - if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { + if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { $rt_end_time = $mrd_end_time; } @@ -142,11 +142,11 @@ do { if (@ready) { my $reply; my $recv_ret; - + $recv_ret = recv(SOCK, $reply, 1500, 0); if (not defined $recv_ret) { - printf STDERR - "Error \%d receiving DHCPv6 " . + printf STDERR + "Error \%d receiving DHCPv6 " . "message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -160,16 +160,16 @@ do { } } -} until ($reply_msg || +} until ($reply_msg || (($MRC != 0) && ($count > $MRC)) || (defined($mrd_end_time) && ($mrd_end_time > time()))); unless ($reply_msg) { if (($MRC != 0) && ($count >= $MRC)) { - print STDERR + print STDERR "No reply after maximum retransmission count.\n"; } else { - print STDERR + print STDERR "No reply after maximum retransmission duration.\n"; } } @@ -184,4 +184,3 @@ if ($reply_msg && ($reply_msg->{msg_type} == $MSG_REPLY)) { #print Dumper($msg->packet()), "\n"; # #print "packet length: ", length($msg->packet()), "\n"; - diff --git a/tests/DHCPv6/282-release-no-address.pl b/tests/DHCPv6/282-release-no-address.pl index b3d0af5c..1fd76d35 100644 --- a/tests/DHCPv6/282-release-no-address.pl +++ b/tests/DHCPv6/282-release-no-address.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -97,10 +97,10 @@ do { socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die; my $addr = inet_pton(AF_INET6, $All_DHCP_Servers); my $packet = $msg->packet(); - my $send_ret = send(SOCK, $packet, 0, + my $send_ret = send(SOCK, $packet, 0, pack_sockaddr_in6($server_port, $addr)); if (not defined($send_ret)) { - printf STDERR + printf STDERR "Error \%d sending DHCPv6 Solicit message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -121,7 +121,7 @@ do { } my $rt_end_time = time() + $RT; - if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { + if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { $rt_end_time = $mrd_end_time; } @@ -138,11 +138,11 @@ do { if (@ready) { my $reply; my $recv_ret; - + $recv_ret = recv(SOCK, $reply, 1500, 0); if (not defined $recv_ret) { - printf STDERR - "Error \%d receiving DHCPv6 " . + printf STDERR + "Error \%d receiving DHCPv6 " . "message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -156,16 +156,16 @@ do { } } -} until ($reply_msg || +} until ($reply_msg || (($MRC != 0) && ($count > $MRC)) || (defined($mrd_end_time) && ($mrd_end_time > time()))); unless ($reply_msg) { if (($MRC != 0) && ($count >= $MRC)) { - print STDERR + print STDERR "No reply after maximum retransmission count.\n"; } else { - print STDERR + print STDERR "No reply after maximum retransmission duration.\n"; } } @@ -180,4 +180,3 @@ if ($reply_msg && ($reply_msg->{msg_type} == $MSG_REPLY)) { #print Dumper($msg->packet()), "\n"; # #print "packet length: ", length($msg->packet()), "\n"; - diff --git a/tests/DHCPv6/283-release.pl b/tests/DHCPv6/283-release.pl index a1baae49..aeda526b 100644 --- a/tests/DHCPv6/283-release.pl +++ b/tests/DHCPv6/283-release.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -103,10 +103,10 @@ do { socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die; my $addr = inet_pton(AF_INET6, $All_DHCP_Servers); my $packet = $msg->packet(); - my $send_ret = send(SOCK, $packet, 0, + my $send_ret = send(SOCK, $packet, 0, pack_sockaddr_in6($server_port, $addr)); if (not defined($send_ret)) { - printf STDERR + printf STDERR "Error \%d sending DHCPv6 Solicit message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -127,7 +127,7 @@ do { } my $rt_end_time = time() + $RT; - if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { + if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { $rt_end_time = $mrd_end_time; } @@ -144,11 +144,11 @@ do { if (@ready) { my $reply; my $recv_ret; - + $recv_ret = recv(SOCK, $reply, 1500, 0); if (not defined $recv_ret) { - printf STDERR - "Error \%d receiving DHCPv6 " . + printf STDERR + "Error \%d receiving DHCPv6 " . "message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -162,16 +162,16 @@ do { } } -} until ($reply_msg || +} until ($reply_msg || (($MRC != 0) && ($count > $MRC)) || (defined($mrd_end_time) && ($mrd_end_time > time()))); unless ($reply_msg) { if (($MRC != 0) && ($count >= $MRC)) { - print STDERR + print STDERR "No reply after maximum retransmission count.\n"; } else { - print STDERR + print STDERR "No reply after maximum retransmission duration.\n"; } } @@ -186,4 +186,3 @@ if ($reply_msg && ($reply_msg->{msg_type} == $MSG_REPLY)) { #print Dumper($msg->packet()), "\n"; # #print "packet length: ", length($msg->packet()), "\n"; - diff --git a/tests/DHCPv6/290-decline-nohost.pl b/tests/DHCPv6/290-decline-nohost.pl index 02a25e31..d034d7ed 100644 --- a/tests/DHCPv6/290-decline-nohost.pl +++ b/tests/DHCPv6/290-decline-nohost.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -89,10 +89,10 @@ do { socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die; my $addr = inet_pton(AF_INET6, $All_DHCP_Servers); my $packet = $msg->packet(); - my $send_ret = send(SOCK, $packet, 0, + my $send_ret = send(SOCK, $packet, 0, pack_sockaddr_in6($server_port, $addr)); if (not defined($send_ret)) { - printf STDERR + printf STDERR "Error \%d sending DHCPv6 Solicit message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -113,7 +113,7 @@ do { } my $rt_end_time = time() + $RT; - if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { + if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { $rt_end_time = $mrd_end_time; } @@ -130,11 +130,11 @@ do { if (@ready) { my $reply; my $recv_ret; - + $recv_ret = recv(SOCK, $reply, 1500, 0); if (not defined $recv_ret) { - printf STDERR - "Error \%d receiving DHCPv6 " . + printf STDERR + "Error \%d receiving DHCPv6 " . "message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -148,16 +148,16 @@ do { } } -} until ($reply_msg || +} until ($reply_msg || (($MRC != 0) && ($count > $MRC)) || (defined($mrd_end_time) && ($mrd_end_time > time()))); unless ($reply_msg) { if (($MRC != 0) && ($count >= $MRC)) { - print STDERR + print STDERR "No reply after maximum retransmission count.\n"; } else { - print STDERR + print STDERR "No reply after maximum retransmission duration.\n"; } } @@ -172,4 +172,3 @@ if ($reply_msg && ($reply_msg->{msg_type} == $MSG_REPLY)) { #print Dumper($msg->packet()), "\n"; # #print "packet length: ", length($msg->packet()), "\n"; - diff --git a/tests/DHCPv6/291-decline-bad-address.pl b/tests/DHCPv6/291-decline-bad-address.pl index d9f0e1e1..a0ecdc6a 100644 --- a/tests/DHCPv6/291-decline-bad-address.pl +++ b/tests/DHCPv6/291-decline-bad-address.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -101,10 +101,10 @@ do { socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die; my $addr = inet_pton(AF_INET6, $All_DHCP_Servers); my $packet = $msg->packet(); - my $send_ret = send(SOCK, $packet, 0, + my $send_ret = send(SOCK, $packet, 0, pack_sockaddr_in6($server_port, $addr)); if (not defined($send_ret)) { - printf STDERR + printf STDERR "Error \%d sending DHCPv6 Solicit message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -125,7 +125,7 @@ do { } my $rt_end_time = time() + $RT; - if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { + if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { $rt_end_time = $mrd_end_time; } @@ -142,11 +142,11 @@ do { if (@ready) { my $reply; my $recv_ret; - + $recv_ret = recv(SOCK, $reply, 1500, 0); if (not defined $recv_ret) { - printf STDERR - "Error \%d receiving DHCPv6 " . + printf STDERR + "Error \%d receiving DHCPv6 " . "message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -160,16 +160,16 @@ do { } } -} until ($reply_msg || +} until ($reply_msg || (($MRC != 0) && ($count > $MRC)) || (defined($mrd_end_time) && ($mrd_end_time > time()))); unless ($reply_msg) { if (($MRC != 0) && ($count >= $MRC)) { - print STDERR + print STDERR "No reply after maximum retransmission count.\n"; } else { - print STDERR + print STDERR "No reply after maximum retransmission duration.\n"; } } @@ -184,4 +184,3 @@ if ($reply_msg && ($reply_msg->{msg_type} == $MSG_REPLY)) { #print Dumper($msg->packet()), "\n"; # #print "packet length: ", length($msg->packet()), "\n"; - diff --git a/tests/DHCPv6/292-decline-no-address.pl b/tests/DHCPv6/292-decline-no-address.pl index 84c970f5..369b21c0 100644 --- a/tests/DHCPv6/292-decline-no-address.pl +++ b/tests/DHCPv6/292-decline-no-address.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -97,10 +97,10 @@ do { socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die; my $addr = inet_pton(AF_INET6, $All_DHCP_Servers); my $packet = $msg->packet(); - my $send_ret = send(SOCK, $packet, 0, + my $send_ret = send(SOCK, $packet, 0, pack_sockaddr_in6($server_port, $addr)); if (not defined($send_ret)) { - printf STDERR + printf STDERR "Error \%d sending DHCPv6 Solicit message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -121,7 +121,7 @@ do { } my $rt_end_time = time() + $RT; - if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { + if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { $rt_end_time = $mrd_end_time; } @@ -138,11 +138,11 @@ do { if (@ready) { my $reply; my $recv_ret; - + $recv_ret = recv(SOCK, $reply, 1500, 0); if (not defined $recv_ret) { - printf STDERR - "Error \%d receiving DHCPv6 " . + printf STDERR + "Error \%d receiving DHCPv6 " . "message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -156,16 +156,16 @@ do { } } -} until ($reply_msg || +} until ($reply_msg || (($MRC != 0) && ($count > $MRC)) || (defined($mrd_end_time) && ($mrd_end_time > time()))); unless ($reply_msg) { if (($MRC != 0) && ($count >= $MRC)) { - print STDERR + print STDERR "No reply after maximum retransmission count.\n"; } else { - print STDERR + print STDERR "No reply after maximum retransmission duration.\n"; } } @@ -180,4 +180,3 @@ if ($reply_msg && ($reply_msg->{msg_type} == $MSG_REPLY)) { #print Dumper($msg->packet()), "\n"; # #print "packet length: ", length($msg->packet()), "\n"; - diff --git a/tests/DHCPv6/293-decline.pl b/tests/DHCPv6/293-decline.pl index 960195ab..014553fa 100644 --- a/tests/DHCPv6/293-decline.pl +++ b/tests/DHCPv6/293-decline.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -103,10 +103,10 @@ do { socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die; my $addr = inet_pton(AF_INET6, $All_DHCP_Servers); my $packet = $msg->packet(); - my $send_ret = send(SOCK, $packet, 0, + my $send_ret = send(SOCK, $packet, 0, pack_sockaddr_in6($server_port, $addr)); if (not defined($send_ret)) { - printf STDERR + printf STDERR "Error \%d sending DHCPv6 Solicit message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -127,7 +127,7 @@ do { } my $rt_end_time = time() + $RT; - if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { + if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { $rt_end_time = $mrd_end_time; } @@ -144,11 +144,11 @@ do { if (@ready) { my $reply; my $recv_ret; - + $recv_ret = recv(SOCK, $reply, 1500, 0); if (not defined $recv_ret) { - printf STDERR - "Error \%d receiving DHCPv6 " . + printf STDERR + "Error \%d receiving DHCPv6 " . "message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -162,16 +162,16 @@ do { } } -} until ($reply_msg || +} until ($reply_msg || (($MRC != 0) && ($count > $MRC)) || (defined($mrd_end_time) && ($mrd_end_time > time()))); unless ($reply_msg) { if (($MRC != 0) && ($count >= $MRC)) { - print STDERR + print STDERR "No reply after maximum retransmission count.\n"; } else { - print STDERR + print STDERR "No reply after maximum retransmission duration.\n"; } } @@ -186,4 +186,3 @@ if ($reply_msg && ($reply_msg->{msg_type} == $MSG_REPLY)) { #print Dumper($msg->packet()), "\n"; # #print "packet length: ", length($msg->packet()), "\n"; - diff --git a/tests/DHCPv6/dhcp_client.pm b/tests/DHCPv6/dhcp_client.pm index 5caa3776..f968e338 100644 --- a/tests/DHCPv6/dhcp_client.pm +++ b/tests/DHCPv6/dhcp_client.pm @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -90,12 +90,12 @@ $HOP_COUNT_LIMIT = 32; @EXPORT = qw( $MSG_SOLICIT $MSG_ADVERTISE $MSG_REQUEST $MSG_CONFIRM $MSG_RENEW $MSG_REBIND $MSG_REPLY $MSG_RELEASE $MSG_DECLINE $MSG_RECONFIGURE $MSG_INFORMATION_REQUEST $MSG_RELAY_FORW - $MSG_RELAY_REPL + $MSG_RELAY_REPL $OPT_CLIENTID $OPT_SERVERID $OPT_IA_NA $OPT_IA_TA $OPT_IAADDR $OPT_ORO $OPT_PREFERENCE $OPT_ELAPSED_TIME $OPT_RELAY_MSG $OPT_AUTH $OPT_UNICAST $OPT_STATUS_CODE $OPT_RAPID_COMMIT - $OPT_USER_CLASS $OPT_VENDOR_CLASS $OPT_VENDOR_OPTS - $OPT_INTERFACE_ID $OPT_RECONF_MSG $OPT_RECONF_ACCEPT + $OPT_USER_CLASS $OPT_VENDOR_CLASS $OPT_VENDOR_OPTS + $OPT_INTERFACE_ID $OPT_RECONF_MSG $OPT_RECONF_ACCEPT $SOL_MAX_DELAY $SOL_TIMEOUT $SOL_MAX_RT $REQ_TIMEOUT $REQ_MAX_RT $REQ_MAX_RC $CNF_MAX_DELAY $CNF_MAX_RT $CNF_MAX_RD $REN_TIMEOUT $REN_MAX_RT $REB_TIMEOUT $REB_MAX_RT @@ -164,7 +164,7 @@ my %docsis_type_num = ( CL_OPTION_DOCSIS_VERS => 38, ); my %docsis_num_type = reverse(%docsis_type_num); - + use strict; use English; use POSIX; @@ -188,7 +188,7 @@ sub mac_addr { } } my @mac_addrs; - foreach my $line (split(/\n/, `arp -an 2>/dev/null`)) { + foreach my $line (split(/\n/, `arp -an 2>/dev/null`)) { my @parts = split(/\s+/, $line); my $ip = $parts[1]; my $mac = $parts[-1]; @@ -225,7 +225,7 @@ sub duid { if (($type == 1) || ($type == 3)) { my $mac_addr = mac_addr_binary(); - if ($type == 1) { + if ($type == 1) { my $time = pack("N", dhcpv6_time()); return "\x00\x01\x00\x01${time}${mac_addr}"; } else { @@ -251,7 +251,7 @@ sub new { if (defined $trans_id) { $this->{trans_id} = $trans_id; } else { - $this->{trans_id} = chr(rand(256)) . + $this->{trans_id} = chr(rand(256)) . chr(rand(256)) . chr(rand(256)); } $this->{options} = [ ]; @@ -336,7 +336,7 @@ sub print_docsis_option { my $num_servers = length($data) / 16; for (my $i=0; $i<$num_servers; $i++) { my $srv = inet_ntop(AF_INET6, substr($data, $i*16, 16)); - print "$indent TFTP server ", ($i+1), ": "; + print "$indent TFTP server ", ($i+1), ": "; print uc($srv), "\n"; } } elsif ($docsis_num_type{$num} eq "CL_OPTION_CONFIG_FILE_NAME") { @@ -345,7 +345,7 @@ sub print_docsis_option { my $num_servers = length($data) / 16; for (my $i=0; $i<$num_servers; $i++) { my $srv = inet_ntop(AF_INET6, substr($data, $i*16, 16)); - print "$indent syslog server ", ($i+1), ": "; + print "$indent syslog server ", ($i+1), ": "; print uc($srv), "\n"; } } @@ -369,7 +369,7 @@ sub print_option { } print "\n"; } - } elsif (($num == $dhcp_client::OPT_CLIENTID) || + } elsif (($num == $dhcp_client::OPT_CLIENTID) || ($num == $dhcp_client::OPT_SERVERID)) { print $indent, " "; if (length($data) > 0) { @@ -380,7 +380,7 @@ sub print_option { } print "\n"; } elsif ($num == $dhcp_client::OPT_IA_NA) { - printf "${indent} IAID: 0x\%08X\n", + printf "${indent} IAID: 0x\%08X\n", unpack("N", substr($data, 0, 4)); printf "${indent} T1: \%d\n", unpack("N", substr($data, 4, 4)); printf "${indent} T2: \%d\n", unpack("N", substr($data, 8, 4)); @@ -391,7 +391,7 @@ sub print_option { } } } elsif ($num == $dhcp_client::OPT_IAADDR) { - printf "${indent} IPv6 address: \%s\n", + printf "${indent} IPv6 address: \%s\n", uc(inet_ntop(AF_INET6, substr($data, 0, 16))); printf "${indent} Preferred lifetime: \%d\n", unpack("N", substr($data, 16, 4)); @@ -422,10 +422,10 @@ sub print_option { } print "\n"; print "${indent} Message: \"$msg\"\n"; - } + } } -# XXX: we aren't careful about packet boundaries and values... +# XXX: we aren't careful about packet boundaries and values... # DO NOT RUN ON PRODUCTION SYSTEMS!!! sub decode { my ($packet, $print) = @_; @@ -451,4 +451,3 @@ sub decode { return $msg; } - diff --git a/tests/DHCPv6/stubcli-opt-in-na.pl b/tests/DHCPv6/stubcli-opt-in-na.pl index d68ba09e..ae113784 100644 --- a/tests/DHCPv6/stubcli-opt-in-na.pl +++ b/tests/DHCPv6/stubcli-opt-in-na.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -96,7 +96,7 @@ my @docsis_oro = ( $DOCSIS_OPT_TFTP_SERVERS ); $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro); # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS) -my $tlv5_data = "\x01\x02\x03\x0"; +my $tlv5_data = "\x01\x02\x03\x0"; $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data; # DOCSIS Device (required by DOCSIS) @@ -131,10 +131,10 @@ do { socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die; my $addr = inet_pton(AF_INET6, $All_DHCP_Servers); my $packet = $msg->packet(); - my $send_ret = send(SOCK, $packet, 0, + my $send_ret = send(SOCK, $packet, 0, pack_sockaddr_in6($server_port, $addr)); if (not defined($send_ret)) { - printf STDERR + printf STDERR "Error \%d sending DHCPv6 Solicit message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -155,7 +155,7 @@ do { } my $rt_end_time = time() + $RT; - if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { + if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { $rt_end_time = $mrd_end_time; } @@ -172,11 +172,11 @@ do { if (@ready) { my $reply; my $recv_ret; - + $recv_ret = recv(SOCK, $reply, 1500, 0); if (not defined $recv_ret) { - printf STDERR - "Error \%d receiving DHCPv6 " . + printf STDERR + "Error \%d receiving DHCPv6 " . "message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -190,16 +190,16 @@ do { } } -} until ($reply_msg || +} until ($reply_msg || (($MRC != 0) && ($count > $MRC)) || (defined($mrd_end_time) && ($mrd_end_time > time()))); unless ($reply_msg) { if (($MRC != 0) && ($count >= $MRC)) { - print STDERR + print STDERR "No reply after maximum retransmission count.\n"; } else { - print STDERR + print STDERR "No reply after maximum retransmission duration.\n"; } } @@ -214,4 +214,3 @@ if ($reply_msg && ($reply_msg->{msg_type} == $MSG_REPLY)) { #print Dumper($msg->packet()), "\n"; # #print "packet length: ", length($msg->packet()), "\n"; - diff --git a/tests/DHCPv6/stubcli.pl b/tests/DHCPv6/stubcli.pl index be9538cd..20b3771f 100644 --- a/tests/DHCPv6/stubcli.pl +++ b/tests/DHCPv6/stubcli.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (c) 2007,2009 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2007-2022 Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,8 +15,8 @@ # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # # Internet Systems Consortium, Inc. -# 950 Charter Street -# Redwood City, CA 94063 +# PO Box 360 +# Newmarket, NH 03857 USA # <info@isc.org> # https://www.isc.org/ @@ -91,7 +91,7 @@ my @docsis_oro = ( $DOCSIS_OPT_TFTP_SERVERS ); $vsio .= pack("nnC*", $DOCSIS_OPT_ORO, 0+@docsis_oro, @docsis_oro); # TLV5 data: CMTS DOCSIS version number 3.0 (required by DOCSIS) -my $tlv5_data = "\x01\x02\x03\x0"; +my $tlv5_data = "\x01\x02\x03\x0"; $vsio .= pack("nn", $DOCSIS_OPT_TLV5, length($tlv5_data)) . $tlv5_data; # DOCSIS Device (required by DOCSIS) @@ -126,10 +126,10 @@ do { socket(SOCK, PF_INET6, SOCK_DGRAM, getprotobyname('udp')) || die; my $addr = inet_pton(AF_INET6, $All_DHCP_Servers); my $packet = $msg->packet(); - my $send_ret = send(SOCK, $packet, 0, + my $send_ret = send(SOCK, $packet, 0, pack_sockaddr_in6($server_port, $addr)); if (not defined($send_ret)) { - printf STDERR + printf STDERR "Error \%d sending DHCPv6 Solicit message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -150,7 +150,7 @@ do { } my $rt_end_time = time() + $RT; - if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { + if (defined($mrd_end_time) && ($mrd_end_time > $rt_end_time)) { $rt_end_time = $mrd_end_time; } @@ -167,11 +167,11 @@ do { if (@ready) { my $reply; my $recv_ret; - + $recv_ret = recv(SOCK, $reply, 1500, 0); if (not defined $recv_ret) { - printf STDERR - "Error \%d receiving DHCPv6 " . + printf STDERR + "Error \%d receiving DHCPv6 " . "message;\n\%s\n", 0+$ERRNO, $ERRNO; exit(1); @@ -185,16 +185,16 @@ do { } } -} until ($reply_msg || +} until ($reply_msg || (($MRC != 0) && ($count > $MRC)) || (defined($mrd_end_time) && ($mrd_end_time > time()))); unless ($reply_msg) { if (($MRC != 0) && ($count >= $MRC)) { - print STDERR + print STDERR "No reply after maximum retransmission count.\n"; } else { - print STDERR + print STDERR "No reply after maximum retransmission duration.\n"; } } @@ -209,4 +209,3 @@ if ($reply_msg && ($reply_msg->{msg_type} == $MSG_REPLY)) { #print Dumper($msg->packet()), "\n"; # #print "packet length: ", length($msg->packet()), "\n"; - |