src/examples/simple_router/simple-router.rb in trema-0.2.8 vs src/examples/simple_router/simple-router.rb in trema-0.3.0

@@ -128,15 +128,15 @@
     end
   end
 
 
   def resolve_next_hop( daddr )
-    next_hop = @routing_table.lookup( daddr.value )
-    if next_hop
-      next_hop
-    else
+    interface = @interfaces.find_by_prefix( daddr.value )
+    if interface
       daddr.value
+    else
+      @routing_table.lookup( daddr.value )
     end
   end
 
 
   def flow_mod( dpid, message, action )
@@ -163,11 +163,11 @@
   end
 
 
   def create_action_from( macsa, macda, port )
     [
-      SetEthSrcAddr.new( macsa.to_s ),
-      SetEthDstAddr.new( macda.to_s ),
+      SetEthSrcAddr.new( macsa ),
+      SetEthDstAddr.new( macda ),
       SendOutPort.new( port )
     ]
   end
 end