--- lib/PXElator/tftpd.pm 2009/08/02 03:31:39 114 +++ lib/PXElator/tftpd.pm 2009/08/02 12:09:02 115 @@ -23,16 +23,18 @@ } STDERR->autoflush(1); +use progress_bar; sub transfer_status { - my $req = shift; - if( $req->{'_REQUEST_'}{'OPCODE'} eq $OPCODES{'RRQ'} ) { - printf STDERR "RRQ %s %u\/%u\r", map { $req->{_REQUEST_}->{$_} } ( 'FileName', 'LASTACK', 'LASTBLK' ); - } elsif ( $req->{'_REQUEST_'}{'OPCODE'} eq $OPCODES{'WRQ'} ) { + my $request = shift; + my $r = $request->{'_REQUEST_'} || die "no _REQUEST_ in ",dump( $request ); + + if( $r->{'OPCODE'} eq $OPCODES{'RRQ'} ) { + progress_bar::tick( $r->{FileName}, $r->{BlkSize} * $r->{LASTACK}, $r->{BlkSize} * $r->{LASTBLK} ); + } elsif ( $r->{'OPCODE'} eq $OPCODES{'WRQ'} ) { die "WRQ disabled"; - printf STDERR "WRQ: %u\/%u\n", $req->{'_REQUEST_'}{'LASTBLK'}, $req->{'_REQUEST_'}{'LASTACK'}; } else { - warn "IGNORED: ", dump( $req ); + warn "IGNORED: ", dump( $request ); } } @@ -52,6 +54,8 @@ # received request print $OPCODES{$request->{'_REQUEST_'}{'OPCODE'}}, " $file\n"; + progress_bar::start; + # process the request if( $request->processRQ() ) { print "\nOK completed $file ", -s "$dir/$file", "\n";