From 1dd8f06ea78e71385d10c2118a3374b0d88f9442 Mon Sep 17 00:00:00 2001 From: Neels Janosch Hofmeyr Date: Thu, 1 Dec 2022 01:01:36 +0100 Subject: [PATCH] add osmo_pfcp_ie_outer_header_creation_to_str_*() Make osmo_pfcp_enc_to_str_outer_header_creation() as osmo_pfcp_ie_outer_header_creation_to_str_*() functions. Used by I0d4d9edcfc94b61bdc74cfd4ff837f151d1c28ae (osmo-upf) Change-Id: I4ad1570485c8081b82284e4e6b4de4d7eed414b0 --- include/osmocom/pfcp/pfcp_ies_custom.h | 4 ++++ src/libosmo-pfcp/pfcp_ies_custom.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/include/osmocom/pfcp/pfcp_ies_custom.h b/include/osmocom/pfcp/pfcp_ies_custom.h index 565fee2..0540bfe 100644 --- a/include/osmocom/pfcp/pfcp_ies_custom.h +++ b/include/osmocom/pfcp/pfcp_ies_custom.h @@ -161,6 +161,10 @@ struct osmo_pfcp_ie_outer_header_creation { uint32_t s_tag; }; +int osmo_pfcp_ie_outer_header_creation_to_str_buf(char *buf, size_t buflen, + const struct osmo_pfcp_ie_outer_header_creation *ohc); +char *osmo_pfcp_ie_outer_header_creation_to_str_c(void *ctx, const struct osmo_pfcp_ie_outer_header_creation *ohc); + /* 3GPP TS 29.244 8.2.64. */ struct osmo_pfcp_ie_outer_header_removal { enum osmo_pfcp_outer_header_removal_desc desc; diff --git a/src/libosmo-pfcp/pfcp_ies_custom.c b/src/libosmo-pfcp/pfcp_ies_custom.c index 422b6a9..06b7494 100644 --- a/src/libosmo-pfcp/pfcp_ies_custom.c +++ b/src/libosmo-pfcp/pfcp_ies_custom.c @@ -857,9 +857,9 @@ int osmo_pfcp_enc_outer_header_creation(struct osmo_gtlv_put *tlv, const void *d return 0; } -int osmo_pfcp_enc_to_str_outer_header_creation(char *buf, size_t buflen, const void *encode_from) +int osmo_pfcp_ie_outer_header_creation_to_str_buf(char *buf, size_t buflen, + const struct osmo_pfcp_ie_outer_header_creation *ohc) { - 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) @@ -877,6 +877,16 @@ int osmo_pfcp_enc_to_str_outer_header_creation(char *buf, size_t buflen, const v return sb.chars_needed; } +char *osmo_pfcp_ie_outer_header_creation_to_str_c(void *ctx, const struct osmo_pfcp_ie_outer_header_creation *ohc) +{ + OSMO_NAME_C_IMPL(ctx, 128, "ERROR", osmo_pfcp_ie_outer_header_creation_to_str_buf, ohc) +} + +int osmo_pfcp_enc_to_str_outer_header_creation(char *buf, size_t buflen, const void *encode_from) +{ + return osmo_pfcp_ie_outer_header_creation_to_str_buf(buf, buflen, encode_from); +} + 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;