diff --git a/examples/heckle/config/config.exs b/examples/heckle/config/config.exs index b8b1eed..abcf6ee 100644 --- a/examples/heckle/config/config.exs +++ b/examples/heckle/config/config.exs @@ -5,23 +5,23 @@ use Mix.Config config :heckle, vlan_tagging: true, vlan_id: 123, - vlan_trunk: "veth0", - access_port1: "veth4", - access_port2: "veth3", + vlan_trunk: "1", + access_port1: "3", + access_port2: "4", receiver_mac: "00000000000f", receiver_ip: {8,8,8,8}, sender_mac: "001122334455", inside_local: {192,168,5,10}, outside_local: {192,168,255,1}, - flow_pattern: :bum + flow_pattern: :bum # :nat || :bum config :tres, protocol: :tcp, - port: 6653, + port: 6633, max_connections: 10, num_acceptors: 10, callback_module: Heckle.Controller, - callback_args: ["0000d2851d52d749"] + callback_args: ["0002b05ada98d790"] config :logger, level: :debug, diff --git a/examples/heckle/lib/heckle/pipeline_profiles.ex b/examples/heckle/lib/heckle/pipeline_profiles.ex index 492febd..6327d1a 100644 --- a/examples/heckle/lib/heckle/pipeline_profiles.ex +++ b/examples/heckle/lib/heckle/pipeline_profiles.ex @@ -8,22 +8,23 @@ defmodule Heckle.PipelineProfiles do name: "classifier", max_entries: 10, config: [:table_miss_mask], # deprecated mask. - match: [:in_port, :masked_eth_src], - wildcards: [:in_port, :masked_eth_src], - instructions: [GotoTable], - write_actions: [Output], + match: [:in_port, :vlan_vid, :eth_src], + wildcards: [:in_port, :vlan_vid, :eth_src], + instructions: [GotoTable, ApplyActions], + apply_actions: [Output, PushVlan, SetField, PopVlan], + apply_setfield: [:eth_dst, :vlan_vid], next_tables: [1], ), TableFeatures.Body.new( table_id: 1, - name: "NAT", + name: "process", max_entries: 10, config: [:table_miss_mask], - match: [:eth_dst, :eth_src, :eth_type, :ipv4_src, :ipv4_dst], - wildcards: [:eth_dst, :eth_src, :eth_type, :ipv4_src, :ipv4_dst], + match: [:eth_src, :masked_eth_dst, :vlan_vid, :eth_type, :ipv4_src, :ipv4_dst], + wildcards: [:eth_src, :masked_eth_dst, :vlan_vid, :eth_type, :ipv4_src, :ipv4_dst], instructions: [ApplyActions], - write_actions: [SetField, PopVlan, PushVlan, Output], - apply_setfield: [:eth_dst, :vlan_vid, :ipv4_src, :ipv4_dst], + apply_actions: [SetField, PopVlan, PushVlan, Output], + apply_setfield: [:eth_src, :eth_dst, :vlan_vid, :ipv4_src, :ipv4_dst], next_tables: [], ) ]