Merge pull request #23 from vjardin/vlan_wildcard

VLAN encap: none
acassen · Feb 20, 2024 · c8a07a1 · c8a07a1
2 parents 265a5b6 + 620d454
commit c8a07a1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/src/gtp_switch_vty.c b/src/gtp_switch_vty.c
@@ -213,7 +213,7 @@ DEFUN(gtpc_force_pgw_selection,
 
 DEFUN(gtpu_ipip,
       gtpu_ipip_cmd,
-      "gtpu-ipip traffic-selector (A.B.C.D|X:X:X:X) local (A.B.C.D|X:X:X:X) remote (A.B.C.D|X:X:X:X) vlan <1-4095>",
+      "gtpu-ipip traffic-selector (A.B.C.D|X:X:X:X) local (A.B.C.D|X:X:X:X) remote (A.B.C.D|X:X:X:X) [vlan <1-4095>]",
       "GTP Userplane IPIP tunnel\n"
       "GTP-U local L3 destination address\n"
       "IPv4 Address\n"
@@ -260,8 +260,8 @@ DEFUN(gtpu_ipip,
 		return CMD_WARNING;
 	}
 
-	if (argc == 4) {
-                VTY_GET_INTEGER_RANGE("Vlan ID", vlan, argv[3], 1, 4095);
+	if (argc == 5) {
+                VTY_GET_INTEGER_RANGE("Vlan ID", vlan, argv[4], 1, 4095);
                 if (vlan) {} ; /* dummy test */
 	}
 
@@ -513,12 +513,16 @@ gtp_config_write(vty_t *vty)
 			vty_out(vty, " pgw-force-selection %s%s"
 	                           , inet_sockaddrtos(&ctx->pgw_addr)
         			   , VTY_NEWLINE);
-		if (__test_bit(GTP_FL_IPTNL_BIT, &ctx->flags))
-			vty_out(vty, " gtpu-ipip traffic-selector %u.%u.%u.%u local %u.%u.%u.%u remote %u.%u.%u.%u%s"
+		if (__test_bit(GTP_FL_IPTNL_BIT, &ctx->flags)) {
+			vty_out(vty, " gtpu-ipip traffic-selector %u.%u.%u.%u local %u.%u.%u.%u remote %u.%u.%u.%u"
 	                           , NIPQUAD(ctx->iptnl.selector_addr)
 	                           , NIPQUAD(ctx->iptnl.local_addr)
-	                           , NIPQUAD(ctx->iptnl.remote_addr)
-        			   , VTY_NEWLINE);
+	                           , NIPQUAD(ctx->iptnl.remote_addr));
+	                if (ctx->iptnl.encap_vlan_id)
+			        vty_out(vty, " vlan %u"
+	                           , ctx->iptnl.encap_vlan_id);
+			vty_out(vty, "%s", VTY_NEWLINE);
+		}
 		if (ctx->iptnl.flags & IPTNL_FL_TRANSPARENT_INGRESS_ENCAP)
 			vty_out(vty, " gtpu-ipip transparent-ingress-encap%s", VTY_NEWLINE);
 		if (ctx->iptnl.flags & IPTNL_FL_TRANSPARENT_EGRESS_ENCAP)

diff --git a/src/gtp_xdp_iptnl.c b/src/gtp_xdp_iptnl.c
@@ -169,9 +169,9 @@ gtp_xdp_iptnl_vty(vty_t *vty, struct bpf_map *map)
 		return -1;
 	}
 
-	vty_out(vty, "+------------------+------------------+------------------+-------+%s"
-		     "| Selector Address |  Local Address   |  Remote Address  | Flags |%s"
-		     "+------------------+------------------+------------------+-------+%s"
+	vty_out(vty, "+------------------+------------------+------------------+-------+----+----+%s"
+		     "| Selector Address |  Local Address   |  Remote Address  | Flags |encV|decV|%s"
+		     "+------------------+------------------+------------------+-------+----+----+%s"
 		   , VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE);
 
 	/* Walk hashtab */
@@ -185,16 +185,18 @@ gtp_xdp_iptnl_vty(vty_t *vty, struct bpf_map *map)
 			continue;
 		}
 
-		vty_out(vty, "| %16s | %16s | %16s | %5d |%s"
+		vty_out(vty, "| %16s | %16s | %16s | %5d |%4d|%4d|%s"
 			   , inet_ntoa2(r[0].selector_addr, sip)
 			   , inet_ntoa2(r[0].local_addr, lip)
 			   , inet_ntoa2(r[0].remote_addr, rip)
 			   , r[0].flags
+			   , r[0].encap_vlan_id
+			   , r[0].decap_vlan_id
 			   , VTY_NEWLINE);
 	}
 
-	vty_out(vty, "+------------------+------------------+------------------+-------+%s"
+	vty_out(vty, "+------------------+------------------+------------------+-------+----+----+%s"
 		   , VTY_NEWLINE);
 	free(r);
         return 0;
-}
+}