lte: create testcases to test IPv6 addresses of EpcTftClassifier

ycpranchu · Oct 11, 2018 · e548c59 · e548c59
1 parent 2a41a58
commit e548c59
Show file tree

Hide file tree

Showing 3 changed files with 289 additions and 223 deletions.
diff --git a/src/lte/model/epc-tft.cc b/src/lte/model/epc-tft.cc
@@ -66,11 +66,13 @@ std::ostream& operator<< (std::ostream& os, EpcTft::PacketFilter& f)
 {
   os << " direction: " << f.direction
       << " remoteAddress: "  << f.remoteAddress
-      << " remoteAddress6: "  << f.remoteAddress6
       << " remoteMask: "  << f.remoteMask
+      << " remoteIpv6Address: "  << f.remoteIpv6Address
+      << " remoteIpv6Prefix: "  << f.remoteIpv6Prefix
       << " localAddress: "  << f.localAddress
-      << " localAddress6: "  << f.localAddress6
       << " localMask: "  << f.localMask
+      << " localIpv6Address: "  << f.localIpv6Address
+      << " localIpv6Prefix: "  << f.localIpv6Prefix
       << " remotePortStart: "   << f.remotePortStart
       << " remotePortEnd: "   << f.remotePortEnd
       << " localPortStart: "   << f.localPortStart

diff --git a/src/lte/model/epc-tft.h b/src/lte/model/epc-tft.h
@@ -125,12 +125,15 @@ class EpcTft : public SimpleRefCount<EpcTft>
 			    to uplink / downlink only, or in both cases*/
 
     Ipv4Address remoteAddress;     /**< IPv4 address of the remote host  */
-    Ipv6Address remoteAddress6;     /**< IPv6 address of the remote host  */
-    Ipv4Mask remoteMask;            /**< IPv4 address mask of the remote host */
-    Ipv4Address localAddress;       /**< IPv4 address of the UE */
-    Ipv6Address localAddress6;      /**< IPv6 address of the UE */
-    Ipv4Mask localMask;  /**< IPv4 address mask of the UE */
-
+    Ipv4Mask remoteMask;           /**< IPv4 address mask of the remote host */
+    Ipv4Address localAddress;      /**< IPv4 address of the UE */
+    Ipv4Mask localMask;            /**< IPv4 address mask of the UE */
+
+    Ipv6Address remoteIpv6Address; /**< IPv6 address of the remote host  */
+    Ipv6Prefix remoteIpv6Prefix;   /**< IPv6 address prefix of the remote host  */
+    Ipv6Address localIpv6Address;  /**< IPv6 address of the UE */
+    Ipv6Prefix localIpv6Prefix;    /**< IPv6 address prefix of the UE */
+
     uint16_t remotePortStart;  /**< start of the port number range of the remote host */
     uint16_t remotePortEnd;    /**< end of the port number range of the remote host */
     uint16_t localPortStart;   /**< start of the port number range of the UE */