dhcp 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 974a171b1f2ae83482f680e59dac9fe86dea5aa5
-  data.tar.gz: 9c40210dad0d88e8b5fcfd6b387778d347a2ff62
+  metadata.gz: ff27859168efaca20656a202f252e830519f8fc1
+  data.tar.gz: 8491c7a8772ac71b6fd6e37ca96f58b320fa1c2c
 SHA512:
-  metadata.gz: 2792b2a2355d67f79e6494befabe1237c683555c92e4126f5c47a83b02326676f271f823460ccb319e8fb8ca89542f4894f294d4d290f635f7cd9d5b7652690d
-  data.tar.gz: 1d80d02bcc3c24614083d027415732a02635de52d96ded420e9f3522ea0c506ab372055fa7672e266bf48e4fc1d981d52cdd0fa0fe4bc56b8be97308ded3962c
+  metadata.gz: 7b47973dfb41fb5839a987d5c35ac2aa779258db03496a25c2f3a4be7f12d0be67e81253d6fe122345ea80803257d787b095183ba7975ba40361279e8eea740b
+  data.tar.gz: 186e766fcb5b3e7134fee72dae11666b556560e0b460233008b22b39c74ec2ddbeee608cbbc13768b36b8f11f3231f5999bcc6c18ce4819512fd18962c6be97f

data/lib/dhcp/s.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require_relative 'server'
+require 'syslog'
+#Syslog.open('dhcp-server')
+s = DHCP::Server.new(:ip => '209.33.249.130', :debug => true, :log => Class.new do ; def err(x) ; STDERR.puts x ; end ; def info(x) ; STDERR.puts x ; end ; def warn(x) ; STDERR.puts x ; end ; def debug(x) ; STDERR.puts x ; end ; end.new)
+s.run

data/lib/dhcp/server.rb

@@ -1,34 +1,72 @@
 #!/usr/bin/env ruby
 # encoding: ASCII-8BIT
 
+require 'socket'
+require 'syslog'
 require_relative 'packet'
 
 module DHCP # :nodoc:
   class Server
+    ZERO_IP = IPAddress('0.0.0.0')
+
     def initialize(opt={})
-      @socket   = nil                    ## UDP server socket
-      @interval = opt[:interval] || 0.5  ## Sleep interval
+      @interval    = opt[:interval] || 0.5          ## Sleep (seconds) if no data
+      @log         = opt[:log]      || Syslog       ## Logging object (should be open already)
+      @server_ip   = opt[:ip]       || '0.0.0.0'    ## Listen on this IP
+      @server_port = opt[:port]     || 67           ## Listen on this UDP port
+      @debug       = opt[:debug]    || false
+
+      ## Bind to UDP server port:
+      @log.info("Starting DHCP on [#{@server_ip}]:#{@server_port} server at #{Time.now}")
+      @sock = UDPSocket.new
+      @sock.do_not_reverse_lookup = true
+      @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_BROADCAST, true) ## Permit sending to broadcast address
+      unless @sock.bind(@server_ip, 67)
+        raise "Failed to bind"
+      end
     end
-    attr_reader :socket
 
-    ## Main server event loop (non-blocking):
+    ## Main server event single-iteration function (non-blocking):
     def run_once
+      r,w,e = IO.select([@sock], nil, [@sock], 0)
+      if !r.nil? && r.size == 1
+        data, src = @sock.recvfrom_nonblock(1500)
+        if data.bytesize < 300
+          @log.debug("Ignoring packet smaller than BOOTP minimum size") if @debug
+        else
+          dispatch_packet(data, src[3], src[1])
+        end
+        return true
+      end
+      if !e.nil? && e.size == 1
+        ## TODO: Handle errors...
+        raise "Unhandled error on socket"
+      end
+      return false
     end
 
     ## Main server event loop (blocking):
     def run
       loop do
-        resut = run_once
+        result = run_once
         sleep @interval if !result  ## Sleep if no data was received and no errors occured
       end
     end
 
+    def show_packet(pk)
+      @log.debug(">>> PACKET: #{pk.type} '#{pk.type_name}' at #{Time.now} >>>")
+      pk.to_s.gsub(/\\/,'\\\\').gsub(/[^\x20-\x7e\n]/){|x| '\x' + x.unpack('H2')[0].upcase}.split("\n").each do |i|
+        @log.debug("..." + i)
+      end
+      @log.debug("<<< END OF PACKET <<<")
+    end
+
     ## Hand off raw UDP packet data here for parsing and dispatch:
     def dispatch_packet(data, source_ip, source_port)
       now = Time.now
-      Syslog.info("Packet (#{data.size} bytes) from [#{source_ip}]:#{source_port} received at #{now}")
+      @log.debug("Packet (#{data.size} bytes) from [#{source_ip}]:#{source_port} received at #{now}")
       if data.size < 300
-        Syslog.info("Ignoring small packet (less than BOOTP minimum size.")
+        @log.debug("Ignoring small packet (less than BOOTP minimum size.") if @debug
         return
       end
 
@@ -36,8 +74,8 @@ module DHCP # :nodoc:
       begin
         packet = DHCP::Packet.new(data)
       rescue => e
-        show_packet(packet)
-        Syslog.err("Error parsing DHCP packet.") 
+        show_packet(packet) if @debug
+        @log.debug("Error parsing DHCP packet.") if @debug
         return
       end
 
@@ -46,36 +84,36 @@ module DHCP # :nodoc:
         relay = true
 
         ## Quick relay sanity-check on GIADDR:
-        if packet.giaddr == IPAddress.new('0.0.0.0')
-          Syslog.err("Packet from relay (port 67) has no GIADDR address set.  Ignoring.")
+        if packet.giaddr == ZERO_IP
+          @log.debug("Packet from relay (port 67) has no GIADDR address set.  Ignoring.") if @debug
           return
         end
 
         unless relay_authorized?(source_ip, packet.giaddr)
-          Syslog.err("Ignoring DHCP packet from unauthorized relay [#{source_ip}].")
+          @log.debug("Ignoring DHCP packet from unauthorized relay [#{source_ip}].") if @debug
           return
         end
       elsif source_port == 68  ## DHCP on directly attached subnet
         relay = false
 
         ## Quick relay sanity-check on GIADDR:
-        if packet.giaddr != IPAddress.new('0.0.0.0')
-          Syslog.err("Direct (non-relay) packet has set GIADDR to [#{packet.giaddr}] in violation of RFC. Ignoring.")
+        if packet.giaddr != ZERO_IP
+          @log.debug("Direct (non-relay) packet has set GIADDR to [#{packet.giaddr}] in violation of RFC. Ignoring.") if @debug
           return
         end
       else
-        Syslog.err("Ignoring packet from UDP port other than 67 (relay) or 68 (direct)")
+        @log.debug("Ignoring packet from UDP port other than 67 (relay) or 68 (direct)") if @debug
         return
       end
 
       ## Ethernet hardware type sanity check:
       if packet.htype != DHCP::HTYPE[:htype_10mb_ethernet][0] || packet.hlen !=  DHCP::HTYPE[:htype_10mb_ethernet][1]
-        Syslog.err("Request hardware type or length doesn't match ETHERNET type and length. Ignoring.")
+        @log.debug("Request hardware type or length doesn't match ETHERNET type and length. Ignoring.") if @debug
         return
       end
 
       if packet.op != DHCP::BOOTREQUEST
-        Syslog.err("Recived a non-BOOTREQUEST packet.  Ignoring.")
+        @log.debug("Recived a non-BOOTREQUEST packet.  Ignoring.") if @debug
         return
       end
 
@@ -94,11 +132,11 @@ module DHCP # :nodoc:
       when DHCP::DHCPLEASEQUERY
         handle_leasequery(packet, source_ip, relay)
       when DHCP::DHCPOFFER, DHCP::DHCPACK, DHCP::DHCPNAK, DHCP::DHCPFORCERENEW, DHCP::DHCPLEASEUNASSIGNED, DHCP::DHCPLEASEACTIVE, DHCP::DHCPLEASEUNKNOWN
-        show_packet(packet)
-        Syslog.err("Packet type #{packet.type_name} in a BOOTREQUEST is invalid.")
+        show_packet(packet) if @debug
+        @log.debug("Packet type #{packet.type_name} in a BOOTREQUEST is invalid.") if @debug
       else
-        show_packet(packet)
-        Syslog.err("Invalid, unknown, or unhandled DHCP packet type received.")
+        show_packet(packet) if @debug
+        @log.debug("Invalid, unknown, or unhandled DHCP packet type received.") if @debug
       end
     end
 
@@ -108,32 +146,32 @@ module DHCP # :nodoc:
 
     ## Handle DHCPDISCOVER packet:
     def handle_discover(packet, source_ip, relay)
-      show_packet(packet)
-      Syslog.info("handle_discover")
+      show_packet(packet) if @debug
+      @log.debug("handle_discover") if @debug
     end
 
     ## Handle DHCPREQUEST packet:
     def handle_request(packet, source_ip, relay)
-      show_packet(packet)
-      Syslog.info("handle_request")
+      show_packet(packet) if @debug
+      @log.debug("handle_request") if @debug
     end
 
     ## Handle DHCPINFORM packet:
     def handle_inform(packet, source_ip, relay)
-      show_packet(packet)
-      Syslog.info("handle_inform")
+      show_packet(packet) if @debug
+      @log.debug("handle_inform") if @debug
     end
 
     ## Handle DHCPDECLINE packet:
     def handle_decline(packet, source_ip, relay)
-      show_packet(packet)
-      Syslog.info("handle_decline")
+      show_packet(packet) if @debug
+      @log.debug("handle_decline") if @debug
     end
 
     ## Handle DHCPLEASEQUERY packet:
     def handle_leasequery(packet, source_ip, relay)
-      show_packet(packet)
-      Syslog.info("handle_leasequery")
+      show_packet(packet) if @debug
+      @log.debug("handle_leasequery") if @debug
     end
   end
 

data/lib/dhcp/version.rb

@@ -3,7 +3,7 @@
 
 module DHCP # :nodoc:
   module Version # :nodoc:
-    STRING = '0.0.3'
+    STRING = '0.0.4'
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhcp
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Aaron D. Gifford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ipaddress
@@ -40,6 +40,7 @@ files:
 - lib/dhcp/dhcp.rb
 - lib/dhcp/options.rb
 - lib/dhcp/packet.rb
+- lib/dhcp/s.rb
 - lib/dhcp/server.rb
 - lib/dhcp/version.rb
 homepage: http://www.aarongifford.com/computers/dhcp/
@@ -65,5 +66,5 @@ rubyforge_project: dhcp
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: dhcp-0.0.3
+summary: dhcp-0.0.4
 test_files: []