commit 8be033993548373f68ba424ac0016a58c72a1712
author Jonghwan Hyun <jonghwan@opennetworking.org> Mon Dec 04 15:48:44 2017 -0800
committer Carmelo Cascone <carmelo@opennetworking.org> Tue Dec 12 23:06:29 2017 +0000
tree 4e7b4505ad5d722ee682265f39570f47bc5f47f8
parent 8bcd5863ffc61cbfe682d34bea36bd6d7104578c

[ONOS-7154] Add DSCP bit support as an INT header indicator

Change-Id: I2e80dd64b8c73808e96bba7470c1c331b562c45e

pipelines/basic/src/main/resources/int.p4

diff --git a/pipelines/basic/src/main/resources/int.p4 b/pipelines/basic/src/main/resources/int.p4
index 1bbfefd..5a8d23a 100644
--- a/pipelines/basic/src/main/resources/int.p4
+++ b/pipelines/basic/src/main/resources/int.p4
@@ -21,7 +21,7 @@
 #include "include/defines.p4"
 #include "include/headers.p4"
 #include "include/actions.p4"
-#include "include/int_defines.p4"
+#include "include/int_definitions.p4"
 #include "include/int_headers.p4"
 #include "include/packet_io.p4"
 #include "include/port_counters.p4"
@@ -53,9 +53,11 @@
     apply {
         if (standard_metadata.ingress_port != CPU_PORT &&
             standard_metadata.egress_port != CPU_PORT &&
-            hdr.udp.isValid()) {
-            process_int_source.apply(hdr, local_metadata, standard_metadata);
-            if(hdr.udp.dst_port == INT_PORT) {
+            (hdr.udp.isValid() || hdr.tcp.isValid())) {
+            if (local_metadata.int_meta.sink == 0 && local_metadata.int_meta.source == 1) {
+                process_int_source.apply(hdr, local_metadata, standard_metadata);
+            }
+            if(hdr.int_header.isValid()) {
                 process_int_transit.apply(hdr, local_metadata, standard_metadata);
                 // update underlay header based on INT information inserted
                 process_int_outer_encap.apply(hdr, local_metadata, standard_metadata);