add params with config prefix if config exists

[pxelator] / lib / PXElator / tftpd.pm

diff --git a/lib/PXElator/tftpd.pm b/lib/PXElator/tftpd.pm
index 1aae0da..f4a8fde 100644 (file)
--- a/lib/PXElator/tftpd.pm
+++ b/lib/PXElator/tftpd.pm
@@ -6,7 +6,7 @@ use strict;
 use Net::TFTPd 0.03 qw(%OPCODES);
 use IO::Socket::INET;
 use Data::Dump qw/dump/;
-use CouchDB;
+use store;
 
 use server;
 
@@ -43,8 +43,6 @@ use config;
 sub tftp_request {
        my $request = shift;
 
-       server->refresh;
-
        warn 'request: ', dump( $request ) if $debug;
 
        my $ip = $request->{_REQUEST_}->{PeerAddr};
@@ -61,10 +59,10 @@ sub tftp_request {
        my $audit = {
                ip => $ip,
                opcode => $opcode,
-               file => $file,
+               path => $file,
                state => 'start',
        };
-       CouchDB::audit( $opcode, $audit );
+       store::audit( $opcode, $audit );
 
        progress_bar::start;
 
@@ -73,12 +71,11 @@ sub tftp_request {
                my $size = -s "$dir/$file";
                $audit->{state} = 'finish';
                $audit->{size} = $size;
-               CouchDB::audit( $opcode, $audit );
+               store::audit( $opcode, $audit );
        } else {
                $audit->{state} = 'error';
                $audit->{error} = Net::TFTPd->error;
-               CouchDB::audit( $opcode, $audit );
-               $request->processRQ();
+               store::audit( $opcode, $audit );
        }
 
 }
@@ -112,8 +109,8 @@ sub start {
 
                CallBack => \&transfer_status,
 #              BlkSize => 8192,
-#              BlkSize => 512,
-               BlkSize => 1456,        # IBM GE seems to be picky
+               BlkSize => 512,         # Dell's RAC doesn't like bigger packets
+#              BlkSize => 1456,        # IBM GE seems to be picky
                Debug => 99,
                %params, # merge user parameters
                _UDPSERVER_ => $udpserver,
@@ -121,7 +118,7 @@ sub start {
 
        warn 'listener: ',dump( $listener ) if $debug;
 
-       CouchDB::audit( 'start', {
+       store::audit( 'start', {
                addr => $listener->{LocalAddr},
                port => $listener->{LocalPort},
                timeout => $listener->{Timeout},
@@ -132,6 +129,7 @@ sub start {
 
                # wait for any request (RRQ or WRQ)
                if(my $request = $listener->waitRQ()) {
+                       server->refresh;
                        tftp_request $request;
                } elsif ( my $error = Net::TFTPd->error ) {
                        warn $error;