From cc1184abc98fd270ee8fee4925f38de08c908bb8 Mon Sep 17 00:00:00 2001
From: MajesticFalcon <Schylarutley@hotmail.com>
Date: Tue, 30 Aug 2016 18:02:00 -0500
Subject: Update Filename and tftp load

---
 lib/oxidized/input/tftp    | 57 ------------------------------------------
 lib/oxidized/input/tftp.rb | 62 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 57 deletions(-)
 delete mode 100644 lib/oxidized/input/tftp
 create mode 100644 lib/oxidized/input/tftp.rb

(limited to 'lib/oxidized/input')

diff --git a/lib/oxidized/input/tftp b/lib/oxidized/input/tftp
deleted file mode 100644
index cac8f2d..0000000
--- a/lib/oxidized/input/tftp
+++ /dev/null
@@ -1,57 +0,0 @@
-module Oxidized
-  require 'net/tftp'
-  require 'timeout'
-  require 'stringio'
-  require_relative 'cli'
-
-  class TFTP < Input
-    RescueFail = {
-      :debug => [
-        #Net::SSH::Disconnect,
-      ],
-      :warn => [
-        #RuntimeError,
-        #Net::SSH::AuthenticationFailed,
-      ],
-    }
-    
-    include Input::CLI
-    
-    # TFTP utilizes UDP, there is not a connection. We simply specify an IP and send/receive data.
-    def connect node
-      @node       = node
-
-      @node.model.cfg['tftp'].each { |cb| instance_exec(&cb) }
-      @log = File.open(Oxidized::Config::Log + "/#{@node.ip}-tftp", 'w') if Oxidized.config.input.debug?
-      @tftp = Net::TFTP.new @node.ip
-    end
-
-    def cmd file
-      Oxidized.logger.info file.methods(true)
-      Oxidized.logger.debug "TFTP: #{file} @ #{@node.name}"
-      config = StringIO.new
-      @tftp.getbinary file, config
-      config.rewind
-      config.read
-    end
-    
-
-    # meh not sure if this is the best way, but perhaps better than not implementing send
-    def send my_proc
-      my_proc.call
-    end
-
-    def output
-      ""
-    end
-
-    private
-
-    def disconnect
-      # TFTP uses UDP, there is no connection to close
-    ensure
-      @log.close if Oxidized.config.input.debug?
-    end
-
-  end
-end
diff --git a/lib/oxidized/input/tftp.rb b/lib/oxidized/input/tftp.rb
new file mode 100644
index 0000000..2a6a088
--- /dev/null
+++ b/lib/oxidized/input/tftp.rb
@@ -0,0 +1,62 @@
+module Oxidized
+  require 'timeout'
+  require 'stringio'
+  require_relative 'cli'
+
+  class TFTP < Input
+    RescueFail = {
+      :debug => [
+        #Net::SSH::Disconnect,
+      ],
+      :warn => [
+        #RuntimeError,
+        #Net::SSH::AuthenticationFailed,
+      ],
+    }
+    
+    include Input::CLI
+    
+    # TFTP utilizes UDP, there is not a connection. We simply specify an IP and send/receive data.
+    def connect node
+      begin
+        require 'net/tftp'
+      rescue LoadError
+        raise OxidizedError, 'net/tftp not found: sudo gem install net-tftp'
+      end
+      @node       = node
+
+      @node.model.cfg['tftp'].each { |cb| instance_exec(&cb) }
+      @log = File.open(Oxidized::Config::Log + "/#{@node.ip}-tftp", 'w') if Oxidized.config.input.debug?
+      @tftp = Net::TFTP.new @node.ip
+    end
+
+    def cmd file
+      Oxidized.logger.info file.methods(true)
+      Oxidized.logger.debug "TFTP: #{file} @ #{@node.name}"
+      config = StringIO.new
+      @tftp.getbinary file, config
+      config.rewind
+      config.read
+    end
+    
+
+    # meh not sure if this is the best way, but perhaps better than not implementing send
+    def send my_proc
+      my_proc.call
+    end
+
+    def output
+      ""
+    end
+
+    private
+
+    def disconnect
+      # TFTP uses UDP, there is no connection to close
+    #rescue Errno::ECONNRESET, IOError
+    ensure
+      @log.close if Oxidized.config.input.debug?
+    end
+
+  end
+end
-- 
cgit v1.2.1