trema 0.2.7 → 0.2.8

data/src/examples/simple_router/router-utils.rb

@@ -0,0 +1,211 @@
+#
+# A router implementation in Trema
+#
+# Copyright (C) 2012 NEC Corporation
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+
+require 'ipaddr'
+
+
+def get_checksum csum, val
+  sum = ( ~csum & 0xffff ) + val
+  while sum > 0xffff
+    sum = ( sum & 0xffff ) + ( sum >> 16 )
+  end
+  ~sum & 0xffff
+end
+
+
+class IPAddr
+  def to_a
+    self.to_s.split( "." ).collect do | each |
+      each.to_i
+    end
+  end
+end
+
+
+class EthernetHeader
+  attr_accessor :macda, :macsa, :eth_type
+
+
+  def initialize macda, macsa, eth_type
+    @macda = macda
+    @macsa = macsa
+    @eth_type = eth_type
+  end
+
+
+  def pack
+    ( @macda.to_a + @macsa.to_a + [ eth_type ] ).pack( "C12n" )
+  end
+end
+
+
+class ARPPacket
+  attr_accessor :type, :tha, :sha, :tpa, :spa
+
+
+  def initialize type, tha, sha, tpa, spa
+    @type = type
+    @tha = tha
+    @sha = sha
+    @tpa = tpa
+    @spa = spa
+  end
+
+
+  def pack
+    eth_header = EthernetHeader.new( @tha, @sha, 0x0806 )
+
+    # arp
+    arp = [ 0x00, 0x01, 0x08, 0x00, 0x06, 0x04, 0x00, @type ]
+    arp += @sha.to_a + @spa.to_a + @tha.to_a + @tpa.to_a
+
+    while arp.length < 46 do
+      arp += [ 0x00 ]
+    end
+
+    eth_header.pack + arp.pack( "C*" )
+  end
+end
+
+
+class ARPRequest < ARPPacket
+  def initialize sha, tpa, spa
+    tha = [ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff ]
+    super( 1, tha, sha, tpa, spa )
+  end
+end
+
+
+class ARPReply < ARPPacket
+  def initialize tha, sha, tpa, spa
+    super( 2, tha, sha, tpa, spa )
+  end
+end
+
+
+class IPPacket
+  attr_accessor :id, :protocol, :daddr, :saddr, :payload
+
+
+  def initialize options
+    @id = options[ :id ]
+    @protocol = options[ :protocol ]
+    @daddr = options[ :daddr ]
+    @saddr = options[ :saddr ]
+    @payload = options[ :payload ]
+    @tot_len = 20 + payload.length
+  end
+
+
+  def pack
+    csum = get_checksum( 0, 0x4500 )
+    header = [ 0x45, 0x00 ] # Version, IHL, ToS
+
+    csum = get_checksum( csum, @tot_len )
+    header += [ @tot_len >> 8, @tot_len & 0xff ] # len
+
+    csum = get_checksum( csum, @id )
+    header += [ @id >> 8, @id & 0xff ] # ID
+
+    csum = get_checksum( csum, 0x4000 )
+    header += [ 0x40, 0x00 ] # Flags, Frag offset
+
+    csum = get_checksum( csum, 0x40 * 0x100 + @protocol )
+    header += [ 0x40, @protocol ] # ttl, protocol
+
+    csum = get_checksum( csum, @saddr.to_i >> 16 )
+    csum = get_checksum( csum, @saddr.to_i & 0xffff )
+    csum = get_checksum( csum, @daddr.to_i >> 16 )
+    csum = get_checksum( csum, @daddr.to_i & 0xffff )
+    header += [ csum >> 8, csum & 0xff ] # checksum
+    header += @saddr.to_a + @daddr.to_a
+
+    header.pack( "C*" ) + @payload.pack
+  end
+end
+
+
+class ICMPPacket
+  attr_reader :payload, :length
+
+
+  def initialize type, code, payload
+    @type = type
+    @code = code
+    @payload = payload
+    @length = 4 + payload.length
+  end
+
+
+  def pack
+    @checksum = get_checksum( 0, @type * 0x100 + @code )
+
+    words = @payload.pack( "C*" ).unpack( "n*" )
+    words.each do | each |
+      @checksum = get_checksum( @checksum, each )
+    end
+
+    [ @type, @code, @checksum ].pack( "C2n" ) + @payload.pack( "C*" )
+  end
+end
+
+
+class ICMPEchoReply < ICMPPacket
+  def initialize payload
+    super( 0x00, 0x00, payload )
+  end
+end
+
+
+module RouterUtils
+  def create_arp_request_from interface, addr
+    arp = ARPRequest.new( interface.hwaddr, addr, interface.ipaddr )
+    arp.pack
+  end
+
+
+  def create_arp_reply_from message, replyaddr
+    arp = ARPReply.new( message.macsa, replyaddr, message.arp_spa, message.arp_tpa )
+    arp.pack
+  end
+
+
+  def create_icmpv4_reply entry, interface, message
+    offset = 14 + 20 + 4
+    payload = message.data.unpack( "C*" )[ offset .. message.data.length - 1 ]
+    icmp = ICMPEchoReply.new( payload )
+    ip_packet = IPPacket.new( :id => message.ipv4_id,
+                              :protocol => message.ipv4_protocol,
+                              :ttl => message.ipv4_ttl,
+                              :daddr => message.ipv4_saddr,
+                              :saddr => message.ipv4_daddr,
+                              :payload => icmp )
+    eth_header = EthernetHeader.new( entry.hwaddr, interface.hwaddr, 0x0800 )
+
+    eth_header.pack + ip_packet.pack
+  end
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8
+### indent-tabs-mode: nil
+### End:

data/src/examples/simple_router/routing-table.rb

@@ -0,0 +1,67 @@
+#
+# Routing Table
+#
+# Copyright (C) 2012 NEC Corporation
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+
+require "ipaddr"
+
+
+class RoutingTable
+  ADDR_LEN = 32
+
+
+  def initialize route = []
+    @db = Array.new( ADDR_LEN + 1 ) { Hash.new }
+    route.each do | each |
+      add( each )
+    end
+  end
+
+
+  def add options
+    dest = IPAddr.new( options[ :destination ] )
+    masklen = options[ :masklen ]
+    prefix = dest.mask( masklen )
+    @db[ masklen ][ prefix.to_i ] = IPAddr.new( options[ :gateway ] )
+  end
+
+
+  def delete options
+    dest = IPAddr.new( options[ :destination ] )
+    masklen = options[ :masklen ]
+    prefix = dest.mask( masklen )
+    @db[ masklen ].delete( prefix.to_i )
+  end
+
+
+  def lookup dest
+    ( 0..ADDR_LEN ).reverse_each do | masklen |
+      prefix = dest.mask( masklen )
+      entry = @db[ masklen ][ prefix.to_i ]
+      return entry if entry
+    end
+    nil
+  end
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/src/examples/simple_router/simple-router.rb

@@ -0,0 +1,180 @@
+#
+# A router implementation in Trema
+#
+# Copyright (C) 2012 NEC Corporation
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+require "arp-table"
+require "interface"
+require "router-utils"
+require "routing-table"
+
+
+class SimpleRouter < Controller
+  include RouterUtils
+
+
+  def start
+    load "simple_router.conf"
+    @interfaces = Interfaces.new( $interface )
+    @arp_table = ARPTable.new
+    @routing_table = RoutingTable.new( $route )
+  end
+
+
+  def packet_in( dpid, message )
+    return if not to_me?( message )
+
+    if message.arp_request?
+      handle_arp_request dpid, message
+    elsif message.arp_reply?
+      handle_arp_reply message
+    elsif message.ipv4?
+      handle_ipv4 dpid, message
+    else
+      # noop.
+    end
+  end
+
+
+  private
+
+
+  def to_me?( message )
+    return true if message.macda.broadcast?
+
+    interface = @interfaces.find_by_port( message.in_port )
+    if interface and interface.has?( message.macda )
+      return true
+    end
+  end
+
+
+  def handle_arp_request( dpid, message )
+    port = message.in_port
+    daddr = message.arp_tpa
+    interface = @interfaces.find_by_port_and_ipaddr( port, daddr )
+    if interface
+      arp_reply = create_arp_reply_from( message, interface.hwaddr )
+      packet_out dpid, arp_reply, SendOutPort.new( interface.port )
+    end
+  end
+
+
+    def handle_arp_reply( message )
+    @arp_table.update message.in_port, message.arp_spa, message.arp_sha
+  end
+
+
+  def handle_ipv4( dpid, message )
+    if should_forward?( message )
+      forward dpid, message
+    elsif message.icmpv4_echo_request?
+      handle_icmpv4_echo_request dpid, message
+    else
+      # noop.
+    end
+  end
+
+
+  def should_forward?( message )
+    not @interfaces.find_by_ipaddr( message.ipv4_daddr )
+  end
+
+
+  def handle_icmpv4_echo_request( dpid, message )
+    interface = @interfaces.find_by_port( message.in_port )
+    saddr = message.ipv4_saddr.value
+    arp_entry = @arp_table.lookup( saddr )
+    if arp_entry
+      icmpv4_reply = create_icmpv4_reply( arp_entry, interface, message )
+      packet_out dpid, icmpv4_reply, SendOutPort.new( interface.port )
+    else
+      handle_unresolved_packet dpid, message, interface, saddr
+    end
+  end
+
+
+  def forward( dpid, message )
+    next_hop = resolve_next_hop( message.ipv4_daddr )
+
+    interface = @interfaces.find_by_prefix( next_hop )
+    if not interface or interface.port == message.in_port
+      return
+    end
+
+    arp_entry = @arp_table.lookup( next_hop )
+    if arp_entry
+      macsa = interface.hwaddr
+      macda = arp_entry.hwaddr
+      action = create_action_from( macsa, macda, interface.port )
+      flow_mod dpid, message, action
+      packet_out dpid, message.data, action
+    else
+      handle_unresolved_packet dpid, message, interface, next_hop
+    end
+  end
+
+
+  def resolve_next_hop( daddr )
+    next_hop = @routing_table.lookup( daddr.value )
+    if next_hop
+      next_hop
+    else
+      daddr.value
+    end
+  end
+
+
+  def flow_mod( dpid, message, action )
+    send_flow_mod_add(
+      dpid,
+      :match => ExactMatch.from( message ),
+      :actions => action
+    )
+  end
+
+
+  def packet_out( dpid, packet, action )
+    send_packet_out(
+      dpid,
+      :data => packet,
+      :actions => action
+    )
+  end
+
+
+  def handle_unresolved_packet( dpid, message, interface, ipaddr )
+    arp_request = create_arp_request_from( interface, ipaddr )
+    packet_out dpid, arp_request, SendOutPort.new( interface.port )
+  end
+
+
+  def create_action_from( macsa, macda, port )
+    [
+      SetEthSrcAddr.new( macsa.to_s ),
+      SetEthDstAddr.new( macda.to_s ),
+      SendOutPort.new( port )
+    ]
+  end
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8
+### indent-tabs-mode: nil
+### End:

data/src/examples/simple_router/simple_router.conf

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+$interface = [
+  {
+    :port => 2,
+    :hwaddr => "00:00:00:01:00:01",
+    :ipaddr => "192.168.1.1",
+    :masklen => 24
+  },
+  {
+    :port => 1,
+    :hwaddr => "00:00:00:01:00:02",
+    :ipaddr => "192.168.2.1",
+    :masklen => 24
+  }
+]
+
+$route = []

data/src/examples/simple_router/simple_router_netns.conf

@@ -0,0 +1,15 @@
+vswitch { dpid "0x1" }
+
+netns ( "host1" ) {
+  ip "192.168.1.2"
+  netmask "255.255.255.0"
+  route :net=>"0.0.0.0/0", :gw=>"192.168.1.1"
+}
+netns ( "host2" ) {
+  ip "192.168.2.2"
+  netmask "255.255.255.0"
+  route :net=>"0.0.0.0/0", :gw=>"192.168.2.1"
+}
+
+link "host1", "0x1"
+link "host2", "0x1"

data/src/examples/simple_router/simple_router_network.conf

@@ -0,0 +1,6 @@
+vswitch ( "switch" ) {
+  datapath_id "0x1"
+}
+
+link "switch", "eth1"
+link "switch", "eth0"

data/src/tremashark/plugin/packet-trema/packet-trema.c

@@ -22,20 +22,20 @@
 #include "config.h"
 #endif
 
-#include <arpa/inet.h>
-#include <epan/addr_resolv.h>
-#include <epan/dissectors/packet-tcp.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <glib.h>
 #include <epan/emem.h>
-#include <epan/etypes.h>
-#include <epan/ipproto.h>
 #include <epan/packet.h>
+#include <epan/dissectors/packet-tcp.h>
 #include <epan/prefs.h>
+#include <epan/ipproto.h>
+#include <epan/etypes.h>
+#include <epan/addr_resolv.h>
 #include <epan/reassemble.h>
-#include <glib.h>
 #include <pcap/pcap.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
+#include <arpa/inet.h>
 #include "messenger.h"
 #include "openflow_service_interface.h"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trema
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Yasuhito Takamiya
@@ -15,7 +15,7 @@ autorequire:
 bindir: .
 cert_chain: []
 
-date: 2012-12-27 00:00:00 Z
+date: 2013-01-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -118,13 +118,12 @@ files:
 - features/example.hello_trema.feature
 - features/example.learning_switch.feature
 - features/example.list_switches.feature
-- features/example.message.echo_reply.feature
-- features/example.message.echo_request.feature
 - features/example.message.features_request.feature
-- features/example.message.hello.feature
 - features/example.message.set_config.feature
 - features/example.message.vendor-action.feature
 - features/example.multi_learning_switch.feature
+- features/example.openflow_message.echo.feature
+- features/example.openflow_message.hello.feature
 - features/example.packet_in.feature
 - features/example.packetin_filter_config.feature
 - features/example.patch_panel.feature
@@ -432,10 +431,8 @@ files:
 - src/examples/multi_learning_switch/multi_learning_switch.c
 - src/examples/multi_learning_switch/multi_learning_switch.conf
 - src/examples/openflow_message/README
-- src/examples/openflow_message/echo-reply.rb
-- src/examples/openflow_message/echo-request.rb
-- src/examples/openflow_message/echo_reply.c
-- src/examples/openflow_message/echo_request.c
+- src/examples/openflow_message/echo.c
+- src/examples/openflow_message/echo.rb
 - src/examples/openflow_message/example.rb
 - src/examples/openflow_message/features-request.rb
 - src/examples/openflow_message/features_request.c
@@ -445,6 +442,7 @@ files:
 - src/examples/openflow_message/set_config.c
 - src/examples/openflow_message/vendor-action.rb
 - src/examples/openflow_message/vendor_action.c
+- src/examples/openflow_switch/echo_switch.c
 - src/examples/openflow_switch/hello_switch.c
 - src/examples/packet_in/README
 - src/examples/packet_in/packet-in.rb
@@ -468,6 +466,14 @@ files:
 - src/examples/repeater_hub/repeater-hub_spec.rb
 - src/examples/repeater_hub/repeater_hub.c
 - src/examples/repeater_hub/repeater_hub.conf
+- src/examples/simple_router/arp-table.rb
+- src/examples/simple_router/interface.rb
+- src/examples/simple_router/router-utils.rb
+- src/examples/simple_router/routing-table.rb
+- src/examples/simple_router/simple-router.rb
+- src/examples/simple_router/simple_router.conf
+- src/examples/simple_router/simple_router_netns.conf
+- src/examples/simple_router/simple_router_network.conf
 - src/examples/switch_info/README
 - src/examples/switch_info/switch-info.rb
 - src/examples/switch_info/switch_info.c

data/features/example.message.echo_reply.feature

@@ -1,26 +0,0 @@
-Feature: Send echo reply messages
-
-  As a Trema user
-  I want to send echo reply messages to openflow switches
-  Because I want to reply to echo requests from openflow switches
-
-  @wip
-  Scenario: Send echo reply x 10
-    When I try trema run "./objects/examples/openflow_message/echo_reply 10" with following configuration (backgrounded):
-      """
-      vswitch("echo_reply") { datapath_id "0xabc" }
-      """
-      And wait until "echo_reply" is up
-      And *** sleep 2 ***
-    Then the log file "openflowd.echo_reply.log" should include "received: OFPT_ECHO_REPLY" x 10
-
-  @wip
-  Scenario: Send echo reply x 10 in Ruby
-   When I try trema run "./src/examples/openflow_message/echo-reply.rb 0xabc, 10" with following configuration (backgrounded):
-     """
-     vswitch("echo-reply") { datapath_id "0xabc" }
-     """
-   And wait until "EchoReplyController" is up
-   And *** sleep 2 ***
-  Then the log file "openflowd.echo-reply.log" should include "received: OFPT_ECHO_REPLY" x 10
-

data/features/example.message.echo_request.feature

@@ -1,25 +0,0 @@
-Feature: Send echo request messages
-
-  As a Trema user
-  I want to send echo request messages to openflow switches
-  So that I can receive echo reply messages from openflow switches
-
-  @wip
-  Scenario: Send echo request x 10
-    When I try trema run "./objects/examples/openflow_message/echo_request 10" with following configuration (backgrounded):
-      """
-      vswitch("echo_request") { datapath_id "0xabc" }
-      """
-      And wait until "echo_request" is up
-      And *** sleep 2 ***
-    Then the log file "openflowd.echo_request.log" should include "received: OFPT_ECHO_REQUEST" x 10
-
-  @wip
-  Scenario: Send echo request x 10 in Ruby
-    When I try trema run "./src/examples/openflow_message/echo-request.rb 0xabc, 10" with following configuration (backgrounded):
-      """
-      vswitch("echo-request") { datapath_id "0xabc" }
-      """
-      And wait until "EchoRequestController" is up
-      And *** sleep 2 ***
-    Then the log file "openflowd.echo-request.log" should include "received: OFPT_ECHO_REQUEST" x 10