net-dhcp 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 084b32f482d254159e2d66d8d5baa30ffb925fd9
-  data.tar.gz: 1d3a98623bd9bc5f9e45f460b25e3c476c56459f
+  metadata.gz: c4382e9e7f0e8b0ea9a3f2ecd7a6e91486034bbd
+  data.tar.gz: d9c1dbdf7cc2d61250c5ae09e56d3adaa4f20cd6
 SHA512:
-  metadata.gz: d110ea9681c2cadb72948fe3178d1b6e270e6335c972139433e5460f3a9d368a47fab20bab591fb1c8f5db310f33c546afbec054e58d11735d96d2a0e734c467
-  data.tar.gz: fc80df66795f01a9e5c855a3fac7f20d43799b92c1a9120f8a3ea52dc45dc7417e617a56888f33a95a2cbed4099f0fea5020c9ca57c153d1c73ec5adae8179bc
+  metadata.gz: bc028daee63ea5752ba22fe70a02039116e039ebcdc15a793e2c9cf5270d3affaf5bf836b2c85f6648b0638d142b07b9a57146ce8bf77503828cbac9f4fa1299
+  data.tar.gz: 1e94409daef8bab1d7015829e91c372e220a4db10129e2f7841a12d771add72a55d7d1859b2b44cd6e14ac358704f056f06e48429d7aec16a8f89aef042cddc3

data/CHANGELOG

@@ -1,3 +1,8 @@
+*1.2.1
+
+* Fix net-dhcp example to allow use of the socket if already in use (mikerodrigues)
+* Fix net-dhcp example script to bail with useful errors if dependencies haven't been installed (mjtko)
+
 *1.2.0
 
 * Fix Array handling for message payloads [presto53]

data/bin/net-dhcp

@@ -1,10 +1,19 @@
+#!/usr/bin/env ruby
 # main.rb
 # 4 de octubre de 2007
 #
 
-require 'dhcp'
-require 'socket'
-require 'pcaplet'
+begin
+  require 'dhcp'
+  require 'net/dhcp'
+  require 'socket'
+  require 'pcaplet'
+rescue LoadError
+  STDERR.puts "Unable to load a required library.  Please ensure you have installed the following gems:"
+  STDERR.puts "  dhcp, ipaddress, ruby-pcap"
+  STDERR.puts "\nError was: #{$!.message}"
+  exit 1
+end
 
 server_thread = Thread.new do
   s = "Packets received by the filter:\n"
@@ -30,8 +39,9 @@ payload = discover.pack
 
 sckt = UDPSocket.new
 sckt.setsockopt(Socket::SOL_SOCKET, Socket::SO_BROADCAST,true)
+sckt.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR, true)
 sckt.bind('', 68)
 sckt.send(payload, 0, "<broadcast>", 67)
 
 trap('INT') {server_thread.kill}
-server_thread.join
+server_thread.join

data/lib/net-dhcp/version.rb

@@ -1,5 +1,5 @@
 module Net
   module Dhcp
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-dhcp
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - daniel martin gomez (etd)