Merge pull request #24 from trema/feature/fix_vhost_exit

vhost should not exit if the link to which the vhost is connected is disabled.

CHANGELOG.md

@@ -3,6 +3,12 @@
 ## develop (unreleased)
 
 
+## 0.6.4 (6/4/2015)
+### Bugs fixed
+* [#24](https://github.com/trema/phut/pull/24): vhost should not exit
+  if the link to which the vhost is connected is disabled.
+
+
 ## 0.6.3 (6/4/2015)
 ### Bugs fixed
 * [#23](https://github.com/trema/phut/pull/23): Fix vhost restart failure.

lib/phut/vhost_daemon.rb

@@ -68,6 +68,9 @@ def lookup_arp_table(ip_address)
     def write_to_raw_socket(packet)
       @packets_sent << packet.snapshot
       raw_socket.write packet.to_binary_s
+    rescue Errno::ENXIO
+      # link is disconnected
+      true
     end
 
     def create_udp_packet(dest)
@@ -81,17 +84,24 @@ def log_file
       "#{@options.fetch(:log_dir)}/vhost.#{@options.fetch(:name)}.log"
     end
 
+    # rubocop:disable MethodLength
     def read_loop
       loop do
-        raw_data, = raw_socket.recvfrom(8192)
-        udp = Pio::Udp.read(raw_data)
-        unless @options[:promisc]
-          next if udp.ip_destination_address != @options.fetch(:ip_address)
+        begin
+          raw_data, = raw_socket.recvfrom(8192)
+          udp = Pio::Udp.read(raw_data)
+          unless @options[:promisc]
+            next if udp.ip_destination_address != @options.fetch(:ip_address)
+          end
+          @logger.info "Received: #{udp}"
+          @packets_received << udp.snapshot
+        rescue Errno::ENETDOWN
+          # link is disconnected
+          sleep 1
         end
-        @logger.info "Received: #{udp}"
-        @packets_received << udp.snapshot
       end
     end
+    # rubocop:enable MethodLength
 
     def start_daemon
       Process.daemon