Add support for setting PDU Session Container Type to UL

free5gc · Nov 1, 2024 · 4c25e4f · 4c25e4f
1 parent d72c6f2
commit 4c25e4f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/include/pktinfo.h b/include/pktinfo.h
@@ -13,6 +13,7 @@ struct gtp5g_pktinfo {
     struct rtable                 *rt;
     struct outer_header_creation  *hdr_creation;
     u8                            qfi;
+    u8                            pdu_type;
     u16                           seq_number;
     struct net_device             *dev;
     __be16                        gtph_port;
@@ -43,7 +44,7 @@ void gtp5g_xmit_skb_ipv4(struct sk_buff *, struct gtp5g_pktinfo *);
 void gtp5g_set_pktinfo_ipv4(struct gtp5g_pktinfo *,
         struct sock *, struct iphdr *,
         struct outer_header_creation *,
-        u8, u16, struct rtable *, struct flowi4 *,
+        u8, u8, u16, struct rtable *, struct flowi4 *,
         struct net_device *);
 void gtp5g_push_header(struct sk_buff *, struct gtp5g_pktinfo *);
 

diff --git a/src/genl/genl_far.c b/src/genl/genl_far.c
@@ -556,6 +556,7 @@ static int gtp5g_genl_fill_far(struct sk_buff *skb, u32 snd_portid, u32 snd_seq,
         if (nla_put_u64_64bit(skb, GTP5G_FAR_SEID, far->seid, 0))
             goto genlmsg_fail;
     }
+
     fwd_param = rcu_dereference(far->fwd_param);
     if (fwd_param) {
         nest_fwd_param = nla_nest_start(skb, GTP5G_FAR_FORWARDING_PARAMETER);

diff --git a/src/gtpu/encap.c b/src/gtpu/encap.c
@@ -931,6 +931,7 @@ static int gtp5g_fwd_skb_ipv4(struct sk_buff *skb,
     struct outer_header_creation *hdr_creation;
     u64 volume, volume_mbqe = 0;
     struct forwarding_parameter *fwd_param;
+    u8 pdu_type = PDU_SESSION_INFO_TYPE0;
 
     TrafficPolicer* tp = NULL;
     Color color = Green;
@@ -959,11 +960,16 @@ static int gtp5g_fwd_skb_ipv4(struct sk_buff *skb,
     if (IS_ERR(rt))
         goto err;
 
+    if (is_uplink(pdr)) {
+        pdu_type = PDU_SESSION_INFO_TYPE1;
+    }
+
     gtp5g_set_pktinfo_ipv4(pktinfo,
             pdr->sk, 
             iph, 
             hdr_creation,
-            pdr->qfi, 
+            pdr->qfi,
+            pdu_type,
             far->seq_number,
             rt, 
             &fl4, 

diff --git a/src/gtpu/pktinfo.c b/src/gtpu/pktinfo.c
@@ -261,13 +261,14 @@ void gtp5g_xmit_skb_ipv4(struct sk_buff *skb, struct gtp5g_pktinfo *pktinfo)
 
 inline void gtp5g_set_pktinfo_ipv4(struct gtp5g_pktinfo *pktinfo,
     struct sock *sk, struct iphdr *iph, struct outer_header_creation *hdr_creation,
-    u8 qfi, u16 seq_number, struct rtable *rt, struct flowi4 *fl4,
+    u8 qfi, u8 pdu_type, u16 seq_number, struct rtable *rt, struct flowi4 *fl4,
     struct net_device *dev)
 {
     pktinfo->sk = sk;
     pktinfo->iph = iph;
     pktinfo->hdr_creation = hdr_creation;
     pktinfo->qfi = qfi;
+    pktinfo->pdu_type = pdu_type;
     pktinfo->seq_number = seq_number;
     pktinfo->rt = rt;
     pktinfo->fl4 = *fl4;
@@ -302,8 +303,15 @@ void gtp5g_push_header(struct sk_buff *skb, struct gtp5g_pktinfo *pktinfo)
         dl_pdu_sess = skb_push(skb, sizeof(*dl_pdu_sess));
         /* Multiple of 4 (TODO include PPI) */
         dl_pdu_sess->length = 1;
-        dl_pdu_sess->pdu_sess_ctr.type_spare = 0; /* For DL */
-        dl_pdu_sess->pdu_sess_ctr.u.dl.ppp_rqi_qfi = pktinfo->qfi;
+
+        if (pktinfo->pdu_type == PDU_SESSION_INFO_TYPE1) { // UL
+            dl_pdu_sess->pdu_sess_ctr.type_spare = PDU_SESSION_INFO_TYPE1; 
+            dl_pdu_sess->pdu_sess_ctr.u.ul.spare_qfi = pktinfo->qfi;
+        } else { // DL
+            dl_pdu_sess->pdu_sess_ctr.type_spare = PDU_SESSION_INFO_TYPE0; 
+            dl_pdu_sess->pdu_sess_ctr.u.dl.ppp_rqi_qfi = pktinfo->qfi;
+        }
+
         //TODO: PPI
         dl_pdu_sess->next_ehdr_type = 0; /* No more extension Header */