trema 0.3.19 → 0.3.20

data/ruby/trema/queue-get-config-reply.c

@@ -131,16 +131,20 @@ get_property( struct ofp_packet_queue *pq, VALUE packet_queue ) {
   struct ofp_queue_prop_header *qph;
   qph = ( struct ofp_queue_prop_header * ) ( ( char * ) pq + offset );
 
-  uint16_t properties_length = ( uint16_t ) ( pq->len - offset );
+  uint16_t properties_length = ( uint16_t ) ( qph->len - offset );
   struct ofp_queue_prop_min_rate *qpmr;
   while ( properties_length > 0 ) {
     if ( qph->property == OFPQT_MIN_RATE ) {
       qpmr = ( struct ofp_queue_prop_min_rate * ) qph;
-      rb_funcall( rb_eval_string( "Trema::MinRateQueue" ), rb_intern( "new" ), 4,
+      rb_funcall(
+        rb_eval_string( "Trema::MinRateQueue" ),
+        rb_intern( "new" ),
+        4,
         UINT2NUM( qph->property ),
         UINT2NUM( qph->len ),
         UINT2NUM( qpmr->rate ),
-        packet_queue );
+        packet_queue
+      );
     }
     properties_length = ( uint16_t ) ( properties_length - pq->len );
     if ( properties_length > 0 ) {
@@ -170,7 +174,6 @@ handle_queue_get_config_reply(
   VALUE pq_attributes = rb_hash_new();
   VALUE packet_queue;
 
-
   rb_hash_aset( attributes, ID2SYM( rb_intern( "datapath_id" ) ), ULL2NUM( datapath_id ) );
   rb_hash_aset( attributes, ID2SYM( rb_intern( "transaction_id" ) ), UINT2NUM( transaction_id ) );
   rb_hash_aset( attributes, ID2SYM( rb_intern( "port" ) ), UINT2NUM( port ) );
@@ -187,7 +190,7 @@ handle_queue_get_config_reply(
       get_property( pq, packet_queue );
       queue = queue->next;
     }
-    rb_hash_aset( attributes, ID2SYM( rb_intern( "queues" ) ), rb_eval_string( "PacketQueue.queues" ) );
+    rb_hash_aset( attributes, ID2SYM( rb_intern( "queues" ) ), rb_eval_string( "Trema::Queue.queues" ) );
   }
   VALUE queue_get_config_reply = rb_funcall( cQueueGetConfigReply, rb_intern( "new" ), 1, attributes );
   rb_funcall( controller, rb_intern( "queue_get_config_reply" ), 2, ULL2NUM( datapath_id ), queue_get_config_reply );

data/ruby/trema/set-ip-tos.rb

@@ -38,15 +38,15 @@ module Trema
     # @param [Integer] type_of_service
     #   the ToS/DSCP field to set to.
     #
-    # @raise [ArgumentError] if type_of_service argument is not an unsigned 8-bit Integer.
+    # @raise [ArgumentError] if type_of_service value is invalid.
     # @raise [TypeError] if type_of_service argument is not an Integer.
     #
     def initialize type_of_service
       unless type_of_service.is_a?( Integer )
         raise TypeError, "ToS must be an unsigned 8-bit integer"
       end
-      unless type_of_service.unsigned_8bit?
-        raise ArgumentError, "ToS must be an unsigned 8-bit integer"
+      unless type_of_service.valid_nw_tos?
+        raise ArgumentError, "Invalid type_of_service (ToS) value."
       end
       @type_of_service = type_of_service
     end

data/ruby/trema/vendor-action.rb

@@ -49,6 +49,7 @@ module Trema
     # @raise [TypeError] if vendor ID is not an Integer.
     # @raise [ArgumentError] if vendor ID is not an unsigned 32-bit Integer.
     # @raise [TypeError] if body is not an Array.
+    # @raise [ArgumentError] if body length is not a multiple of 8.
     #
     def initialize vendor_id, body = nil
       unless vendor_id.is_a?( Integer )
@@ -57,9 +58,12 @@ module Trema
       unless vendor_id.unsigned_32bit?
         raise ArgumentError, "Vendor ID must be an unsigned 32-bit integer"
       end
-      if ( not body.nil? )  and ( not body.is_a?( Array ) )
+      if ( not body.nil? ) and ( not body.is_a?( Array ) )
         raise TypeError, "Body must be an Array"
       end
+      if ( not body.nil? ) and ( body.size % 8 != 0 )
+        raise ArgumentError, "Body length must be a multiple of 8"
+      end
 
       @vendor_id = vendor_id
       @body = body

data/ruby/trema/version.rb

@@ -17,7 +17,7 @@
 
 
 module Trema
-  VERSION = "0.3.19"
+  VERSION = "0.3.20"
 end
 
 

data/spec/trema/echo-reply_spec.rb

@@ -21,44 +21,44 @@ require "trema"
 
 
 module Trema
-  describe EchoReply, ".new", :nosudo => true do
+  describe EchoReply, ".new" do
     it_should_behave_like "any Openflow message with default transaction ID"
     its( :user_data ) { should be_nil }
   end
 
 
-  describe EchoReply, ".new(nil)", :nosudo => true do
+  describe EchoReply, ".new(nil)" do
     subject { EchoReply.new( nil ) }
     it_should_behave_like "any Openflow message with default transaction ID"
     its( :user_data ) { should be_nil }
   end
 
 
-  describe EchoReply, ".new(transaction_id)", :nosudo => true do
+  describe EchoReply, ".new(transaction_id)" do
     subject { EchoReply.new( transaction_id ) }
     it_should_behave_like "any Openflow message with transaction ID"
   end
 
 
-  describe EchoReply, ".new(:transaction_id => value)", :nosudo => true do
+  describe EchoReply, ".new(:transaction_id => value)" do
     subject { EchoReply.new( :transaction_id => transaction_id ) }
     it_should_behave_like "any Openflow message with transaction ID"
   end
 
 
-  describe EchoReply, ".new(:xid => value)", :nosudo => true do
+  describe EchoReply, ".new(:xid => value)" do
     subject { EchoReply.new( :xid => xid ) }
     it_should_behave_like "any Openflow message with xid"
   end
 
 
-  describe EchoReply, ".new(:user_data => value)", :nosudo => true do
+  describe EchoReply, ".new(:user_data => value)" do
     subject { EchoReply.new( :user_data => user_data ) }
     it_should_behave_like "any Openflow message with user_data"
   end
 
 
-  describe EchoReply, ".new(:transaction_id => value, :user_data => value)", :nosudo => true do
+  describe EchoReply, ".new(:transaction_id => value, :user_data => value)" do
     subject { EchoReply.new( :transaction_id => transaction_id, :user_data => user_data ) }
 
     context 'transaction_id: 123, user_data: "USER DATA"' do
@@ -71,7 +71,7 @@ module Trema
   end
 
 
-  describe EchoReply, '.new("INVALID OPTION")', :nosudo => true do
+  describe EchoReply, '.new("INVALID OPTION")' do
     it { expect { EchoReply.new "INVALID OPTION" }.to raise_error( TypeError ) }
   end
 end

data/spec/trema/echo-request_spec.rb

@@ -115,7 +115,7 @@ module Trema
   end
 
 
-  describe EchoRequest, '.new("INVALID OPTION")', :nosudo => true do
+  describe EchoRequest, '.new("INVALID OPTION")' do
     it { expect { EchoRequest.new "INVALID OPTION" }.to raise_error( TypeError ) }
   end
 end

data/spec/trema/hello_spec.rb

@@ -21,36 +21,36 @@ require "trema"
 
 
 module Trema
-  describe Hello, ".new", :nosudo => true do
+  describe Hello, ".new" do
     it_should_behave_like "any Openflow message with default transaction ID"
   end
 
 
-  describe Hello, ".new(nil)", :nosudo => true do
+  describe Hello, ".new(nil)" do
     subject { Hello.new( nil ) }
     it_should_behave_like "any Openflow message with default transaction ID"
   end
 
 
-  describe Hello, ".new(transaction_id)", :nosudo => true do
+  describe Hello, ".new(transaction_id)" do
     subject { Hello.new( transaction_id ) }
     it_should_behave_like "any Openflow message with transaction ID"
   end
 
 
-  describe Hello, ".new(:transaction_id => value)", :nosudo => true do
+  describe Hello, ".new(:transaction_id => value)" do
     subject { Hello.new( :transaction_id => transaction_id ) }
     it_should_behave_like "any Openflow message with transaction ID"
   end
 
 
-  describe Hello, ".new(:xid => value)", :nosudo => true do
+  describe Hello, ".new(:xid => value)" do
     subject { Hello.new( :xid => xid ) }
     it_should_behave_like "any Openflow message with xid"
   end
 
 
-  describe Hello, '.new("INVALID OPTION")', :nosudo => true do
+  describe Hello, '.new("INVALID OPTION")' do
     it { expect { Hello.new "INVALID OPTION" }.to raise_error( TypeError ) }
   end
 end

data/spec/trema/packet-in_spec.rb

@@ -130,6 +130,7 @@ describe Trema::PacketIn do
           expect( message.in_port ).to be > 0
           expect( message.vtag? ).to be_false
           expect( message.arp? ).to be_true
+          expect( message.rarp? ).to be_false
           expect( message.ipv4? ).to be_false
           expect( message.lldp? ).to be_false
           expect( message.tcp? ).to be_false
@@ -145,6 +146,125 @@ describe Trema::PacketIn do
           expect( message.arp_request? ).to be_false
           expect( message.arp_reply? ).to be_true
 
+          expect( message.rarp_oper ).to be_nil
+          expect( message.rarp_sha ).to be_nil
+          expect( message.rarp_spa ).to be_nil
+          expect( message.rarp_tha ).to be_nil
+          expect( message.rarp_tpa ).to be_nil
+          expect( message.rarp_request? ).to be_false
+          expect( message.rarp_reply? ).to be_false
+
+          expect( message.vlan_tpid ).to be_nil
+          expect( message.vlan_tci ).to be_nil
+          expect( message.vlan_prio ).to be_nil
+          expect( message.vlan_cfi ).to be_nil
+          expect( message.vlan_vid ).to be_nil
+
+          expect( message.ipv4_version ).to be_nil
+          expect( message.ipv4_ihl ).to be_nil
+          expect( message.ipv4_tos ).to be_nil
+          expect( message.ipv4_tot_len ).to be_nil
+          expect( message.ipv4_id ).to be_nil
+          expect( message.ipv4_frag_off ).to be_nil
+          expect( message.ipv4_ttl ).to be_nil
+          expect( message.ipv4_protocol ).to be_nil
+          expect( message.ipv4_checksum ).to be_nil
+          expect( message.ipv4_saddr ).to be_nil
+          expect( message.ipv4_daddr ).to be_nil
+
+          expect( message.icmpv4_type ).to be_nil
+          expect( message.icmpv4_code ).to be_nil
+          expect( message.icmpv4_checksum ).to be_nil
+          expect( message.icmpv4_id ).to be_nil
+          expect( message.icmpv4_seq ).to be_nil
+          expect( message.icmpv4_gateway ).to be_nil
+
+          expect( message.igmp_type ).to be_nil
+          expect( message.igmp_checksum ).to be_nil
+          expect( message.igmp_group ).to be_nil
+
+          expect( message.tcp_src_port ).to be_nil
+          expect( message.tcp_dst_port ).to be_nil
+          expect( message.tcp_seq_no ).to be_nil
+          expect( message.tcp_ack_no ).to be_nil
+          expect( message.tcp_offset ).to be_nil
+          expect( message.tcp_flags ).to be_nil
+          expect( message.tcp_window ).to be_nil
+          expect( message.tcp_checksum ).to be_nil
+          expect( message.tcp_urgent ).to be_nil
+
+          expect( message.udp_src_port ).to be_nil
+          expect( message.udp_dst_port ).to be_nil
+          expect( message.udp_checksum ).to be_nil
+          expect( message.udp_len ).to be_nil
+        end
+
+        controller( "PacketInSendController" ).send_packet_out(
+          0xabc,
+          :data => data,
+          :actions => Trema::ActionOutput.new( :port => Controller::OFPP_CONTROLLER )
+        )
+        sleep 2
+      }
+    end
+
+    it "should have correct RARP packet fields" do
+      network {
+        vswitch( "packet-in" ) { datapath_id 0xabc }
+        vhost "host1"
+        vhost ( "host2" ) { mac "00:00:00:00:00:02" }
+        link "host1", "packet-in"
+        link "host2", "packet-in"
+      }.run( PacketInSendController ) {
+        data = [
+          0xff, 0xff, 0xff, 0xff, 0xff, 0xff, # dst
+          0x00, 0x00, 0x00, 0x00, 0x00, 0x01, # src
+          0x80, 0x35, # ether type
+          # rarp
+          0x00, 0x01, # hardware type
+          0x08, 0x00, # protocol type
+          0x06, # hardware address length
+          0x04, # protocol address length
+          0x00, 0x03, # operation
+          0x00, 0x00, 0x00, 0x00, 0x00, 0x01, # sender hardware address
+          0xc0, 0xa8, 0x00, 0x01, # sender protocol address
+          0x00, 0x00, 0x00, 0x00, 0x00, 0x02, # target hardware address
+          0x00, 0x00, 0x00, 0x00, # target protocol address
+          # padding to 64 bytes
+          0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+          0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+          0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+          0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+          0x00, 0x00
+        ].pack( "C*" )
+        controller( "PacketInSendController" ).should_receive( :packet_in ) do | datapath_id, message |
+          expect( message.in_port ).to be > 0
+          expect( message.vtag? ).to be_false
+          expect( message.arp? ).to be_false
+          expect( message.rarp? ).to be_true
+          expect( message.ipv4? ).to be_false
+          expect( message.lldp? ).to be_false
+          expect( message.tcp? ).to be_false
+          expect( message.udp? ).to be_false
+          expect( message.icmpv4? ).to be_false
+          expect( message.igmp? ).to be_false
+
+          expect( message.arp_oper ).to be_nil
+          expect( message.arp_sha ).to be_nil
+          expect( message.arp_spa ).to be_nil
+          expect( message.arp_tha ).to be_nil
+          expect( message.arp_tpa ).to be_nil
+          expect( message.arp_request? ).to be_false
+          expect( message.arp_reply? ).to be_false
+
+          expect( message.rarp_oper ).to eq( 3 )
+          expect( message.rarp_sha.to_s ).to eq( "00:00:00:00:00:01" )
+          expect( message.rarp_spa.to_s ).to eq( "192.168.0.1" )
+          expect( message.rarp_tha.to_s ).to eq( "00:00:00:00:00:02" )
+          expect( message.rarp_tpa.to_s ).to eq( "0.0.0.0" )
+          expect( message.rarp_request? ).to be_true
+          expect( message.rarp_reply? ).to be_false
+
           expect( message.vlan_tpid ).to be_nil
           expect( message.vlan_tci ).to be_nil
           expect( message.vlan_prio ).to be_nil
@@ -241,6 +361,7 @@ describe Trema::PacketIn do
           expect( message.in_port ).to be > 0
           expect( message.vtag? ).to be_false
           expect( message.arp? ).to be_false
+          expect( message.rarp? ).to be_false
           expect( message.ipv4? ).to be_true
           expect( message.lldp? ).to be_false
           expect( message.udp? ).to be_false
@@ -275,6 +396,12 @@ describe Trema::PacketIn do
           expect( message.arp_spa ).to be_nil
           expect( message.arp_tha ).to be_nil
           expect( message.arp_tpa ).to be_nil
+
+          expect( message.rarp_oper ).to be_nil
+          expect( message.rarp_sha ).to be_nil
+          expect( message.rarp_spa ).to be_nil
+          expect( message.rarp_tha ).to be_nil
+          expect( message.rarp_tpa ).to be_nil
         end
 
         controller( "PacketInSendController" ).send_packet_out(
@@ -325,6 +452,7 @@ describe Trema::PacketIn do
           expect( message.in_port ).to be > 0
           expect( message.vtag? ).to be_false
           expect( message.arp? ).to be_false
+          expect( message.rarp? ).to be_false
           expect( message.ipv4? ).to be_true
           expect( message.lldp? ).to be_false
           expect( message.tcp? ).to be_false
@@ -406,6 +534,7 @@ describe Trema::PacketIn do
           expect( message.in_port ).to be > 0
           expect( message.vtag? ).to be_true
           expect( message.arp? ).to be_false
+          expect( message.rarp? ).to be_false
           expect( message.ipv4? ).to be_true
           expect( message.lldp? ).to be_false
           expect( message.udp? ).to be_false
@@ -490,6 +619,7 @@ describe Trema::PacketIn do
           expect( message.in_port ).to be > 0
           expect( message.vtag? ).to be_false
           expect( message.arp? ).to be_false
+          expect( message.rarp? ).to be_false
           expect( message.ipv4? ).to be_true
           expect( message.lldp? ).to be_false
           expect( message.udp? ).to be_false
@@ -555,6 +685,7 @@ describe Trema::PacketIn do
           expect( message.in_port ).to be > 0
           expect( message.vtag? ).to be_false
           expect( message.arp? ).to be_false
+          expect( message.rarp? ).to be_false
           expect( message.ipv4? ).to be_false
           expect( message.lldp? ).to be_true
           expect( message.udp? ).to be_false

data/spec/trema/queue-get-config-reply_spec.rb

@@ -29,7 +29,7 @@ describe QueueGetConfigReply, ".new( VALID OPTIONS )" do
     QueueGetConfigReply.new( :datapath_id => 0xabc,
       :transaction_id => 123,
       :port => 1,
-      :queues => Queue.queues
+      :queues => Trema::Queue.queues
     )
   end
   its( "queues.length" ) { should ==  2  }

data/spec/trema/set-ip-tos_spec.rb

@@ -40,6 +40,11 @@ describe SetIpTos, ".new( type_of_service )", :type => "actions" do
     it { expect { subject }.to raise_error( TypeError ) }
   end
 
+  context "with type_of_service (1)" do
+    let( :type_of_service ) { 1 }
+    it { expect { subject }.to raise_error( ArgumentError ) }
+  end
+
   context "when sending a Flow Mod with SetIpTos" do
     let( :type_of_service ) { 4 }
 

data/spec/trema/vendor-action_spec.rb

@@ -45,6 +45,11 @@ describe VendorAction, ".new(0x00002320, body)", :type => "actions" do
     it { expect { subject }.to raise_error( TypeError ) }
   end
 
+  context "with body 9 octets long" do
+    let( :body ) { [ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 ] }
+    it { expect { subject }.to raise_error( ArgumentError ) }
+  end
+
   context "when sending a Flow Mod with VendorAction" do
     let( :body ) { [ 0x00, 0x08, 0x54, 0x72, 0x65, 0x6d, 0x61, 0x00 ] }
 

data/src/examples/switch_event_config/.gitignore

@@ -2,6 +2,5 @@ add_forward_entry
 delete_forward_entry
 dump_forward_entries
 set_forward_entries
-nw_dsl.conf
 switch_event_config_add.conf
 

data/src/examples/switch_event_config/network.conf

@@ -0,0 +1,2 @@
+vswitch { datapath_id 0x1 }
+vswitch { datapath_id 0x2 }

data/src/lib/arp.h

@@ -48,7 +48,9 @@ typedef struct arp_header {
 
 
 #define ARP_OP_REQUEST 1
-#define ARP_OP_REPLY   2
+#define ARP_OP_REPLY 2
+#define ARP_OP_RREQUEST 3
+#define ARP_OP_RREPLY 4
 
 
 #endif // ARP_H

data/src/lib/ether.h

@@ -39,6 +39,7 @@
 #define ETH_ETHTYPE_8023 0x05dc
 #define ETH_ETHTYPE_IPV4 0x0800
 #define ETH_ETHTYPE_ARP 0x0806
+#define ETH_ETHTYPE_RARP 0x8035
 #define ETH_ETHTYPE_TPID 0x8100
 #define ETH_ETHTYPE_IPV6 0x86DD
 #define ETH_ETHTYPE_EAPOL 0x88c7

data/src/lib/event_forward_interface.c

@@ -649,7 +649,6 @@ all_sw_tx*
 _insert_tx( size_t n_dpids, struct event_forward_operation_to_all_request_param *param ) {
   all_sw_tx *tx = xcalloc( 1, sizeof(all_sw_tx) );
   tx->txid = get_txid();
-  info( "txid %#x Start dispatching to switches", tx->txid );
   tx->request_param = param;
   tx->tx_result = EFI_OPERATION_SUCCEEDED;
   tx->waiting_dpid = create_hash_with_size( compare_datapath_id,
@@ -666,7 +665,8 @@ _dispatch_to_all_switch( uint64_t *dpids, size_t n_dpids, void *user_data ) {
   struct event_forward_operation_to_all_request_param *param = user_data;
 
   all_sw_tx *tx = _insert_tx( n_dpids, param );
-
+  info( "txid %#x Start dispatching to switches", tx->txid );
+  debug( "dispatching to %zd switches", n_dpids );
   // copy dpid hash to transaction.
   for ( size_t i = 0 ; i < n_dpids ; ++i ) {
     uint64_t *dpid = xmalloc( sizeof( uint64_t ) );
@@ -715,11 +715,16 @@ _dispatch_to_all_switch( uint64_t *dpids, size_t n_dpids, void *user_data ) {
     }
   }
 
-  if ( tx->tx_result == EFI_OPERATION_FAILED ) {
+  if ( n_dpids == 0 || tx->tx_result == EFI_OPERATION_FAILED ) {
+    if ( n_dpids == 0 ) {
+      info( "txid %#x completed. No switches found.", tx->txid );
+    }
+    else if ( tx->tx_result == EFI_OPERATION_FAILED ) {
+      info( "txid %#x completed with failure.", tx->txid );
+    }
     if ( param->callback != NULL ) {
       param->callback( tx->tx_result, param->user_data );
     }
-    info( "txid %#x completed with failure.", tx->txid );
     // remove and cleanup tx
     delete_hash_entry( efi_tx_table, &tx->txid );
     xfree_all_sw_tx( tx );

data/src/lib/openflow_message.c

@@ -1638,6 +1638,7 @@ append_action_vendor( openflow_actions *actions, const uint32_t vendor, const bu
   debug( "Appending a vendor action ( vendor = %#" PRIx32 ", body length = %u ).", vendor, body_length );
 
   assert( actions != NULL );
+  assert( ( body_length % 8 ) == 0 );
 
   action_vendor = ( struct ofp_action_vendor_header * )
                   xcalloc( 1, sizeof( struct ofp_action_vendor_header ) + body_length );
@@ -3457,6 +3458,9 @@ validate_action_vendor( const struct ofp_action_vendor_header *action ) {
   if ( ntohs( action->len ) < sizeof( struct ofp_action_vendor_header ) ) {
     return ERROR_TOO_SHORT_ACTION_VENDOR;
   }
+  else if ( ntohs( action->len ) % 8 != 0 ) {
+    return ERROR_INVALID_LENGTH_ACTION_VENDOR;
+  }
 
   // action->vendor
 
@@ -3758,6 +3762,7 @@ static struct error_map {
       { ERROR_TOO_LONG_ACTION_ENQUEUE, OFPET_BAD_ACTION, OFPBAC_BAD_LEN },
       { ERROR_INVALID_PORT_NO, OFPET_BAD_ACTION, OFPBAC_BAD_OUT_PORT },
       { ERROR_TOO_SHORT_ACTION_VENDOR, OFPET_BAD_ACTION, OFPBAC_BAD_LEN },
+      { ERROR_INVALID_LENGTH_ACTION_VENDOR, OFPET_BAD_ACTION, OFPBAC_BAD_LEN },
       { ERROR_UNDEFINED_ACTION_TYPE, OFPET_BAD_ACTION, OFPBAC_BAD_TYPE },
       { 0, 0, 0 },
     }
@@ -3800,6 +3805,7 @@ static struct error_map {
       { ERROR_TOO_LONG_ACTION_ENQUEUE, OFPET_BAD_ACTION, OFPBAC_BAD_LEN },
       { ERROR_INVALID_PORT_NO, OFPET_BAD_ACTION, OFPBAC_BAD_OUT_PORT },
       { ERROR_TOO_SHORT_ACTION_VENDOR, OFPET_BAD_ACTION, OFPBAC_BAD_LEN },
+      { ERROR_INVALID_LENGTH_ACTION_VENDOR, OFPET_BAD_ACTION, OFPBAC_BAD_LEN },
       { ERROR_UNDEFINED_ACTION_TYPE, OFPET_BAD_ACTION, OFPBAC_BAD_TYPE },
       { ERROR_INVALID_WILDCARDS, OFPET_FLOW_MOD_FAILED, OFPFMFC_EPERM }, // FIXME
       { ERROR_UNDEFINED_FLOW_MOD_COMMAND, OFPET_FLOW_MOD_FAILED, OFPFMFC_BAD_COMMAND },

data/src/lib/openflow_message.h

@@ -202,6 +202,7 @@ enum {
   ERROR_TOO_SHORT_ACTION_ENQUEUE,
   ERROR_TOO_LONG_ACTION_ENQUEUE,
   ERROR_TOO_SHORT_ACTION_VENDOR,
+  ERROR_INVALID_LENGTH_ACTION_VENDOR,
   ERROR_UNSUPPORTED_STATS_TYPE,
   ERROR_INVALID_STATS_REPLY_FLAGS,
   ERROR_INVALID_FLOW_PRIORITY,

data/src/lib/packet_info.c

@@ -124,6 +124,13 @@ packet_type_arp( const buffer *frame ) {
 }
 
 
+bool
+packet_type_rarp( const buffer *frame ) {
+  die_if_NULL( frame );
+  return if_packet_type( frame, NW_RARP );
+}
+
+
 bool
 packet_type_ipv4( const buffer *frame ) {
   die_if_NULL( frame );
@@ -218,6 +225,22 @@ packet_type_arp_reply( const buffer *frame ) {
 }
 
 
+bool
+packet_type_rarp_request( const buffer *frame ) {
+  die_if_NULL( frame );
+  return ( if_packet_type( frame, NW_RARP ) &
+           if_arp_opcode( frame, ARP_OP_RREQUEST ) );
+}
+
+
+bool
+packet_type_rarp_reply( const buffer *frame ) {
+  die_if_NULL( frame );
+  return ( if_packet_type( frame, NW_RARP ) &
+           if_arp_opcode( frame, ARP_OP_RREPLY ) );
+}
+
+
 static bool
 if_icmpv4_type( const buffer *frame, const uint32_t type ) {
   die_if_NULL( frame );

data/src/lib/packet_info.h

@@ -48,6 +48,7 @@ enum {
   NW_ARP = 0x00001000,
   NW_IGMP = 0x00002000,
   NW_LLDP = 0x00004000,
+  NW_RARP = 0x00008000,
   TP_TCP = 0x00010000,
   TP_UDP = 0x00020000,
   TP_ETHERIP = 0x00040000,
@@ -58,6 +59,7 @@ enum {
   ETH_VTAG_SNAP = ETH_8021Q | ETH_8023_SNAP,
   ETH_ARP = ETH_DIX | NW_ARP,
   ETH_LLDP = ETH_DIX | NW_LLDP,
+  ETH_RARP = ETH_DIX | NW_RARP,
   ETH_IPV4 = ETH_DIX | NW_IPV4,
   ETH_IPV4_ICMPV4 = ETH_IPV4 | NW_ICMPV4,
   ETH_IPV4_IGMP = ETH_IPV4 | NW_IGMP,
@@ -191,6 +193,7 @@ bool packet_type_eth_llc( const buffer *frame );
 bool packet_type_eth_snap( const buffer *frame );
 bool packet_type_ether( const buffer *frame );
 bool packet_type_arp( const buffer *frame );
+bool packet_type_rarp( const buffer *frame );
 bool packet_type_ipv4( const buffer *frame );
 bool packet_type_ipv6( const buffer *frame );
 bool packet_type_lldp( const buffer *frame );
@@ -204,6 +207,8 @@ bool packet_type_ipv4_etherip( const buffer *frame );
 
 bool packet_type_arp_request( const buffer *frame );
 bool packet_type_arp_reply( const buffer *frame );
+bool packet_type_rarp_request( const buffer *frame );
+bool packet_type_rarp_reply( const buffer *frame );
 
 bool packet_type_icmpv4_echo_reply( const buffer *frame );
 bool packet_type_icmpv4_dst_unreach( const buffer *frame );

data/src/lib/packet_parser.c

@@ -119,7 +119,7 @@ parse_ether( buffer *buf ) {
 
 
 static void
-parse_arp( buffer *buf ) {
+parse_arp( buffer *buf, uint32_t format ) {
   assert( buf != NULL );
 
   packet_info *packet_info = buf->user_data;
@@ -144,7 +144,7 @@ parse_arp( buffer *buf ) {
   memcpy( packet_info->arp_tha, arp_header->tha, ETH_ADDRLEN );
   packet_info->arp_tpa = ntohl( arp_header->tip );
 
-  packet_info->format |= NW_ARP;
+  packet_info->format |= format;
 }
 
 
@@ -441,7 +441,12 @@ parse_packet( buffer *buf ) {
   switch ( packet_info->eth_type ) {
   case ETH_ETHTYPE_ARP:
     packet_info->l3_header = packet_info->l2_payload;
-    parse_arp( buf );
+    parse_arp( buf, NW_ARP );
+    break;
+
+  case ETH_ETHTYPE_RARP:
+    packet_info->l3_header = packet_info->l2_payload;
+    parse_arp( buf, NW_RARP );
     break;
 
   case ETH_ETHTYPE_IPV4: