Fix an issue in mac mask match

Initializer was set to the first byte only. Signed-off-by: Kiran Shastri <shastrinator@gmail.com>
noironetworks · Dec 17, 2020 · a1caf63 · a1caf63
1 parent 8f3cc26
commit a1caf63
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/agent-ovs/ovs/include/PacketLogHandler.h b/agent-ovs/ovs/include/PacketLogHandler.h
@@ -173,7 +173,7 @@ class PacketFilterSpec: public PacketTuple {
         uint8_t m1Bytes[6],m2Bytes[6];
         m1.toUIntArray(m1Bytes);
         m2.toUIntArray(m2Bytes);
-        uint8_t maskBytes[6] = {0xff};
+        uint8_t maskBytes[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
         if(!mask.empty()) {
             opflex::modb::MAC macMask(mask);
             macMask.toUIntArray(maskBytes);
@@ -219,7 +219,7 @@ class PacketFilterSpec: public PacketTuple {
 
     }
     bool compareTuple(PacketTuple &p, PacketDecoder &decoder) {
-        std::vector<int> named_match_fields {3,6,7,8};
+        std::vector<int> named_match_fields {TFLD_ETH_TYPE, TFLD_IP_PROTO, TFLD_SPORT, TFLD_DPORT};
         std::vector<std::string> base_layer_names {"EProto", "IPProto",
                                                 "",""};
         auto base_layer_itr = base_layer_names.begin();
@@ -245,16 +245,16 @@ class PacketFilterSpec: public PacketTuple {
             base_layer_itr++;
         }
 
-        std::vector<int> mac_fields {1,2};
+        std::vector<int> mac_fields {TFLD_SRC_MAC, TFLD_DST_MAC};
         for (auto &i:mac_fields) {
             if(!fields[i].second.empty()) {
                 if(!compareMacs(fields[i].second,p.fields[i].second,
-                            fields[i+9].second)) {
+                            fields[i+8].second)) {
                     return false;
                 }
             }
         }
-        std::vector<int> ip_fields {4,5};
+        std::vector<int> ip_fields {TFLD_SRC_IP, TFLD_DST_IP};
         for (auto &i:ip_fields) {
             if(!fields[i].second.empty()) {
                 if(!compareIps(fields[i].second,p.fields[i].second,