Merge "Dont use link local flag in bgp-aas flow encode." into R3.2

Juniper · Feb 21, 2017 · 707b466 · 707b466
2 parents 82a3e34 + e7f8716
commit 707b466
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/vnsw/agent/vrouter/ksync/flowtable_ksync.cc b/src/vnsw/agent/vrouter/ksync/flowtable_ksync.cc
@@ -345,13 +345,14 @@ int FlowTableKSyncEntry::Encode(sandesh_op::type op, char *buf, int buf_len) {
                 }
             }
 
-            //TODO Seperate flags for BgpRouterService??
-            if (nat_flow->is_flags_set(FlowEntry::LinkLocalBindLocalSrcPort) ||
-                nat_flow->is_flags_set(FlowEntry::BgpRouterService)) {
+            //Link local, flag determines relaxed policy
+            if (nat_flow->is_flags_set(FlowEntry::LinkLocalBindLocalSrcPort)) {
                 flags |= VR_FLOW_FLAG_LINK_LOCAL;
-                if (nat_flow->is_flags_set(FlowEntry::BgpRouterService)) {
-                    flags |= VR_FLOW_BGP_SERVICE;
-                }
+            }
+
+            //Bgp service, flag determines relaxed policy
+            if (nat_flow->is_flags_set(FlowEntry::BgpRouterService)) {
+                flags |= VR_FLOW_BGP_SERVICE;
             }
 
             flags |= VR_FLOW_FLAG_VRFT;