Fix mpls_label match view in ofl-strcurs-print.c

Makefile.am

@@ -17,7 +17,7 @@ AM_CPPFLAGS = $(SSL_CFLAGS) -g
 AM_CPPFLAGS += -I $(top_srcdir)/include
 AM_CPPFLAGS += -I $(top_srcdir)/lib
 
-AM_CFLAGS = -Wstrict-prototypes
+AM_CFLAGS = -Wstrict-prototypes -Werror
 
 if NDEBUG
 AM_CPPFLAGS += -DNDEBUG

README.md

@@ -1,63 +1,82 @@
-# OpenFlow 1.3 Software Switch
+# Basic OpenFlow Software Switch (BOFUSS)
 
-This is an [OpenFlow 1.3][ofp13] compatible user-space software switch implementation. The code is based on the [Ericsson TrafficLab 1.1 softswitch
-implementation][ericssonsw11], with changes in the forwarding plane to support
-OpenFlow 1.3.
+This is an [OpenFlow 1.3][ofp13] compatible user-space software switch implementation. The code is based on the [Ericsson TrafficLab 1.1 softswitch implementation][ericssonsw11], with changes in the forwarding plane to support
+OpenFlow 1.3. 
+
+### [A paper that describes the basic architecture, selected use cases and a few benchmarks is available on Arxiv](https://arxiv.org/abs/1901.06699). 
+If you use the switch for academic purpuses, please consider the use of this citation.
+
+```
+@article{fernandes2020road,
+  title={The road to BOFUSS: The basic OpenFlow userspace software switch},
+  author={Fernandes, Eder Le{\~a}o and Rojas, Elisa and Alvarez-Horcajo, Joaquin and Kis, Zolt{\`a}n Lajos and Sanvito, Davide and Bonelli, Nicola and Cascone, Carmelo and Rothenberg, Christian Esteve},
+  journal={Journal of Network and Computer Applications},
+  pages={102685},
+  year={2020},
+  publisher={Elsevier}
+}
+
+```
+
+## [Please read the FAQ before posting an issue](https://github.com/CPqD/ofsoftswitch13/wiki/Frequently-Asked-Questions)
+
+Check the [Wiki](https://github.com/CPqD/ofsoftswitch13/wiki) for some resources that could possibly help you to modify the switch.  
+
+**UPDATE**: A new experimental branch with contributions from the [BEBA EU Project][beba-eu] is available with lots of performance improvements and OpenFlow extensions. If you want to try the code checkout to the BEBA-EU branch.
+
+```bash
+$ git checkout remotes/origin/BEBA-EU
+```
 
 The following components are available in this package:
 * `ofdatapath`: the switch implementation
 * `ofprotocol`: secure channel for connecting the switch to the controller
 * `oflib`: a library for converting to/from 1.3 wire format
 * `dpctl`: a tool for configuring the switch from the console
 
+
 # Getting Started
 
-These instructions have been tested on Ubuntu 12.04. Other distributions or versions may need different steps.
+These instructions have been tested on Ubuntu 16.04. Other distributions or versions may need different steps. 
 
 ## Before building
 The switch makes use of the NetBee library to parse packets, so we need to install it first.
 
 1. Install the following packages:
 
     ```
-    $ sudo apt-get install cmake libpcap-dev libxerces-c2-dev libpcre3-dev flex bison
+    $ sudo apt-get install cmake libpcap-dev libxerces-c3.1 libxerces-c-dev libpcre3 libpcre3-dev flex bison pkg-config autoconf libtool libboost-dev
     ```
 
-2. Download and unpack the source code from: http://www.nbee.org/download/nbeesrc-12-05-16.php
-
-3. Create the build system
+2. Clone and build netbee
 
     ```
-    $ cd nbeesrc/src
+    $ git clone https://github.com/netgroup-polito/netbee.git
+    $ cd netbee/src
     $ cmake .
-    ```
-
-4. Compile
-
-    ```
     $ make
     ```
 
-5. Add the shared libraries built in `/nbeesrc/bin/` to your `/usr/local/lib` directory
+3. Add the shared libraries built in `/nbeesrc/bin/` to your `/usr/local/lib` directory
 
     ```
     $ sudo cp ../bin/libn*.so /usr/local/lib
     ```
 
-6. Run `ldconfig`
+4. Run `ldconfig`
 
     ```
     $ sudo ldconfig
     ```
 
-7. Put the folder `nbeesrc/include` in the `/usr/include`
+5. Put the contens of folder `nbeesrc/include` in the `/usr/include`
 
     ```
-    $ sudo cp -R ../include /usr/include
+    $ sudo cp -R ../include/* /usr/include/
     ```
 
 ## Building
-Run the following commands in the `of13softswitch` directory to build and install everything:
+Run the following commands in the `ofsoftswitch13` directory to build and install everything:
 
     $ ./boot.sh
     $ ./configure
@@ -108,13 +127,7 @@ You can send requests to the switch using the `dpctl` utility.
     $ utilities/dpctl tcp:<switch-host>:<switch-port> flow-mod table=0,cmd=add in_port=1 meter:1
     ```
 
-For a complete list of commands and arguments, use the `--help` argument.
-
-The `dpctl` utility has some limitations at the moment:
-* No support for OXM masks
-* No support for multipart messages
-* Some set_field action fields are not present
-
+For a complete list of commands and arguments, use the `--help` argument. Also, check the wiki for [Flow Mod examples](https://github.com/CPqD/ofsoftswitch13/wiki/Dpctl-Flow-Mod-Cases)
 
 # Contribute
 Please submit your bug reports, fixes and suggestions as pull requests on
@@ -126,32 +139,15 @@ code from the original Stanford switch).
 
 # Acknowledgments
 
-This project is supported by Ericsson Innovation Center in Brazil.
-Maintained by CPqD in technical collaboration with Ericsson Research.
-
-**Contributions:**
-
-Zoltán Lajos Kis, ofsoftswitch 1.1 implementation and guidance for OpenFlow spec related subjects.
-
-Jean Tourrilhes, lots of critical memory bug fixes on table features.
-
-Khai Nguyen Dinh and Thanh Le Dinh, contributions on meter features.
-
-Rich Lane, added the right compiler linker.
-
-yu-iwata, fixed flow deletion without matchin out_port.
-
-Yuval Adler, bug fixes related to matching on vlan and ethertype.
-
-Hiroyasu OHYAMA, correct URL of NetBee Library.
-
-... 
+This project was supported by Ericsson Innovation Center in Brazil.
+Formerly maintained by CPqD in technical collaboration with Ericsson Research.
 
-*"Your name here" -- please, let us*
-*know if we forgot to add your name to the list of contributors!*
+[**List of Contributors**](https://github.com/CPqD/ofsoftswitch13/wiki/List-of-Contributors)
 
 # Contact
-E-mail: Eder Leao Fernandes (ederlf@cpqd.com.br)
+E-mail: Eder Leao Fernandes (ederleaofernandes at gmail . com)
 
 [ofp13]: https://www.opennetworking.org/images/stories/downloads/specification/openflow-spec-v1.3.0.pdf
 [ericssonsw11]: https://github.com/TrafficLab/of11softswitch
+[compileubuntu14]: http://tocai.dia.uniroma3.it/compunet-wiki/index.php/Installing_and_setting_up_OpenFlow_tools
+[beba-eu]: http://www.beba-project.eu/ 

boot.sh

@@ -3,12 +3,18 @@
 set -e
 
 # Generate list of files in debian/ to distribute.
-(echo '# Automatically generated by boot.sh (from Git tree).' &&
- printf 'EXTRA_DIST += \\\n' &&
- git ls-files debian | grep -v '^debian/\.gitignore$' |
- sed -e 's/\(.*\)/	\1 \\/' -e '$s/ \\//') > debian/automake.mk
+if [ -d .git ]; then
+  (echo '# Automatically generated by boot.sh (from Git tree).' &&
+   printf 'EXTRA_DIST += \\\n' &&
+   git ls-files debian | grep -v '^debian/\.gitignore$' |
+   sed -e 's/\(.*\)/    \1 \\/' -e '$s/ \\//') > debian/automake.mk
+else
+  (echo '# Automatically generated by boot.sh (from ls).' &&
+   printf 'EXTRA_DIST += \\\n' &&
+   ls debian | grep -v '^debian/\.gitignore$' |
+   sed -e 's/^/debian\//' -e 's/\(.*\)/    \1 \\/' -e '$s/ \\//') > debian/automake.mk   
+fi
 
 cat debian/control.in > debian/control
-
 # Bootstrap configure system from .ac/.am files
 autoreconf --install --force

customnetpdl.xml

@@ -737,6 +737,7 @@
                     <case value="1"> <nextproto proto="#icmp"/> </case>
 					<case value="6"> <nextproto proto="#tcp"/> </case>
 					<case value="17"> <nextproto proto="#udp"/> </case>
+					<case value="132"> <nextproto proto="#sctp"/> </case>
 				</switch>
 			</if-true>
 		</if>
@@ -891,10 +892,13 @@
 	</execute-code>
 
 	<format>
-		<fields>
-			<field type="bit" name="ver" longname="Version" mask="0xF0000000" size="4" showtemplate="FieldDec"/>
-			<field type="bit" name="tos" longname="Type of service" mask="0x0F000000" size="4" showtemplate="FieldHex"/>
-			<field type="bit" name="flabel" longname="{0x8000 28}" mask="0x00FFFFFF" size="4" showtemplate="FieldHex"/>
+		<fields>			
+			<block name="ipv6_ver_tc_fl" longname="Version, Traffic class and Flow label">
+				<field type="bit" name="ipv6 dscp" longname="{0x8000 8} DSCP" mask="F0000000" size="4" showtemplate="FieldDec"/>
+				<field type="bit" name="ipv6 ecn" longname="{0x8000 9} ECN" mask="0F000000" size="4" showtemplate="FieldDec"/>
+				<field type="bit" name="flabel"  mask="00FFFFFF" size="4" showtemplate="FieldDec"/>
+			</block>
+			<!-- <field type="fixed" name="ipv6_ver_tc_fl" longname="Version Traffic Class and Flow Label" size="4" showtemplate="FieldHex"/> -->
 			<field type="fixed" name="plen" longname="Payload Length" size="2" showtemplate="FieldDec"/>
 			<field type="fixed" name="nexthdr" longname="{0x8000 10} Next Header" size="1" showtemplate="ipv6.nexthdr"/>
 			<field type="fixed" name="hop" longname="Hop limit" size="1" showtemplate="FieldDec"/>
@@ -1040,7 +1044,7 @@
 <!--			<case value="29"> <nextproto proto="#TP4"/> </case> -->
 <!--			<case value="45"> <nextproto proto="#IDRP"/> </case> -->
 			<case value="58"> <nextproto proto="#icmp6"/> </case>
-
+			<case value="132"> <nextproto proto="#sctp"/> </case>
 		</switch>
 	</encapsulation>
 
@@ -1151,7 +1155,7 @@
 			-->
 			<field type="bit" name="prio" longname="Priority" mask="0xE000" size="2" showtemplate="FieldDec"/>
 			<field type="bit" name="dei" longname="Drop Eligibility" mask="0x1000" size="2" showtemplate="FieldDec"/>
-			<field type="bit" name="isid" longname="{0x8000 37} I-SID" mask="0x0FFF" size="2" showtemplate="FieldDec"/>
+			<field type="bit" name="isid" longname="{0x8000 37} I-SID" mask="0x0FFF" size="4" showtemplate="FieldDec"/>
 
 			<field type="fixed" name="type" longname="{0x8000 5} Type" size="2" showtemplate="eth.typelength"/>
 		</fields>
@@ -1412,7 +1416,7 @@
 		<block name="NDO" longname="Neighbor Discovery Option" showtemplate="icmp6.ndo">
 -->
 		<block name="NDO" longname="Neighbor Discovery Option">
-			<field type="fixed" name="ndotype" longname="Type" size="1" showtemplate="icmp6.ndotype"/>
+			<field type="fixed" name="ndotype" longname="Type" size="1" showtemplate="FieldDec"/>
 			<field type="fixed" name="length" longname="Length" size="1" showtemplate="FieldDec"/>
 
 			<switch expr="buf2int(ndotype)">
@@ -1734,7 +1738,6 @@
 		</fields>
 	</format>
 
-
 	<visualization>
 		<showsumtemplate name="udp">
 			<section name="next"/>
@@ -1746,6 +1749,28 @@
 	</visualization>
 </protocol>
 
+<protocol name="sctp" longname="SCTP (Stream Control Transmission Protocol)" showsumtemplate="sctp">
+
+	<format>
+		<fields>
+			<field type="fixed" name="sport" size="2" showtemplate="FieldDec"/>
+			<field type="fixed" name="dport" size="2" showtemplate="FieldDec"/>
+			<field type="fixed" name="ver_tag" longname="Verification Tag" size="4" showtemplate="FieldDec"/>	
+			<field type="fixed" name="crc" longname="Checksum" size="4" showtemplate="FieldHex"/>
+		</fields>
+	</format>
+
+	<visualization>
+		<showsumtemplate name="sctp">
+			<section name="next"/>
+			<text value="SCTP: port "/>
+			<protofield name="sport" showdata="showvalue"/>
+			<text value=" => "/>
+			<protofield name="dport" showdata="showvalue"/>
+		</showsumtemplate>
+	</visualization>
+</protocol>
+
 <protocol name="icmp" longname="ICMP (Internet Control Message Protocol)" showsumtemplate="icmp">
 	<format>
 		<fields>

debian/openflow-common.install

@@ -1,3 +1,2 @@
-_debian/utilities/ofp-parse-leaks usr/bin
 _debian/utilities/ofp-pki usr/sbin
 _debian/utilities/vlogconf usr/sbin

debian/openflow-controller.default

@@ -5,11 +5,11 @@
 # This is a space-delimited list of connection methods:
 #
 # * "pssl:[PORT]": Listen for SSL connections on the specified PORT
-#   (default: 6633).  The private key, certificate, and CA certificate
+#   (default: 6653).  The private key, certificate, and CA certificate
 #   must be specified below.
 #
 # * "pctp:[PORT]": Listen for TCP connections on the specified PORT
-#   (default: 6633).  Not recommended for security reasons.
+#   (default: 6653).  Not recommended for security reasons.
 #
 # * "nl:DP_IDX": Listen on local datapath DP_IDX.  Used only if this
 #   machine is also an OpenFlow switch and not running the secure

debian/openflow-switch.template

@@ -69,8 +69,8 @@ SWITCH_IP=dhcp
 
 # CONTROLLER: Location of controller.
 # One of the following formats:
-#  tcp:HOST[:PORT]         via TCP to PORT (default: 6633) on HOST
-#  ssl:HOST[:PORT]         via SSL to PORT (default: 6633) on HOST
+#  tcp:HOST[:PORT]         via TCP to PORT (default: 6653) on HOST
+#  ssl:HOST[:PORT]         via SSL to PORT (default: 6653) on HOST
 # The default below assumes that the controller is running locally.
 # This setting has no effect when MODE is set to 'discovery'.
 #CONTROLLER="tcp:127.0.0.1"