Merge into master from pull request #139:
add bsn_disable_src_mac_check instruction (https://github.com/floodlight/loxigen/pull/139)
diff --git a/java_gen/java_type.py b/java_gen/java_type.py
index d1a9e67..eca00e7 100644
--- a/java_gen/java_type.py
+++ b/java_gen/java_type.py
@@ -597,10 +597,10 @@
'of_action_push_mpls': { 'ethertype': eth_type },
'of_action_push_pbb': { 'ethertype': eth_type },
'of_action_push_vlan': { 'ethertype': eth_type },
+ 'of_action_pop_mpls': { 'ethertype': eth_type },
'of_action_set_nw_dst': { 'nw_addr': ipv4 },
'of_action_set_nw_ecn': { 'nw_ecn': ip_ecn },
'of_action_set_nw_src': { 'nw_addr': ipv4 },
- 'of_action_set_nw_dst': { 'tp_port': transport_port },
'of_action_set_tp_dst': { 'tp_port': transport_port },
'of_action_set_tp_src': { 'tp_port': transport_port },
'of_action_set_vlan_pcp': { 'vlan_pcp': vlan_pcp },
diff --git a/java_gen/pre-written/pom.xml b/java_gen/pre-written/pom.xml
index cc480df..9845e87 100644
--- a/java_gen/pre-written/pom.xml
+++ b/java_gen/pre-written/pom.xml
@@ -148,6 +148,74 @@
<downloadJavadocs>true</downloadJavadocs>
</configuration>
</plugin>
+ <!-- use maven git-commit-id plugin to provide vcs metadata -->
+ <plugin>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
+ <version>2.1.5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>revision</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ <configuration>
+ <!-- our BuildInfoManager expects dates to be in ISO-8601 format -->
+ <dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
+
+ <verbose>true</verbose>
+
+ <skipPoms>true</skipPoms>
+ <generateGitPropertiesFile>false</generateGitPropertiesFile>
+ <dotGitDirectory>${project.basedir}/../../.git</dotGitDirectory>
+ <failOnNoGitDirectory>false</failOnNoGitDirectory>
+
+ <gitDescribe>
+ <skip>false</skip>
+ <always>true</always>
+ <abbrev>7</abbrev>
+ <dirty>-dirty</dirty>
+ <forceLongFormat>false</forceLongFormat>
+ </gitDescribe>
+ </configuration>
+ </plugin>
+ <!-- include git info in generated jars -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.projectfloodlight.core.Main</mainClass>
+ </manifest>
+ <manifestSections>
+ <manifestSection>
+ <name>Floodlight-buildinfo</name>
+ <manifestEntries>
+ <projectName>${project.name}</projectName>
+ <version>${project.version}</version>
+ <vcsRevision>${git.commit.id.abbrev}</vcsRevision>
+ <vcsBranch>${git.branch}</vcsBranch>
+ <vcsDirty>${git.commit.id.describe}</vcsDirty>
+ <buildUser>${user.name}</buildUser>
+ <buildDate>${git.build.time}</buildDate>
+ </manifestEntries>
+ </manifestSection>
+ </manifestSections>
+ </archive>
+ </configuration>
+ </plugin>
+
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java
index a502836..2c63048 100644
--- a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java
+++ b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java
@@ -108,11 +108,11 @@
new Prerequisite<IpProtocol>(MatchField.IP_PROTO, IpProtocol.SCTP));
public final static MatchField<ICMPv4Type> ICMPV4_TYPE = new MatchField<ICMPv4Type>(
- "icmpv4_src", MatchFields.ICMPV4_TYPE,
+ "icmpv4_type", MatchFields.ICMPV4_TYPE,
new Prerequisite<IpProtocol>(MatchField.IP_PROTO, IpProtocol.ICMP));
public final static MatchField<ICMPv4Code> ICMPV4_CODE = new MatchField<ICMPv4Code>(
- "icmpv4_dst", MatchFields.ICMPV4_CODE,
+ "icmpv4_code", MatchFields.ICMPV4_CODE,
new Prerequisite<IpProtocol>(MatchField.IP_PROTO, IpProtocol.ICMP));
public final static MatchField<ArpOpcode> ARP_OP = new MatchField<ArpOpcode>(
diff --git a/wireshark_gen/templates/openflow.lua b/wireshark_gen/templates/openflow.lua
index 7113281..d9eb76a 100644
--- a/wireshark_gen/templates/openflow.lua
+++ b/wireshark_gen/templates/openflow.lua
@@ -29,6 +29,14 @@
:: ir = loxi_globals.ir
:: include('_copyright.lua')
+-- Copy this file to your wireshark plugin directory:
+-- Linux / OS X: ~/.wireshark/plugins/
+-- Windows: C:\Documents and Settings\<username>\Application Data\Wireshark\plugins\
+-- You may need to create the directory.
+
+-- The latest version of this dissector is always available at:
+-- http://www.projectfloodlight.org/openflow.lua
+
:: include('_ofreader.lua')
:: include('_oftype_readers.lua')