r6157 - in /trunk/libnet-tftp-perl: ChangeLog MANIFEST META.yml TFTP.pm
rmayorga-guest at users.alioth.debian.org
rmayorga-guest at users.alioth.debian.org
Mon Jul 30 21:07:23 UTC 2007
Author: rmayorga-guest
Date: Mon Jul 30 21:07:23 2007
New Revision: 6157
URL: http://svn.debian.org/wsvn/?sc=1&rev=6157
Log:
Updating files with new upstream version
Added:
trunk/libnet-tftp-perl/META.yml
Modified:
trunk/libnet-tftp-perl/ChangeLog
trunk/libnet-tftp-perl/MANIFEST
trunk/libnet-tftp-perl/TFTP.pm
Modified: trunk/libnet-tftp-perl/ChangeLog
URL: http://svn.debian.org/wsvn/trunk/libnet-tftp-perl/ChangeLog?rev=6157&op=diff
==============================================================================
--- trunk/libnet-tftp-perl/ChangeLog (original)
+++ trunk/libnet-tftp-perl/ChangeLog Mon Jul 30 21:07:23 2007
@@ -1,3 +1,9 @@
+Release 0.17 -- Wed Jul 18 06:30:05 CDT 2007
+
+Enhancements
+ * Added support for IPv6 (patch from John Jason Brzozowski)
+
+
Change 746 on 2002/09/23 by <gbarr at pobox.com> (Graham Barr)
Fix return logic for get and put (patch from Bruce Gray)
Modified: trunk/libnet-tftp-perl/MANIFEST
URL: http://svn.debian.org/wsvn/trunk/libnet-tftp-perl/MANIFEST?rev=6157&op=diff
==============================================================================
--- trunk/libnet-tftp-perl/MANIFEST (original)
+++ trunk/libnet-tftp-perl/MANIFEST Mon Jul 30 21:07:23 2007
@@ -3,3 +3,4 @@
Makefile.PL
README
TFTP.pm
+META.yml Module meta-data (added by MakeMaker)
Added: trunk/libnet-tftp-perl/META.yml
URL: http://svn.debian.org/wsvn/trunk/libnet-tftp-perl/META.yml?rev=6157&op=file
==============================================================================
--- trunk/libnet-tftp-perl/META.yml (added)
+++ trunk/libnet-tftp-perl/META.yml Mon Jul 30 21:07:23 2007
@@ -1,0 +1,10 @@
+# http://module-build.sourceforge.net/META-spec.html
+#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
+name: Net-TFTP
+version: 0.17
+version_from: TFTP.pm
+installdirs: site
+requires:
+
+distribution_type: module
+generated_by: ExtUtils::MakeMaker version 6.17
Modified: trunk/libnet-tftp-perl/TFTP.pm
URL: http://svn.debian.org/wsvn/trunk/libnet-tftp-perl/TFTP.pm?rev=6157&op=diff
==============================================================================
--- trunk/libnet-tftp-perl/TFTP.pm (original)
+++ trunk/libnet-tftp-perl/TFTP.pm Mon Jul 30 21:07:23 2007
@@ -1,6 +1,6 @@
# Net::TFTP.pm
#
-# Copyright (c) 1998 Graham Barr <gbarr at pobox.com>. All rights reserved.
+# Copyright (c) 1998,2007 Graham Barr <gbarr at pobox.com>. All rights reserved.
# This program is free software; you can redistribute it and/or
# modify it under the same terms as Perl itself.
@@ -10,7 +10,7 @@
use vars qw($VERSION);
use IO::File;
-$VERSION = "0.16"; # $Id: //depot/tftp/TFTP.pm#6 $
+$VERSION = "0.17"; # $Id: TFTP.pm 12 2007-07-18 11:32:42Z gbarr $
sub RRQ () { 01 } # read request
sub WRQ () { 02 } # write request
@@ -25,16 +25,17 @@
my $pkg = shift;
my $host = shift;
- bless {
- Debug => 0, # Debug off
- Timeout => 5, # resend after 5 seconds
- Retries => 5, # resend max 5 times
- Port => 69, # tftp port number
- BlockSize => 0, # use default blocksize (512)
- Mode => 'netascii', # transfer in netascii
- @_, # user overrides
- Host => $host, # the hostname
- }, $pkg;
+ bless {
+ Debug => 0, # Debug off
+ Timeout => 5, # resend after 5 seconds
+ Retries => 5, # resend max 5 times
+ Port => 69, # tftp port number
+ BlockSize => 0, # use default blocksize (512)
+ IpMode => 'v4', # Operate in IPv6 mode, off by default
+ Mode => 'netascii', # transfer in netascii
+ @_, # user overrides
+ Host => $host, # the hostname
+ }, $pkg;
}
sub timeout {
@@ -76,6 +77,13 @@
my $self = shift;
my $v = $self->{'Host'};
$self->{'Host'} = shift if @_;
+ $v
+}
+
+sub ip_mode {
+ my $self = shift;
+ my $v = $self->{'IpMode'};
+ $self->{'IpMode'} = shift if @_;
$v
}
@@ -208,20 +216,42 @@
my $io = $pkg->SUPER::new;
$opts->{'Mode'} = lc($opts->{'Mode'});
+ $opts->{'IpMode'} = lc($opts->{'IpMode'});
$opts->{'Mode'} = "netascii"
unless $opts->{'Mode'} eq "octet";
$opts->{'ascii'} = lc($opts->{'Mode'}) eq "netascii";
my $host = $opts->{'Host'};
- my $port = $host =~ s/:(\d+)$// ? $1 : $opts->{'Port'};
+ ## jjmb - had to make an adjustment here the logic used originally does not work well
+ ## with IPv6.
+ my $port = undef;
+ if($opts->{'IpMode'} eq "v6") {
+ require Socket6;
+ require IO::Socket::INET6;
+ $port = $opts->{'Port'};
+ } else {
+ $port = $host =~ s/:(\d+)$// ? $1 : $opts->{'Port'};
+ }
my $addr = inet_aton($host);
- unless($addr) {
- $tftp->{'error'} = "Bad hostname '$host'";
- return undef;
- }
-
- my $sock = IO::Socket::INET->new(Proto => 'udp');
+ ## jjmb - added some logic here for the time being to prevent some errors from showing
+ if($opts->{'IpMode'} eq "v6") {
+ # Skipping validation
+ } else {
+ unless($addr) {
+ $tftp->{'error'} = "Bad hostname '$host'";
+ return undef;
+ }
+ }
+
+ ## jjmb - need to construct different objects depending on the IP version used
+ my $sock = undef;
+ if($opts->{'IpMode'} eq "v6") {
+ $sock = IO::Socket::INET6->new(PeerAddr => $opts->{'Host'}, Port => $opts->{'Port'}, Proto => 'udp');
+ } else {
+ $sock = IO::Socket::INET->new(Proto => 'udp');
+ }
+
my $mode = $opts->{'Mode'};
my $pkt = pack("n a* c a* c", $op, $remote, 0, $mode, 0);
@@ -243,7 +273,11 @@
@{$opts}{'obuf','blk','ack'} = ('',0,-1);
}
- send($sock,$pkt,0,pack_sockaddr_in($port,inet_aton($host)));
+ if($tftp->{'IpMode'} eq "v6") {
+ send($sock,$pkt,0,Socket6::sockaddr_in6($port,Socket6::inet_pton(AF_INET6,$host)));
+ } else {
+ send($sock,$pkt,0,pack_sockaddr_in($port,inet_aton($host)));
+ }
_dumppkt($sock,1,$pkt) if $opts->{'Debug'};
tie *$io, "Net::TFTP::IO",$opts;
@@ -583,7 +617,11 @@
# The struct in $peer can be bigger than needed for AF_INET
# so could contain garbage at the end. unpacking and re-packing
# will ensure it is zero filled (Thanks TomC)
- $peer = pack_sockaddr_in(unpack_sockaddr_in($peer));
+ if($self->{'IpMode'} eq "v6") {
+ $peer = Socket6::pack_sockaddr_in6(Socket6::unpack_sockaddr_in6($peer));
+ } else {
+ $peer = pack_sockaddr_in(unpack_sockaddr_in($peer));
+ }
$self->{'peer'} ||= $peer; # Remember first peer
@@ -776,6 +814,7 @@
Port Port to send data to 69
Mode Mode to transfer data in, "octet" or "netascii" "netascii"
BlockSize Negotiate size of blocks to use in the transfer 512
+ IpMode Indicates whether to operate in IPv6 mode "v4"
=back
@@ -852,6 +891,10 @@
then a new value is set for that option and the previous value returned.
If no value is passed then the current value is returned.
+=item ip_mode ( [ VALUE ] )
+
+Set or get which verion of IP to use ("v4" or "v6")
+
=item ascii
=item netascii
@@ -872,12 +915,8 @@
=head1 COPYRIGHT
-Copyright (c) 1998 Graham Barr. All rights reserved.
+Copyright (c) 1998,2007 Graham Barr. All rights reserved.
This program is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
-=for html <hr>
-
-I<$Id: //depot/tftp/TFTP.pm#6 $>
-
=cut
More information about the Pkg-perl-cvs-commits
mailing list