Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_dl_llc_sapi_priority
by pespin 02 Apr '22
by pespin 02 Apr '22
02 Apr '22
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27633 )
Change subject: pcu: Introduce test TC_dl_llc_sapi_priority
......................................................................
pcu: Introduce test TC_dl_llc_sapi_priority
Related: OS#5508
Related: SYS#5908
Change-Id: I26308a59718a6470853c964583a39986006e59c0
---
M pcu/PCU_Tests.ttcn
1 file changed, 99 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/27633/1
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index 0a67486..8012daa 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -3022,6 +3022,104 @@
f_shutdown(__BFILE__, __LINE__, final := true);
}
+/* OS#5508: Verify scheduling of LLC frames with SAPI=1 (GMM) takes precedence
+ * over SAPI2/7/8 which in turn take prececende over others */
+testcase TC_dl_llc_sapi_priority() runs on RAW_PCU_Test_CT {
+ var octetstring data_sapi1 := f_pad_oct('01'O, 19, 'ff'O);
+ var octetstring data_sapi2 := f_pad_oct('02'O, 19, 'ff'O);
+ var octetstring data_sapi7 := f_pad_oct('07'O, 19, 'ff'O);
+ var octetstring data_sapi8 := f_pad_oct('08'O, 19, 'ff'O);
+ var octetstring data_sapi_other := f_pad_oct('03'O, 19, 'ff'O);
+ var RlcmacDlBlock dl_block;
+ var uint32_t dl_fn;
+ var GprsMS ms;
+ var integer state := 1;
+
+ /* Initialize NS/BSSGP side */
+ f_init_bssgp();
+ /* Initialize GPRS MS side */
+ f_init_gprs_ms();
+ ms := g_ms[0]; /* We only use first MS in this test */
+
+ /* Initialize the PCU interface abstraction */
+ f_init_raw(testcasename(), ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS));
+
+ /* Lock to CS1 to keep same DL RLCMAC data block size: */
+ g_cs_initial_dl := 1;
+ g_mcs_max_dl := 1;
+ f_pcuvty_set_allowed_cs_mcs();
+
+ /* Establish BSSGP connection to the PCU */
+ f_bssgp_establish();
+ f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli);
+
+ /* SGSN sends some low prio DL data, PCU will page on CCCH (PCH) */
+ for (var integer i := 0; i < 10; i := i + 1) {
+ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data_sapi_other));
+ }
+ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data_sapi2));
+ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data_sapi7));
+ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data_sapi8));
+ BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data_sapi1));
+ f_ms_exp_dl_tbf_ass_ccch(ms, PCU_IF_SAPI_PCH);
+
+ /* Wait timer X2002 and DL block is available after CCCH IMM ASS */
+ f_sleep(X2002);
+
+ while (state != 0) {
+ var OCT1 rx_sapi;
+ f_rx_rlcmac_dl_block_exp_data(dl_block, dl_fn, ?, ?);
+ rx_sapi := dl_block.data.blocks[0].payload[0];
+
+ select (state) {
+ case(1) { /* We expect the first GMM LLC frame here (SAPI=1, highest prio) */
+ if (rx_sapi != '01'O) {
+ setverdict(fail, "Wrong prio: Expected LLC SAPI 1 (GMM) but got ", rx_sapi);
+ f_shutdown(__BFILE__, __LINE__);
+ }
+ state := 2;
+ }
+ case(2) { /* We expect the second LLC frame here (SAPI=2, middle prio) */
+ if (rx_sapi != '02'O) {
+ setverdict(fail, "Wrong prio: Expected LLC SAPI 2 but got ", rx_sapi);
+ f_shutdown(__BFILE__, __LINE__);
+ }
+ state := 7;
+ }
+ case(7) { /* We expect the third LLC frame here (SAPI=7, middle prio) */
+ if (rx_sapi != '07'O) {
+ setverdict(fail, "Wrong prio: Expected LLC SAPI 7 but got ", rx_sapi);
+ f_shutdown(__BFILE__, __LINE__);
+ }
+ state := 8;
+ }
+ case(8) { /* We expect the fourth LLC frame here (SAPI=8, middle prio) */
+ if (rx_sapi != '08'O) {
+ setverdict(fail, "Wrong prio: Expected LLC SAPI 8 but got ", rx_sapi);
+ f_shutdown(__BFILE__, __LINE__);
+ }
+ state := 3;
+ }
+ case(3) { /* We expect the other LLC frame here (SAPI=3, lower prio) */
+ if (rx_sapi != '03'O) {
+ setverdict(fail, "Wrong prio: Expected LLC SAPI 3 but got ", rx_sapi);
+ f_shutdown(__BFILE__, __LINE__);
+ }
+ state := 0; /* Done, break */
+ }
+ }
+ /* Keep Ack/Nack description updated (except for last BSN) */
+ f_acknackdesc_ack_block(ms.dl_tbf.acknack_desc, dl_block);
+
+ if (f_dl_block_rrbp_valid(dl_block)) {
+ f_ms_tx_ul_block(ms, ts_RLCMAC_DL_ACK_NACK(ms.dl_tbf.tfi, ms.dl_tbf.acknack_desc),
+ f_dl_block_ack_fn(dl_block, dl_fn));
+ }
+ }
+
+ f_shutdown(__BFILE__, __LINE__, final := true);
+}
+
/* Verify allocation and use of multislot tbf, triggered by MS class provided in SGSN. SYS#5131 */
testcase TC_dl_multislot_tbf_ms_class_from_sgsn() runs on RAW_PCU_Test_CT {
var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS));
@@ -6724,6 +6822,7 @@
execute( TC_dl_flow_more_blocks() );
execute( TC_ul_flow_multiple_llc_blocks() );
execute( TC_dl_no_ack_retrans_imm_ass() );
+ execute( TC_dl_llc_sapi_priority() );
execute( TC_paging_cs_from_bts() );
execute( TC_paging_cs_from_sgsn_sign_ptmsi() );
execute( TC_paging_cs_from_sgsn_sign() );
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27633
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I26308a59718a6470853c964583a39986006e59c0
Gerrit-Change-Number: 27633
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
1
0
02 Apr '22
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27632 )
Change subject: RLCMAC_EncDec: Fix bug decoding LI[0]=0
......................................................................
RLCMAC_EncDec: Fix bug decoding LI[0]=0
Change-Id: I86c1b48c922f50013257c8dce405cbad1d77d868
---
M library/RLCMAC_EncDec.cc
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/27632/1
diff --git a/library/RLCMAC_EncDec.cc b/library/RLCMAC_EncDec.cc
index 97bd0be..1b56984 100644
--- a/library/RLCMAC_EncDec.cc
+++ b/library/RLCMAC_EncDec.cc
@@ -513,8 +513,17 @@
if (ret_val.blocks().is_bound()) {
for (int i = 0; i < ret_val.blocks().size_of(); i++) {
unsigned int length = ret_val.blocks()[i].hdr()().length__ind();
+
+ /* LI[0]=0 indicates: The current LLC PDU would fit within
+ current RLC data block but the addition of the length
+ indicator octet (to indicate the LLC PDU boundary) causes the
+ LLC PDU to extend into another RLC data block */
+ if (i == 0 && length == 0)
+ length = ttcn_buffer.get_read_len();
+
if (length > ttcn_buffer.get_read_len())
length = ttcn_buffer.get_read_len();
+
ret_val.blocks()[i].payload() = OCTETSTRING(length, ttcn_buffer.get_read_data());
ttcn_buffer.increase_pos(length);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27632
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I86c1b48c922f50013257c8dce405cbad1d77d868
Gerrit-Change-Number: 27632
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
1
0
02 Apr '22
Attention is currently required from: neels.
iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27081 )
Change subject: stats: new trackers for lchan life duration
......................................................................
Patch Set 18:
(1 comment)
Patchset:
PS18:
Hi Neels,
I appreciate the review. I currently have reduced availability due to some vacation days but will address the comments and update the patchset early next week.
One clarification before I address the comments: I definitely want to record milliseconds (if only for clarity...no one uses decaseconds) but don't need to update the timer each millisecond. Is it possible to keep resolution at milliseconds but only trigger updates every 1/10th of a second? This would be ideal to me.
Everything else looks good to me. I just need a chance to implement + post back here.
Thanks again,
-Michael
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347
Gerrit-Change-Number: 27081
Gerrit-PatchSet: 18
Gerrit-Owner: iedemam <michael(a)kapsulate.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 01 Apr 2022 13:31:57 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
1
0
Change in osmo-upf[master]: libosmo-pfcp: implement PFCP header and msg handling
by neels 01 Apr '22
by neels 01 Apr '22
01 Apr '22
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/27631 )
Change subject: libosmo-pfcp: implement PFCP header and msg handling
......................................................................
Patch Set 2:
This change is ready for review.
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/27631
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: I3f85ea052a6b7c064244a8093777e53a47c8c61e
Gerrit-Change-Number: 27631
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Fri, 01 Apr 2022 11:14:55 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
1
0
Change in osmo-bsc[master]: doc/examples: add a confmerge file with example hopping parameters
by pespin 01 Apr '22
by pespin 01 Apr '22
01 Apr '22
Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27630 )
Change subject: doc/examples: add a confmerge file with example hopping parameters
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27630
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I205eb53901e06ee52dc64e050cfe2374cb9c771e
Gerrit-Change-Number: 27630
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 01 Apr 2022 10:37:39 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
1
0
Change in osmo-upf[master]: libosmo-pfcp: implement PFCP header and msg handling
by neels 01 Apr '22
by neels 01 Apr '22
01 Apr '22
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/27631 )
Change subject: libosmo-pfcp: implement PFCP header and msg handling
......................................................................
libosmo-pfcp: implement PFCP header and msg handling
Related: SYS#5599
Change-Id: I3f85ea052a6b7c064244a8093777e53a47c8c61e
---
M include/osmocom/pfcp/Makefile.am
A include/osmocom/pfcp/pfcp_msg.h
M src/libosmo-pfcp/Makefile.am
M src/libosmo-pfcp/pfcp_ies_custom.c
A src/libosmo-pfcp/pfcp_msg.c
5 files changed, 722 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/31/27631/1
diff --git a/include/osmocom/pfcp/Makefile.am b/include/osmocom/pfcp/Makefile.am
index 4bfc194..72be40e 100644
--- a/include/osmocom/pfcp/Makefile.am
+++ b/include/osmocom/pfcp/Makefile.am
@@ -1,5 +1,6 @@
pfcp_HEADERS = \
pfcp_ies_custom.h \
+ pfcp_msg.h \
pfcp_proto.h \
pfcp_strs.h \
$(NULL)
diff --git a/include/osmocom/pfcp/pfcp_msg.h b/include/osmocom/pfcp/pfcp_msg.h
new file mode 100644
index 0000000..3e3ec84
--- /dev/null
+++ b/include/osmocom/pfcp/pfcp_msg.h
@@ -0,0 +1,165 @@
+/* PFCP message encoding and decoding */
+/*
+ * (C) 2021-2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>
+ * All Rights Reserved.
+ *
+ * Author: Neels Janosch Hofmeyr <nhofmeyr(a)sysmocom.de>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <inttypes.h>
+
+#include <osmocom/core/socket.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/fsm.h>
+
+#include <osmocom/pfcp/pfcp_proto.h>
+#include <osmocom/pfcp/pfcp_ies_auto.h>
+#include <osmocom/pfcp/pfcp_strs.h>
+
+struct msgb;
+struct osmo_t16l16v_ie;
+
+#define OSMO_PFCP_MSGB_ALLOC_SIZE 2048
+
+#define OSMO_LOG_PFCP_MSG_SRC(M, LEVEL, file, line, FMT, ARGS...) do { \
+ struct osmo_fsm_inst *_fi = (M) ? ( (M)->ctx.session_fi ?: (M)->ctx.peer_fi ) : NULL; \
+ enum osmo_pfcp_cause *cause = osmo_pfcp_msg_cause(M); \
+ if ((M)->h.seid_present) { \
+ LOGPFSMSLSRC(_fi, DLPFCP, LEVEL, file, line, \
+ "%s%s PFCP seq-%u SEID-0x%"PRIx64" %s%s%s: " FMT, \
+ _fi ? "" : osmo_sockaddr_to_str_c(OTC_SELECT, &(M)->remote_addr), \
+ (M)->rx ? "-rx->" : "<-tx-", (M)->h.sequence_nr, \
+ (M)->h.seid, \
+ osmo_pfcp_message_type_str((M)->h.message_type), cause ? ": " : "", \
+ cause ? osmo_pfcp_cause_str(*cause) : "", ##ARGS); \
+ } else { \
+ LOGPFSMSLSRC(_fi, DLPFCP, LEVEL, file, line, \
+ "%s%s PFCP seq-%u %s%s%s: " FMT, \
+ _fi ? "" : osmo_sockaddr_to_str_c(OTC_SELECT, &(M)->remote_addr), \
+ (M)->rx ? "-rx->" : "<-tx-", (M)->h.sequence_nr, \
+ osmo_pfcp_message_type_str((M)->h.message_type), cause ? ": " : "", \
+ cause ? osmo_pfcp_cause_str(*cause) : "", ##ARGS); \
+ } \
+ } while(0)
+
+#define OSMO_LOG_PFCP_MSG(M, LEVEL, FMT, ARGS...) \
+ OSMO_LOG_PFCP_MSG_SRC(M, LEVEL, __FILE__, __LINE__, FMT, ##ARGS)
+
+/* Return the next PFCP transmit sequence number based on the given sequence state var. */
+static inline uint32_t osmo_pfcp_next_seq(uint32_t *seq_state)
+{
+ (*seq_state)++;
+ (*seq_state) &= 0xffffff;
+ return *seq_state;
+}
+
+struct osmo_pfcp_header_parsed {
+ uint8_t version;
+ enum osmo_pfcp_message_type message_type;
+ uint32_t sequence_nr;
+ bool priority_present;
+ uint8_t priority;
+ bool seid_present;
+ uint64_t seid;
+};
+
+struct osmo_pfcp_msg {
+ /* Peer's remote address. Received from this peer, or should be sent to this peer. */
+ struct osmo_sockaddr remote_addr;
+ /* True when this message was received from a remote; false when this message is going to be sent. */
+ bool rx;
+ /* True when this message is a Response message type; false if Request. This is set by
+ * osmo_pfcp_msg_decode() for received messages, and by osmo_pfcp_msg_alloc_tx */
+ bool is_response;
+
+ struct osmo_pfcp_header_parsed h;
+
+ int ofs_cause;
+ int ofs_node_id;
+
+ /* The union of decoded IEs from all supported PFCP message types. The union and its structure is defined in
+ * pfcp_ies_auto.h, which is generated by gen__pfcp_ies_auto.c.
+ */
+ union osmo_pfcp_ies ies;
+
+ /* Context information about this message, used for logging */
+ struct {
+ /* Peer FSM instance that this message is received from / sent to. This can be set in the
+ * osmo_pfcp_endpoint->set_msg_ctx() implementation, up to the caller. If present, this is used for
+ * logging context, and can also be used by the caller to reduce lookup iterations. */
+ struct osmo_fsm_inst *peer_fi;
+ struct osmo_use_count *peer_use_count;
+ const char *peer_use_token;
+
+ /* Session FSM instance that this message is received from / sent to. This can be set in the
+ * osmo_pfcp_endpoint->set_msg_ctx() implementation, up to the caller. If present, this is used for
+ * logging context, and can also be used by the caller to reduce lookup iterations. */
+ struct osmo_fsm_inst *session_fi;
+ struct osmo_use_count *session_use_count;
+ const char *session_use_token;
+ } ctx;
+};
+
+#define OSMO_PFCP_MSG_FOR_IES(IES_P) ((struct osmo_pfcp_msg*)((char*)IES_P - offsetof(struct osmo_pfcp_msg, ies)))
+
+bool osmo_pfcp_msgtype_is_response(enum osmo_pfcp_message_type message_type);
+
+int osmo_pfcp_ie_f_teid_to_str_buf(char *buf, size_t len, const struct osmo_pfcp_ie_f_teid *ft);
+char *osmo_pfcp_ie_f_teid_to_str_c(void *ctx, const struct osmo_pfcp_ie_f_teid *ft);
+
+int osmo_pfcp_msg_encode(struct msgb *msg, const struct osmo_pfcp_msg *pfcp_msg);
+
+int osmo_pfcp_msg_decode_header(struct osmo_gtlv_load *tlv, struct osmo_pfcp_msg *m,
+ const struct msgb *msg);
+int osmo_pfcp_msg_decode_tlv(struct osmo_pfcp_msg *m, struct osmo_gtlv_load *tlv);
+
+struct osmo_pfcp_msg *osmo_pfcp_msg_alloc_rx(void *ctx, const struct osmo_sockaddr *remote_addr);
+struct osmo_pfcp_msg *osmo_pfcp_msg_alloc_tx(void *ctx, const struct osmo_sockaddr *remote_addr,
+ const struct osmo_pfcp_ie_node_id *local_node_id,
+ const struct osmo_pfcp_msg *in_reply_to,
+ enum osmo_pfcp_message_type msg_type);
+
+void osmo_pfcp_msg_invalidate_ctx(struct osmo_pfcp_msg *m, struct osmo_fsm_inst *deleted_fi);
+
+void osmo_pfcp_msg_free(struct osmo_pfcp_msg *m);
+
+int osmo_pfcp_ie_node_id_from_osmo_sockaddr(struct osmo_pfcp_ie_node_id *node_id, const struct osmo_sockaddr *os);
+int osmo_pfcp_ie_node_id_to_osmo_sockaddr(const struct osmo_pfcp_ie_node_id *node_id, struct osmo_sockaddr *os);
+
+#define OSMO_PFCP_MSG_MEMB(M, OFS) ((OFS) <= 0 ? NULL : (void*)((uint8_t*)(M) + OFS))
+
+static inline enum osmo_pfcp_cause *osmo_pfcp_msg_cause(const struct osmo_pfcp_msg *m)
+{
+ return OSMO_PFCP_MSG_MEMB(m, m->ofs_cause);
+}
+
+static inline struct osmo_pfcp_ie_node_id *osmo_pfcp_msg_node_id(const struct osmo_pfcp_msg *m)
+{
+ return OSMO_PFCP_MSG_MEMB(m, m->ofs_node_id);
+}
+
+int osmo_pfcp_ie_f_seid_cmp(const struct osmo_pfcp_ie_f_seid *a, const struct osmo_pfcp_ie_f_seid *b);
+void osmo_pfcp_ie_f_seid_set_addr(struct osmo_pfcp_ie_f_seid *f_seid, const struct osmo_sockaddr *addr);
+
+int osmo_pfcp_msg_to_str_buf(char *buf, size_t buflen, const struct osmo_pfcp_msg *m);
+char *osmo_pfcp_msg_to_str_c(void *ctx, const struct osmo_pfcp_msg *m);
diff --git a/src/libosmo-pfcp/Makefile.am b/src/libosmo-pfcp/Makefile.am
index 0e249f9..c8accb9 100644
--- a/src/libosmo-pfcp/Makefile.am
+++ b/src/libosmo-pfcp/Makefile.am
@@ -25,6 +25,7 @@
libosmo_pfcp_a_SOURCES = \
pfcp_ies_custom.c \
+ pfcp_msg.c \
pfcp_strs.c \
\
pfcp_ies_auto.c \
diff --git a/src/libosmo-pfcp/pfcp_ies_custom.c b/src/libosmo-pfcp/pfcp_ies_custom.c
index 660a08d..8823df7 100644
--- a/src/libosmo-pfcp/pfcp_ies_custom.c
+++ b/src/libosmo-pfcp/pfcp_ies_custom.c
@@ -34,12 +34,13 @@
#include <osmocom/pfcp/pfcp_ies_custom.h>
#include <osmocom/pfcp/pfcp_strs.h>
+#include <osmocom/pfcp/pfcp_msg.h>
/* Assumes presence of local variable osmo_pfcp_msg *m. m->log_ctx may be NULL. */
#define RETURN_ERROR(RC, FMT, ARGS...) \
do {\
OSMO_ASSERT(decoded_struct); \
- LOGP(DLPFCP, LOGL_ERROR, FMT " (%d: %s)\n", ##ARGS, RC, \
+ OSMO_LOG_PFCP_MSG(OSMO_PFCP_MSG_FOR_IES(decoded_struct), LOGL_ERROR, FMT " (%d: %s)\n", ##ARGS, RC, \
strerror((RC) > 0 ? (RC) : -(RC))); \
return RC; \
} while (0)
diff --git a/src/libosmo-pfcp/pfcp_msg.c b/src/libosmo-pfcp/pfcp_msg.c
new file mode 100644
index 0000000..aa390f0
--- /dev/null
+++ b/src/libosmo-pfcp/pfcp_msg.c
@@ -0,0 +1,553 @@
+/*
+ * (C) 2021-2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>
+ * All Rights Reserved.
+ *
+ * Author: Neels Janosch Hofmeyr <nhofmeyr(a)sysmocom.de>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <errno.h>
+#include <string.h>
+
+#include <osmocom/core/endian.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/fsm.h>
+#include <osmocom/core/use_count.h>
+#include <osmocom/core/bitvec.h>
+
+#include <osmocom/pfcp/pfcp_msg.h>
+#include <osmocom/gtlv/gtlv_dec_enc.h>
+
+/* Assumes presence of local variable osmo_pfcp_msg *m. m->log_ctx may be NULL. */
+#define RETURN_ERROR(RC, FMT, ARGS...) \
+ do {\
+ OSMO_ASSERT(m); \
+ OSMO_LOG_PFCP_MSG(m, LOGL_ERROR, FMT " (%d: %s)\n", ##ARGS, RC, strerror((RC) > 0? (RC) : -(RC))); \
+ return RC; \
+ } while (0)
+
+bool osmo_pfcp_msgtype_is_response(enum osmo_pfcp_message_type message_type)
+{
+ switch (message_type) {
+ case OSMO_PFCP_MSGT_HEARTBEAT_RESP:
+ case OSMO_PFCP_MSGT_PFD_MGMT_RESP:
+ case OSMO_PFCP_MSGT_ASSOC_SETUP_RESP:
+ case OSMO_PFCP_MSGT_ASSOC_UPDATE_RESP:
+ case OSMO_PFCP_MSGT_ASSOC_RELEASE_RESP:
+ case OSMO_PFCP_MSGT_VERSION_NOT_SUPP_RESP:
+ case OSMO_PFCP_MSGT_NODE_REPORT_RESP:
+ case OSMO_PFCP_MSGT_SESSION_SET_DEL_RESP:
+ case OSMO_PFCP_MSGT_SESSION_EST_RESP:
+ case OSMO_PFCP_MSGT_SESSION_MOD_RESP:
+ case OSMO_PFCP_MSGT_SESSION_DEL_RESP:
+ case OSMO_PFCP_MSGT_SESSION_REP_RESP:
+ return true;
+ default:
+ return false;
+ }
+}
+
+struct osmo_pfcp_header_common {
+ uint8_t seid_present:1,
+ message_priority_present:1,
+ follow_on:1,
+ spare:2,
+ version:3;
+ uint8_t message_type;
+ uint16_t message_length;
+} __attribute__ ((packed));
+
+struct osmo_pfcp_header_no_seid {
+ struct osmo_pfcp_header_common c;
+ uint8_t sequence_nr[3];
+ uint8_t spare;
+} __attribute__ ((packed));
+
+struct osmo_pfcp_header_seid {
+ struct osmo_pfcp_header_common c;
+ uint64_t session_endpoint_identifier;
+ uint8_t sequence_nr[3];
+ uint8_t message_priority:4,
+ spare:4;
+} __attribute__ ((packed));
+
+int osmo_pfcp_ie_node_id_from_osmo_sockaddr(struct osmo_pfcp_ie_node_id *node_id, const struct osmo_sockaddr *os)
+{
+ switch (os->u.sa.sa_family) {
+ case AF_INET:
+ node_id->type = OSMO_PFCP_NODE_ID_T_IPV4;
+ break;
+ case AF_INET6:
+ node_id->type = OSMO_PFCP_NODE_ID_T_IPV6;
+ break;
+ default:
+ return -ENOTSUP;
+ }
+ node_id->ip = *os;
+ return 0;
+}
+
+int osmo_pfcp_ie_node_id_to_osmo_sockaddr(const struct osmo_pfcp_ie_node_id *node_id, struct osmo_sockaddr *os)
+{
+ switch (node_id->type) {
+ case OSMO_PFCP_NODE_ID_T_IPV4:
+ if (os->u.sa.sa_family != AF_INET)
+ return -EINVAL;
+ break;
+ case OSMO_PFCP_NODE_ID_T_IPV6:
+ if (os->u.sa.sa_family != AF_INET6)
+ return -EINVAL;
+ break;
+ default:
+ return -ENOTSUP;
+ }
+ *os = node_id->ip;
+ return 0;
+}
+
+static int pfcp_header_set_message_length(struct osmo_pfcp_header_common *c, unsigned int header_and_payload_len)
+{
+ if (header_and_payload_len < sizeof(struct osmo_pfcp_header_common))
+ return -EINVAL;
+ if (header_and_payload_len - sizeof(struct osmo_pfcp_header_common) > UINT16_MAX)
+ return -EMSGSIZE;
+ osmo_store16be(header_and_payload_len - sizeof(struct osmo_pfcp_header_common),
+ &c->message_length);
+ return 0;
+}
+
+static unsigned int pfcp_header_get_message_length(const struct osmo_pfcp_header_common *c)
+{
+ unsigned int len = osmo_load16be(&c->message_length);
+ return len + sizeof(struct osmo_pfcp_header_common);
+}
+
+/*! Encode and append the given PFCP header to a msgb.
+ * \param[out] msg message buffer to which to push the header.
+ * \param[in] to-be-encoded representation of PFCP header. */
+static int enc_pfcp_header(struct msgb *msg, const struct osmo_pfcp_msg *m)
+{
+ const struct osmo_pfcp_header_parsed *parsed = &m->h;
+ struct osmo_pfcp_header_seid *h_seid;
+ struct osmo_pfcp_header_no_seid *h_no_seid;
+ struct osmo_pfcp_header_common *c;
+ int rc;
+
+ if (!parsed->seid_present) {
+ h_no_seid = (struct osmo_pfcp_header_no_seid*)msgb_put(msg, sizeof(struct osmo_pfcp_header_no_seid));
+ c = &h_no_seid->c;
+ } else {
+ h_seid = (struct osmo_pfcp_header_seid*)msgb_put(msg, sizeof(struct osmo_pfcp_header_seid));
+ c = &h_seid->c;
+ }
+
+ *c = (struct osmo_pfcp_header_common){
+ .version = parsed->version,
+ .message_priority_present = (parsed->priority_present ? 1 : 0),
+ .seid_present = (parsed->seid_present ? 1 : 0),
+ .message_type = parsed->message_type,
+ };
+
+ /* Put a preliminary length reflecting only the header, until it is updated later in osmo_pfcp_msg_encode(). */
+ rc = pfcp_header_set_message_length(c, parsed->seid_present ? sizeof(struct osmo_pfcp_header_seid)
+ : sizeof(struct osmo_pfcp_header_no_seid));
+ if (rc)
+ RETURN_ERROR(rc, "Problem with PFCP message length");
+
+ if (!parsed->seid_present) {
+ osmo_store32be_ext(parsed->sequence_nr, h_no_seid->sequence_nr, 3);
+ if (parsed->priority_present)
+ RETURN_ERROR(-EINVAL, "Message Priority can only be present when the SEID is also present");
+ } else {
+ osmo_store64be(parsed->seid, &h_seid->session_endpoint_identifier);
+ osmo_store32be_ext(parsed->sequence_nr, h_seid->sequence_nr, 3);
+ if (parsed->priority_present)
+ h_seid->message_priority = parsed->priority;
+ }
+
+ return 0;
+}
+
+static void osmo_pfcp_msg_set_memb_ofs(struct osmo_pfcp_msg *m)
+{
+ const struct osmo_gtlv_coding *mc = osmo_pfcp_get_msg_coding(m->h.message_type);
+ m->ofs_cause = 0;
+ m->ofs_node_id = 0;
+ if (!mc)
+ return;
+ for (; !osmo_gtlv_coding_end(mc) && (m->ofs_cause == 0 || m->ofs_node_id == 0); mc++) {
+ if (mc->ti.tag == OSMO_PFCP_IEI_CAUSE)
+ m->ofs_cause = offsetof(struct osmo_pfcp_msg, ies) + mc->memb_ofs;
+ if (mc->ti.tag == OSMO_PFCP_IEI_NODE_ID)
+ m->ofs_node_id = offsetof(struct osmo_pfcp_msg, ies) + mc->memb_ofs;
+ }
+
+#if 0
+ switch (m->h.message_type) {
+ case OSMO_PFCP_MSGT_ASSOC_SETUP_REQ:
+ m->ofs_node_id = offsetof(struct osmo_pfcp_msg, ies.assoc_setup_req.node_id);
+ break;
+ case OSMO_PFCP_MSGT_ASSOC_SETUP_RESP:
+ m->ofs_cause = offsetof(struct osmo_pfcp_msg, ies.assoc_setup_resp.cause);
+ m->ofs_node_id = offsetof(struct osmo_pfcp_msg, ies.assoc_setup_resp.node_id);
+ break;
+ case OSMO_PFCP_MSGT_SESSION_EST_REQ:
+ m->ofs_node_id = offsetof(struct osmo_pfcp_msg, ies.session_est_req.node_id);
+ break;
+ case OSMO_PFCP_MSGT_SESSION_EST_RESP:
+ m->ofs_cause = offsetof(struct osmo_pfcp_msg, ies.session_est_resp.cause);
+ m->ofs_node_id = offsetof(struct osmo_pfcp_msg, ies.session_est_resp.node_id);
+ break;
+ default:
+ m->ofs_cause = 0;
+ m->ofs_node_id = 0;
+ break;
+ }
+#endif
+};
+
+/*! Decode a single PFCP message's header.
+ *
+ * If msg->l4h is non-NULL, decode at msgb_l4(msg). If l4h is NULL, decode at msgb_l3(msg).
+ * In case of bundled PFCP messages, decode only one message and return the offset to the next message in the buffer.
+ * Hence, to decode a message bundle, increment msg->l4h until all messages are decoded:
+ *
+ * msg->l4h = msg->l3h;
+ * while (msgb_l4len(msg)) {
+ * struct osmo_pfcp_msg m;
+ * struct osmo_gtlv_load tlv;
+ * int rc;
+ * rc = osmo_pfcp_msg_decode_header(&tlv, &m, msg);
+ * if (rc < 0)
+ * error();
+ * msg->l4h += rc;
+ *
+ * if (osmo_pfcp_msg_decode_tlv(&m, &tlv))
+ * error();
+ * handle(&m);
+ * }
+ *
+ * \param[out] tlv Return TLV start pointer and length in tlv->src.*.
+ * \param[inout] m Place the decoded data in m->h; use m->ctx.* as logging context.
+ * \param[in] msg PFCP data to parse, possibly containing a PFCP message bundle.
+ * \return total single PFCP message length (<= data_len) on success, negative on error.
+ */
+int osmo_pfcp_msg_decode_header(struct osmo_gtlv_load *tlv, struct osmo_pfcp_msg *m,
+ const struct msgb *msg)
+{
+ struct osmo_pfcp_header_parsed *parsed = &m->h;
+ const uint8_t *pfcp_msg_data;
+ unsigned int pfcp_msg_data_len;
+ unsigned int header_len;
+ unsigned int message_length;
+ const struct osmo_pfcp_header_common *c;
+
+ if (msg->l4h) {
+ pfcp_msg_data = msgb_l4(msg);
+ pfcp_msg_data_len = msgb_l4len(msg);
+ } else {
+ pfcp_msg_data = msgb_l3(msg);
+ pfcp_msg_data_len = msgb_l3len(msg);
+ }
+
+ if (!pfcp_msg_data || !pfcp_msg_data_len)
+ RETURN_ERROR(-EINVAL, "No Layer 3 data in this message buffer");
+
+ if (pfcp_msg_data_len < sizeof(struct osmo_pfcp_header_common))
+ RETURN_ERROR(-EINVAL, "Message too short for PFCP header: %u", pfcp_msg_data_len);
+
+ c = (void*)pfcp_msg_data;
+
+ header_len = (c->seid_present ? sizeof(struct osmo_pfcp_header_seid) : sizeof(struct osmo_pfcp_header_no_seid));
+ if (pfcp_msg_data_len < header_len)
+ RETURN_ERROR(-EINVAL, "Message too short for PFCP header: %u", pfcp_msg_data_len);
+
+ *parsed = (struct osmo_pfcp_header_parsed){
+ .version = c->version,
+ .priority_present = (bool)c->message_priority_present,
+ .seid_present = (bool)c->seid_present,
+ .message_type = c->message_type,
+ };
+
+ m->is_response = osmo_pfcp_msgtype_is_response(parsed->message_type);
+ osmo_pfcp_msg_set_memb_ofs(m);
+
+ message_length = pfcp_header_get_message_length(c);
+ if (message_length > pfcp_msg_data_len)
+ RETURN_ERROR(-EMSGSIZE,
+ "The header's indicated total message length %u is larger than the received data %u",
+ message_length, pfcp_msg_data_len);
+
+ /* T16L16V payload data and len */
+ *tlv = (struct osmo_gtlv_load){
+ .cfg = &osmo_t16l16v_cfg,
+ .src = {
+ .data = pfcp_msg_data + header_len,
+ .len = message_length - header_len,
+ },
+ };
+
+ if (c->follow_on) {
+ /* Another PFCP message should follow */
+ if (pfcp_msg_data_len - message_length < sizeof(struct osmo_pfcp_header_common))
+ OSMO_LOG_PFCP_MSG(m, LOGL_INFO,
+ "PFCP message indicates more messages should follow in the bundle,"
+ " but remaining size %u is too short", pfcp_msg_data_len - message_length);
+ } else {
+ /* No more PFCP message should follow in the bundle */
+ if (pfcp_msg_data_len > message_length)
+ OSMO_LOG_PFCP_MSG(m, LOGL_INFO, "Surplus data after PFCP message: %u",
+ pfcp_msg_data_len - message_length);
+ }
+
+ if (!parsed->seid_present) {
+ const struct osmo_pfcp_header_no_seid *h_no_seid = (void*)pfcp_msg_data;
+ parsed->sequence_nr = osmo_load32be_ext_2(h_no_seid->sequence_nr, 3);
+ if (parsed->priority_present)
+ RETURN_ERROR(-EINVAL, "Message Priority can only be present when the SEID is also present");
+ } else {
+ const struct osmo_pfcp_header_seid *h_seid = (void*)pfcp_msg_data;
+ parsed->seid = osmo_load64be(&h_seid->session_endpoint_identifier);
+ parsed->sequence_nr = osmo_load32be_ext_2(h_seid->sequence_nr, 3);
+ if (parsed->priority_present)
+ parsed->priority = h_seid->message_priority;
+ }
+
+ return message_length;
+}
+
+void osmo_pfcp_msg_err_cb(void *data, void *decoded_struct, const char *file, int line, const char *fmt, ...)
+{
+ va_list ap;
+ if (log_check_level(DLPFCP, LOGL_ERROR)) {
+ char *errmsg;
+
+ va_start(ap, fmt);
+ errmsg = talloc_vasprintf(OTC_SELECT, fmt, ap);
+ va_end(ap);
+ OSMO_LOG_PFCP_MSG_SRC((struct osmo_pfcp_msg *)data, LOGL_ERROR, file, line, "%s", errmsg);
+ }
+}
+
+int osmo_pfcp_msg_decode_tlv(struct osmo_pfcp_msg *m, struct osmo_gtlv_load *tlv)
+{
+ return osmo_pfcp_ies_decode(&m->ies, tlv, false, m->h.message_type, osmo_pfcp_msg_err_cb, m, osmo_pfcp_iei_strs);
+}
+
+static int osmo_pfcp_msg_encode_tlv(struct msgb *msg, const struct osmo_pfcp_msg *m)
+{
+ struct osmo_gtlv_put tlv = {
+ .cfg = &osmo_t16l16v_cfg,
+ .dst = msg,
+ };
+ return osmo_pfcp_ies_encode(&tlv, &m->ies, m->h.message_type, osmo_pfcp_msg_err_cb, (void*)m, osmo_pfcp_iei_strs);
+}
+
+/* Append the encoded PFCP message to the message buffer.
+ *
+ * If msg->l3h is NULL, point it at the start of the encoded message.
+ * Always point msg->l4h at the start of the newly encoded message.
+ * Hence, in a message bundle, msg->l3h always points at the first PFCP message, while msg->l4h always points at the
+ * last PFCP message.
+ *
+ * When adding a PFCP message to a bundle, set the Follow On (FO) flag of the previously last message to 1, and of the
+ * newly encoded, now last message as 0.
+ *
+ * To log errors to a specific osmo_fsm_inst, point m->log_ctx to that instance before calling this function. Otherwise
+ * set log_ctx = NULL.
+ *
+ * \return 0 on success, negative on error. */
+int osmo_pfcp_msg_encode(struct msgb *msg, const struct osmo_pfcp_msg *m)
+{
+ struct osmo_pfcp_header_common *c;
+ int rc;
+
+ /* Forming a bundle? If yes, set the Follow On flag of the currently last message to 1 */
+ if (msg->l4h && msgb_l4len(msg)) {
+ c = msgb_l4(msg);
+ c->follow_on = 1;
+ }
+ /* Make sure l3h points at the first PFCP message in a message bundle */
+ if (!msg->l3h)
+ msg->l3h = msg->tail;
+ /* Make sure l4h points at the last PFCP message in a message bundle */
+ msg->l4h = msg->tail;
+ c = (void*)msg->tail;
+
+ rc = enc_pfcp_header(msg, m);
+ if (rc)
+ return rc;
+
+ rc = osmo_pfcp_msg_encode_tlv(msg, m);
+ if (rc)
+ return rc;
+
+ /* Update the header's message_length */
+ rc = pfcp_header_set_message_length(c, msgb_l4len(msg));
+ if (rc)
+ RETURN_ERROR(rc, "Problem with PFCP message length");
+ return 0;
+}
+
+static int osmo_pfcp_msg_destructor(struct osmo_pfcp_msg *m);
+
+static struct osmo_pfcp_msg *_osmo_pfcp_msg_alloc(void *ctx, const struct osmo_sockaddr *remote_addr)
+{
+ struct osmo_pfcp_msg *m = talloc(ctx, struct osmo_pfcp_msg);
+ *m = (struct osmo_pfcp_msg){
+ .remote_addr = *remote_addr,
+ .h = {
+ .version = 1,
+ },
+ };
+ talloc_set_destructor(m, osmo_pfcp_msg_destructor);
+ return m;
+}
+
+struct osmo_pfcp_msg *osmo_pfcp_msg_alloc_rx(void *ctx, const struct osmo_sockaddr *remote_addr)
+{
+ struct osmo_pfcp_msg *rx = _osmo_pfcp_msg_alloc(ctx, remote_addr);
+ rx->rx = true;
+ return rx;
+}
+
+struct osmo_pfcp_msg *osmo_pfcp_msg_alloc_tx(void *ctx, const struct osmo_sockaddr *remote_addr,
+ const struct osmo_pfcp_ie_node_id *node_id,
+ const struct osmo_pfcp_msg *in_reply_to,
+ enum osmo_pfcp_message_type msg_type)
+{
+ struct osmo_pfcp_msg *tx;
+ if (!remote_addr && in_reply_to)
+ remote_addr = &in_reply_to->remote_addr;
+ OSMO_ASSERT(remote_addr);
+ tx = _osmo_pfcp_msg_alloc(ctx, remote_addr);
+ tx->is_response = osmo_pfcp_msgtype_is_response(msg_type);
+ tx->h.message_type = msg_type;
+ if (in_reply_to)
+ tx->h.sequence_nr = in_reply_to->h.sequence_nr;
+ osmo_pfcp_msg_set_memb_ofs(tx);
+
+ /* Write the local node id data to the correct tx->ies.* member. */
+ if (node_id) {
+ struct osmo_pfcp_ie_node_id *tx_node_id = osmo_pfcp_msg_node_id(tx);
+ if (tx_node_id)
+ *tx_node_id = *node_id;
+ }
+ return tx;
+}
+
+static int osmo_pfcp_msg_destructor(struct osmo_pfcp_msg *m)
+{
+ OSMO_LOG_PFCP_MSG(m, LOGL_DEBUG, "discarding\n");
+ if (m->ctx.session_use_count)
+ osmo_use_count_get_put(m->ctx.session_use_count, m->ctx.session_use_token, -1);
+ m->ctx.session_fi = NULL;
+ m->ctx.session_use_count = NULL;
+ m->ctx.session_use_token = NULL;
+
+ if (m->ctx.peer_use_count)
+ osmo_use_count_get_put(m->ctx.peer_use_count, m->ctx.peer_use_token, -1);
+ m->ctx.peer_fi = NULL;
+ m->ctx.peer_use_count = NULL;
+ m->ctx.peer_use_token = NULL;
+ return 0;
+}
+
+void osmo_pfcp_msg_free(struct osmo_pfcp_msg *m)
+{
+ if (!m)
+ return;
+ talloc_free(m);
+}
+
+int osmo_pfcp_ie_f_seid_cmp(const struct osmo_pfcp_ie_f_seid *a, const struct osmo_pfcp_ie_f_seid *b)
+{
+ int rc;
+ if (a == b)
+ return 0;
+ if (!a)
+ return -1;
+ if (!b)
+ return 1;
+ /* It suffices if one of the IP addresses match */
+ if (a->ip_addr.v4_present && b->ip_addr.v4_present)
+ rc = osmo_sockaddr_cmp(&a->ip_addr.v4, &b->ip_addr.v4);
+ else if (a->ip_addr.v6_present && b->ip_addr.v6_present)
+ rc = osmo_sockaddr_cmp(&a->ip_addr.v6, &b->ip_addr.v6);
+ else
+ rc = (a->ip_addr.v4_present ? -1 : 1);
+ if (rc)
+ return rc;
+ if (a->seid < b->seid)
+ return -1;
+ if (a->seid > b->seid)
+ return 1;
+ return 0;
+}
+
+int osmo_pfcp_ip_addrs_set(struct osmo_pfcp_ip_addrs *dst, const struct osmo_sockaddr *addr)
+{
+ switch (addr->u.sas.ss_family) {
+ case AF_INET:
+ dst->v4_present = true;
+ dst->v4 = *addr;
+ return 0;
+ case AF_INET6:
+ dst->v6_present = true;
+ dst->v6 = *addr;
+ return 0;
+ default:
+ return -ENOTSUP;
+ }
+}
+
+#if 0
+void osmo_pfcp_msg_invalidate_ctx(struct osmo_pfcp_msg *m, struct osmo_fsm_inst *deleted_fi)
+{
+ if (m->ctx.session_fi == deleted_fi) {
+ m->ctx.session_fi = NULL;
+ m->ctx.session_use_count = NULL;
+ m->ctx.session_use_token = NULL;
+ }
+ if (m->ctx.peer_fi == deleted_fi) {
+ m->ctx.peer_fi = NULL;
+ m->ctx.peer_use_count = NULL;
+ m->ctx.peer_use_token = NULL;
+ }
+}
+#endif
+
+int osmo_pfcp_msg_to_str_buf(char *buf, size_t buflen, const struct osmo_pfcp_msg *m)
+{
+ struct osmo_strbuf sb = { .buf = buf, .len = buflen };
+ OSMO_STRBUF_PRINTF(sb, "PFCPv%u %s hdr={seq=%u", m->h.version, osmo_pfcp_message_type_str(m->h.message_type),
+ m->h.sequence_nr);
+ if (m->h.priority_present)
+ OSMO_STRBUF_PRINTF(sb, " prio=%u", m->h.priority);
+ if (m->h.seid_present)
+ OSMO_STRBUF_PRINTF(sb, " SEID=0x%"PRIx64, m->h.seid);
+ OSMO_STRBUF_PRINTF(sb, "} ies={");
+ OSMO_STRBUF_APPEND(sb, osmo_pfcp_ies_encode_to_str, &m->ies, m->h.message_type, osmo_pfcp_iei_strs);
+ OSMO_STRBUF_PRINTF(sb, " }");
+ return sb.chars_needed;
+}
+
+char *osmo_pfcp_msg_to_str_c(void *ctx, const struct osmo_pfcp_msg *m)
+{
+ OSMO_NAME_C_IMPL(ctx, 256, "ERROR", osmo_pfcp_msg_to_str_buf, m)
+}
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/27631
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: I3f85ea052a6b7c064244a8093777e53a47c8c61e
Gerrit-Change-Number: 27631
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: newchange
1
0
01 Apr '22
neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/27221 )
Change subject: libosmo-pfcp: add pfcp_proto.h pfcp_strs.h
......................................................................
libosmo-pfcp: add pfcp_proto.h pfcp_strs.h
Related: SYS#5599
Change-Id: I568b821e89007ed52eeefcdbcb6edd8052a8b5be
---
M configure.ac
M include/osmocom/Makefile.am
A include/osmocom/pfcp/Makefile.am
A include/osmocom/pfcp/pfcp_proto.h
A include/osmocom/pfcp/pfcp_strs.h
M src/Makefile.am
A src/libosmo-pfcp/Makefile.am
A src/libosmo-pfcp/pfcp_strs.c
8 files changed, 1,152 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
neels: Looks good to me, approved
diff --git a/configure.ac b/configure.ac
index ad97ab0..42e6e77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -198,9 +198,11 @@
include/Makefile
include/osmocom/Makefile
include/osmocom/gtlv/Makefile
+ include/osmocom/pfcp/Makefile
include/osmocom/upf/Makefile
src/Makefile
src/libosmo-gtlv/Makefile
+ src/libosmo-pfcp/Makefile
src/osmo-upf/Makefile
tests/Makefile
tests/atlocal
diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am
index add4b3b..9ed7a41 100644
--- a/include/osmocom/Makefile.am
+++ b/include/osmocom/Makefile.am
@@ -1,4 +1,5 @@
SUBDIRS = \
gtlv \
+ pfcp \
upf \
$(NULL)
diff --git a/include/osmocom/pfcp/Makefile.am b/include/osmocom/pfcp/Makefile.am
new file mode 100644
index 0000000..ff7df5e
--- /dev/null
+++ b/include/osmocom/pfcp/Makefile.am
@@ -0,0 +1,6 @@
+pfcp_HEADERS = \
+ pfcp_proto.h \
+ pfcp_strs.h \
+ $(NULL)
+
+pfcpdir = $(includedir)/osmocom/pfcp
diff --git a/include/osmocom/pfcp/pfcp_proto.h b/include/osmocom/pfcp/pfcp_proto.h
new file mode 100644
index 0000000..d387b1b
--- /dev/null
+++ b/include/osmocom/pfcp/pfcp_proto.h
@@ -0,0 +1,528 @@
+/* 3GPP TS 29.244: Packet Forwarding Control Protocol */
+/*
+ * (C) 2021-2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>
+ * All Rights Reserved.
+ *
+ * Author: Neels Janosch Hofmeyr <nhofmeyr(a)sysmocom.de>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+#define OSMO_PFCP_PORT 8805
+
+/* Section 7.3 / Table 7.3-1 */
+enum osmo_pfcp_message_type {
+ OSMO_PFCP_MSGT_NONE = 0,
+
+ /* Node related messages */
+ OSMO_PFCP_MSGT_HEARTBEAT_REQ = 1,
+ OSMO_PFCP_MSGT_HEARTBEAT_RESP = 2,
+ OSMO_PFCP_MSGT_PFD_MGMT_REQ = 3,
+ OSMO_PFCP_MSGT_PFD_MGMT_RESP = 4,
+ OSMO_PFCP_MSGT_ASSOC_SETUP_REQ = 5,
+ OSMO_PFCP_MSGT_ASSOC_SETUP_RESP = 6,
+ OSMO_PFCP_MSGT_ASSOC_UPDATE_REQ = 7,
+ OSMO_PFCP_MSGT_ASSOC_UPDATE_RESP = 8,
+ OSMO_PFCP_MSGT_ASSOC_RELEASE_REQ = 9,
+ OSMO_PFCP_MSGT_ASSOC_RELEASE_RESP = 10,
+ OSMO_PFCP_MSGT_VERSION_NOT_SUPP_RESP = 11,
+ OSMO_PFCP_MSGT_NODE_REPORT_REQ = 12,
+ OSMO_PFCP_MSGT_NODE_REPORT_RESP = 13,
+ OSMO_PFCP_MSGT_SESSION_SET_DEL_REQ = 14,
+ OSMO_PFCP_MSGT_SESSION_SET_DEL_RESP = 15,
+
+ /* Session related messages */
+ OSMO_PFCP_MSGT_SESSION_EST_REQ = 50,
+ OSMO_PFCP_MSGT_SESSION_EST_RESP = 51,
+ OSMO_PFCP_MSGT_SESSION_MOD_REQ = 52,
+ OSMO_PFCP_MSGT_SESSION_MOD_RESP = 53,
+ OSMO_PFCP_MSGT_SESSION_DEL_REQ = 54,
+ OSMO_PFCP_MSGT_SESSION_DEL_RESP = 55,
+ OSMO_PFCP_MSGT_SESSION_REP_REQ = 56,
+ OSMO_PFCP_MSGT_SESSION_REP_RESP = 57,
+};
+
+/* Section 8.1.2 / Table 8.1.2-1 */
+enum osmo_pfcp_iei {
+ OSMO_PFCP_INVALID_IEI = 0,
+ OSMO_PFCP_IEI_CREATE_PDR = 1,
+ OSMO_PFCP_IEI_PDI = 2,
+ OSMO_PFCP_IEI_CREATE_FAR = 3,
+ OSMO_PFCP_IEI_FORW_PARAMS = 4,
+ OSMO_PFCP_IEI_DUPL_PARAMS = 5,
+ OSMO_PFCP_IEI_CREATE_URR = 6,
+ OSMO_PFCP_IEI_CREATE_QER = 7,
+ OSMO_PFCP_IEI_CREATED_PDR = 8,
+ OSMO_PFCP_IEI_UPD_PDR = 9,
+ OSMO_PFCP_IEI_UPD_FAR = 10,
+ OSMO_PFCP_IEI_UPD_FORW_PARAMS = 11,
+ OSMO_PFCP_IEI_UPD_BAR_SESS_REP_RESP = 12,
+ OSMO_PFCP_IEI_UPD_URR = 13,
+ OSMO_PFCP_IEI_UPD_QER = 14,
+ OSMO_PFCP_IEI_REMOVE_PDR = 15,
+ OSMO_PFCP_IEI_REMOVE_FAR = 16,
+ OSMO_PFCP_IEI_REMOVE_URR = 17,
+ OSMO_PFCP_IEI_REMOVE_QER = 18,
+ OSMO_PFCP_IEI_CAUSE = 19,
+ OSMO_PFCP_IEI_SOURCE_IFACE = 20,
+ OSMO_PFCP_IEI_F_TEID = 21,
+ OSMO_PFCP_IEI_NETWORK_INST = 22,
+ OSMO_PFCP_IEI_SDF_FILTER = 23,
+ OSMO_PFCP_IEI_APPLICATION_ID = 24,
+ OSMO_PFCP_IEI_GATE_STATUS = 25,
+ OSMO_PFCP_IEI_MBR = 26,
+ OSMO_PFCP_IEI_GBR = 27,
+ OSMO_PFCP_IEI_QER_CORRELATION_ID = 28,
+ OSMO_PFCP_IEI_PRECEDENCE = 29,
+ OSMO_PFCP_IEI_TRANSPORT_LEVEL_MARKING = 30,
+ OSMO_PFCP_IEI_VOLUME_THRESH = 31,
+ OSMO_PFCP_IEI_TIME_THRESH = 32,
+ OSMO_PFCP_IEI_MONITORING_TIME = 33,
+ OSMO_PFCP_IEI_SUBSEQUENT_VOLUME_THRESH = 34,
+ OSMO_PFCP_IEI_SUBSEQUENT_TIME_THRESH = 35,
+ OSMO_PFCP_IEI_INACT_DETECTION_TIME = 36,
+ OSMO_PFCP_IEI_REPORTING_TRIGGERS = 37,
+ OSMO_PFCP_IEI_REDIRECT_INFO = 38,
+ OSMO_PFCP_IEI_REP_TYPE = 39,
+ OSMO_PFCP_IEI_OFFENDING_IE = 40,
+ OSMO_PFCP_IEI_FORW_POLICY = 41,
+ OSMO_PFCP_IEI_DESTINATION_IFACE = 42,
+ OSMO_PFCP_IEI_UP_FUNCTION_FEATURES = 43,
+ OSMO_PFCP_IEI_APPLY_ACTION = 44,
+ OSMO_PFCP_IEI_DL_DATA_SERVICE_INFO = 45,
+ OSMO_PFCP_IEI_DL_DATA_NOTIFICATION_DELAY = 46,
+ OSMO_PFCP_IEI_DL_BUFF_DURATION = 47,
+ OSMO_PFCP_IEI_DL_BUFF_SUGGESTED_PACKET_COUNT = 48,
+ OSMO_PFCP_IEI_PFCPSMREQ_FLAGS = 49,
+ OSMO_PFCP_IEI_PFCPSRRSP_FLAGS = 50,
+ OSMO_PFCP_IEI_LOAD_CTRL_INFO = 51,
+ OSMO_PFCP_IEI_SEQUENCE_NUMBER = 52,
+ OSMO_PFCP_IEI_METRIC = 53,
+ OSMO_PFCP_IEI_OVERLOAD_CTRL_INFO = 54,
+ OSMO_PFCP_IEI_TIMER = 55,
+ OSMO_PFCP_IEI_PDR_ID = 56,
+ OSMO_PFCP_IEI_F_SEID = 57,
+ OSMO_PFCP_IEI_APPLICATION_IDS_PFDS = 58,
+ OSMO_PFCP_IEI_PFD_CONTEXT = 59,
+ OSMO_PFCP_IEI_NODE_ID = 60,
+ OSMO_PFCP_IEI_PFD_CONTENTS = 61,
+ OSMO_PFCP_IEI_MEAS_METHOD = 62,
+ OSMO_PFCP_IEI_USAGE_REP_TRIGGER = 63,
+ OSMO_PFCP_IEI_MEAS_PERIOD = 64,
+ OSMO_PFCP_IEI_FQ_CSID = 65,
+ OSMO_PFCP_IEI_VOLUME_MEAS = 66,
+ OSMO_PFCP_IEI_DURATION_MEAS = 67,
+ OSMO_PFCP_IEI_APPLICATION_DETECTION_INFO = 68,
+ OSMO_PFCP_IEI_TIME_OF_FIRST_PACKET = 69,
+ OSMO_PFCP_IEI_TIME_OF_LAST_PACKET = 70,
+ OSMO_PFCP_IEI_QUOTA_HOLDING_TIME = 71,
+ OSMO_PFCP_IEI_DROPPED_DL_TRAFFIC_THRESH = 72,
+ OSMO_PFCP_IEI_VOLUME_QUOTA = 73,
+ OSMO_PFCP_IEI_TIME_QUOTA = 74,
+ OSMO_PFCP_IEI_START_TIME = 75,
+ OSMO_PFCP_IEI_END_TIME = 76,
+ OSMO_PFCP_IEI_QUERY_URR = 77,
+ OSMO_PFCP_IEI_USAGE_REP_SESS_MOD_RESP = 78,
+ OSMO_PFCP_IEI_USAGE_REP_SESS_DEL_RESP = 79,
+ OSMO_PFCP_IEI_USAGE_REP_SESS_REP_REQ = 80,
+ OSMO_PFCP_IEI_URR_ID = 81,
+ OSMO_PFCP_IEI_LINKED_URR_ID = 82,
+ OSMO_PFCP_IEI_DL_DATA_REP = 83,
+ OSMO_PFCP_IEI_OUTER_HEADER_CREATION = 84,
+ OSMO_PFCP_IEI_CREATE_BAR = 85,
+ OSMO_PFCP_IEI_UPD_BAR_SESS_MOD_REQ = 86,
+ OSMO_PFCP_IEI_REMOVE_BAR = 87,
+ OSMO_PFCP_IEI_BAR_ID = 88,
+ OSMO_PFCP_IEI_CP_FUNCTION_FEATURES = 89,
+ OSMO_PFCP_IEI_USAGE_INFO = 90,
+ OSMO_PFCP_IEI_APPLICATION_INST_ID = 91,
+ OSMO_PFCP_IEI_FLOW_INFO = 92,
+ OSMO_PFCP_IEI_UE_IP_ADDRESS = 93,
+ OSMO_PFCP_IEI_PACKET_RATE = 94,
+ OSMO_PFCP_IEI_OUTER_HEADER_REMOVAL = 95,
+ OSMO_PFCP_IEI_RECOVERY_TIME_STAMP = 96,
+ OSMO_PFCP_IEI_DL_FLOW_LEVEL_MARKING = 97,
+ OSMO_PFCP_IEI_HEADER_ENRICHMENT = 98,
+ OSMO_PFCP_IEI_ERROR_IND_REP = 99,
+ OSMO_PFCP_IEI_MEAS_INFO = 100,
+ OSMO_PFCP_IEI_NODE_REP_TYPE = 101,
+ OSMO_PFCP_IEI_USER_PLANE_PATH_FAILURE_REP = 102,
+ OSMO_PFCP_IEI_REMOTE_GTP_U_PEER = 103,
+ OSMO_PFCP_IEI_UR_SEQN = 104,
+ OSMO_PFCP_IEI_UPD_DUPL_PARAMS = 105,
+ OSMO_PFCP_IEI_ACTIVATE_PREDEFINED_RULES = 106,
+ OSMO_PFCP_IEI_DEACTIVATE_PREDEFINED_RULES = 107,
+ OSMO_PFCP_IEI_FAR_ID = 108,
+ OSMO_PFCP_IEI_QER_ID = 109,
+ OSMO_PFCP_IEI_OCI_FLAGS = 110,
+ OSMO_PFCP_IEI_PFCP_ASSOC_RELEASE_REQ = 111,
+ OSMO_PFCP_IEI_GRACEFUL_RELEASE_PERIOD = 112,
+ OSMO_PFCP_IEI_PDN_TYPE = 113,
+ OSMO_PFCP_IEI_FAILED_RULE_ID = 114,
+ OSMO_PFCP_IEI_TIME_QUOTA_MECHANISM = 115,
+ OSMO_PFCP_IEI_RESERVED = 116,
+ OSMO_PFCP_IEI_USER_PLANE_INACT_TIMER = 117,
+ OSMO_PFCP_IEI_AGGREGATED_URRS = 118,
+ OSMO_PFCP_IEI_MULTIPLIER = 119,
+ OSMO_PFCP_IEI_AGGREGATED_URR_ID = 120,
+ OSMO_PFCP_IEI_SUBSEQUENT_VOLUME_QUOTA = 121,
+ OSMO_PFCP_IEI_SUBSEQUENT_TIME_QUOTA = 122,
+ OSMO_PFCP_IEI_RQI = 123,
+ OSMO_PFCP_IEI_QFI = 124,
+ OSMO_PFCP_IEI_QUERY_URR_REFERENCE = 125,
+ OSMO_PFCP_IEI_ADDITIONAL_USAGE_REPS_INFO = 126,
+ OSMO_PFCP_IEI_CREATE_TRAFFIC_ENDPOINT = 127,
+ OSMO_PFCP_IEI_CREATED_TRAFFIC_ENDPOINT = 128,
+ OSMO_PFCP_IEI_UPD_TRAFFIC_ENDPOINT = 129,
+ OSMO_PFCP_IEI_REMOVE_TRAFFIC_ENDPOINT = 130,
+ OSMO_PFCP_IEI_TRAFFIC_ENDPOINT_ID = 131,
+ OSMO_PFCP_IEI_ETHERNET_PACKET_FILTER = 132,
+ OSMO_PFCP_IEI_MAC_ADDRESS = 133,
+ OSMO_PFCP_IEI_C_TAG = 134,
+ OSMO_PFCP_IEI_S_TAG = 135,
+ OSMO_PFCP_IEI_ETHERTYPE = 136,
+ OSMO_PFCP_IEI_PROXYING = 137,
+ OSMO_PFCP_IEI_ETHERNET_FILTER_ID = 138,
+ OSMO_PFCP_IEI_ETHERNET_FILTER_PROPERTIES = 139,
+ OSMO_PFCP_IEI_SUGGESTED_BUFF_PACKETS_COUNT = 140,
+ OSMO_PFCP_IEI_USER_ID = 141,
+ OSMO_PFCP_IEI_ETHERNET_PDU_SESS_INFO = 142,
+ OSMO_PFCP_IEI_ETHERNET_TRAFFIC_INFO = 143,
+ OSMO_PFCP_IEI_MAC_ADDRS_DETECTED = 144,
+ OSMO_PFCP_IEI_MAC_ADDRS_REMOVED = 145,
+ OSMO_PFCP_IEI_ETHERNET_INACT_TIMER = 146,
+ OSMO_PFCP_IEI_ADDITIONAL_MONITORING_TIME = 147,
+ OSMO_PFCP_IEI_EVENT_QUOTA = 148,
+ OSMO_PFCP_IEI_EVENT_THRESH = 149,
+ OSMO_PFCP_IEI_SUBSEQUENT_EVENT_QUOTA = 150,
+ OSMO_PFCP_IEI_SUBSEQUENT_EVENT_THRESH = 151,
+ OSMO_PFCP_IEI_TRACE_INFO = 152,
+ OSMO_PFCP_IEI_FRAMED_ROUTE = 153,
+ OSMO_PFCP_IEI_FRAMED_ROUTING = 154,
+ OSMO_PFCP_IEI_FRAMED_IPV6_ROUTE = 155,
+ OSMO_PFCP_IEI_TIME_STAMP = 156,
+ OSMO_PFCP_IEI_AVERAGING_WINDOW = 157,
+ OSMO_PFCP_IEI_PAGING_POLICY_INDICATOR = 158,
+ OSMO_PFCP_IEI_APN_DNN = 159,
+ OSMO_PFCP_IEI_3GPP_IFACE_TYPE = 160,
+ OSMO_PFCP_IEI_PFCPSRREQ_FLAGS = 161,
+ OSMO_PFCP_IEI_PFCPAUREQ_FLAGS = 162,
+ OSMO_PFCP_IEI_ACTIVATION_TIME = 163,
+ OSMO_PFCP_IEI_DEACTIVATION_TIME = 164,
+ OSMO_PFCP_IEI_CREATE_MAR = 165,
+ OSMO_PFCP_IEI_3GPP_ACCESS_FORW_ACTION_INFO = 166,
+ OSMO_PFCP_IEI_NON_3GPP_ACCESS_FORW_ACTION_INFO = 167,
+ OSMO_PFCP_IEI_REMOVE_MAR = 168,
+ OSMO_PFCP_IEI_UPD_MAR = 169,
+ OSMO_PFCP_IEI_MAR_ID = 170,
+ OSMO_PFCP_IEI_STEERING_FUNCTIONALITY = 171,
+ OSMO_PFCP_IEI_STEERING_MODE = 172,
+ OSMO_PFCP_IEI_WEIGHT = 173,
+ OSMO_PFCP_IEI_PRIORITY = 174,
+ OSMO_PFCP_IEI_UPD_3GPP_ACCESS_FORW_ACTION_INFO = 175,
+ OSMO_PFCP_IEI_UPD_NON_3GPP_ACCESS_FORW_ACTION_INFO = 176,
+ OSMO_PFCP_IEI_UE_IP_ADDRESS_POOL_IDENTITY = 177,
+ OSMO_PFCP_IEI_ALTERNATIVE_SMF_IP_ADDRESS = 178,
+ OSMO_PFCP_IEI_PACKET_REPLICATION_AND_DETECTION_CARRY_ON_INFO = 179,
+ OSMO_PFCP_IEI_SMF_SET_ID = 180,
+ OSMO_PFCP_IEI_QUOTA_VALIDITY_TIME = 181,
+ OSMO_PFCP_IEI_NUMBER_OF_REPS = 182,
+ OSMO_PFCP_IEI_PFCP_SESS_RETENTION_INFO_IN_ASSOC_SETUP_REQ = 183,
+ OSMO_PFCP_IEI_PFCPASRSP_FLAGS = 184,
+ OSMO_PFCP_IEI_CP_ENTITY_IP_ADDRESS = 185,
+ OSMO_PFCP_IEI_PFCPSEREQ_FLAGS = 186,
+ OSMO_PFCP_IEI_USER_PLANE_PATH_RECOVERY_REP = 187,
+ OSMO_PFCP_IEI_IP_MULTICAST_ADDR_INFO_IN_SESS_EST_REQ = 188,
+ OSMO_PFCP_IEI_JOIN_IP_MULTICAST_INFO_IE_IN_USAGE_REP = 189,
+ OSMO_PFCP_IEI_LEAVE_IP_MULTICAST_INFO_IE_IN_USAGE_REP = 190,
+ OSMO_PFCP_IEI_IP_MULTICAST_ADDRESS = 191,
+ OSMO_PFCP_IEI_SOURCE_IP_ADDRESS = 192,
+ OSMO_PFCP_IEI_PACKET_RATE_STATUS = 193,
+ OSMO_PFCP_IEI_CREATE_BRIDGE_INFO_FOR_TSC = 194,
+ OSMO_PFCP_IEI_CREATED_BRIDGE_INFO_FOR_TSC = 195,
+ OSMO_PFCP_IEI_DS_TT_PORT_NUMBER = 196,
+ OSMO_PFCP_IEI_NW_TT_PORT_NUMBER = 197,
+ OSMO_PFCP_IEI_TSN_BRIDGE_ID = 198,
+ OSMO_PFCP_IEI_TSC_MGMT_INFO_IE_IN_SESS_MOD_REQ = 199,
+ OSMO_PFCP_IEI_TSC_MGMT_INFO_IE_IN_SESS_MOD_RESP = 200,
+ OSMO_PFCP_IEI_TSC_MGMT_INFO_IE_IN_SESS_REP_REQ = 201,
+ OSMO_PFCP_IEI_PORT_MGMT_INFO_CONTAINER = 202,
+ OSMO_PFCP_IEI_CLOCK_DRIFT_CTRL_INFO = 203,
+ OSMO_PFCP_IEI_REQUESTED_CLOCK_DRIFT_INFO = 204,
+ OSMO_PFCP_IEI_CLOCK_DRIFT_REP = 205,
+ OSMO_PFCP_IEI_TSN_TIME_DOMAIN_NUMBER = 206,
+ OSMO_PFCP_IEI_TIME_OFFSET_THRESH = 207,
+ OSMO_PFCP_IEI_CUMULATIVE_RATERATIO_THRESH = 208,
+ OSMO_PFCP_IEI_TIME_OFFSET_MEAS = 209,
+ OSMO_PFCP_IEI_CUMULATIVE_RATERATIO_MEAS = 210,
+ OSMO_PFCP_IEI_REMOVE_SRR = 211,
+ OSMO_PFCP_IEI_CREATE_SRR = 212,
+ OSMO_PFCP_IEI_UPD_SRR = 213,
+ OSMO_PFCP_IEI_SESS_REP = 214,
+ OSMO_PFCP_IEI_SRR_ID = 215,
+ OSMO_PFCP_IEI_ACCESS_AVAIL_CTRL_INFO = 216,
+ OSMO_PFCP_IEI_REQUESTED_ACCESS_AVAIL_INFO = 217,
+ OSMO_PFCP_IEI_ACCESS_AVAIL_REP = 218,
+ OSMO_PFCP_IEI_ACCESS_AVAIL_INFO = 219,
+ OSMO_PFCP_IEI_PROVIDE_ATSSS_CTRL_INFO = 220,
+ OSMO_PFCP_IEI_ATSSS_CTRL_PARAMS = 221,
+ OSMO_PFCP_IEI_MPTCP_CTRL_INFO = 222,
+ OSMO_PFCP_IEI_ATSSS_LL_CTRL_INFO = 223,
+ OSMO_PFCP_IEI_PMF_CTRL_INFO = 224,
+ OSMO_PFCP_IEI_MPTCP_PARAMS = 225,
+ OSMO_PFCP_IEI_ATSSS_LL_PARAMS = 226,
+ OSMO_PFCP_IEI_PMF_PARAMS = 227,
+ OSMO_PFCP_IEI_MPTCP_ADDRESS_INFO = 228,
+ OSMO_PFCP_IEI_UE_LINK_SPECIFIC_IP_ADDRESS = 229,
+ OSMO_PFCP_IEI_PMF_ADDRESS_INFO = 230,
+ OSMO_PFCP_IEI_ATSSS_LL_INFO = 231,
+ OSMO_PFCP_IEI_DATA_NETWORK_ACCESS_IDENTIFIER = 232,
+ OSMO_PFCP_IEI_UE_IP_ADDRESS_POOL_INFO = 233,
+ OSMO_PFCP_IEI_AVERAGE_PACKET_DELAY = 234,
+ OSMO_PFCP_IEI_MIN_PACKET_DELAY = 235,
+ OSMO_PFCP_IEI_MAX_PACKET_DELAY = 236,
+ OSMO_PFCP_IEI_QOS_REP_TRIGGER = 237,
+ OSMO_PFCP_IEI_GTP_U_PATH_QOS_CTRL_INFO = 238,
+ OSMO_PFCP_IEI_GTP_U_PATH_QOS_REP_NODE_REP_REQ = 239,
+ OSMO_PFCP_IEI_QOS_INFO_IN_GTP_U_PATH_QOS_REP = 240,
+ OSMO_PFCP_IEI_GTP_U_PATH_IFACE_TYPE = 241,
+ OSMO_PFCP_IEI_QOS_MONITORING_PER_QOS_FLOW_CTRL_INFO = 242,
+ OSMO_PFCP_IEI_REQUESTED_QOS_MONITORING = 243,
+ OSMO_PFCP_IEI_REPORTING_FREQUENCY = 244,
+ OSMO_PFCP_IEI_PACKET_DELAY_THRESHOLDS = 245,
+ OSMO_PFCP_IEI_MIN_WAIT_TIME = 246,
+ OSMO_PFCP_IEI_QOS_MONITORING_REP = 247,
+ OSMO_PFCP_IEI_QOS_MONITORING_MEAS = 248,
+ OSMO_PFCP_IEI_MT_EDT_CTRL_INFO = 249,
+ OSMO_PFCP_IEI_DL_DATA_PACKETS_SIZE = 250,
+ OSMO_PFCP_IEI_QER_CTRL_INDICATIONS = 251,
+ OSMO_PFCP_IEI_PACKET_RATE_STATUS_REP = 252,
+ OSMO_PFCP_IEI_NF_INST_ID = 253,
+ OSMO_PFCP_IEI_ETHERNET_CONTEXT_INFO = 254,
+ OSMO_PFCP_IEI_REDUNDANT_TRANSMISSION_PARAMS = 255,
+ OSMO_PFCP_IEI_UPDATED_PDR = 256,
+ OSMO_PFCP_IEI_S_NSSAI = 257,
+ OSMO_PFCP_IEI_IP_VERSION = 258,
+ OSMO_PFCP_IEI_PFCPASREQ_FLAGS = 259,
+ OSMO_PFCP_IEI_DATA_STATUS = 260,
+ OSMO_PFCP_IEI_PROVIDE_RDS_CONF_INFO = 261,
+ OSMO_PFCP_IEI_RDS_CONF_INFO = 262,
+ OSMO_PFCP_IEI_QUERY_PACKET_RATE_STATUS_IE_IN_SESS_MOD_REQ = 263,
+ OSMO_PFCP_IEI_PACKET_RATE_STATUS_REP_IE_IN_SESS_MOD_RESP = 264,
+ OSMO_PFCP_IEI_MPTCP_APPLICABLE_IND = 265,
+ OSMO_PFCP_IEI_BRIDGE_MGMT_INFO_CONTAINER = 266,
+ OSMO_PFCP_IEI_UE_IP_ADDRESS_USAGE_INFO = 267,
+ OSMO_PFCP_IEI_NUMBER_OF_UE_IP_ADDRS = 268,
+ OSMO_PFCP_IEI_VALIDITY_TIMER = 269,
+ OSMO_PFCP_IEI_REDUNDANT_TRANSMISSION_FORW_PARAMS = 270,
+ OSMO_PFCP_IEI_TRANSPORT_DELAY_REPORTING = 271,
+};
+
+/* Section 8.2.1 / Table 8.2.1-1 */
+enum osmo_pfcp_cause {
+ OSMO_PFCP_CAUSE_RESERVED = 0,
+ OSMO_PFCP_CAUSE_REQUEST_ACCEPTED = 1,
+ OSMO_PFCP_CAUSE_MORE_USAGE_REPORT_TO_SEND = 2,
+ OSMO_PFCP_CAUSE_REQUEST_REJECTED = 64,
+ OSMO_PFCP_CAUSE_SESSION_CTX_NOT_FOUND = 65,
+ OSMO_PFCP_CAUSE_MANDATORY_IE_MISSING = 66,
+ OSMO_PFCP_CAUSE_CONDITIONAL_IE_MISSING = 67,
+ OSMO_PFCP_CAUSE_INVALID_LENGTH = 68,
+ OSMO_PFCP_CAUSE_MANDATORY_IE_INCORRECT = 69,
+ OSMO_PFCP_CAUSE_INVALID_FORW_POLICY = 70,
+ OSMO_PFCP_CAUSE_INVALID_F_TEID_ALLOC_OPTION = 71,
+ OSMO_PFCP_CAUSE_NO_ESTABLISHED_PFCP_ASSOC = 72,
+ OSMO_PFCP_CAUSE_RULE_CREATION_MOD_FAILURE = 73,
+ OSMO_PFCP_CAUSE_PFCP_ENTITY_IN_CONGESTION = 74,
+ OSMO_PFCP_CAUSE_NO_RESOURCES_AVAILABLE = 75,
+ OSMO_PFCP_CAUSE_SERVICE_NOT_SUPPORTED = 76,
+ OSMO_PFCP_CAUSE_SYSTEM_FAILURE = 77,
+ OSMO_PFCP_CAUSE_REDIRECTION_REQUESTED = 78,
+ OSMO_PFCP_CAUSE_ALL_DYNAMIC_ADDRESSES_ARE_OCCUPIED = 79,
+};
+
+/* Section 8.2.38 */
+enum osmo_pfcp_node_id_type {
+ OSMO_PFCP_NODE_ID_T_IPV4 = 0,
+ OSMO_PFCP_NODE_ID_T_IPV6 = 1,
+ OSMO_PFCP_NODE_ID_T_FQDN = 2,
+};
+
+enum osmo_pfcp_3gpp_iface_type {
+ OSMO_PFCP_3GPP_IFACE_TYPE_S1_U = 0,
+ OSMO_PFCP_3GPP_IFACE_TYPE_S5_S8_U = 1,
+ OSMO_PFCP_3GPP_IFACE_TYPE_S4_U = 2,
+ OSMO_PFCP_3GPP_IFACE_TYPE_S11_U = 3,
+ OSMO_PFCP_3GPP_IFACE_TYPE_S12_U = 4,
+ OSMO_PFCP_3GPP_IFACE_TYPE_GN_GP_U = 5,
+ OSMO_PFCP_3GPP_IFACE_TYPE_S2A_U = 6,
+ OSMO_PFCP_3GPP_IFACE_TYPE_S2B_U = 7,
+ OSMO_PFCP_3GPP_IFACE_TYPE_ENODEB_GTP_U_INTERFACE_FOR_DL_DATA_FORWARDING = 8,
+ OSMO_PFCP_3GPP_IFACE_TYPE_ENODEB_GTP_U_INTERFACE_FOR_UL_DATA_FORWARDING = 9,
+ OSMO_PFCP_3GPP_IFACE_TYPE_SGW_UPF_GTP_U_INTERFACE_FOR_DL_DATA_FORWARDING = 10,
+ OSMO_PFCP_3GPP_IFACE_TYPE_N3_3GPP_ACCESS = 11,
+ OSMO_PFCP_3GPP_IFACE_TYPE_N3_TRUSTED_NON_3GPP_ACCESS = 12,
+ OSMO_PFCP_3GPP_IFACE_TYPE_N3_UNTRUSTED_NON_3GPP_ACCESS = 13,
+ OSMO_PFCP_3GPP_IFACE_TYPE_N3_FOR_DATA_FORWARDING = 14,
+ OSMO_PFCP_3GPP_IFACE_TYPE_N9 = 15,
+ OSMO_PFCP_3GPP_IFACE_TYPE_SGI = 16,
+ OSMO_PFCP_3GPP_IFACE_TYPE_N6 = 17,
+ OSMO_PFCP_3GPP_IFACE_TYPE_N19 = 18,
+ OSMO_PFCP_3GPP_IFACE_TYPE_S8_U = 19,
+ OSMO_PFCP_3GPP_IFACE_TYPE_GP_U = 20,
+};
+
+enum osmo_pfcp_source_iface {
+ OSMO_PFCP_SOURCE_IFACE_ACCESS = 0,
+ OSMO_PFCP_SOURCE_IFACE_CORE = 1,
+ OSMO_PFCP_SOURCE_IFACE_SGI_LAN_N6_LAN = 2,
+ OSMO_PFCP_SOURCE_IFACE_CP_FUNCTION = 3,
+ OSMO_PFCP_SOURCE_IFACE_5G_VN_INTERNAL = 4,
+};
+
+enum osmo_pfcp_dest_iface {
+ OSMO_PFCP_DEST_IFACE_ACCESS = 0,
+ OSMO_PFCP_DEST_IFACE_CORE = 1,
+ OSMO_PFCP_DEST_IFACE_SGI_LAN_N6_LAN = 2,
+ OSMO_PFCP_DEST_IFACE_CP_FUNCTION = 3,
+ OSMO_PFCP_DEST_IFACE_LI_FUNCTION = 4,
+ OSMO_PFCP_DEST_IFACE_5G_VN_INTERNAL = 5,
+};
+
+/* The enum values correspond to the bit index in the supported features bitmask in the PFCP UP Function Features IE.
+ * 0 means first octet and first bit, "Octet 5 Bit 1" as in spec;
+ * 7 means first octet last bit, "Octet 5 Bit 8";
+ * 8 means second octet first bit, "Octet 6 Bit 1";
+ * and so on.
+ * Intended for use with osmo_pfcp_bits_get(), osmo_pfcp_bits_set(), osmo_pfcp_bits_to_str_c().
+ */
+enum osmo_pfcp_up_feature {
+ OSMO_PFCP_UP_FEAT_BUCP = 0,
+ OSMO_PFCP_UP_FEAT_DDND,
+ OSMO_PFCP_UP_FEAT_DLBD,
+ OSMO_PFCP_UP_FEAT_TRST,
+ OSMO_PFCP_UP_FEAT_FTUP,
+ OSMO_PFCP_UP_FEAT_PFDM,
+ OSMO_PFCP_UP_FEAT_HEEU,
+ OSMO_PFCP_UP_FEAT_TREU,
+ OSMO_PFCP_UP_FEAT_EMPU,
+ OSMO_PFCP_UP_FEAT_PDIU,
+ OSMO_PFCP_UP_FEAT_UDBC,
+ OSMO_PFCP_UP_FEAT_QUOAC,
+ OSMO_PFCP_UP_FEAT_TRACE,
+ OSMO_PFCP_UP_FEAT_FRRT,
+ OSMO_PFCP_UP_FEAT_PFDE,
+ OSMO_PFCP_UP_FEAT_EPFAR,
+ OSMO_PFCP_UP_FEAT_DPDRA,
+ OSMO_PFCP_UP_FEAT_ADPDP,
+ OSMO_PFCP_UP_FEAT_UEIP,
+ OSMO_PFCP_UP_FEAT_SSET,
+ OSMO_PFCP_UP_FEAT_MNOP,
+ OSMO_PFCP_UP_FEAT_MTE,
+ OSMO_PFCP_UP_FEAT_BUNDL,
+ OSMO_PFCP_UP_FEAT_GCOM,
+ OSMO_PFCP_UP_FEAT_MPAS,
+ OSMO_PFCP_UP_FEAT_RTTL,
+ OSMO_PFCP_UP_FEAT_VTIME,
+ OSMO_PFCP_UP_FEAT_NORP,
+ OSMO_PFCP_UP_FEAT_IP6PL,
+ OSMO_PFCP_UP_FEAT_TSCU,
+ OSMO_PFCP_UP_FEAT_MPTCP,
+ OSMO_PFCP_UP_FEAT_ATSSSLL,
+ OSMO_PFCP_UP_FEAT_QFQM,
+ OSMO_PFCP_UP_FEAT_GPQM,
+ OSMO_PFCP_UP_FEAT_MTEDT,
+ OSMO_PFCP_UP_FEAT_CIOT,
+ OSMO_PFCP_UP_FEAT_ETHAR,
+ OSMO_PFCP_UP_FEAT_DDDS,
+ OSMO_PFCP_UP_FEAT_RDS,
+ OSMO_PFCP_UP_FEAT_RTTWP,
+};
+
+/* The enum values correspond to the bit index in the supported features bitmask in the PFCP CP Function Features IE.
+ * 0 means first octet and first bit, "Octet 5 Bit 1" as in spec;
+ * 7 means first octet last bit, "Octet 5 Bit 8";
+ * 8 means second octet first bit, "Octet 6 Bit 1";
+ * and so on.
+ * Intended for use with osmo_pfcp_bits_get(), osmo_pfcp_bits_set(), osmo_pfcp_bits_to_str_c().
+ */
+enum osmo_pfcp_cp_feature {
+ OSMO_PFCP_CP_FEAT_LOAD = 0,
+ OSMO_PFCP_CP_FEAT_OVRL,
+ OSMO_PFCP_CP_FEAT_EPFAR,
+ OSMO_PFCP_CP_FEAT_SSET,
+ OSMO_PFCP_CP_FEAT_BUNDL,
+ OSMO_PFCP_CP_FEAT_MPAS,
+ OSMO_PFCP_CP_FEAT_ARDR,
+ OSMO_PFCP_CP_FEAT_UIAUR,
+};
+
+/* The enum values correspond to the bit index in the PFCP Apply Action IE.
+ * 0 means first octet and first bit, "Octet 5 Bit 1" as in spec;
+ * 7 means first octet last bit, "Octet 5 Bit 8";
+ * 8 means second octet first bit, "Octet 6 Bit 1";
+ * and so on.
+ * Intended for use with osmo_pfcp_bits_get(), osmo_pfcp_bits_set(), osmo_pfcp_bits_to_str_c().
+ */
+enum osmo_pfcp_apply_action {
+ OSMO_PFCP_APPLY_ACTION_DROP = 0,
+ OSMO_PFCP_APPLY_ACTION_FORW,
+ OSMO_PFCP_APPLY_ACTION_BUFF,
+ OSMO_PFCP_APPLY_ACTION_NOCP,
+ OSMO_PFCP_APPLY_ACTION_DUPL,
+ OSMO_PFCP_APPLY_ACTION_IPMA,
+ OSMO_PFCP_APPLY_ACTION_IPMD,
+ OSMO_PFCP_APPLY_ACTION_DFRT,
+ OSMO_PFCP_APPLY_ACTION_EDRT,
+ OSMO_PFCP_APPLY_ACTION_BDPN,
+ OSMO_PFCP_APPLY_ACTION_DDPN,
+};
+
+/* The enum values correspond to the bit index in the description bitmask in the PFCP Outer Header Creation IE.
+ * 0 means first octet and first bit, "Octet 5 Bit 1" as in spec;
+ * 7 means first octet last bit, "Octet 5 Bit 8";
+ * 8 means second octet first bit, "Octet 6 Bit 1";
+ * and so on.
+ * Intended for use with osmo_pfcp_bits_get(), osmo_pfcp_bits_set(), osmo_pfcp_bits_to_str_c().
+ */
+enum osmo_pfcp_outer_header_creation {
+ OSMO_PFCP_OUTER_HEADER_CREATION_GTP_U_UDP_IPV4 = 0,
+ OSMO_PFCP_OUTER_HEADER_CREATION_GTP_U_UDP_IPV6,
+ OSMO_PFCP_OUTER_HEADER_CREATION_UDP_IPV4,
+ OSMO_PFCP_OUTER_HEADER_CREATION_UDP_IPV6,
+ OSMO_PFCP_OUTER_HEADER_CREATION_IPV4,
+ OSMO_PFCP_OUTER_HEADER_CREATION_IPV6,
+ OSMO_PFCP_OUTER_HEADER_CREATION_C_TAG,
+ OSMO_PFCP_OUTER_HEADER_CREATION_S_TAG,
+ OSMO_PFCP_OUTER_HEADER_CREATION_N19_INDICATION,
+ OSMO_PFCP_OUTER_HEADER_CREATION_N6_INDICATION,
+};
+
+/* 3GPP TS 29.244 8.2.64 */
+enum osmo_pfcp_outer_header_removal_desc {
+ OSMO_PFCP_OUTER_HEADER_REMOVAL_GTP_U_UDP_IPV4 = 0,
+ OSMO_PFCP_OUTER_HEADER_REMOVAL_GTP_U_UDP_IPV6 = 1,
+ OSMO_PFCP_OUTER_HEADER_REMOVAL_UDP_IPV4 = 2,
+ OSMO_PFCP_OUTER_HEADER_REMOVAL_UDP_IPV6 = 3,
+ OSMO_PFCP_OUTER_HEADER_REMOVAL_IPV4 = 4,
+ OSMO_PFCP_OUTER_HEADER_REMOVAL_IPV6 = 5,
+ OSMO_PFCP_OUTER_HEADER_REMOVAL_GTP_U_UDP_IP = 6,
+ OSMO_PFCP_OUTER_HEADER_REMOVAL_VLAN_S_TAG = 7,
+ OSMO_PFCP_OUTER_HEADER_REMOVAL_S_TAG_AND_C_TAG = 8,
+};
diff --git a/include/osmocom/pfcp/pfcp_strs.h b/include/osmocom/pfcp/pfcp_strs.h
new file mode 100644
index 0000000..d0b106a
--- /dev/null
+++ b/include/osmocom/pfcp/pfcp_strs.h
@@ -0,0 +1,94 @@
+/*
+ * (C) 2021-2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>
+ * All Rights Reserved.
+ *
+ * Author: Neels Janosch Hofmeyr <nhofmeyr(a)sysmocom.de>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+#include <osmocom/core/utils.h>
+
+#include <osmocom/pfcp/pfcp_proto.h>
+
+extern const struct value_string osmo_pfcp_message_type_strs[];
+static inline const char *osmo_pfcp_message_type_str(enum osmo_pfcp_message_type val)
+{
+ return get_value_string(osmo_pfcp_message_type_strs, val);
+}
+
+extern const struct value_string osmo_pfcp_iei_strs[];
+static inline const char *osmo_pfcp_iei_str(enum osmo_pfcp_iei val)
+{
+ return get_value_string(osmo_pfcp_iei_strs, val);
+}
+
+extern const struct value_string osmo_pfcp_cause_strs[];
+static inline const char *osmo_pfcp_cause_str(enum osmo_pfcp_cause val)
+{
+ return get_value_string(osmo_pfcp_cause_strs, val);
+}
+
+extern const struct value_string osmo_pfcp_up_feature_strs[];
+static inline const char *osmo_pfcp_up_feature_str(enum osmo_pfcp_up_feature val)
+{
+ return get_value_string(osmo_pfcp_up_feature_strs, val);
+}
+
+extern const struct value_string osmo_pfcp_cp_feature_strs[];
+static inline const char *osmo_pfcp_cp_feature_str(enum osmo_pfcp_cp_feature val)
+{
+ return get_value_string(osmo_pfcp_cp_feature_strs, val);
+}
+
+extern const struct value_string osmo_pfcp_apply_action_strs[];
+static inline const char *osmo_pfcp_apply_action_str(enum osmo_pfcp_apply_action val)
+{
+ return get_value_string(osmo_pfcp_apply_action_strs, val);
+}
+
+extern const struct value_string osmo_pfcp_outer_header_creation_strs[];
+static inline const char *osmo_pfcp_outer_header_creation_str(enum osmo_pfcp_outer_header_creation val)
+{
+ return get_value_string(osmo_pfcp_outer_header_creation_strs, val);
+}
+
+extern const struct value_string osmo_pfcp_outer_header_removal_desc_strs[];
+static inline const char *osmo_pfcp_outer_header_removal_desc_str(enum osmo_pfcp_outer_header_removal_desc val)
+{
+ return get_value_string(osmo_pfcp_outer_header_removal_desc_strs, val);
+}
+
+extern const struct value_string osmo_pfcp_source_iface_strs[];
+static inline const char *osmo_pfcp_source_iface_str(enum osmo_pfcp_source_iface val)
+{
+ return get_value_string(osmo_pfcp_source_iface_strs, val);
+}
+
+extern const struct value_string osmo_pfcp_dest_iface_strs[];
+static inline const char *osmo_pfcp_dest_iface_str(enum osmo_pfcp_dest_iface val)
+{
+ return get_value_string(osmo_pfcp_dest_iface_strs, val);
+}
+
+extern const struct value_string osmo_pfcp_3gpp_iface_type_strs[];
+static inline const char *osmo_pfcp_3gpp_iface_type_str(enum osmo_pfcp_3gpp_iface_type val)
+{
+ return get_value_string(osmo_pfcp_3gpp_iface_type_strs, val);
+}
diff --git a/src/Makefile.am b/src/Makefile.am
index a2fb37e..34cf082 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,5 @@
SUBDIRS = \
libosmo-gtlv \
+ libosmo-pfcp \
osmo-upf \
$(NULL)
diff --git a/src/libosmo-pfcp/Makefile.am b/src/libosmo-pfcp/Makefile.am
new file mode 100644
index 0000000..f2dacfe
--- /dev/null
+++ b/src/libosmo-pfcp/Makefile.am
@@ -0,0 +1,28 @@
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir)/include \
+ -I$(top_builddir) \
+ -I$(builddir) \
+ $(NULL)
+
+AM_CFLAGS = \
+ -Wall \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOVTY_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(NULL)
+
+AM_LDFLAGS = \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOVTY_LIBS) \
+ $(COVERAGE_LDFLAGS) \
+ $(NULL)
+
+noinst_LIBRARIES = \
+ libosmo-pfcp.a \
+ $(NULL)
+
+libosmo_pfcp_a_SOURCES = \
+ pfcp_strs.c \
+ $(NULL)
diff --git a/src/libosmo-pfcp/pfcp_strs.c b/src/libosmo-pfcp/pfcp_strs.c
new file mode 100644
index 0000000..bd53aa0
--- /dev/null
+++ b/src/libosmo-pfcp/pfcp_strs.c
@@ -0,0 +1,492 @@
+/*
+ * (C) 2021-2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>
+ * All Rights Reserved.
+ *
+ * Author: Neels Janosch Hofmeyr <nhofmeyr(a)sysmocom.de>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <osmocom/pfcp/pfcp_strs.h>
+
+const struct value_string osmo_pfcp_message_type_strs[] = {
+ { OSMO_PFCP_MSGT_HEARTBEAT_REQ, "HEARTBEAT_REQ" },
+ { OSMO_PFCP_MSGT_HEARTBEAT_RESP, "HEARTBEAT_RESP" },
+ { OSMO_PFCP_MSGT_PFD_MGMT_REQ, "PFD_MGMT_REQ" },
+ { OSMO_PFCP_MSGT_PFD_MGMT_RESP, "PFD_MGMT_RESP" },
+ { OSMO_PFCP_MSGT_ASSOC_SETUP_REQ, "ASSOC_SETUP_REQ" },
+ { OSMO_PFCP_MSGT_ASSOC_SETUP_RESP, "ASSOC_SETUP_RESP" },
+ { OSMO_PFCP_MSGT_ASSOC_UPDATE_REQ, "ASSOC_UPDATE_REQ" },
+ { OSMO_PFCP_MSGT_ASSOC_UPDATE_RESP, "ASSOC_UPDATE_RESP" },
+ { OSMO_PFCP_MSGT_ASSOC_RELEASE_REQ, "ASSOC_RELEASE_REQ" },
+ { OSMO_PFCP_MSGT_ASSOC_RELEASE_RESP, "ASSOC_RELEASE_RESP" },
+ { OSMO_PFCP_MSGT_VERSION_NOT_SUPP_RESP, "VERSION_NOT_SUPP_RESP" },
+ { OSMO_PFCP_MSGT_NODE_REPORT_REQ, "NODE_REPORT_REQ" },
+ { OSMO_PFCP_MSGT_NODE_REPORT_RESP, "NODE_REPORT_RESP" },
+ { OSMO_PFCP_MSGT_SESSION_SET_DEL_REQ, "SESSION_SET_DEL_REQ" },
+ { OSMO_PFCP_MSGT_SESSION_SET_DEL_RESP, "SESSION_SET_DEL_RESP" },
+ { OSMO_PFCP_MSGT_SESSION_EST_REQ, "SESSION_EST_REQ" },
+ { OSMO_PFCP_MSGT_SESSION_EST_RESP, "SESSION_EST_RESP" },
+ { OSMO_PFCP_MSGT_SESSION_MOD_REQ, "SESSION_MOD_REQ" },
+ { OSMO_PFCP_MSGT_SESSION_MOD_RESP, "SESSION_MOD_RESP" },
+ { OSMO_PFCP_MSGT_SESSION_DEL_REQ, "SESSION_DEL_REQ" },
+ { OSMO_PFCP_MSGT_SESSION_DEL_RESP, "SESSION_DEL_RESP" },
+ { OSMO_PFCP_MSGT_SESSION_REP_REQ, "SESSION_REP_REQ" },
+ { OSMO_PFCP_MSGT_SESSION_REP_RESP, "SESSION_REP_RESP" },
+ { 0 }
+};
+
+const struct value_string osmo_pfcp_iei_strs[] = {
+ { OSMO_PFCP_IEI_CREATE_PDR, "Create PDR" },
+ { OSMO_PFCP_IEI_PDI, "PDI" },
+ { OSMO_PFCP_IEI_CREATE_FAR, "Create FAR" },
+ { OSMO_PFCP_IEI_FORW_PARAMS, "Forwarding Parameters" },
+ { OSMO_PFCP_IEI_DUPL_PARAMS, "Duplicating Parameters" },
+ { OSMO_PFCP_IEI_CREATE_URR, "Create URR" },
+ { OSMO_PFCP_IEI_CREATE_QER, "Create QER" },
+ { OSMO_PFCP_IEI_CREATED_PDR, "Created PDR" },
+ { OSMO_PFCP_IEI_UPD_PDR, "Update PDR" },
+ { OSMO_PFCP_IEI_UPD_FAR, "Update FAR" },
+ { OSMO_PFCP_IEI_UPD_FORW_PARAMS, "Update Forwarding Parameters" },
+ { OSMO_PFCP_IEI_UPD_BAR_SESS_REP_RESP, "Update BAR (PFCP Session Report Response)" },
+ { OSMO_PFCP_IEI_UPD_URR, "Update URR" },
+ { OSMO_PFCP_IEI_UPD_QER, "Update QER" },
+ { OSMO_PFCP_IEI_REMOVE_PDR, "Remove PDR" },
+ { OSMO_PFCP_IEI_REMOVE_FAR, "Remove FAR" },
+ { OSMO_PFCP_IEI_REMOVE_URR, "Remove URR" },
+ { OSMO_PFCP_IEI_REMOVE_QER, "Remove QER" },
+ { OSMO_PFCP_IEI_CAUSE, "Cause" },
+ { OSMO_PFCP_IEI_SOURCE_IFACE, "Source Interface" },
+ { OSMO_PFCP_IEI_F_TEID, "F-TEID" },
+ { OSMO_PFCP_IEI_NETWORK_INST, "Network Instance" },
+ { OSMO_PFCP_IEI_SDF_FILTER, "SDF Filter" },
+ { OSMO_PFCP_IEI_APPLICATION_ID, "Application ID" },
+ { OSMO_PFCP_IEI_GATE_STATUS, "Gate Status" },
+ { OSMO_PFCP_IEI_MBR, "MBR" },
+ { OSMO_PFCP_IEI_GBR, "GBR" },
+ { OSMO_PFCP_IEI_QER_CORRELATION_ID, "QER Correlation ID" },
+ { OSMO_PFCP_IEI_PRECEDENCE, "Precedence" },
+ { OSMO_PFCP_IEI_TRANSPORT_LEVEL_MARKING, "Transport Level Marking" },
+ { OSMO_PFCP_IEI_VOLUME_THRESH, "Volume Threshold" },
+ { OSMO_PFCP_IEI_TIME_THRESH, "Time Threshold" },
+ { OSMO_PFCP_IEI_MONITORING_TIME, "Monitoring Time" },
+ { OSMO_PFCP_IEI_SUBSEQUENT_VOLUME_THRESH, "Subsequent Volume Threshold" },
+ { OSMO_PFCP_IEI_SUBSEQUENT_TIME_THRESH, "Subsequent Time Threshold" },
+ { OSMO_PFCP_IEI_INACT_DETECTION_TIME, "Inactivity Detection Time" },
+ { OSMO_PFCP_IEI_REPORTING_TRIGGERS, "Reporting Triggers" },
+ { OSMO_PFCP_IEI_REDIRECT_INFO, "Redirect Information" },
+ { OSMO_PFCP_IEI_REP_TYPE, "Report Type" },
+ { OSMO_PFCP_IEI_OFFENDING_IE, "Offending IE" },
+ { OSMO_PFCP_IEI_FORW_POLICY, "Forwarding Policy" },
+ { OSMO_PFCP_IEI_DESTINATION_IFACE, "Destination Interface" },
+ { OSMO_PFCP_IEI_UP_FUNCTION_FEATURES, "UP Function Features" },
+ { OSMO_PFCP_IEI_APPLY_ACTION, "Apply Action" },
+ { OSMO_PFCP_IEI_DL_DATA_SERVICE_INFO, "Downlink Data Service Information" },
+ { OSMO_PFCP_IEI_DL_DATA_NOTIFICATION_DELAY, "Downlink Data Notification Delay" },
+ { OSMO_PFCP_IEI_DL_BUFF_DURATION, "DL Buffering Duration" },
+ { OSMO_PFCP_IEI_DL_BUFF_SUGGESTED_PACKET_COUNT, "DL Buffering Suggested Packet Count" },
+ { OSMO_PFCP_IEI_PFCPSMREQ_FLAGS, "PFCPSMReq-Flags" },
+ { OSMO_PFCP_IEI_PFCPSRRSP_FLAGS, "PFCPSRRsp-Flags" },
+ { OSMO_PFCP_IEI_LOAD_CTRL_INFO, "Load Control Information" },
+ { OSMO_PFCP_IEI_SEQUENCE_NUMBER, "Sequence Number" },
+ { OSMO_PFCP_IEI_METRIC, "Metric" },
+ { OSMO_PFCP_IEI_OVERLOAD_CTRL_INFO, "Overload Control Information" },
+ { OSMO_PFCP_IEI_TIMER, "Timer" },
+ { OSMO_PFCP_IEI_PDR_ID, "PDR ID" },
+ { OSMO_PFCP_IEI_F_SEID, "F-SEID" },
+ { OSMO_PFCP_IEI_APPLICATION_IDS_PFDS, "Application ID's PFDs" },
+ { OSMO_PFCP_IEI_PFD_CONTEXT, "PFD context" },
+ { OSMO_PFCP_IEI_NODE_ID, "Node ID" },
+ { OSMO_PFCP_IEI_PFD_CONTENTS, "PFD contents" },
+ { OSMO_PFCP_IEI_MEAS_METHOD, "Measurement Method" },
+ { OSMO_PFCP_IEI_USAGE_REP_TRIGGER, "Usage Report Trigger" },
+ { OSMO_PFCP_IEI_MEAS_PERIOD, "Measurement Period" },
+ { OSMO_PFCP_IEI_FQ_CSID, "FQ-CSID" },
+ { OSMO_PFCP_IEI_VOLUME_MEAS, "Volume Measurement" },
+ { OSMO_PFCP_IEI_DURATION_MEAS, "Duration Measurement" },
+ { OSMO_PFCP_IEI_APPLICATION_DETECTION_INFO, "Application Detection Information" },
+ { OSMO_PFCP_IEI_TIME_OF_FIRST_PACKET, "Time of First Packet" },
+ { OSMO_PFCP_IEI_TIME_OF_LAST_PACKET, "Time of Last Packet" },
+ { OSMO_PFCP_IEI_QUOTA_HOLDING_TIME, "Quota Holding Time" },
+ { OSMO_PFCP_IEI_DROPPED_DL_TRAFFIC_THRESH, "Dropped DL Traffic Threshold" },
+ { OSMO_PFCP_IEI_VOLUME_QUOTA, "Volume Quota" },
+ { OSMO_PFCP_IEI_TIME_QUOTA, "Time Quota" },
+ { OSMO_PFCP_IEI_START_TIME, "Start Time" },
+ { OSMO_PFCP_IEI_END_TIME, "End Time" },
+ { OSMO_PFCP_IEI_QUERY_URR, "Query URR" },
+ { OSMO_PFCP_IEI_USAGE_REP_SESS_MOD_RESP, "Usage Report (Session Modification Response)" },
+ { OSMO_PFCP_IEI_USAGE_REP_SESS_DEL_RESP, "Usage Report (Session Deletion Response)" },
+ { OSMO_PFCP_IEI_USAGE_REP_SESS_REP_REQ, "Usage Report (Session Report Request)" },
+ { OSMO_PFCP_IEI_URR_ID, "URR ID" },
+ { OSMO_PFCP_IEI_LINKED_URR_ID, "Linked URR ID" },
+ { OSMO_PFCP_IEI_DL_DATA_REP, "Downlink Data Report" },
+ { OSMO_PFCP_IEI_OUTER_HEADER_CREATION, "Outer Header Creation" },
+ { OSMO_PFCP_IEI_CREATE_BAR, "Create BAR" },
+ { OSMO_PFCP_IEI_UPD_BAR_SESS_MOD_REQ, "Update BAR (Session Modification Request)" },
+ { OSMO_PFCP_IEI_REMOVE_BAR, "Remove BAR" },
+ { OSMO_PFCP_IEI_BAR_ID, "BAR ID" },
+ { OSMO_PFCP_IEI_CP_FUNCTION_FEATURES, "CP Function Features" },
+ { OSMO_PFCP_IEI_USAGE_INFO, "Usage Information" },
+ { OSMO_PFCP_IEI_APPLICATION_INST_ID, "Application Instance ID" },
+ { OSMO_PFCP_IEI_FLOW_INFO, "Flow Information" },
+ { OSMO_PFCP_IEI_UE_IP_ADDRESS, "UE IP Address" },
+ { OSMO_PFCP_IEI_PACKET_RATE, "Packet Rate" },
+ { OSMO_PFCP_IEI_OUTER_HEADER_REMOVAL, "Outer Header Removal" },
+ { OSMO_PFCP_IEI_RECOVERY_TIME_STAMP, "Recovery Time Stamp" },
+ { OSMO_PFCP_IEI_DL_FLOW_LEVEL_MARKING, "DL Flow Level Marking" },
+ { OSMO_PFCP_IEI_HEADER_ENRICHMENT, "Header Enrichment" },
+ { OSMO_PFCP_IEI_ERROR_IND_REP, "Error Indication Report" },
+ { OSMO_PFCP_IEI_MEAS_INFO, "Measurement Information" },
+ { OSMO_PFCP_IEI_NODE_REP_TYPE, "Node Report Type" },
+ { OSMO_PFCP_IEI_USER_PLANE_PATH_FAILURE_REP, "User Plane Path Failure Report" },
+ { OSMO_PFCP_IEI_REMOTE_GTP_U_PEER, "Remote GTP-U Peer" },
+ { OSMO_PFCP_IEI_UR_SEQN, "UR-SEQN" },
+ { OSMO_PFCP_IEI_UPD_DUPL_PARAMS, "Update Duplicating Parameters" },
+ { OSMO_PFCP_IEI_ACTIVATE_PREDEFINED_RULES, "Activate Predefined Rules" },
+ { OSMO_PFCP_IEI_DEACTIVATE_PREDEFINED_RULES, "Deactivate Predefined Rules" },
+ { OSMO_PFCP_IEI_FAR_ID, "FAR ID" },
+ { OSMO_PFCP_IEI_QER_ID, "QER ID" },
+ { OSMO_PFCP_IEI_OCI_FLAGS, "OCI Flags" },
+ { OSMO_PFCP_IEI_PFCP_ASSOC_RELEASE_REQ, "PFCP Association Release Request" },
+ { OSMO_PFCP_IEI_GRACEFUL_RELEASE_PERIOD, "Graceful Release Period" },
+ { OSMO_PFCP_IEI_PDN_TYPE, "PDN Type" },
+ { OSMO_PFCP_IEI_FAILED_RULE_ID, "Failed Rule ID" },
+ { OSMO_PFCP_IEI_TIME_QUOTA_MECHANISM, "Time Quota Mechanism" },
+ { OSMO_PFCP_IEI_RESERVED, "Reserved" },
+ { OSMO_PFCP_IEI_USER_PLANE_INACT_TIMER, "User Plane Inactivity Timer" },
+ { OSMO_PFCP_IEI_AGGREGATED_URRS, "Aggregated URRs" },
+ { OSMO_PFCP_IEI_MULTIPLIER, "Multiplier" },
+ { OSMO_PFCP_IEI_AGGREGATED_URR_ID, "Aggregated URR ID" },
+ { OSMO_PFCP_IEI_SUBSEQUENT_VOLUME_QUOTA, "Subsequent Volume Quota" },
+ { OSMO_PFCP_IEI_SUBSEQUENT_TIME_QUOTA, "Subsequent Time Quota" },
+ { OSMO_PFCP_IEI_RQI, "RQI" },
+ { OSMO_PFCP_IEI_QFI, "QFI" },
+ { OSMO_PFCP_IEI_QUERY_URR_REFERENCE, "Query URR Reference" },
+ { OSMO_PFCP_IEI_ADDITIONAL_USAGE_REPS_INFO, "Additional Usage Reports Information" },
+ { OSMO_PFCP_IEI_CREATE_TRAFFIC_ENDPOINT, "Create Traffic Endpoint" },
+ { OSMO_PFCP_IEI_CREATED_TRAFFIC_ENDPOINT, "Created Traffic Endpoint" },
+ { OSMO_PFCP_IEI_UPD_TRAFFIC_ENDPOINT, "Update Traffic Endpoint" },
+ { OSMO_PFCP_IEI_REMOVE_TRAFFIC_ENDPOINT, "Remove Traffic Endpoint" },
+ { OSMO_PFCP_IEI_TRAFFIC_ENDPOINT_ID, "Traffic Endpoint ID" },
+ { OSMO_PFCP_IEI_ETHERNET_PACKET_FILTER, "Ethernet Packet Filter" },
+ { OSMO_PFCP_IEI_MAC_ADDRESS, "MAC address" },
+ { OSMO_PFCP_IEI_C_TAG, "C-TAG" },
+ { OSMO_PFCP_IEI_S_TAG, "S-TAG" },
+ { OSMO_PFCP_IEI_ETHERTYPE, "Ethertype" },
+ { OSMO_PFCP_IEI_PROXYING, "Proxying" },
+ { OSMO_PFCP_IEI_ETHERNET_FILTER_ID, "Ethernet Filter ID" },
+ { OSMO_PFCP_IEI_ETHERNET_FILTER_PROPERTIES, "Ethernet Filter Properties" },
+ { OSMO_PFCP_IEI_SUGGESTED_BUFF_PACKETS_COUNT, "Suggested Buffering Packets Count" },
+ { OSMO_PFCP_IEI_USER_ID, "User ID" },
+ { OSMO_PFCP_IEI_ETHERNET_PDU_SESS_INFO, "Ethernet PDU Session Information" },
+ { OSMO_PFCP_IEI_ETHERNET_TRAFFIC_INFO, "Ethernet Traffic Information" },
+ { OSMO_PFCP_IEI_MAC_ADDRS_DETECTED, "MAC Addresses Detected" },
+ { OSMO_PFCP_IEI_MAC_ADDRS_REMOVED, "MAC Addresses Removed" },
+ { OSMO_PFCP_IEI_ETHERNET_INACT_TIMER, "Ethernet Inactivity Timer" },
+ { OSMO_PFCP_IEI_ADDITIONAL_MONITORING_TIME, "Additional Monitoring Time" },
+ { OSMO_PFCP_IEI_EVENT_QUOTA, "Event Quota" },
+ { OSMO_PFCP_IEI_EVENT_THRESH, "Event Threshold" },
+ { OSMO_PFCP_IEI_SUBSEQUENT_EVENT_QUOTA, "Subsequent Event Quota" },
+ { OSMO_PFCP_IEI_SUBSEQUENT_EVENT_THRESH, "Subsequent Event Threshold" },
+ { OSMO_PFCP_IEI_TRACE_INFO, "Trace Information" },
+ { OSMO_PFCP_IEI_FRAMED_ROUTE, "Framed-Route" },
+ { OSMO_PFCP_IEI_FRAMED_ROUTING, "Framed-Routing" },
+ { OSMO_PFCP_IEI_FRAMED_IPV6_ROUTE, "Framed-IPv6-Route" },
+ { OSMO_PFCP_IEI_TIME_STAMP, "Time Stamp" },
+ { OSMO_PFCP_IEI_AVERAGING_WINDOW, "Averaging Window" },
+ { OSMO_PFCP_IEI_PAGING_POLICY_INDICATOR, "Paging Policy Indicator" },
+ { OSMO_PFCP_IEI_APN_DNN, "APN/DNN" },
+ { OSMO_PFCP_IEI_3GPP_IFACE_TYPE, "3GPP Interface Type" },
+ { OSMO_PFCP_IEI_PFCPSRREQ_FLAGS, "PFCPSRReq-Flags" },
+ { OSMO_PFCP_IEI_PFCPAUREQ_FLAGS, "PFCPAUReq-Flags" },
+ { OSMO_PFCP_IEI_ACTIVATION_TIME, "Activation Time" },
+ { OSMO_PFCP_IEI_DEACTIVATION_TIME, "Deactivation Time" },
+ { OSMO_PFCP_IEI_CREATE_MAR, "Create MAR" },
+ { OSMO_PFCP_IEI_3GPP_ACCESS_FORW_ACTION_INFO, "3GPP Access Forwarding Action Information" },
+ { OSMO_PFCP_IEI_NON_3GPP_ACCESS_FORW_ACTION_INFO, "Non-3GPP Access Forwarding Action Information" },
+ { OSMO_PFCP_IEI_REMOVE_MAR, "Remove MAR" },
+ { OSMO_PFCP_IEI_UPD_MAR, "Update MAR" },
+ { OSMO_PFCP_IEI_MAR_ID, "MAR ID" },
+ { OSMO_PFCP_IEI_STEERING_FUNCTIONALITY, "Steering Functionality" },
+ { OSMO_PFCP_IEI_STEERING_MODE, "Steering Mode" },
+ { OSMO_PFCP_IEI_WEIGHT, "Weight" },
+ { OSMO_PFCP_IEI_PRIORITY, "Priority" },
+ { OSMO_PFCP_IEI_UPD_3GPP_ACCESS_FORW_ACTION_INFO, "Update 3GPP Access Forwarding Action Information" },
+ { OSMO_PFCP_IEI_UPD_NON_3GPP_ACCESS_FORW_ACTION_INFO, "Update Non 3GPP Access Forwarding Action Information" },
+ { OSMO_PFCP_IEI_UE_IP_ADDRESS_POOL_IDENTITY, "UE IP address Pool Identity" },
+ { OSMO_PFCP_IEI_ALTERNATIVE_SMF_IP_ADDRESS, "Alternative SMF IP Address" },
+ { OSMO_PFCP_IEI_PACKET_REPLICATION_AND_DETECTION_CARRY_ON_INFO, "Packet Replication and Detection Carry-On Information" },
+ { OSMO_PFCP_IEI_SMF_SET_ID, "SMF Set ID" },
+ { OSMO_PFCP_IEI_QUOTA_VALIDITY_TIME, "Quota Validity Time" },
+ { OSMO_PFCP_IEI_NUMBER_OF_REPS, "Number of Reports" },
+ { OSMO_PFCP_IEI_PFCP_SESS_RETENTION_INFO_IN_ASSOC_SETUP_REQ, "PFCP Session Retention Information (within PFCP Association Setup Request)" },
+ { OSMO_PFCP_IEI_PFCPASRSP_FLAGS, "PFCPASRsp-Flags" },
+ { OSMO_PFCP_IEI_CP_ENTITY_IP_ADDRESS, "CP PFCP Entity IP Address" },
+ { OSMO_PFCP_IEI_PFCPSEREQ_FLAGS, "PFCPSEReq-Flags" },
+ { OSMO_PFCP_IEI_USER_PLANE_PATH_RECOVERY_REP, "User Plane Path Recovery Report" },
+ { OSMO_PFCP_IEI_IP_MULTICAST_ADDR_INFO_IN_SESS_EST_REQ, "IP Multicast Addressing Info within PFCP Session Establishment Request" },
+ { OSMO_PFCP_IEI_JOIN_IP_MULTICAST_INFO_IE_IN_USAGE_REP, "Join IP Multicast Information IE within Usage Report" },
+ { OSMO_PFCP_IEI_LEAVE_IP_MULTICAST_INFO_IE_IN_USAGE_REP, "Leave IP Multicast Information IE within Usage Report" },
+ { OSMO_PFCP_IEI_IP_MULTICAST_ADDRESS, "IP Multicast Address" },
+ { OSMO_PFCP_IEI_SOURCE_IP_ADDRESS, "Source IP Address" },
+ { OSMO_PFCP_IEI_PACKET_RATE_STATUS, "Packet Rate Status" },
+ { OSMO_PFCP_IEI_CREATE_BRIDGE_INFO_FOR_TSC, "Create Bridge Info for TSC" },
+ { OSMO_PFCP_IEI_CREATED_BRIDGE_INFO_FOR_TSC, "Created Bridge Info for TSC" },
+ { OSMO_PFCP_IEI_DS_TT_PORT_NUMBER, "DS-TT Port Number" },
+ { OSMO_PFCP_IEI_NW_TT_PORT_NUMBER, "NW-TT Port Number" },
+ { OSMO_PFCP_IEI_TSN_BRIDGE_ID, "TSN Bridge ID" },
+ { OSMO_PFCP_IEI_TSC_MGMT_INFO_IE_IN_SESS_MOD_REQ, "TSC Management Information IE within PFCP Session Modification Request" },
+ { OSMO_PFCP_IEI_TSC_MGMT_INFO_IE_IN_SESS_MOD_RESP, "TSC Management Information IE within PFCP Session Modification Response" },
+ { OSMO_PFCP_IEI_TSC_MGMT_INFO_IE_IN_SESS_REP_REQ, "TSC Management Information IE within PFCP Session Report Request" },
+ { OSMO_PFCP_IEI_PORT_MGMT_INFO_CONTAINER, "Port Management Information Container" },
+ { OSMO_PFCP_IEI_CLOCK_DRIFT_CTRL_INFO, "Clock Drift Control Information" },
+ { OSMO_PFCP_IEI_REQUESTED_CLOCK_DRIFT_INFO, "Requested Clock Drift Information" },
+ { OSMO_PFCP_IEI_CLOCK_DRIFT_REP, "Clock Drift Report" },
+ { OSMO_PFCP_IEI_TSN_TIME_DOMAIN_NUMBER, "TSN Time Domain Number" },
+ { OSMO_PFCP_IEI_TIME_OFFSET_THRESH, "Time Offset Threshold" },
+ { OSMO_PFCP_IEI_CUMULATIVE_RATERATIO_THRESH, "Cumulative rateRatio Threshold" },
+ { OSMO_PFCP_IEI_TIME_OFFSET_MEAS, "Time Offset Measurement" },
+ { OSMO_PFCP_IEI_CUMULATIVE_RATERATIO_MEAS, "Cumulative rateRatio Measurement" },
+ { OSMO_PFCP_IEI_REMOVE_SRR, "Remove SRR" },
+ { OSMO_PFCP_IEI_CREATE_SRR, "Create SRR" },
+ { OSMO_PFCP_IEI_UPD_SRR, "Update SRR" },
+ { OSMO_PFCP_IEI_SESS_REP, "Session Report" },
+ { OSMO_PFCP_IEI_SRR_ID, "SRR ID" },
+ { OSMO_PFCP_IEI_ACCESS_AVAIL_CTRL_INFO, "Access Availability Control Information" },
+ { OSMO_PFCP_IEI_REQUESTED_ACCESS_AVAIL_INFO, "Requested Access Availability Information" },
+ { OSMO_PFCP_IEI_ACCESS_AVAIL_REP, "Access Availability Report" },
+ { OSMO_PFCP_IEI_ACCESS_AVAIL_INFO, "Access Availability Information" },
+ { OSMO_PFCP_IEI_PROVIDE_ATSSS_CTRL_INFO, "Provide ATSSS Control Information" },
+ { OSMO_PFCP_IEI_ATSSS_CTRL_PARAMS, "ATSSS Control Parameters" },
+ { OSMO_PFCP_IEI_MPTCP_CTRL_INFO, "MPTCP Control Information" },
+ { OSMO_PFCP_IEI_ATSSS_LL_CTRL_INFO, "ATSSS-LL Control Information" },
+ { OSMO_PFCP_IEI_PMF_CTRL_INFO, "PMF Control Information" },
+ { OSMO_PFCP_IEI_MPTCP_PARAMS, "MPTCP Parameters" },
+ { OSMO_PFCP_IEI_ATSSS_LL_PARAMS, "ATSSS-LL Parameters" },
+ { OSMO_PFCP_IEI_PMF_PARAMS, "PMF Parameters" },
+ { OSMO_PFCP_IEI_MPTCP_ADDRESS_INFO, "MPTCP Address Information" },
+ { OSMO_PFCP_IEI_UE_LINK_SPECIFIC_IP_ADDRESS, "UE Link-Specific IP Address" },
+ { OSMO_PFCP_IEI_PMF_ADDRESS_INFO, "PMF Address Information" },
+ { OSMO_PFCP_IEI_ATSSS_LL_INFO, "ATSSS-LL Information" },
+ { OSMO_PFCP_IEI_DATA_NETWORK_ACCESS_IDENTIFIER, "Data Network Access Identifier" },
+ { OSMO_PFCP_IEI_UE_IP_ADDRESS_POOL_INFO, "UE IP address Pool Information" },
+ { OSMO_PFCP_IEI_AVERAGE_PACKET_DELAY, "Average Packet Delay" },
+ { OSMO_PFCP_IEI_MIN_PACKET_DELAY, "Minimum Packet Delay" },
+ { OSMO_PFCP_IEI_MAX_PACKET_DELAY, "Maximum Packet Delay" },
+ { OSMO_PFCP_IEI_QOS_REP_TRIGGER, "QoS Report Trigger" },
+ { OSMO_PFCP_IEI_GTP_U_PATH_QOS_CTRL_INFO, "GTP-U Path QoS Control Information" },
+ { OSMO_PFCP_IEI_GTP_U_PATH_QOS_REP_NODE_REP_REQ, "GTP-U Path QoS Report (PFCP Node Report Request)" },
+ { OSMO_PFCP_IEI_QOS_INFO_IN_GTP_U_PATH_QOS_REP, "QoS Information in GTP-U Path QoS Report" },
+ { OSMO_PFCP_IEI_GTP_U_PATH_IFACE_TYPE, "GTP-U Path Interface Type" },
+ { OSMO_PFCP_IEI_QOS_MONITORING_PER_QOS_FLOW_CTRL_INFO, "QoS Monitoring per QoS flow Control Information" },
+ { OSMO_PFCP_IEI_REQUESTED_QOS_MONITORING, "Requested QoS Monitoring" },
+ { OSMO_PFCP_IEI_REPORTING_FREQUENCY, "Reporting Frequency" },
+ { OSMO_PFCP_IEI_PACKET_DELAY_THRESHOLDS, "Packet Delay Thresholds" },
+ { OSMO_PFCP_IEI_MIN_WAIT_TIME, "Minimum Wait Time" },
+ { OSMO_PFCP_IEI_QOS_MONITORING_REP, "QoS Monitoring Report" },
+ { OSMO_PFCP_IEI_QOS_MONITORING_MEAS, "QoS Monitoring Measurement" },
+ { OSMO_PFCP_IEI_MT_EDT_CTRL_INFO, "MT-EDT Control Information" },
+ { OSMO_PFCP_IEI_DL_DATA_PACKETS_SIZE, "DL Data Packets Size" },
+ { OSMO_PFCP_IEI_QER_CTRL_INDICATIONS, "QER Control Indications" },
+ { OSMO_PFCP_IEI_PACKET_RATE_STATUS_REP, "Packet Rate Status Report" },
+ { OSMO_PFCP_IEI_NF_INST_ID, "NF Instance ID" },
+ { OSMO_PFCP_IEI_ETHERNET_CONTEXT_INFO, "Ethernet Context Information" },
+ { OSMO_PFCP_IEI_REDUNDANT_TRANSMISSION_PARAMS, "Redundant Transmission Parameters" },
+ { OSMO_PFCP_IEI_UPDATED_PDR, "Updated PDR" },
+ { OSMO_PFCP_IEI_S_NSSAI, "S-NSSAI" },
+ { OSMO_PFCP_IEI_IP_VERSION, "IP version" },
+ { OSMO_PFCP_IEI_PFCPASREQ_FLAGS, "PFCPASReq-Flags" },
+ { OSMO_PFCP_IEI_DATA_STATUS, "Data Status" },
+ { OSMO_PFCP_IEI_PROVIDE_RDS_CONF_INFO, "Provide RDS configuration information" },
+ { OSMO_PFCP_IEI_RDS_CONF_INFO, "RDS configuration information" },
+ { OSMO_PFCP_IEI_QUERY_PACKET_RATE_STATUS_IE_IN_SESS_MOD_REQ, "Query Packet Rate Status IE within PFCP Session Modification Request" },
+ { OSMO_PFCP_IEI_PACKET_RATE_STATUS_REP_IE_IN_SESS_MOD_RESP, "Packet Rate Status Report IE within PFCP Session Modification Response" },
+ { OSMO_PFCP_IEI_MPTCP_APPLICABLE_IND, "MPTCP Applicable Indication" },
+ { OSMO_PFCP_IEI_BRIDGE_MGMT_INFO_CONTAINER, "Bridge Management Information Container" },
+ { OSMO_PFCP_IEI_UE_IP_ADDRESS_USAGE_INFO, "UE IP Address Usage Information" },
+ { OSMO_PFCP_IEI_NUMBER_OF_UE_IP_ADDRS, "Number of UE IP Addresses" },
+ { OSMO_PFCP_IEI_VALIDITY_TIMER, "Validity Timer" },
+ { OSMO_PFCP_IEI_REDUNDANT_TRANSMISSION_FORW_PARAMS, "Redundant Transmission Forwarding Parameters" },
+ { OSMO_PFCP_IEI_TRANSPORT_DELAY_REPORTING, "Transport Delay Reporting" },
+ { 0 }
+};
+
+const struct value_string osmo_pfcp_cause_strs[] = {
+ { OSMO_PFCP_CAUSE_RESERVED, "0" },
+ { OSMO_PFCP_CAUSE_REQUEST_ACCEPTED, "Request accepted (success)" },
+ { OSMO_PFCP_CAUSE_MORE_USAGE_REPORT_TO_SEND, "More Usage Report to send" },
+ { OSMO_PFCP_CAUSE_REQUEST_REJECTED, "Request rejected (reason not specified)" },
+ { OSMO_PFCP_CAUSE_SESSION_CTX_NOT_FOUND, "Session context not found" },
+ { OSMO_PFCP_CAUSE_MANDATORY_IE_MISSING, "Mandatory IE missing" },
+ { OSMO_PFCP_CAUSE_CONDITIONAL_IE_MISSING, "Conditional IE missing" },
+ { OSMO_PFCP_CAUSE_INVALID_LENGTH, "Invalid length" },
+ { OSMO_PFCP_CAUSE_MANDATORY_IE_INCORRECT, "Mandatory IE incorrect" },
+ { OSMO_PFCP_CAUSE_INVALID_FORW_POLICY, "Invalid Forwarding Policy" },
+ { OSMO_PFCP_CAUSE_INVALID_F_TEID_ALLOC_OPTION, "Invalid F-TEID allocation option" },
+ { OSMO_PFCP_CAUSE_NO_ESTABLISHED_PFCP_ASSOC, "No established PFCP Association" },
+ { OSMO_PFCP_CAUSE_RULE_CREATION_MOD_FAILURE, "Rule creation/modification Failure" },
+ { OSMO_PFCP_CAUSE_PFCP_ENTITY_IN_CONGESTION, "PFCP entity in congestion" },
+ { OSMO_PFCP_CAUSE_NO_RESOURCES_AVAILABLE, "No resources available" },
+ { OSMO_PFCP_CAUSE_SERVICE_NOT_SUPPORTED, "Service not supported" },
+ { OSMO_PFCP_CAUSE_SYSTEM_FAILURE, "System failure" },
+ { OSMO_PFCP_CAUSE_REDIRECTION_REQUESTED, "Redirection Requested" },
+ { OSMO_PFCP_CAUSE_ALL_DYNAMIC_ADDRESSES_ARE_OCCUPIED, "All dynamic addresses are occupied" },
+ { 0 }
+};
+
+const struct value_string osmo_pfcp_up_feature_strs[] = {
+ { OSMO_PFCP_UP_FEAT_BUCP, "BUCP" },
+ { OSMO_PFCP_UP_FEAT_DDND, "DDND" },
+ { OSMO_PFCP_UP_FEAT_DLBD, "DLBD" },
+ { OSMO_PFCP_UP_FEAT_TRST, "TRST" },
+ { OSMO_PFCP_UP_FEAT_FTUP, "FTUP" },
+ { OSMO_PFCP_UP_FEAT_PFDM, "PFDM" },
+ { OSMO_PFCP_UP_FEAT_HEEU, "HEEU" },
+ { OSMO_PFCP_UP_FEAT_TREU, "TREU" },
+ { OSMO_PFCP_UP_FEAT_EMPU, "EMPU" },
+ { OSMO_PFCP_UP_FEAT_PDIU, "PDIU" },
+ { OSMO_PFCP_UP_FEAT_UDBC, "UDBC" },
+ { OSMO_PFCP_UP_FEAT_QUOAC, "QUOAC" },
+ { OSMO_PFCP_UP_FEAT_TRACE, "TRACE" },
+ { OSMO_PFCP_UP_FEAT_FRRT, "FRRT" },
+ { OSMO_PFCP_UP_FEAT_PFDE, "PFDE" },
+ { OSMO_PFCP_UP_FEAT_EPFAR, "EPFAR" },
+ { OSMO_PFCP_UP_FEAT_DPDRA, "DPDRA" },
+ { OSMO_PFCP_UP_FEAT_ADPDP, "ADPDP" },
+ { OSMO_PFCP_UP_FEAT_UEIP, "UEIP" },
+ { OSMO_PFCP_UP_FEAT_SSET, "SSET" },
+ { OSMO_PFCP_UP_FEAT_MNOP, "MNOP" },
+ { OSMO_PFCP_UP_FEAT_MTE, "MTE" },
+ { OSMO_PFCP_UP_FEAT_BUNDL, "BUNDL" },
+ { OSMO_PFCP_UP_FEAT_GCOM, "GCOM" },
+ { OSMO_PFCP_UP_FEAT_MPAS, "MPAS" },
+ { OSMO_PFCP_UP_FEAT_RTTL, "RTTL" },
+ { OSMO_PFCP_UP_FEAT_VTIME, "VTIME" },
+ { OSMO_PFCP_UP_FEAT_NORP, "NORP" },
+ { OSMO_PFCP_UP_FEAT_IP6PL, "IP6PL" },
+ { OSMO_PFCP_UP_FEAT_TSCU, "TSCU" },
+ { OSMO_PFCP_UP_FEAT_MPTCP, "MPTCP" },
+ { OSMO_PFCP_UP_FEAT_ATSSSLL, "ATSSSLL" },
+ { OSMO_PFCP_UP_FEAT_QFQM, "QFQM" },
+ { OSMO_PFCP_UP_FEAT_GPQM, "GPQM" },
+ { OSMO_PFCP_UP_FEAT_MTEDT, "MTEDT" },
+ { OSMO_PFCP_UP_FEAT_CIOT, "CIOT" },
+ { OSMO_PFCP_UP_FEAT_ETHAR, "ETHAR" },
+ { OSMO_PFCP_UP_FEAT_DDDS, "DDDS" },
+ { OSMO_PFCP_UP_FEAT_RDS, "RDS" },
+ { OSMO_PFCP_UP_FEAT_RTTWP, "RTTWP" },
+ {}
+};
+
+
+const struct value_string osmo_pfcp_cp_feature_strs[] = {
+ { OSMO_PFCP_CP_FEAT_LOAD, "LOAD" },
+ { OSMO_PFCP_CP_FEAT_OVRL, "OVRL" },
+ { OSMO_PFCP_CP_FEAT_EPFAR, "EPFAR" },
+ { OSMO_PFCP_CP_FEAT_SSET, "SSET" },
+ { OSMO_PFCP_CP_FEAT_BUNDL, "BUNDL" },
+ { OSMO_PFCP_CP_FEAT_MPAS, "MPAS" },
+ { OSMO_PFCP_CP_FEAT_ARDR, "ARDR" },
+ { OSMO_PFCP_CP_FEAT_UIAUR, "UIAUR" },
+ {}
+};
+
+const struct value_string osmo_pfcp_apply_action_strs[] = {
+ { OSMO_PFCP_APPLY_ACTION_DROP, "DROP" },
+ { OSMO_PFCP_APPLY_ACTION_FORW, "FORW" },
+ { OSMO_PFCP_APPLY_ACTION_BUFF, "BUFF" },
+ { OSMO_PFCP_APPLY_ACTION_NOCP, "NOCP" },
+ { OSMO_PFCP_APPLY_ACTION_DUPL, "DUPL" },
+ { OSMO_PFCP_APPLY_ACTION_IPMA, "IPMA" },
+ { OSMO_PFCP_APPLY_ACTION_IPMD, "IPMD" },
+ { OSMO_PFCP_APPLY_ACTION_DFRT, "DFRT" },
+ { OSMO_PFCP_APPLY_ACTION_EDRT, "EDRT" },
+ { OSMO_PFCP_APPLY_ACTION_BDPN, "BDPN" },
+ { OSMO_PFCP_APPLY_ACTION_DDPN, "DDPN" },
+ {}
+};
+
+const struct value_string osmo_pfcp_outer_header_creation_strs[] = {
+ { OSMO_PFCP_OUTER_HEADER_CREATION_GTP_U_UDP_IPV4, "GTP_U_UDP_IPV4" },
+ { OSMO_PFCP_OUTER_HEADER_CREATION_GTP_U_UDP_IPV6, "GTP_U_UDP_IPV6" },
+ { OSMO_PFCP_OUTER_HEADER_CREATION_UDP_IPV4, "UDP_IPV4" },
+ { OSMO_PFCP_OUTER_HEADER_CREATION_UDP_IPV6, "UDP_IPV6" },
+ { OSMO_PFCP_OUTER_HEADER_CREATION_IPV4, "IPV4" },
+ { OSMO_PFCP_OUTER_HEADER_CREATION_IPV6, "IPV6" },
+ { OSMO_PFCP_OUTER_HEADER_CREATION_C_TAG, "C_TAG" },
+ { OSMO_PFCP_OUTER_HEADER_CREATION_S_TAG, "S_TAG" },
+ { OSMO_PFCP_OUTER_HEADER_CREATION_N19_INDICATION, "N19_INDICATION" },
+ { OSMO_PFCP_OUTER_HEADER_CREATION_N6_INDICATION, "N6_INDICATION" },
+ {}
+};
+
+const struct value_string osmo_pfcp_outer_header_removal_desc_strs[] = {
+ { OSMO_PFCP_OUTER_HEADER_REMOVAL_GTP_U_UDP_IPV4, "GTP_U_UDP_IPV4" },
+ { OSMO_PFCP_OUTER_HEADER_REMOVAL_GTP_U_UDP_IPV6, "GTP_U_UDP_IPV6" },
+ { OSMO_PFCP_OUTER_HEADER_REMOVAL_UDP_IPV4, "UDP_IPV4" },
+ { OSMO_PFCP_OUTER_HEADER_REMOVAL_UDP_IPV6, "UDP_IPV6" },
+ { OSMO_PFCP_OUTER_HEADER_REMOVAL_IPV4, "IPV4" },
+ { OSMO_PFCP_OUTER_HEADER_REMOVAL_IPV6, "IPV6" },
+ { OSMO_PFCP_OUTER_HEADER_REMOVAL_GTP_U_UDP_IP, "GTP_U_UDP_IP" },
+ { OSMO_PFCP_OUTER_HEADER_REMOVAL_VLAN_S_TAG, "VLAN_S_TAG" },
+ { OSMO_PFCP_OUTER_HEADER_REMOVAL_S_TAG_AND_C_TAG, "S_TAG_AND_C_TAG" },
+ {}
+};
+
+const struct value_string osmo_pfcp_source_iface_strs[] = {
+ { OSMO_PFCP_SOURCE_IFACE_ACCESS, "Access" },
+ { OSMO_PFCP_SOURCE_IFACE_CORE, "Core" },
+ { OSMO_PFCP_SOURCE_IFACE_SGI_LAN_N6_LAN, "SGi-LAN/N6-LAN" },
+ { OSMO_PFCP_SOURCE_IFACE_CP_FUNCTION, "CP-function" },
+ { OSMO_PFCP_SOURCE_IFACE_5G_VN_INTERNAL, "5G-VN-Internal" },
+ {}
+};
+
+const struct value_string osmo_pfcp_dest_iface_strs[] = {
+ { OSMO_PFCP_DEST_IFACE_ACCESS, "Access" },
+ { OSMO_PFCP_DEST_IFACE_CORE, "Core" },
+ { OSMO_PFCP_DEST_IFACE_SGI_LAN_N6_LAN, "SGi-LAN/N6-LAN" },
+ { OSMO_PFCP_DEST_IFACE_CP_FUNCTION, "CP-function" },
+ { OSMO_PFCP_DEST_IFACE_LI_FUNCTION, "LI-function" },
+ { OSMO_PFCP_DEST_IFACE_5G_VN_INTERNAL, "5G-VN-Internal" },
+ {}
+};
+
+const struct value_string osmo_pfcp_3gpp_iface_type_strs[] = {
+ { OSMO_PFCP_3GPP_IFACE_TYPE_S1_U, "S1_U" },
+ { OSMO_PFCP_3GPP_IFACE_TYPE_S5_S8_U, "S5_S8_U" },
+ { OSMO_PFCP_3GPP_IFACE_TYPE_S4_U, "S4_U" },
+ { OSMO_PFCP_3GPP_IFACE_TYPE_S11_U, "S11_U" },
+ { OSMO_PFCP_3GPP_IFACE_TYPE_S12_U, "S12_U" },
+ { OSMO_PFCP_3GPP_IFACE_TYPE_GN_GP_U, "GN_GP_U" },
+ { OSMO_PFCP_3GPP_IFACE_TYPE_S2A_U, "S2A_U" },
+ { OSMO_PFCP_3GPP_IFACE_TYPE_S2B_U, "S2B_U" },
+ { OSMO_PFCP_3GPP_IFACE_TYPE_ENODEB_GTP_U_INTERFACE_FOR_DL_DATA_FORWARDING, "ENODEB_GTP_U_INTERFACE_FOR_DL_DATA_FORWARDING" },
+ { OSMO_PFCP_3GPP_IFACE_TYPE_ENODEB_GTP_U_INTERFACE_FOR_UL_DATA_FORWARDING, "ENODEB_GTP_U_INTERFACE_FOR_UL_DATA_FORWARDING" },
+ { OSMO_PFCP_3GPP_IFACE_TYPE_SGW_UPF_GTP_U_INTERFACE_FOR_DL_DATA_FORWARDING, "SGW_UPF_GTP_U_INTERFACE_FOR_DL_DATA_FORWARDING" },
+ { OSMO_PFCP_3GPP_IFACE_TYPE_N3_3GPP_ACCESS, "N3_3GPP_ACCESS" },
+ { OSMO_PFCP_3GPP_IFACE_TYPE_N3_TRUSTED_NON_3GPP_ACCESS, "N3_TRUSTED_NON_3GPP_ACCESS" },
+ { OSMO_PFCP_3GPP_IFACE_TYPE_N3_UNTRUSTED_NON_3GPP_ACCESS, "N3_UNTRUSTED_NON_3GPP_ACCESS" },
+ { OSMO_PFCP_3GPP_IFACE_TYPE_N3_FOR_DATA_FORWARDING, "N3_FOR_DATA_FORWARDING" },
+ { OSMO_PFCP_3GPP_IFACE_TYPE_N9, "N9" },
+ { OSMO_PFCP_3GPP_IFACE_TYPE_SGI, "SGI" },
+ { OSMO_PFCP_3GPP_IFACE_TYPE_N6, "N6" },
+ { OSMO_PFCP_3GPP_IFACE_TYPE_N19, "N19" },
+ { OSMO_PFCP_3GPP_IFACE_TYPE_S8_U, "S8_U" },
+ { OSMO_PFCP_3GPP_IFACE_TYPE_GP_U, "GP_U" },
+ {}
+};
7 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/27221
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: I568b821e89007ed52eeefcdbcb6edd8052a8b5be
Gerrit-Change-Number: 27221
Gerrit-PatchSet: 8
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
1
0
Change in osmo-upf[master]: libosmo-pfcp: implement/generate TLV and IE value coding
by neels 01 Apr '22
by neels 01 Apr '22
01 Apr '22
neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/27222 )
Change subject: libosmo-pfcp: implement/generate TLV and IE value coding
......................................................................
libosmo-pfcp: implement/generate TLV and IE value coding
Related: SYS#5599
Change-Id: I3069045b2d42dac88d955c636230adc64a7a4aa7
---
M include/osmocom/pfcp/Makefile.am
A include/osmocom/pfcp/pfcp_ies_custom.h
M src/libosmo-pfcp/Makefile.am
A src/libosmo-pfcp/gen__pfcp_ies_auto.c
A src/libosmo-pfcp/pfcp_ies_custom.c
5 files changed, 1,565 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
neels: Looks good to me, approved
diff --git a/include/osmocom/pfcp/Makefile.am b/include/osmocom/pfcp/Makefile.am
index ff7df5e..4bfc194 100644
--- a/include/osmocom/pfcp/Makefile.am
+++ b/include/osmocom/pfcp/Makefile.am
@@ -1,6 +1,22 @@
pfcp_HEADERS = \
+ pfcp_ies_custom.h \
pfcp_proto.h \
pfcp_strs.h \
$(NULL)
pfcpdir = $(includedir)/osmocom/pfcp
+
+BUILT_SOURCES = \
+ pfcp_ies_auto.h \
+ $(NULL)
+
+CLEANFILES = \
+ pfcp_ies_auto.h \
+ $(NULL)
+
+pfcp_ies_auto.h: $(top_srcdir)/src/libosmo-pfcp/gen__pfcp_ies_auto.c \
+ $(top_srcdir)/src/libosmo-gtlv/gtlv_gen.c \
+ $(top_srcdir)/include/osmocom/gtlv/gtlv_gen.h
+ $(MAKE) -C $(top_builddir)/src/libosmo-gtlv
+ $(MAKE) -C $(top_builddir)/src/libosmo-pfcp gen__pfcp_ies_auto
+ $(top_builddir)/src/libosmo-pfcp/gen__pfcp_ies_auto h > $(builddir)/pfcp_ies_auto.h
diff --git a/include/osmocom/pfcp/pfcp_ies_custom.h b/include/osmocom/pfcp/pfcp_ies_custom.h
new file mode 100644
index 0000000..9f26550
--- /dev/null
+++ b/include/osmocom/pfcp/pfcp_ies_custom.h
@@ -0,0 +1,163 @@
+/* Definitions for decoded PFCP IEs, to be used by the auto-generated pfcp_ies_auto.c. */
+/*
+ * (C) 2021-2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>
+ * All Rights Reserved.
+ *
+ * Author: Neels Janosch Hofmeyr <nhofmeyr(a)sysmocom.de>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+#include <osmocom/core/socket.h>
+
+#include <osmocom/pfcp/pfcp_proto.h>
+
+/* Common pattern used in various PFCP IEs. */
+struct osmo_pfcp_ip_addrs {
+ bool v4_present;
+ struct osmo_sockaddr v4;
+ bool v6_present;
+ struct osmo_sockaddr v6;
+};
+
+int osmo_pfcp_ip_addrs_set(struct osmo_pfcp_ip_addrs *dst, const struct osmo_sockaddr *addr);
+
+/* 3GPP TS 29.244 8.2.38, IETF RFC 1035 3.1 */
+struct osmo_pfcp_ie_node_id {
+ enum osmo_pfcp_node_id_type type;
+ union {
+ struct osmo_sockaddr ip;
+ /* Fully qualified domain name in "dot" notation ("host.example.com") */
+ char fqdn[254];
+ };
+};
+
+bool osmo_pfcp_bits_get(const uint8_t *bits, unsigned int bitpos);
+void osmo_pfcp_bits_set(uint8_t *bits, unsigned int bitpos, bool val);
+int osmo_pfcp_bits_to_str_buf(char *buf, size_t buflen, const uint8_t *bits, const struct value_string *bit_strs);
+char *osmo_pfcp_bits_to_str_c(void *ctx, const uint8_t *bits, const struct value_string *bit_str);
+
+/* 3GPP TS 29.244 8.2.25
+ * Usage:
+ * struct osmo_pfcp_ie_up_function_features x;
+ * osmo_pfcp_bits_set(x.bits, OSMO_PFCP_UP_FEAT_BUNDL, true);
+ * if (osmo_pfcp_bits_get(x.bits, OSMO_PFCP_UP_FEAT_BUNDL))
+ * foo();
+ * printf("%s\n", osmo_pfcp_bits_to_str_c(x.bits, osmo_pfcp_up_feature_strs));
+ */
+struct osmo_pfcp_ie_up_function_features {
+ uint8_t bits[6];
+};
+
+/* 3GPP TS 29.244 8.2.58
+ * struct osmo_pfcp_ie_cp_function_features x;
+ * osmo_pfcp_bits_set(x.bits, OSMO_PFCP_CP_FEAT_BUNDL, true);
+ * if (osmo_pfcp_bits_get(x.bits, OSMO_PFCP_CP_FEAT_BUNDL))
+ * foo();
+ * printf("%s\n", osmo_pfcp_bits_to_str_c(x.bits, osmo_pfcp_cp_feature_strs));
+ */
+struct osmo_pfcp_ie_cp_function_features {
+ uint8_t bits[3];
+};
+
+/* 3GPP TS 29.244 8.2.37 */
+struct osmo_pfcp_ie_f_seid {
+ uint64_t seid;
+ struct osmo_pfcp_ip_addrs ip_addr;
+};
+
+void osmo_pfcp_ie_f_seid_set(struct osmo_pfcp_ie_f_seid *f_seid, uint64_t seid,
+ const struct osmo_sockaddr *remote_addr);
+
+/* 3GPP TS 29.244 8.3.2 */
+struct osmo_pfcp_ie_f_teid {
+ bool choose_flag;
+ union {
+ struct {
+ uint32_t teid;
+ struct osmo_pfcp_ip_addrs ip_addr;
+ } fixed;
+ struct {
+ bool ipv4_addr;
+ bool ipv6_addr;
+ bool choose_id_present;
+ uint8_t choose_id;
+ } choose;
+ };
+};
+
+/* 3GPP TS 29.244 8.2.62 */
+struct osmo_pfcp_ie_ue_ip_address {
+ bool chv6;
+ bool chv4;
+ bool ip_is_destination;
+ struct osmo_pfcp_ip_addrs ip_addr;
+ bool ipv6_prefix_delegation_bits_present;
+ uint8_t ipv6_prefix_delegation_bits;
+ bool ipv6_prefix_length_present;
+ uint8_t ipv6_prefix_length;
+};
+
+/* 3GPP TS 29.244 8.2.26.
+ * Usage:
+ * struct osmo_pfcp_ie_apply_action x;
+ * osmo_pfcp_bits_set(x.bits, OSMO_PFCP_APPLY_ACTION_FORW, true);
+ * if (osmo_pfcp_bits_get(x.bits, OSMO_PFCP_APPLY_ACTION_FORW))
+ * foo();
+ * printf("%s\n", osmo_pfcp_bits_to_str_c(x.bits, osmo_pfcp_apply_action_strs));
+ */
+struct osmo_pfcp_ie_apply_action {
+ uint8_t bits[2];
+};
+
+struct osmo_pfcp_ie_network_inst {
+ /* A domain name may have up to 253 characters; plus nul. */
+ char str[253+1];
+};
+
+struct osmo_pfcp_ie_activate_predefined_rules {
+ char str[256];
+};
+
+/* 3GPP TS 29.244 8.2.56 */
+struct osmo_pfcp_ie_outer_header_creation {
+ /* desc_bits Usage:
+ * osmo_pfcp_bits_set(x.desc_bits, OSMO_PFCP_OUTER_HEADER_CREATION_GTP_U_UDP_IPV4, true);
+ * if (osmo_pfcp_bits_get(x.desc_bits, OSMO_PFCP_OUTER_HEADER_CREATION_GTP_U_UDP_IPV4))
+ * foo();
+ * printf("%s\n", osmo_pfcp_bits_to_str_c(x.desc_bits, osmo_pfcp_outer_header_creation_strs));
+ */
+ uint8_t desc_bits[2];
+ bool teid_present;
+ uint32_t teid;
+ struct osmo_pfcp_ip_addrs ip_addr;
+ bool port_number_present;
+ uint16_t port_number;
+ bool c_tag_present;
+ uint32_t c_tag;
+ bool s_tag_present;
+ uint32_t s_tag;
+};
+
+/* 3GPP TS 29.244 8.2.64. */
+struct osmo_pfcp_ie_outer_header_removal {
+ enum osmo_pfcp_outer_header_removal_desc desc;
+ bool gtp_u_extension_header_del_present;
+ uint8_t gtp_u_extension_header_del_bits[1];
+};
diff --git a/src/libosmo-pfcp/Makefile.am b/src/libosmo-pfcp/Makefile.am
index f2dacfe..0e249f9 100644
--- a/src/libosmo-pfcp/Makefile.am
+++ b/src/libosmo-pfcp/Makefile.am
@@ -24,5 +24,37 @@
$(NULL)
libosmo_pfcp_a_SOURCES = \
+ pfcp_ies_custom.c \
pfcp_strs.c \
+ \
+ pfcp_ies_auto.c \
+ $(NULL)
+
+BUILT_SOURCES = \
+ pfcp_ies_auto.c \
+ $(NULL)
+
+CLEANFILES = \
+ pfcp_ies_auto.c \
+ $(NULL)
+
+pfcp_ies_auto.c: $(srcdir)/gen__pfcp_ies_auto.c \
+ $(top_srcdir)/src/libosmo-gtlv/gtlv_gen.c \
+ $(top_srcdir)/include/osmocom/gtlv/gtlv_gen.h
+ $(MAKE) -C $(top_builddir)/src/libosmo-gtlv
+ $(MAKE) gen__pfcp_ies_auto
+ $(builddir)/gen__pfcp_ies_auto c > $(builddir)/pfcp_ies_auto.c
+
+noinst_PROGRAMS = \
+ gen__pfcp_ies_auto \
+ $(NULL)
+
+gen__pfcp_ies_auto_SOURCES = \
+ gen__pfcp_ies_auto.c \
+ $(NULL)
+
+gen__pfcp_ies_auto_LDADD = \
+ $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.a \
+ $(LIBOSMOCORE_LIBS) \
+ $(COVERAGE_LDFLAGS) \
$(NULL)
diff --git a/src/libosmo-pfcp/gen__pfcp_ies_auto.c b/src/libosmo-pfcp/gen__pfcp_ies_auto.c
new file mode 100644
index 0000000..0dfb43c
--- /dev/null
+++ b/src/libosmo-pfcp/gen__pfcp_ies_auto.c
@@ -0,0 +1,365 @@
+/* Tool to generate C source code of structs and IE arrays for de- and encoding PFCP messages. */
+/*
+ * (C) 2021-2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>
+ * All Rights Reserved.
+ *
+ * Author: Neels Janosch Hofmeyr <nhofmeyr(a)sysmocom.de>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/gtlv/gtlv_gen.h>
+
+#define O OSMO_GTLV_GEN_O
+#define M OSMO_GTLV_GEN_M
+#define O_MULTI OSMO_GTLV_GEN_O_MULTI
+#define M_MULTI OSMO_GTLV_GEN_M_MULTI
+#define ALL_FROM_NAME osmo_gtlv_gen_ie_auto
+
+#define Ms(MEMB_NAME) M(MEMB_NAME, #MEMB_NAME)
+#define Os(MEMB_NAME) O(MEMB_NAME, #MEMB_NAME)
+#define O_MULTIs(N, MEMB_NAME) O_MULTI(N, MEMB_NAME, #MEMB_NAME)
+#define M_MULTIs(N, M, MEMB_NAME) M_MULTI(N, M, MEMB_NAME, #MEMB_NAME)
+
+static const struct osmo_gtlv_gen_ie recovery_time_stamp = {
+ "uint32_t",
+ .dec_enc = "32be",
+ .spec_ref = "7.4.2",
+};
+
+static const struct osmo_gtlv_gen_ie cause = {
+ "enum osmo_pfcp_cause",
+ .spec_ref = "8.2.1",
+};
+
+static const struct osmo_gtlv_gen_ie offending_ie = {
+ .decoded_type = "enum osmo_pfcp_iei",
+ .spec_ref = "8.2.22",
+};
+
+static const struct osmo_gtlv_gen_ie f_seid = {
+ .tag_name = "f_seid",
+ .spec_ref = "8.2.37",
+};
+
+static const struct osmo_gtlv_gen_ie pdr_id = {
+ .decoded_type = "uint16_t",
+ .dec_enc = "16be",
+ .spec_ref = "8.2.36",
+};
+
+static const struct osmo_gtlv_gen_ie precedence = {
+ .decoded_type = "uint32_t",
+ .dec_enc = "32be",
+ .spec_ref = "8.2.11",
+};
+
+static const struct osmo_gtlv_gen_ie source_iface = {
+ .decoded_type = "enum osmo_pfcp_source_iface",
+ .spec_ref = "8.2.2",
+};
+
+static const struct osmo_gtlv_gen_ie f_teid = {
+ .tag_name = "f_teid",
+ .spec_ref = "8.2.3",
+};
+
+static const struct osmo_gtlv_gen_ie traffic_endpoint_id = {
+ .tag_name = "traffic_endpoint_id",
+ .decoded_type = "uint8_t",
+ .dec_enc = "8",
+ .spec_ref = "8.2.92",
+};
+
+static const struct osmo_gtlv_gen_ie iface_type = {
+ .decoded_type = "enum osmo_pfcp_3gpp_iface_type",
+ .tag_name = "3gpp_iface_type",
+ .spec_ref = "8.2.118",
+};
+
+static const struct osmo_gtlv_gen_ie_o ies_in_pdi[] = {
+ Ms(source_iface),
+ O(f_teid, "local_f_teid"),
+ O(ALL_FROM_NAME, "ue_ip_address"),
+ Os(traffic_endpoint_id),
+ O(iface_type, "source_iface_type"),
+ {}
+};
+
+static const struct osmo_gtlv_gen_ie pdi = {
+ .nested_ies = ies_in_pdi,
+ .spec_ref = "7.5.2.2-2",
+};
+
+static const struct osmo_gtlv_gen_ie far_id = {
+ .decoded_type = "uint32_t",
+ .dec_enc = "32be",
+ .spec_ref = "8.2.74",
+};
+
+static const struct osmo_gtlv_gen_ie_o ies_in_create_pdr[] = {
+ Ms(pdr_id),
+ Ms(precedence),
+ Ms(pdi),
+ O(ALL_FROM_NAME, "outer_header_removal"),
+ Os(far_id),
+ O(ALL_FROM_NAME, "activate_predefined_rules"),
+ {}
+};
+
+static const struct osmo_gtlv_gen_ie create_pdr = {
+ .nested_ies = ies_in_create_pdr,
+ .spec_ref = "7.5.2.2",
+};
+
+static const struct osmo_gtlv_gen_ie_o ies_in_created_pdr[] = {
+ Ms(pdr_id),
+ O(f_teid, "local_f_teid"),
+ {}
+};
+
+static const struct osmo_gtlv_gen_ie created_pdr = {
+ .nested_ies = ies_in_created_pdr,
+ .spec_ref = "7.5.3.2",
+};
+
+static const struct osmo_gtlv_gen_ie_o ies_in_upd_pdr[] = {
+ Ms(pdr_id),
+ O(ALL_FROM_NAME, "outer_header_removal"),
+ Os(pdi),
+ Os(far_id),
+ O(ALL_FROM_NAME, "activate_predefined_rules"),
+ {}
+};
+
+static const struct osmo_gtlv_gen_ie upd_pdr = {
+ .nested_ies = ies_in_upd_pdr,
+ .spec_ref = "7.5.4.2",
+};
+
+static const struct osmo_gtlv_gen_ie_o ies_in_updated_pdr[] = {
+ Ms(pdr_id),
+ O(f_teid, "local_f_teid"),
+ {}
+};
+
+static const struct osmo_gtlv_gen_ie updated_pdr = {
+ .nested_ies = ies_in_updated_pdr,
+ .spec_ref = "7.5.9.3",
+};
+
+static const struct osmo_gtlv_gen_ie_o ies_in_remove_pdr[] = {
+ Ms(pdr_id),
+ {}
+};
+
+static const struct osmo_gtlv_gen_ie remove_pdr = {
+ .nested_ies = ies_in_remove_pdr,
+ .spec_ref = "7.5.4.6",
+};
+
+static const struct osmo_gtlv_gen_ie destination_iface = {
+ .decoded_type = "enum osmo_pfcp_dest_iface",
+ .dec_enc = "dest_iface",
+ .spec_ref = "8.2.24",
+};
+
+static const struct osmo_gtlv_gen_ie_o ies_in_forw_params[] = {
+ Ms(destination_iface),
+ O(ALL_FROM_NAME, "network_inst"),
+ O(ALL_FROM_NAME, "outer_header_creation"),
+ O(traffic_endpoint_id, "linked_te_id"),
+ O(iface_type, "destination_iface_type"),
+ {}
+};
+
+static const struct osmo_gtlv_gen_ie forw_params = {
+ .nested_ies = ies_in_forw_params,
+ .spec_ref = "7.5.2.3-2",
+};
+
+static const struct osmo_gtlv_gen_ie_o ies_in_upd_forw_params[] = {
+ Os(destination_iface),
+ O(ALL_FROM_NAME, "network_inst"),
+ O(ALL_FROM_NAME, "outer_header_creation"),
+ O(traffic_endpoint_id, "linked_te_id"),
+ O(iface_type, "destination_iface_type"),
+ {}
+};
+
+static const struct osmo_gtlv_gen_ie upd_forw_params = {
+ .nested_ies = ies_in_upd_forw_params,
+ .spec_ref = "7.5.4.3-2",
+};
+
+static const struct osmo_gtlv_gen_ie_o ies_in_create_far[] = {
+ Ms(far_id),
+ M(ALL_FROM_NAME, "apply_action"),
+ Os(forw_params),
+ {}
+};
+
+static const struct osmo_gtlv_gen_ie create_far = {
+ .nested_ies = ies_in_create_far,
+ .spec_ref = "7.5.2.3",
+};
+
+static const struct osmo_gtlv_gen_ie_o ies_in_remove_far[] = {
+ Ms(far_id),
+ {}
+};
+
+static const struct osmo_gtlv_gen_ie remove_far = {
+ .nested_ies = ies_in_remove_far,
+ .spec_ref = "7.5.4.6",
+};
+
+static const struct osmo_gtlv_gen_ie_o ies_in_upd_far[] = {
+ Ms(far_id),
+ O(ALL_FROM_NAME, "apply_action"),
+ Os(upd_forw_params),
+ {}
+};
+
+static const struct osmo_gtlv_gen_ie upd_far = {
+ .nested_ies = ies_in_upd_far,
+ .spec_ref = "7.5.4.3",
+};
+
+static const struct osmo_gtlv_gen_ie_o ies_in_msg_heartbeat_req[] = {
+ Ms(recovery_time_stamp),
+ {}
+};
+
+static const struct osmo_gtlv_gen_ie_o ies_in_msg_heartbeat_resp[] = {
+ Ms(recovery_time_stamp),
+ {}
+};
+
+static const struct osmo_gtlv_gen_ie_o ies_in_msg_assoc_setup_req[] = {
+ M(ALL_FROM_NAME, "node_id"),
+ Ms(recovery_time_stamp),
+ O(ALL_FROM_NAME, "up_function_features"),
+ O(ALL_FROM_NAME, "cp_function_features"),
+ {}
+};
+
+static const struct osmo_gtlv_gen_ie_o ies_in_msg_assoc_setup_resp[] = {
+ M(ALL_FROM_NAME, "node_id"),
+ Ms(cause),
+ Ms(recovery_time_stamp),
+ O(ALL_FROM_NAME, "up_function_features"),
+ O(ALL_FROM_NAME, "cp_function_features"),
+ {}
+};
+
+static const struct osmo_gtlv_gen_ie_o ies_in_msg_assoc_release_req[] = {
+ M(ALL_FROM_NAME, "node_id"),
+ {}
+};
+
+static const struct osmo_gtlv_gen_ie_o ies_in_msg_assoc_release_resp[] = {
+ M(ALL_FROM_NAME, "node_id"),
+ Ms(cause),
+ {}
+};
+
+static const struct osmo_gtlv_gen_ie_o ies_in_msg_session_est_req[] = {
+ M(ALL_FROM_NAME, "node_id"),
+ O(f_seid, "cp_f_seid"),
+ M_MULTIs(32, 1, create_pdr),
+ M_MULTI(32, 1, create_far, "create_far"),
+ {}
+};
+
+static const struct osmo_gtlv_gen_ie_o ies_in_msg_session_est_resp[] = {
+ M(ALL_FROM_NAME, "node_id"),
+ Ms(cause),
+ Os(offending_ie),
+ O(f_seid, "up_f_seid"),
+ O_MULTIs(32, created_pdr),
+ {}
+};
+
+static const struct osmo_gtlv_gen_ie_o ies_in_msg_session_mod_req[] = {
+ O(f_seid, "cp_f_seid"),
+ O_MULTIs(32, remove_pdr),
+ O_MULTIs(32, remove_far),
+ O_MULTIs(32, create_pdr),
+ O_MULTIs(32, create_far),
+ O_MULTIs(32, upd_pdr),
+ O_MULTIs(32, upd_far),
+ {}
+};
+
+static const struct osmo_gtlv_gen_ie_o ies_in_msg_session_mod_resp[] = {
+ Ms(cause),
+ Os(offending_ie),
+ O_MULTIs(32, created_pdr),
+ O_MULTIs(32, updated_pdr),
+ {}
+};
+
+static const struct osmo_gtlv_gen_ie_o ies_in_msg_session_del_req[] = {
+ /* no IEs */
+ {}
+};
+
+static const struct osmo_gtlv_gen_ie_o ies_in_msg_session_del_resp[] = {
+ Ms(cause),
+ {}
+};
+
+#define MSG(NAME) { #NAME, ies_in_msg_##NAME }
+static const struct osmo_gtlv_gen_msg pfcp_msg_defs[] = {
+ MSG(heartbeat_req),
+ MSG(heartbeat_resp),
+ MSG(assoc_setup_req),
+ MSG(assoc_setup_resp),
+ MSG(assoc_release_req),
+ MSG(assoc_release_resp),
+ MSG(session_est_req),
+ MSG(session_est_resp),
+ MSG(session_mod_req),
+ MSG(session_mod_resp),
+ MSG(session_del_req),
+ MSG(session_del_resp),
+ {}
+};
+
+int main(int argc, const char **argv)
+{
+ struct osmo_gtlv_gen_cfg cfg = {
+ .proto_name = "osmo_pfcp",
+ .spec_ref_prefix = "3GPP TS 29.244 ",
+ .message_type_enum = "enum osmo_pfcp_message_type",
+ .message_type_prefix = "OSMO_PFCP_MSGT_",
+ .tag_enum = "enum osmo_pfcp_iei",
+ .tag_prefix = "OSMO_PFCP_IEI_",
+ .decoded_type_prefix = "struct osmo_pfcp_ie_",
+ .h_header = "#include <osmocom/pfcp/pfcp_ies_custom.h>",
+ .c_header = "#include <osmocom/pfcp/pfcp_ies_auto.h>",
+ .msg_defs = pfcp_msg_defs,
+ .add_enc_to_str = true,
+ };
+ return osmo_gtlv_gen_main(&cfg, argc, argv);
+}
diff --git a/src/libosmo-pfcp/pfcp_ies_custom.c b/src/libosmo-pfcp/pfcp_ies_custom.c
new file mode 100644
index 0000000..660a08d
--- /dev/null
+++ b/src/libosmo-pfcp/pfcp_ies_custom.c
@@ -0,0 +1,989 @@
+/* Decoded PFCP IEs, to be used by the auto-generated pfcp_ies_auto.c. */
+/*
+ * (C) 2021-2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>
+ * All Rights Reserved.
+ *
+ * Author: Neels Janosch Hofmeyr <nhofmeyr(a)sysmocom.de>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <errno.h>
+#include <inttypes.h>
+
+#include <osmocom/core/socket.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/core/msgb.h>
+
+#include <osmocom/gtlv/gtlv.h>
+
+#include <osmocom/pfcp/pfcp_ies_custom.h>
+#include <osmocom/pfcp/pfcp_strs.h>
+
+/* Assumes presence of local variable osmo_pfcp_msg *m. m->log_ctx may be NULL. */
+#define RETURN_ERROR(RC, FMT, ARGS...) \
+ do {\
+ OSMO_ASSERT(decoded_struct); \
+ LOGP(DLPFCP, LOGL_ERROR, FMT " (%d: %s)\n", ##ARGS, RC, \
+ strerror((RC) > 0 ? (RC) : -(RC))); \
+ return RC; \
+ } while (0)
+
+/* Assumes presence of local variable osmo_gtlv_load *tlv. Usage:
+ * ENSURE_LENGTH_IS_EXACTLY(2);
+ */
+#define ENSURE_LENGTH_IS_EXACTLY(VAL) \
+ do { \
+ if (!(tlv->len == VAL)) \
+ RETURN_ERROR(-EINVAL, "IE has length = %zu, expected length == " #VAL, tlv->len); \
+ } while (0)
+
+/* Assumes presence of local variable osmo_gtlv_load *tlv. Usage:
+ * ENSURE_LENGTH_IS_AT_LEAST(1);
+ */
+#define ENSURE_LENGTH_IS_AT_LEAST(VAL) \
+ do { \
+ if (!(tlv->len >= VAL)) \
+ RETURN_ERROR(-EINVAL, "IE has length = %zu, expected length >= " #VAL, tlv->len); \
+ } while (0)
+
+/* Assumes presence of local variable osmo_gtlv_load *tlv. Usage:
+ * const uint8_t *pos = tlv->val;
+ * ENSURE_REMAINING_LENGTH_IS_AT_LEAST("first part", pos, 23);
+ * <parse first part>
+ * pos += 23;
+ * ENSURE_REMAINING_LENGTH_IS_AT_LEAST("very long part", pos, 235);
+ * <parse very long part>
+ * pos += 235;
+ */
+#define ENSURE_REMAINING_LENGTH_IS_AT_LEAST(NAME, POS, MIN_VAL) \
+ do { \
+ if (!((tlv->len - ((POS) - tlv->val)) >= MIN_VAL)) \
+ RETURN_ERROR(-EINVAL, \
+ "at value octet %d: %zu octets remaining, but " #NAME " requires length >= " #MIN_VAL, \
+ (int)((POS) - tlv->val), \
+ tlv->len - ((POS) - tlv->val)); \
+ } while (0)
+
+void osmo_pfcp_ie_f_seid_set(struct osmo_pfcp_ie_f_seid *f_seid, uint64_t seid, const struct osmo_sockaddr *remote_addr)
+{
+ *f_seid = (struct osmo_pfcp_ie_f_seid) {
+ .seid = seid,
+ };
+ osmo_pfcp_ip_addrs_set(&f_seid->ip_addr, remote_addr);
+}
+
+int osmo_pfcp_dec_cause(void *decoded_struct, void *decode_to, const struct osmo_gtlv_load *tlv)
+{
+ enum osmo_pfcp_cause *cause = decode_to;
+ ENSURE_LENGTH_IS_EXACTLY(1);
+ *cause = *tlv->val;
+ return 0;
+}
+
+int osmo_pfcp_enc_cause(struct osmo_gtlv_put *tlv, const void *decoded_struct, const void *encode_from)
+{
+ const enum osmo_pfcp_cause *cause = encode_from;
+ msgb_put_u8(tlv->dst, *cause);
+ return 0;
+}
+
+int osmo_pfcp_enc_to_str_cause(char *buf, size_t buflen, const void *encode_from)
+{
+ const enum osmo_pfcp_cause *cause = encode_from;
+ return snprintf(buf, buflen, "%s", osmo_pfcp_cause_str(*cause));
+}
+
+int osmo_pfcp_dec_offending_ie(void *decoded_struct, void *decode_to, const struct osmo_gtlv_load *tlv)
+{
+ enum osmo_pfcp_iei *offending_ie = decode_to;
+ ENSURE_LENGTH_IS_EXACTLY(2);
+ *offending_ie = osmo_load16be(tlv->val);
+ return 0;
+}
+
+int osmo_pfcp_enc_offending_ie(struct osmo_gtlv_put *tlv, const void *decoded_struct, const void *encode_from)
+{
+ const enum osmo_pfcp_iei *offending_ie = encode_from;
+ msgb_put_u16(tlv->dst, *offending_ie);
+ return 0;
+}
+
+int osmo_pfcp_enc_to_str_offending_ie(char *buf, size_t buflen, const void *encode_from)
+{
+ const enum osmo_pfcp_iei *offending_ie = encode_from;
+ return snprintf(buf, buflen, "%s", osmo_pfcp_iei_str(*offending_ie));
+}
+
+int osmo_pfcp_dec_8(void *decoded_struct, void *decode_to, const struct osmo_gtlv_load *tlv)
+{
+ uint8_t *u8 = decode_to;
+ ENSURE_LENGTH_IS_AT_LEAST(1);
+ *u8 = tlv->val[0];
+ return 0;
+}
+
+int osmo_pfcp_enc_8(struct osmo_gtlv_put *tlv, const void *decoded_struct, const void *encode_from)
+{
+ const uint8_t *u8 = encode_from;
+ msgb_put_u8(tlv->dst, *u8);
+ return 0;
+}
+
+int osmo_pfcp_enc_to_str_8(char *buf, size_t buflen, const void *encode_from)
+{
+ const uint8_t *u8 = encode_from;
+ return snprintf(buf, buflen, "%u", *u8);
+}
+
+int osmo_pfcp_dec_16be(void *decoded_struct, void *decode_to, const struct osmo_gtlv_load *tlv)
+{
+ uint16_t *u16 = decode_to;
+ ENSURE_LENGTH_IS_AT_LEAST(2);
+ *u16 = osmo_load16be(tlv->val);
+ return 0;
+}
+
+int osmo_pfcp_enc_16be(struct osmo_gtlv_put *tlv, const void *decoded_struct, const void *encode_from)
+{
+ const uint16_t *u16 = encode_from;
+ msgb_put_u16(tlv->dst, *u16);
+ return 0;
+}
+
+int osmo_pfcp_enc_to_str_16be(char *buf, size_t buflen, const void *encode_from)
+{
+ const uint16_t *u16 = encode_from;
+ return snprintf(buf, buflen, "%u", *u16);
+}
+
+int osmo_pfcp_dec_32be(void *decoded_struct, void *decode_to, const struct osmo_gtlv_load *tlv)
+{
+ uint32_t *u32 = decode_to;
+ ENSURE_LENGTH_IS_AT_LEAST(4);
+ *u32 = osmo_load32be(tlv->val);
+ return 0;
+}
+
+int osmo_pfcp_enc_32be(struct osmo_gtlv_put *tlv, const void *decoded_struct, const void *encode_from)
+{
+ const uint32_t *u32 = encode_from;
+ msgb_put_u32(tlv->dst, *u32);
+ return 0;
+}
+
+int osmo_pfcp_enc_to_str_32be(char *buf, size_t buflen, const void *encode_from)
+{
+ const uint32_t *u32 = encode_from;
+ return snprintf(buf, buflen, "%u", *u32);
+}
+
+int osmo_pfcp_dec_3gpp_iface_type(void *decoded_struct, void *decode_to, const struct osmo_gtlv_load *tlv)
+{
+ enum osmo_pfcp_3gpp_iface_type *_3gpp_iface_type = decode_to;
+ ENSURE_LENGTH_IS_AT_LEAST(1);
+ *_3gpp_iface_type = tlv->val[0] & 0x3f;
+ return 0;
+}
+
+int osmo_pfcp_enc_3gpp_iface_type(struct osmo_gtlv_put *tlv, const void *decoded_struct, const void *encode_from)
+{
+ const enum osmo_pfcp_3gpp_iface_type *_3gpp_iface_type = encode_from;
+ msgb_put_u8(tlv->dst, (uint8_t)(*_3gpp_iface_type) & 0x3f);
+ return 0;
+}
+
+int osmo_pfcp_enc_to_str_3gpp_iface_type(char *buf, size_t buflen, const void *encode_from)
+{
+ const enum osmo_pfcp_3gpp_iface_type *_3gpp_iface_type = encode_from;
+ return snprintf(buf, buflen, "%s", osmo_pfcp_3gpp_iface_type_str(*_3gpp_iface_type));
+}
+
+int osmo_pfcp_dec_source_iface(void *decoded_struct, void *decode_to, const struct osmo_gtlv_load *tlv)
+{
+ enum osmo_pfcp_source_iface *source_iface = decode_to;
+ ENSURE_LENGTH_IS_AT_LEAST(1);
+ *source_iface = tlv->val[0] & 0xf;
+ return 0;
+}
+
+int osmo_pfcp_enc_source_iface(struct osmo_gtlv_put *tlv, const void *decoded_struct, const void *encode_from)
+{
+ const enum osmo_pfcp_source_iface *source_iface = encode_from;
+ msgb_put_u8(tlv->dst, (uint8_t)(*source_iface) & 0xf);
+ return 0;
+}
+
+int osmo_pfcp_enc_to_str_source_iface(char *buf, size_t buflen, const void *encode_from)
+{
+ const enum osmo_pfcp_source_iface *source_iface = encode_from;
+ return snprintf(buf, buflen, "%s", osmo_pfcp_source_iface_str(*source_iface));
+}
+
+int osmo_pfcp_dec_dest_iface(void *decoded_struct, void *decode_to, const struct osmo_gtlv_load *tlv)
+{
+ enum osmo_pfcp_dest_iface *dest_interface = decode_to;
+ ENSURE_LENGTH_IS_AT_LEAST(1);
+ *dest_interface = tlv->val[0] & 0xf;
+ return 0;
+}
+
+int osmo_pfcp_enc_dest_iface(struct osmo_gtlv_put *tlv, const void *decoded_struct, const void *encode_from)
+{
+ const enum osmo_pfcp_dest_iface *dest_interface = encode_from;
+ msgb_put_u8(tlv->dst, (uint8_t)(*dest_interface) & 0xf);
+ return 0;
+}
+
+int osmo_pfcp_enc_to_str_dest_iface(char *buf, size_t buflen, const void *encode_from)
+{
+ const enum osmo_pfcp_dest_iface *dest_iface = encode_from;
+ return snprintf(buf, buflen, "%s", osmo_pfcp_dest_iface_str(*dest_iface));
+}
+
+int osmo_pfcp_dec_node_id(void *decoded_struct, void *decode_to, const struct osmo_gtlv_load *tlv)
+{
+ struct osmo_pfcp_ie_node_id *node_id = decode_to;
+ const void *ip;
+ unsigned int ip_len;
+ unsigned int want_len;
+ ENSURE_LENGTH_IS_AT_LEAST(1);
+ node_id->type = *(uint8_t *)tlv->val;
+ ip = &tlv->val[1];
+ ip_len = tlv->len - 1;
+
+ switch (node_id->type) {
+ case OSMO_PFCP_NODE_ID_T_IPV4:
+ want_len = sizeof(node_id->ip.u.sin.sin_addr);
+ if (ip_len != want_len)
+ RETURN_ERROR(-EINVAL, "Node ID: wrong IPv4 address value length %u, expected %u",
+ ip_len, want_len);
+ osmo_sockaddr_from_octets(&node_id->ip, ip, ip_len);
+ break;
+ case OSMO_PFCP_NODE_ID_T_IPV6:
+ want_len = sizeof(node_id->ip.u.sin6.sin6_addr);
+ if (ip_len != want_len)
+ RETURN_ERROR(-EINVAL, "Node ID: wrong IPv6 address value length %u, expected %u",
+ ip_len, want_len);
+ osmo_sockaddr_from_octets(&node_id->ip, ip, ip_len);
+ break;
+ case OSMO_PFCP_NODE_ID_T_FQDN:
+ /* Copy and add a trailing nul */
+ OSMO_STRLCPY_ARRAY(node_id->fqdn, ip);
+ break;
+ default:
+ RETURN_ERROR(-EINVAL, "Invalid Node ID Type: %d", node_id->type);
+ }
+ return 0;
+}
+
+int osmo_pfcp_enc_node_id(struct osmo_gtlv_put *tlv, const void *decoded_struct, const void *encode_from)
+{
+ unsigned int l;
+ const struct osmo_pfcp_ie_node_id *node_id = encode_from;
+ msgb_put_u8(tlv->dst, node_id->type);
+ switch (node_id->type) {
+ case OSMO_PFCP_NODE_ID_T_IPV4:
+ l = sizeof(node_id->ip.u.sin.sin_addr);
+ osmo_sockaddr_to_octets(msgb_put(tlv->dst, l), l, &node_id->ip);
+ break;
+ case OSMO_PFCP_NODE_ID_T_IPV6:
+ l = sizeof(node_id->ip.u.sin6.sin6_addr);
+ osmo_sockaddr_to_octets(msgb_put(tlv->dst, l), l, &node_id->ip);
+ break;
+ case OSMO_PFCP_NODE_ID_T_FQDN:
+ l = strnlen(node_id->fqdn, sizeof(node_id->fqdn));
+ /* Copy without trailing nul */
+ memcpy((char *)msgb_put(tlv->dst, l), node_id->fqdn, l);
+ break;
+ default:
+ RETURN_ERROR(-EINVAL, "Invalid Node ID Type: %d", node_id->type);
+ }
+ return 0;
+}
+
+int osmo_pfcp_enc_to_str_node_id(char *buf, size_t buflen, const void *encode_from)
+{
+ const struct osmo_pfcp_ie_node_id *node_id = encode_from;
+ struct osmo_strbuf sb = { .buf = buf, .len = buflen };
+
+ switch (node_id->type) {
+ case OSMO_PFCP_NODE_ID_T_IPV4:
+ OSMO_STRBUF_PRINTF(sb, "v4:");
+ break;
+ case OSMO_PFCP_NODE_ID_T_IPV6:
+ OSMO_STRBUF_PRINTF(sb, "v6:");
+ break;
+ case OSMO_PFCP_NODE_ID_T_FQDN:
+ OSMO_STRBUF_PRINTF(sb, "fqdn:");
+ OSMO_STRBUF_APPEND(sb, osmo_quote_str_buf3,
+ node_id->fqdn, strnlen(node_id->fqdn, sizeof(node_id->fqdn)));
+ return sb.chars_needed;
+ default:
+ OSMO_STRBUF_PRINTF(sb, "unknown-node-id-type-%u", node_id->type);
+ return sb.chars_needed;
+ }
+
+ OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &node_id->ip);
+ return sb.chars_needed;
+}
+
+bool osmo_pfcp_bits_get(const uint8_t *bits, unsigned int bitpos)
+{
+ unsigned int bytenum = bitpos / 8;
+ unsigned int bitmask = 1 << (bitpos % 8);
+
+ return (bool)(bits[bytenum] & bitmask);
+}
+
+void osmo_pfcp_bits_set(uint8_t *bits, unsigned int bitpos, bool val)
+{
+ unsigned int bytenum = bitpos / 8;
+ unsigned int bitmask = 1 << (bitpos % 8);
+
+ if (val)
+ bits[bytenum] |= bitmask;
+ else
+ bits[bytenum] &= ~bitmask;
+}
+
+int osmo_pfcp_bits_to_str_buf(char *buf, size_t buflen, const uint8_t *bits, const struct value_string *bit_strs)
+{
+ struct osmo_strbuf sb = { .buf = buf, .len = buflen };
+ OSMO_STRBUF_PRINTF(sb, "(");
+ for (; bit_strs->str; bit_strs++) {
+ if (osmo_pfcp_bits_get(bits, bit_strs->value)) {
+ OSMO_STRBUF_PRINTF(sb, " %s", bit_strs->str);
+ }
+ }
+ OSMO_STRBUF_PRINTF(sb, " )");
+ return sb.chars_needed;
+}
+
+char *osmo_pfcp_bits_to_str_c(void *ctx, const uint8_t *bits, const struct value_string *bit_str)
+{
+ OSMO_NAME_C_IMPL(ctx, 64, "ERROR", osmo_pfcp_bits_to_str_buf, bits, bit_str)
+}
+
+int osmo_pfcp_dec_up_function_features(void *decoded_struct, void *decode_to, const struct osmo_gtlv_load *tlv)
+{
+ struct osmo_pfcp_ie_up_function_features *up_function_features = decode_to;
+ ENSURE_LENGTH_IS_AT_LEAST(6);
+ memcpy(up_function_features->bits, tlv->val, 6);
+ return 0;
+}
+
+int osmo_pfcp_enc_up_function_features(struct osmo_gtlv_put *tlv, const void *decoded_struct, const void *encode_from)
+{
+ const struct osmo_pfcp_ie_up_function_features *up_function_features = encode_from;
+ memcpy(msgb_put(tlv->dst, 6), up_function_features->bits, 6);
+ return 0;
+}
+
+int osmo_pfcp_enc_to_str_up_function_features(char *buf, size_t buflen, const void *encode_from)
+{
+ const struct osmo_pfcp_ie_up_function_features *up_function_features = encode_from;
+ return osmo_pfcp_bits_to_str_buf(buf, buflen, up_function_features->bits, osmo_pfcp_up_feature_strs);
+}
+
+int osmo_pfcp_dec_cp_function_features(void *decoded_struct, void *decode_to, const struct osmo_gtlv_load *tlv)
+{
+ struct osmo_pfcp_ie_cp_function_features *cp_function_features = decode_to;
+ ENSURE_LENGTH_IS_AT_LEAST(sizeof(cp_function_features->bits));
+ memcpy(cp_function_features->bits, tlv->val, sizeof(cp_function_features->bits));
+ return 0;
+}
+
+int osmo_pfcp_enc_cp_function_features(struct osmo_gtlv_put *tlv, const void *decoded_struct, const void *encode_from)
+{
+ const struct osmo_pfcp_ie_cp_function_features *cp_function_features = encode_from;
+ memcpy(msgb_put(tlv->dst, sizeof(cp_function_features->bits)),
+ cp_function_features->bits, sizeof(cp_function_features->bits));
+ return 0;
+}
+
+int osmo_pfcp_enc_to_str_cp_function_features(char *buf, size_t buflen, const void *encode_from)
+{
+ const struct osmo_pfcp_ie_cp_function_features *cp_function_features = encode_from;
+ return osmo_pfcp_bits_to_str_buf(buf, buflen, cp_function_features->bits, osmo_pfcp_cp_feature_strs);
+}
+
+int osmo_pfcp_dec_f_seid(void *decoded_struct, void *decode_to, const struct osmo_gtlv_load *tlv)
+{
+ struct osmo_pfcp_ie_f_seid *f_seid = decode_to;
+ uint8_t flags;
+ uint8_t pos;
+ unsigned int l;
+ /* flags and 8 octet seid */
+ ENSURE_LENGTH_IS_AT_LEAST(9);
+ flags = tlv->val[0];
+ f_seid->ip_addr.v6_present = flags & 1;
+ f_seid->ip_addr.v4_present = flags & 2;
+ f_seid->seid = osmo_load64be(&tlv->val[1]);
+ pos = 9;
+ if (f_seid->ip_addr.v4_present) {
+ l = sizeof(f_seid->ip_addr.v4.u.sin.sin_addr);
+ if (pos + l > tlv->len)
+ RETURN_ERROR(-EINVAL, "F-SEID IE is too short for the IPv4 address: %zu", tlv->len);
+ osmo_sockaddr_from_octets(&f_seid->ip_addr.v4, &tlv->val[pos], l);
+ pos += l;
+ }
+ if (f_seid->ip_addr.v6_present) {
+ l = sizeof(f_seid->ip_addr.v4.u.sin6.sin6_addr);
+ if (pos + l > tlv->len)
+ RETURN_ERROR(-EINVAL, "F-SEID IE is too short for the IPv6 address: %zu", tlv->len);
+ osmo_sockaddr_from_octets(&f_seid->ip_addr.v6, &tlv->val[pos], l);
+ pos += l;
+ }
+ return 0;
+}
+
+int osmo_pfcp_enc_f_seid(struct osmo_gtlv_put *tlv, const void *decoded_struct, const void *encode_from)
+{
+ const struct osmo_pfcp_ie_f_seid *f_seid = encode_from;
+ unsigned int l;
+ uint8_t flags = (f_seid->ip_addr.v6_present ? 1 : 0) + (f_seid->ip_addr.v4_present ? 2 : 0);
+ /* flags and 8 octet seid */
+ msgb_put_u8(tlv->dst, flags);
+ osmo_store64be(f_seid->seid, msgb_put(tlv->dst, 8));
+
+ if (f_seid->ip_addr.v4_present) {
+ if (f_seid->ip_addr.v4.u.sin.sin_family != AF_INET)
+ RETURN_ERROR(-EINVAL,
+ "f_seid IE indicates IPv4 address, but there is no ipv4_addr");
+ l = sizeof(f_seid->ip_addr.v4.u.sin.sin_addr);
+ osmo_sockaddr_to_octets(msgb_put(tlv->dst, l), l, &f_seid->ip_addr.v4);
+ }
+ if (f_seid->ip_addr.v6_present) {
+ if (f_seid->ip_addr.v6.u.sin6.sin6_family != AF_INET6)
+ RETURN_ERROR(-EINVAL,
+ "f_seid IE indicates IPv6 address, but there is no ipv6_addr");
+ l = sizeof(f_seid->ip_addr.v6.u.sin6.sin6_addr);
+ osmo_sockaddr_to_octets(msgb_put(tlv->dst, l), l, &f_seid->ip_addr.v6);
+ }
+ return 0;
+}
+
+static int ip_addrs_to_str_buf(char *buf, size_t buflen, const struct osmo_pfcp_ip_addrs *addrs)
+{
+ struct osmo_strbuf sb = { .buf = buf, .len = buflen };
+ if (addrs->v4_present) {
+ OSMO_STRBUF_PRINTF(sb, ",v4:");
+ OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &addrs->v4);
+ }
+ if (addrs->v6_present) {
+ OSMO_STRBUF_PRINTF(sb, ",v6:");
+ OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &addrs->v6);
+ }
+ return sb.chars_needed;
+}
+
+int osmo_pfcp_enc_to_str_f_seid(char *buf, size_t buflen, const void *encode_from)
+{
+ const struct osmo_pfcp_ie_f_seid *f_seid = encode_from;
+ struct osmo_strbuf sb = { .buf = buf, .len = buflen };
+ OSMO_STRBUF_PRINTF(sb, "0x%"PRIx64, f_seid->seid);
+ OSMO_STRBUF_APPEND(sb, ip_addrs_to_str_buf, &f_seid->ip_addr);
+ return sb.chars_needed;
+}
+
+int osmo_pfcp_dec_f_teid(void *decoded_struct, void *decode_to, const struct osmo_gtlv_load *tlv)
+{
+ struct osmo_pfcp_ie_f_teid *f_teid = decode_to;
+ uint8_t flags;
+ const uint8_t *pos;
+
+ *f_teid = (struct osmo_pfcp_ie_f_teid){};
+
+ pos = tlv->val;
+
+ ENSURE_REMAINING_LENGTH_IS_AT_LEAST("flags", pos, 1);
+ flags = *pos;
+ pos++;
+ f_teid->choose_flag = flags & 4;
+
+ if (!f_teid->choose_flag) {
+ /* A fixed TEID and address are provided */
+ f_teid->fixed.ip_addr.v4_present = flags & 1;
+ f_teid->fixed.ip_addr.v6_present = flags & 2;
+
+ ENSURE_REMAINING_LENGTH_IS_AT_LEAST("TEID", pos, 4);
+ f_teid->fixed.teid = osmo_load32be(pos);
+ pos += 4;
+
+ if (f_teid->fixed.ip_addr.v4_present) {
+ osmo_static_assert(sizeof(f_teid->fixed.ip_addr.v4.u.sin.sin_addr) == 4, sin_addr_size_is_4);
+ ENSURE_REMAINING_LENGTH_IS_AT_LEAST("IPv4 address", pos, 4);
+ osmo_sockaddr_from_octets(&f_teid->fixed.ip_addr.v4, pos, 4);
+ pos += 4;
+ }
+ if (f_teid->fixed.ip_addr.v6_present) {
+ osmo_static_assert(sizeof(f_teid->fixed.ip_addr.v6.u.sin6.sin6_addr) == 16, sin6_addr_size_is_16);
+ ENSURE_REMAINING_LENGTH_IS_AT_LEAST("IPv6 address", pos, 16);
+ osmo_sockaddr_from_octets(&f_teid->fixed.ip_addr.v6, pos, 16);
+ pos += 16;
+ }
+ } else {
+ /* CH flag is 1, choose an F-TEID. */
+ f_teid->choose.ipv4_addr = flags & 1;
+ f_teid->choose.ipv6_addr = flags & 2;
+ f_teid->choose.choose_id_present = flags & 8;
+
+ if (f_teid->choose.choose_id_present) {
+ ENSURE_REMAINING_LENGTH_IS_AT_LEAST("CHOOSE ID", pos, 1);
+ f_teid->choose.choose_id = *pos;
+ pos++;
+ }
+ }
+ return 0;
+}
+
+int osmo_pfcp_enc_f_teid(struct osmo_gtlv_put *tlv, const void *decoded_struct, const void *encode_from)
+{
+ const struct osmo_pfcp_ie_f_teid *f_teid = encode_from;
+ uint8_t flags;
+
+ flags = (f_teid->choose_flag ? 4 : 0);
+
+ if (!f_teid->choose_flag) {
+ /* A fixed TEID and address are provided */
+ flags |= (f_teid->fixed.ip_addr.v4_present ? 1 : 0)
+ + (f_teid->fixed.ip_addr.v6_present ? 2 : 0);
+
+ msgb_put_u8(tlv->dst, flags);
+ msgb_put_u32(tlv->dst, f_teid->fixed.teid);
+
+ if (f_teid->fixed.ip_addr.v4_present) {
+ if (f_teid->fixed.ip_addr.v4.u.sin.sin_family != AF_INET)
+ RETURN_ERROR(-EINVAL,
+ "f_teid IE indicates IPv4 address, but there is no ipv4_addr"
+ " (sin_family = %d != AF_INET)", f_teid->fixed.ip_addr.v4.u.sin.sin_family);
+ osmo_sockaddr_to_octets(msgb_put(tlv->dst, 4), 4, &f_teid->fixed.ip_addr.v4);
+ }
+ if (f_teid->fixed.ip_addr.v6_present) {
+ if (f_teid->fixed.ip_addr.v6.u.sin6.sin6_family != AF_INET6)
+ RETURN_ERROR(-EINVAL,
+ "f_teid IE indicates IPv6 address, but there is no ipv6_addr"
+ " (sin6_family = %d != AF_INET6)", f_teid->fixed.ip_addr.v6.u.sin6.sin6_family);
+ osmo_sockaddr_to_octets(msgb_put(tlv->dst, 16), 16, &f_teid->fixed.ip_addr.v6);
+ }
+ } else {
+ flags |= (f_teid->choose.ipv4_addr ? 1 : 0)
+ + (f_teid->choose.ipv6_addr ? 2 : 0)
+ + (f_teid->choose.choose_id_present ? 8 : 0);
+ msgb_put_u8(tlv->dst, flags);
+ if (f_teid->choose.choose_id_present)
+ msgb_put_u8(tlv->dst, f_teid->choose.choose_id);
+ }
+ return 0;
+}
+
+int osmo_pfcp_ie_f_teid_to_str_buf(char *buf, size_t buflen, const struct osmo_pfcp_ie_f_teid *ft)
+{
+ struct osmo_strbuf sb = { .buf = buf, .len = buflen };
+ if (ft->choose_flag) {
+ OSMO_STRBUF_PRINTF(sb, "CHOOSE");
+ if (ft->choose.ipv4_addr)
+ OSMO_STRBUF_PRINTF(sb, "-v4");
+ if (ft->choose.ipv6_addr)
+ OSMO_STRBUF_PRINTF(sb, "-v6");
+ if (ft->choose.choose_id_present)
+ OSMO_STRBUF_PRINTF(sb, "-id%u", ft->choose.choose_id);
+ } else {
+ OSMO_STRBUF_PRINTF(sb, "TEID-0x%x", ft->fixed.teid);
+ OSMO_STRBUF_APPEND(sb, ip_addrs_to_str_buf, &ft->fixed.ip_addr);
+ }
+ return sb.chars_needed;
+}
+
+char *osmo_pfcp_ie_f_teid_to_str_c(void *ctx, const struct osmo_pfcp_ie_f_teid *ft)
+{
+ OSMO_NAME_C_IMPL(ctx, 64, "ERROR", osmo_pfcp_ie_f_teid_to_str_buf, ft)
+}
+
+int osmo_pfcp_enc_to_str_f_teid(char *buf, size_t buflen, const void *encode_from)
+{
+ const struct osmo_pfcp_ie_f_teid *f_teid = encode_from;
+ return osmo_pfcp_ie_f_teid_to_str_buf(buf, buflen, f_teid);
+}
+
+int osmo_pfcp_dec_apply_action(void *decoded_struct, void *decode_to, const struct osmo_gtlv_load *tlv)
+{
+ struct osmo_pfcp_ie_apply_action *apply_action = decode_to;
+ ENSURE_LENGTH_IS_AT_LEAST(1);
+ *apply_action = (struct osmo_pfcp_ie_apply_action){};
+ memcpy(apply_action->bits, tlv->val, OSMO_MIN(tlv->len, sizeof(apply_action->bits)));
+ return 0;
+}
+
+int osmo_pfcp_enc_apply_action(struct osmo_gtlv_put *tlv, const void *decoded_struct, const void *encode_from)
+{
+ const struct osmo_pfcp_ie_apply_action *apply_action = encode_from;
+ memcpy(msgb_put(tlv->dst, sizeof(apply_action->bits)),
+ apply_action->bits, sizeof(apply_action->bits));
+ return 0;
+}
+
+int osmo_pfcp_enc_to_str_apply_action(char *buf, size_t buflen, const void *encode_from)
+{
+ const struct osmo_pfcp_ie_apply_action *apply_action = encode_from;
+ return osmo_pfcp_bits_to_str_buf(buf, buflen, apply_action->bits, osmo_pfcp_apply_action_strs);
+}
+
+int osmo_pfcp_dec_network_inst(void *decoded_struct, void *decode_to, const struct osmo_gtlv_load *tlv)
+{
+ struct osmo_pfcp_ie_network_inst *network_inst = decode_to;
+ osmo_strlcpy(network_inst->str, (const char *)tlv->val, OSMO_MIN(sizeof(network_inst->str), tlv->len+1));
+ return 0;
+}
+
+int osmo_pfcp_enc_network_inst(struct osmo_gtlv_put *tlv, const void *decoded_struct, const void *encode_from)
+{
+ const struct osmo_pfcp_ie_network_inst *network_inst = encode_from;
+ unsigned int l = strlen(network_inst->str);
+ if (l)
+ memcpy(msgb_put(tlv->dst, l), network_inst->str, l);
+ return 0;
+}
+
+int osmo_pfcp_enc_to_str_network_inst(char *buf, size_t buflen, const void *encode_from)
+{
+ const struct osmo_pfcp_ie_network_inst *network_inst = encode_from;
+ return osmo_quote_str_buf3(buf, buflen, network_inst->str,
+ strnlen(network_inst->str, sizeof(network_inst->str)));
+}
+
+int osmo_pfcp_dec_outer_header_creation(void *decoded_struct, void *decode_to, const struct osmo_gtlv_load *tlv)
+{
+ struct osmo_pfcp_ie_outer_header_creation *ohc = decode_to;
+ const uint8_t *pos;
+ bool gtp_u_udp_ipv4;
+ bool gtp_u_udp_ipv6;
+ bool udp_ipv4;
+ bool udp_ipv6;
+ bool ipv4;
+ bool ipv6;
+ bool c_tag;
+ bool s_tag;
+
+ *ohc = (struct osmo_pfcp_ie_outer_header_creation){};
+
+ ENSURE_LENGTH_IS_AT_LEAST(2);
+
+ memcpy(ohc->desc_bits, tlv->val, 2);
+
+ gtp_u_udp_ipv4 = osmo_pfcp_bits_get(ohc->desc_bits, OSMO_PFCP_OUTER_HEADER_CREATION_GTP_U_UDP_IPV4);
+ udp_ipv4 = osmo_pfcp_bits_get(ohc->desc_bits, OSMO_PFCP_OUTER_HEADER_CREATION_UDP_IPV4);
+ ipv4 = osmo_pfcp_bits_get(ohc->desc_bits, OSMO_PFCP_OUTER_HEADER_CREATION_IPV4);
+ gtp_u_udp_ipv6 = osmo_pfcp_bits_get(ohc->desc_bits, OSMO_PFCP_OUTER_HEADER_CREATION_GTP_U_UDP_IPV6);
+ udp_ipv6 = osmo_pfcp_bits_get(ohc->desc_bits, OSMO_PFCP_OUTER_HEADER_CREATION_UDP_IPV6);
+ ipv6 = osmo_pfcp_bits_get(ohc->desc_bits, OSMO_PFCP_OUTER_HEADER_CREATION_IPV6);
+ c_tag = osmo_pfcp_bits_get(ohc->desc_bits, OSMO_PFCP_OUTER_HEADER_CREATION_C_TAG);
+ s_tag = osmo_pfcp_bits_get(ohc->desc_bits, OSMO_PFCP_OUTER_HEADER_CREATION_S_TAG);
+
+ pos = tlv->val + 2;
+ if (gtp_u_udp_ipv4 || gtp_u_udp_ipv6) {
+ ENSURE_REMAINING_LENGTH_IS_AT_LEAST("TEID", pos, 4);
+ ohc->teid_present = true;
+ ohc->teid = osmo_load32be(pos);
+ pos += 4;
+ }
+ if (gtp_u_udp_ipv4 || udp_ipv4 || ipv4) {
+ ENSURE_REMAINING_LENGTH_IS_AT_LEAST("IPv4 address", pos, 4);
+ ohc->ip_addr.v4_present = true;
+ osmo_sockaddr_from_octets(&ohc->ip_addr.v4, pos, 4);
+ pos += 4;
+ }
+ if (gtp_u_udp_ipv6 || udp_ipv6 || ipv6) {
+ ENSURE_REMAINING_LENGTH_IS_AT_LEAST("IPv6 address", pos, 16);
+ ohc->ip_addr.v6_present = true;
+ osmo_sockaddr_from_octets(&ohc->ip_addr.v6, pos, 16);
+ pos += 16;
+ }
+ if (udp_ipv4 || udp_ipv6) {
+ ENSURE_REMAINING_LENGTH_IS_AT_LEAST("UDP port number", pos, 2);
+ ohc->port_number_present = true;
+ ohc->port_number = osmo_load16be(pos);
+ pos += 2;
+ }
+ if (c_tag) {
+ ohc->c_tag_present = true;
+ ENSURE_REMAINING_LENGTH_IS_AT_LEAST("C-TAG", pos, 3);
+ ohc->c_tag_present = true;
+ ohc->c_tag = osmo_load32be_ext_2(pos, 3);
+ pos += 3;
+ }
+ if (s_tag) {
+ ohc->s_tag_present = true;
+ ENSURE_REMAINING_LENGTH_IS_AT_LEAST("S-TAG", pos, 3);
+ ohc->s_tag_present = true;
+ ohc->s_tag = osmo_load32be_ext_2(pos, 3);
+ pos += 3;
+ }
+
+ return 0;
+}
+
+int osmo_pfcp_enc_outer_header_creation(struct osmo_gtlv_put *tlv, const void *decoded_struct, const void *encode_from)
+{
+ const struct osmo_pfcp_ie_outer_header_creation *ohc = encode_from;
+ bool gtp_u_udp_ipv4;
+ bool gtp_u_udp_ipv6;
+ bool udp_ipv4;
+ bool udp_ipv6;
+ bool ipv4;
+ bool ipv6;
+ bool c_tag;
+ bool s_tag;
+
+ memcpy(msgb_put(tlv->dst, sizeof(ohc->desc_bits)), ohc->desc_bits, sizeof(ohc->desc_bits));
+
+ gtp_u_udp_ipv4 = osmo_pfcp_bits_get(ohc->desc_bits, OSMO_PFCP_OUTER_HEADER_CREATION_GTP_U_UDP_IPV4);
+ udp_ipv4 = osmo_pfcp_bits_get(ohc->desc_bits, OSMO_PFCP_OUTER_HEADER_CREATION_UDP_IPV4);
+ ipv4 = osmo_pfcp_bits_get(ohc->desc_bits, OSMO_PFCP_OUTER_HEADER_CREATION_IPV4);
+ gtp_u_udp_ipv6 = osmo_pfcp_bits_get(ohc->desc_bits, OSMO_PFCP_OUTER_HEADER_CREATION_GTP_U_UDP_IPV6);
+ udp_ipv6 = osmo_pfcp_bits_get(ohc->desc_bits, OSMO_PFCP_OUTER_HEADER_CREATION_UDP_IPV6);
+ ipv6 = osmo_pfcp_bits_get(ohc->desc_bits, OSMO_PFCP_OUTER_HEADER_CREATION_IPV6);
+ c_tag = osmo_pfcp_bits_get(ohc->desc_bits, OSMO_PFCP_OUTER_HEADER_CREATION_C_TAG);
+ s_tag = osmo_pfcp_bits_get(ohc->desc_bits, OSMO_PFCP_OUTER_HEADER_CREATION_S_TAG);
+
+ if ((gtp_u_udp_ipv4 || gtp_u_udp_ipv6) != (ohc->teid_present))
+ RETURN_ERROR(-EINVAL, "teid_present = %s does not match the description bits 0x%02x\n",
+ ohc->teid_present ? "true" : "false",
+ ohc->desc_bits[0]);
+ if (ohc->teid_present)
+ msgb_put_u32(tlv->dst, ohc->teid);
+
+ if ((gtp_u_udp_ipv4 || udp_ipv4 || ipv4) != ohc->ip_addr.v4_present)
+ RETURN_ERROR(-EINVAL, "ipv4_addr_present = %s does not match the description bits 0x%02x\n",
+ ohc->ip_addr.v4_present ? "true" : "false",
+ ohc->desc_bits[0]);
+ if (ohc->ip_addr.v4_present)
+ osmo_sockaddr_to_octets(msgb_put(tlv->dst, 4), 4, &ohc->ip_addr.v4);
+
+ if ((gtp_u_udp_ipv6 || udp_ipv6 || ipv6) != ohc->ip_addr.v6_present)
+ RETURN_ERROR(-EINVAL, "ipv6_addr_present = %s does not match the description bits 0x%02x\n",
+ ohc->ip_addr.v6_present ? "true" : "false",
+ ohc->desc_bits[0]);
+ if (ohc->ip_addr.v6_present)
+ osmo_sockaddr_to_octets(msgb_put(tlv->dst, 16), 16, &ohc->ip_addr.v6);
+
+ if ((udp_ipv4 || udp_ipv6) != ohc->port_number_present)
+ RETURN_ERROR(-EINVAL, "port_number_present = %s does not match the description bits 0x%02x\n",
+ ohc->port_number_present ? "true" : "false",
+ ohc->desc_bits[0]);
+ if (ohc->port_number_present)
+ msgb_put_u16(tlv->dst, ohc->port_number);
+
+ if (c_tag != ohc->c_tag_present)
+ RETURN_ERROR(-EINVAL, "c_tag_present = %s does not match the description bits 0x%02x%02x\n",
+ ohc->c_tag_present ? "true" : "false",
+ ohc->desc_bits[1], ohc->desc_bits[0]);
+ if (ohc->c_tag_present)
+ osmo_store32be_ext(ohc->c_tag, msgb_put(tlv->dst, 3), 3);
+
+ if (s_tag != ohc->s_tag_present)
+ RETURN_ERROR(-EINVAL, "s_tag_present = %s does not match the description bits 0x%02x%02x\n",
+ ohc->s_tag_present ? "true" : "false",
+ ohc->desc_bits[1], ohc->desc_bits[0]);
+ if (ohc->s_tag_present)
+ osmo_store32be_ext(ohc->s_tag, msgb_put(tlv->dst, 3), 3);
+
+ return 0;
+}
+
+int osmo_pfcp_enc_to_str_outer_header_creation(char *buf, size_t buflen, const void *encode_from)
+{
+ const struct osmo_pfcp_ie_outer_header_creation *ohc = encode_from;
+ struct osmo_strbuf sb = { .buf = buf, .len = buflen };
+ OSMO_STRBUF_APPEND(sb, osmo_pfcp_bits_to_str_buf, ohc->desc_bits, osmo_pfcp_outer_header_creation_strs);
+ if (ohc->teid_present)
+ OSMO_STRBUF_PRINTF(sb, ",TEID:0x%x", ohc->teid);
+ OSMO_STRBUF_APPEND(sb, ip_addrs_to_str_buf, &ohc->ip_addr);
+ if (ohc->port_number_present)
+ OSMO_STRBUF_PRINTF(sb, ",port:%u", ohc->port_number);
+ if (ohc->c_tag_present)
+ OSMO_STRBUF_PRINTF(sb, ",c-tag:%u", ohc->c_tag);
+ if (ohc->s_tag_present)
+ OSMO_STRBUF_PRINTF(sb, ",s-tag:%u", ohc->s_tag);
+ return sb.chars_needed;
+}
+
+int osmo_pfcp_dec_activate_predefined_rules(void *decoded_struct, void *decode_to, const struct osmo_gtlv_load *tlv)
+{
+ struct osmo_pfcp_ie_activate_predefined_rules *activate_predefined_rules = decode_to;
+ osmo_strlcpy(activate_predefined_rules->str, (const char *)tlv->val, OSMO_MIN(sizeof(activate_predefined_rules->str), tlv->len+1));
+ return 0;
+}
+
+int osmo_pfcp_enc_activate_predefined_rules(struct osmo_gtlv_put *tlv, const void *decoded_struct, const void *encode_from)
+{
+ const struct osmo_pfcp_ie_activate_predefined_rules *activate_predefined_rules = encode_from;
+ unsigned int l = strlen(activate_predefined_rules->str);
+ if (l)
+ memcpy(msgb_put(tlv->dst, l), activate_predefined_rules->str, l);
+ return 0;
+}
+
+int osmo_pfcp_enc_to_str_activate_predefined_rules(char *buf, size_t buflen, const void *encode_from)
+{
+ const struct osmo_pfcp_ie_activate_predefined_rules *activate_predefined_rules = encode_from;
+ return osmo_quote_str_buf3(buf, buflen, activate_predefined_rules->str,
+ strnlen(activate_predefined_rules->str, sizeof(activate_predefined_rules->str)));
+}
+
+int osmo_pfcp_dec_outer_header_removal(void *decoded_struct, void *decode_to, const struct osmo_gtlv_load *tlv)
+{
+ struct osmo_pfcp_ie_outer_header_removal *outer_header_removal = decode_to;
+ ENSURE_LENGTH_IS_AT_LEAST(1);
+ outer_header_removal->desc = tlv->val[0];
+
+ if (tlv->len > 1) {
+ outer_header_removal->gtp_u_extension_header_del_present = true;
+ memcpy(outer_header_removal->gtp_u_extension_header_del_bits, &tlv->val[1],
+ sizeof(outer_header_removal->gtp_u_extension_header_del_bits));
+ }
+ return 0;
+}
+
+int osmo_pfcp_enc_outer_header_removal(struct osmo_gtlv_put *tlv, const void *decoded_struct, const void *encode_from)
+{
+ const struct osmo_pfcp_ie_outer_header_removal *outer_header_removal = encode_from;
+ msgb_put_u8(tlv->dst, outer_header_removal->desc);
+ if (outer_header_removal->gtp_u_extension_header_del_present) {
+ memcpy(msgb_put(tlv->dst, sizeof(outer_header_removal->gtp_u_extension_header_del_bits)),
+ outer_header_removal->gtp_u_extension_header_del_bits,
+ sizeof(outer_header_removal->gtp_u_extension_header_del_bits));
+ }
+ return 0;
+}
+
+int osmo_pfcp_enc_to_str_outer_header_removal(char *buf, size_t buflen, const void *encode_from)
+{
+ const struct osmo_pfcp_ie_outer_header_removal *outer_header_removal = encode_from;
+ struct osmo_strbuf sb = { .buf = buf, .len = buflen };
+ OSMO_STRBUF_PRINTF(sb, "%s", osmo_pfcp_outer_header_removal_desc_str(outer_header_removal->desc));
+ if (outer_header_removal->gtp_u_extension_header_del_present)
+ OSMO_STRBUF_PRINTF(sb, ",ext-hdr-del:0x%x", outer_header_removal->gtp_u_extension_header_del_bits[0]);
+ return sb.chars_needed;
+}
+
+int osmo_pfcp_dec_ue_ip_address(void *decoded_struct, void *decode_to, const struct osmo_gtlv_load *tlv)
+{
+ struct osmo_pfcp_ie_ue_ip_address *ue_ip_address = decode_to;
+ const uint8_t *pos;
+ uint8_t flags;
+
+ pos = tlv->val;
+
+ ENSURE_REMAINING_LENGTH_IS_AT_LEAST("flags", pos, 1);
+ flags = *pos;
+ pos++;
+
+ ue_ip_address->ipv6_prefix_length_present = flags & (1 << 6);
+ ue_ip_address->chv6 = flags & (1 << 5);
+ ue_ip_address->chv4 = flags & (1 << 4);
+ ue_ip_address->ipv6_prefix_delegation_bits_present = flags & (1 << 3);
+ ue_ip_address->ip_is_destination = flags & (1 << 2);
+ ue_ip_address->ip_addr.v4_present = flags & (1 << 1);
+ ue_ip_address->ip_addr.v6_present = flags & (1 << 0);
+
+ if (ue_ip_address->ip_addr.v4_present) {
+ ENSURE_REMAINING_LENGTH_IS_AT_LEAST("IPv4 address", pos, 4);
+ osmo_sockaddr_from_octets(&ue_ip_address->ip_addr.v4, pos, 4);
+ pos += 4;
+ }
+ if (ue_ip_address->ip_addr.v6_present) {
+ ENSURE_REMAINING_LENGTH_IS_AT_LEAST("IPv6 address", pos, 16);
+ osmo_sockaddr_from_octets(&ue_ip_address->ip_addr.v6, pos, 16);
+ pos += 16;
+ }
+
+ if (ue_ip_address->ipv6_prefix_delegation_bits_present) {
+ ENSURE_REMAINING_LENGTH_IS_AT_LEAST("IPv6 prefix delegation bits", pos, 1);
+ ue_ip_address->ipv6_prefix_delegation_bits = *pos;
+ pos++;
+ }
+ if (ue_ip_address->ipv6_prefix_length_present) {
+ ENSURE_REMAINING_LENGTH_IS_AT_LEAST("IPv6 prefix length", pos, 1);
+ ue_ip_address->ipv6_prefix_length = *pos;
+ pos++;
+ }
+
+ return 0;
+}
+
+int osmo_pfcp_enc_ue_ip_address(struct osmo_gtlv_put *tlv, const void *decoded_struct, const void *encode_from)
+{
+ const struct osmo_pfcp_ie_ue_ip_address *ue_ip_address = encode_from;
+ unsigned int l;
+ uint8_t flags;
+
+ flags = 0
+ | (ue_ip_address->ipv6_prefix_length_present ? (1 << 6) : 0)
+ | (ue_ip_address->chv6 ? (1 << 5) : 0)
+ | (ue_ip_address->chv4 ? (1 << 4) : 0)
+ | (ue_ip_address->ipv6_prefix_delegation_bits_present ? (1 << 3) : 0)
+ | (ue_ip_address->ip_is_destination ? (1 << 2) : 0)
+ | (ue_ip_address->ip_addr.v4_present ? (1 << 1) : 0)
+ | (ue_ip_address->ip_addr.v6_present ? (1 << 0) : 0)
+ ;
+
+ msgb_put_u8(tlv->dst, flags);
+
+ if (ue_ip_address->ip_addr.v4_present) {
+ if (ue_ip_address->ip_addr.v4.u.sin.sin_family != AF_INET)
+ RETURN_ERROR(-EINVAL,
+ "ue_ip_address IE indicates IPv4 address, but there is no ipv4_addr");
+ l = sizeof(ue_ip_address->ip_addr.v4.u.sin.sin_addr);
+ osmo_sockaddr_to_octets(msgb_put(tlv->dst, l), l, &ue_ip_address->ip_addr.v4);
+ }
+ if (ue_ip_address->ip_addr.v6_present) {
+ if (ue_ip_address->ip_addr.v6.u.sin6.sin6_family != AF_INET6)
+ RETURN_ERROR(-EINVAL,
+ "ue_ip_address IE indicates IPv6 address, but there is no ipv6_addr");
+ l = sizeof(ue_ip_address->ip_addr.v6.u.sin6.sin6_addr);
+ osmo_sockaddr_to_octets(msgb_put(tlv->dst, l), l, &ue_ip_address->ip_addr.v6);
+ }
+
+ if (ue_ip_address->ipv6_prefix_delegation_bits_present)
+ msgb_put_u8(tlv->dst, ue_ip_address->ipv6_prefix_delegation_bits);
+
+ if (ue_ip_address->ipv6_prefix_length_present)
+ msgb_put_u8(tlv->dst, ue_ip_address->ipv6_prefix_length);
+
+ return 0;
+}
+
+int osmo_pfcp_enc_to_str_ue_ip_address(char *buf, size_t buflen, const void *encode_from)
+{
+ const struct osmo_pfcp_ie_ue_ip_address *uia = encode_from;
+ struct osmo_strbuf sb = { .buf = buf, .len = buflen };
+ if (uia->chv4)
+ OSMO_STRBUF_PRINTF(sb, "chv4");
+ if (uia->chv6)
+ OSMO_STRBUF_PRINTF(sb, "%schv4", sb.pos ? "," : "");
+ if (uia->ip_is_destination)
+ OSMO_STRBUF_PRINTF(sb, "%sdst", sb.pos ? "," : "");
+ OSMO_STRBUF_APPEND(sb, ip_addrs_to_str_buf, &uia->ip_addr);
+ if (uia->ipv6_prefix_delegation_bits_present)
+ OSMO_STRBUF_PRINTF(sb, ",ipv6-prefix-deleg:%x", uia->ipv6_prefix_delegation_bits);
+ if (uia->ipv6_prefix_length_present)
+ OSMO_STRBUF_PRINTF(sb, ",ipv6-prefix-len:%u", uia->ipv6_prefix_length);
+ return sb.chars_needed;
+}
11 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/27222
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: I3069045b2d42dac88d955c636230adc64a7a4aa7
Gerrit-Change-Number: 27222
Gerrit-PatchSet: 12
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
1
0
Change in osmo-upf[master]: libosmo-pfcp: implement/generate TLV and IE value coding
by neels 01 Apr '22
by neels 01 Apr '22
01 Apr '22
Hello Jenkins Builder, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-upf/+/27222
to look at the new patch set (#12).
Change subject: libosmo-pfcp: implement/generate TLV and IE value coding
......................................................................
libosmo-pfcp: implement/generate TLV and IE value coding
Related: SYS#5599
Change-Id: I3069045b2d42dac88d955c636230adc64a7a4aa7
---
M include/osmocom/pfcp/Makefile.am
A include/osmocom/pfcp/pfcp_ies_custom.h
M src/libosmo-pfcp/Makefile.am
A src/libosmo-pfcp/gen__pfcp_ies_auto.c
A src/libosmo-pfcp/pfcp_ies_custom.c
5 files changed, 1,565 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/22/27222/12
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/27222
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: I3069045b2d42dac88d955c636230adc64a7a4aa7
Gerrit-Change-Number: 27222
Gerrit-PatchSet: 12
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
1
0
01 Apr '22
Attention is currently required from: pespin.
Hello Jenkins Builder, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-upf/+/27221
to look at the new patch set (#8).
Change subject: libosmo-pfcp: add pfcp_proto.h pfcp_strs.h
......................................................................
libosmo-pfcp: add pfcp_proto.h pfcp_strs.h
Related: SYS#5599
Change-Id: I568b821e89007ed52eeefcdbcb6edd8052a8b5be
---
M configure.ac
M include/osmocom/Makefile.am
A include/osmocom/pfcp/Makefile.am
A include/osmocom/pfcp/pfcp_proto.h
A include/osmocom/pfcp/pfcp_strs.h
M src/Makefile.am
A src/libosmo-pfcp/Makefile.am
A src/libosmo-pfcp/pfcp_strs.c
8 files changed, 1,152 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/21/27221/8
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/27221
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: I568b821e89007ed52eeefcdbcb6edd8052a8b5be
Gerrit-Change-Number: 27221
Gerrit-PatchSet: 8
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
1
0