diff --git a/openair-cn/COMMON/gtpv1_u_messages_types.h b/openair-cn/COMMON/gtpv1_u_messages_types.h
index 961d06c7b0..a63ede6244 100644
--- a/openair-cn/COMMON/gtpv1_u_messages_types.h
+++ b/openair-cn/COMMON/gtpv1_u_messages_types.h
@@ -73,12 +73,14 @@ typedef struct {
 typedef struct {
     uint8_t  *buffer;
     uint32_t  length;
+    uint32_t  offset;                       ///< start of message offset in buffer
     Teid_t    local_S1u_teid;               ///< Tunnel Endpoint Identifier
 } Gtpv1uTunnelDataInd;
 
 typedef struct {
     uint8_t  *buffer;
     uint32_t  length;
+    uint32_t  offset;                       ///< start of message offset in buffer
     Teid_t    local_S1u_teid;               ///< Tunnel Endpoint Identifier
     Teid_t    S1u_enb_teid;                 ///< Tunnel Endpoint Identifier
 } Gtpv1uTunnelDataReq;
diff --git a/openair-cn/COMMON/udp_messages_types.h b/openair-cn/COMMON/udp_messages_types.h
index b742d1e706..b379cf2e62 100644
--- a/openair-cn/COMMON/udp_messages_types.h
+++ b/openair-cn/COMMON/udp_messages_types.h
@@ -39,8 +39,16 @@ typedef struct {
 typedef struct {
     uint8_t  *buffer;
     uint32_t  buffer_length;
+    uint32_t  buffer_offset;
     uint32_t  peer_address;
     uint32_t  peer_port;
-} udp_data_req_t, udp_data_ind_t;
+} udp_data_req_t;
+
+typedef struct {
+    uint8_t  *buffer;
+    uint32_t  buffer_length;
+    uint32_t  peer_address;
+    uint32_t  peer_port;
+} udp_data_ind_t;
 
 #endif /* UDP_MESSAGES_TYPES_H_ */