November 2022 - gerrit-log - lists.osmocom.org

Change in osmo-mgw[master]: Add realtime scheduling and set priority in service file

by msuraev

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/30041 ) Change subject: Add realtime scheduling and set priority in service file ...................................................................... Add realtime scheduling and set priority in service file This sets lowest realtime priority which still takes precedence over any non-realtime service. Related: OS#5687 Change-Id: Ib1705a164b04b876f129a17c4e8353b9ddcc538e --- M contrib/systemd/osmo-mgw.service 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/contrib/systemd/osmo-mgw.service b/contrib/systemd/osmo-mgw.service index 5798491..13c8515 100644 --- a/contrib/systemd/osmo-mgw.service +++ b/contrib/systemd/osmo-mgw.service @@ -8,6 +8,11 @@ Restart=always ExecStart=/usr/bin/osmo-mgw -s -c /etc/osmocom/osmo-mgw.cfg RestartSec=2 +# CPU scheduling policy: +CPUSchedulingPolicy=rr +# For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority): +CPUSchedulingPriority=1 +# See sched(7) for further details on real-time policies and priorities [Install] WantedBy=multi-user.target -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/30041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib1705a164b04b876f129a17c4e8353b9ddcc538e Gerrit-Change-Number: 30041 Gerrit-PatchSet: 5 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-msc[master]: rtp_stream: set_remote_addr: do nothing when unchanged

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/30113 ) Change subject: rtp_stream: set_remote_addr: do nothing when unchanged ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/30113 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I15181d84f3eb8a4ab9077cf12fcb138d51733102 Gerrit-Change-Number: 30113 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 14 Nov 2022 10:52:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-mgw[master]: Add realtime scheduling and set priority in service file

by msuraev

Attention is currently required from: pespin, fixeria. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/30041 ) Change subject: Add realtime scheduling and set priority in service file ...................................................................... Patch Set 4: (1 comment) File contrib/systemd/osmo-mgw.service: https://gerrit.osmocom.org/c/osmo-mgw/+/30041/comment/ab602eab_91aad59e PS2, Line 13: 1 (lowest priority > I think it's fine to have the "lowest realtime priority". […] Yepp, higher than any other non-realtime process. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/30041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib1705a164b04b876f129a17c4e8353b9ddcc538e Gerrit-Change-Number: 30041 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 14 Nov 2022 10:51:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-msc[master]: rtp_stream_commit: check missing MGW ep only when ready for RTP

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/30112 ) Change subject: rtp_stream_commit: check missing MGW ep only when ready for RTP ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: What's the benefit of this patch? I lack some rationale. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/30112 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I24a81a926b97c9f0fb31df782d1cf931eaff9db1 Gerrit-Change-Number: 30112 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 14 Nov 2022 10:51:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-iuh[master]: asn1tostruct: fix defines getting redefined

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/30088 ) Change subject: asn1tostruct: fix defines getting redefined ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/30088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I2ecae6789899952d1dc5691ab76907abeaa71c12 Gerrit-Change-Number: 30088 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 14 Nov 2022 10:49:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-msc[master]: fix sdp_msg_to_sdp_str(), never add fmtp for unset codec

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/30111 ) Change subject: fix sdp_msg_to_sdp_str(), never add fmtp for unset codec ...................................................................... Patch Set 1: (1 comment) File src/libmsc/sdp_msg.c: https://gerrit.osmocom.org/c/osmo-msc/+/30111/comment/3f3ba062_f4b67149 PS1, Line 271: if (!sdp_audio_codec_is_set(codec)) Isn't sdp_audio_codec_is_set() implemented by checking codec->subtype_name[0] like before? what's changing in this patch? I'm missing something? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/30111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1892efd9360585f98419ebbd0df180f7f3a8160d Gerrit-Change-Number: 30111 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 14 Nov 2022 10:49:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-iuh[master]: contrib/jenkins.sh: use --enable-werror

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/30144 ) Change subject: contrib/jenkins.sh: use --enable-werror ...................................................................... contrib/jenkins.sh: use --enable-werror Change-Id: Idf0ecd012071b5786773643fc71cc44ec070aa05 --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/44/30144/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 9ee073d..ad59c84 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -26,9 +26,9 @@ # the asn1c binary is used by the 'regen' target below osmo-build-dep.sh asn1c aper-prefix -CONFIG="" +CONFIG="--enable-werror" if [ "$WITH_MANUALS" = "1" ]; then - CONFIG="--enable-manuals" + CONFIG=" --enable-manuals" fi set +x -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/30144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Idf0ecd012071b5786773643fc71cc44ec070aa05 Gerrit-Change-Number: 30144 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common_cn: rename ctx -> priv

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/30143 ) Change subject: ranap_common_cn: rename ctx -> priv ...................................................................... ranap_common_cn: rename ctx -> priv Rename the "ctx" argument of ranap_cn_rx_co and ranap_cn_rx_cl to "priv" as it is private user data passed to the callback. Change-Id: I929548e9224298be94f7d3ed4cdca0580147721d --- M include/osmocom/ranap/ranap_common.h M include/osmocom/ranap/ranap_common_cn.h M src/ranap_common_cn.c 3 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/43/30143/1 diff --git a/include/osmocom/ranap/ranap_common.h b/include/osmocom/ranap/ranap_common.h index 5b052f0..5727c0d 100644 --- a/include/osmocom/ranap/ranap_common.h +++ b/include/osmocom/ranap/ranap_common.h @@ -597,7 +597,7 @@ #define RANAP_DEBUG(x, args ...) DEBUGP(_ranap_DRANAP, x, ## args) /* Callback to be used with decoder functions in ranap_common_cn.c ranap_common_ran.c */ -typedef void (*ranap_handle_cb)(void *ctx, ranap_message *ranap_msg); +typedef void (*ranap_handle_cb)(void *priv, ranap_message *ranap_msg); extern int asn1_xer_print; diff --git a/include/osmocom/ranap/ranap_common_cn.h b/include/osmocom/ranap/ranap_common_cn.h index 8f1260b..2b37a8e 100644 --- a/include/osmocom/ranap/ranap_common_cn.h +++ b/include/osmocom/ranap/ranap_common_cn.h @@ -14,7 +14,7 @@ OSMO_DEPRECATED("Use ranap_cn_rx_cl_decode_2() instead, the first arg is not used"); /* receive a connection-less RANAP message */ -int ranap_cn_rx_cl(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len); +int ranap_cn_rx_cl(ranap_handle_cb cb, void *priv, uint8_t *data, size_t len); /* free a decoded connection-oriented RANAP message */ void ranap_cn_rx_co_free(ranap_message *message); @@ -25,4 +25,4 @@ OSMO_DEPRECATED("Use ranap_cn_rx_co_decode_2() instead, the first arg is not used"); /* receive a connection-oriented RANAP message */ -int ranap_cn_rx_co(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len); +int ranap_cn_rx_co(ranap_handle_cb cb, void *priv, uint8_t *data, size_t len); diff --git a/src/ranap_common_cn.c b/src/ranap_common_cn.c index c6ae8e8..bca49c5 100644 --- a/src/ranap_common_cn.c +++ b/src/ranap_common_cn.c @@ -310,7 +310,7 @@ /* receive a connection-oriented RANAP message and call * cn_ranap_handle_co() with the resulting ranap_message struct */ -int ranap_cn_rx_co(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len) +int ranap_cn_rx_co(ranap_handle_cb cb, void *priv, uint8_t *data, size_t len) { ranap_message message; int rc; @@ -318,7 +318,7 @@ rc = ranap_cn_rx_co_decode_2(&message, data, len); if (rc == 0) - (*cb)(ctx, &message); + (*cb)(priv, &message); else LOGP(DRANAP, LOGL_ERROR, "Not calling cn_ranap_handle_co() due to rc=%d\n", rc); @@ -556,7 +556,7 @@ /* receive a connection-less RANAP message and call * cn_ranap_handle_co() with the resulting ranap_message struct */ -int ranap_cn_rx_cl(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len) +int ranap_cn_rx_cl(ranap_handle_cb cb, void *priv, uint8_t *data, size_t len) { ranap_message message; int rc; @@ -564,7 +564,7 @@ rc = ranap_cn_rx_cl_decode_2(&message, data, len); if (rc == 0) - (*cb)(ctx, &message); + (*cb)(priv, &message); else LOGP(DRANAP, LOGL_ERROR, "Not calling cn_ranap_handle_cl() due to rc=%d\n", rc); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/30143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I929548e9224298be94f7d3ed4cdca0580147721d Gerrit-Change-Number: 30143 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in osmo-iuh[master]: ranap_common_cn: remove unused ctx args

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/30142 ) Change subject: ranap_common_cn: remove unused ctx args ...................................................................... ranap_common_cn: remove unused ctx args ranap_cn_rx_co and ranap_cn_rx_cl both have a void *ctx argument, that gets passed to: * a callback function and * to various decode functions in the same file. As it is named "ctx", it looks like a talloc context. But the decode functions don't use ctx at all and so in reality it is private userdata for the callback. It is used as such by test/hnb-test-rua and in osmo-msc. Start cleaning this up by removing the unused ctx args, a future patch will rename it to priv and yet another patch will fix a compiler warning in test/hnb-test-rua by properly using it as userdata arg. Change-Id: I8936197d7ae7ffddbe8ee99d909d74ac5b3ab227 --- M TODO-RELEASE M include/osmocom/ranap/ranap_common_cn.h M src/ranap_common_cn.c 3 files changed, 35 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/42/30142/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index d0852fc..38f84fa 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmo-ranap API/ABI change deprecate ranap_cn_rx_{cl,co}_decode, use ranap_cn_rx_{cl,co}_decode_2 instead diff --git a/include/osmocom/ranap/ranap_common_cn.h b/include/osmocom/ranap/ranap_common_cn.h index fb65049..8f1260b 100644 --- a/include/osmocom/ranap/ranap_common_cn.h +++ b/include/osmocom/ranap/ranap_common_cn.h @@ -9,7 +9,9 @@ void ranap_cn_rx_cl_free(ranap_message *message); /* decode a connection-less RANAP message */ -int ranap_cn_rx_cl_decode(void *ctx, ranap_message *message, uint8_t *data, size_t len); +int ranap_cn_rx_cl_decode_2(ranap_message *message, uint8_t *data, size_t len); +int ranap_cn_rx_cl_decode(void *unused, ranap_message *message, uint8_t *data, size_t len) + OSMO_DEPRECATED("Use ranap_cn_rx_cl_decode_2() instead, the first arg is not used"); /* receive a connection-less RANAP message */ int ranap_cn_rx_cl(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len); @@ -18,7 +20,9 @@ void ranap_cn_rx_co_free(ranap_message *message); /* decode a connection-oriented RANAP message */ -int ranap_cn_rx_co_decode(void *ctx, ranap_message *message, uint8_t *data, size_t len); +int ranap_cn_rx_co_decode_2(ranap_message *message, uint8_t *data, size_t len); +int ranap_cn_rx_co_decode(void *unused, ranap_message *message, uint8_t *data, size_t len) + OSMO_DEPRECATED("Use ranap_cn_rx_co_decode_2() instead, the first arg is not used"); /* receive a connection-oriented RANAP message */ int ranap_cn_rx_co(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len); diff --git a/src/ranap_common_cn.c b/src/ranap_common_cn.c index 3f6f284..c6ae8e8 100644 --- a/src/ranap_common_cn.c +++ b/src/ranap_common_cn.c @@ -31,8 +31,7 @@ #define DRANAP _ranap_DRANAP -static int cn_ranap_rx_initiating_msg_co(void *ctx, RANAP_InitiatingMessage_t *imsg, - ranap_message *message) +static int cn_ranap_rx_initiating_msg_co(RANAP_InitiatingMessage_t *imsg, ranap_message *message) { int rc = 0; @@ -125,8 +124,7 @@ } } -static int cn_ranap_rx_successful_msg_co(void *ctx, RANAP_SuccessfulOutcome_t *imsg, - ranap_message *message) +static int cn_ranap_rx_successful_msg_co(RANAP_SuccessfulOutcome_t *imsg, ranap_message *message) { int rc = 0; @@ -183,8 +181,7 @@ } } -static int cn_ranap_rx_outcome_msg_co(void *ctx, RANAP_Outcome_t *imsg, - ranap_message *message) +static int cn_ranap_rx_outcome_msg_co(RANAP_Outcome_t *imsg, ranap_message *message) { int rc = 0; @@ -225,16 +222,16 @@ } } -static int _cn_ranap_rx_co(void *ctx, RANAP_RANAP_PDU_t *pdu, ranap_message *message) +static int _cn_ranap_rx_co(RANAP_RANAP_PDU_t *pdu, ranap_message *message) { int rc = 0; switch (pdu->present) { case RANAP_RANAP_PDU_PR_initiatingMessage: - rc = cn_ranap_rx_initiating_msg_co(ctx, &pdu->choice.initiatingMessage, message); + rc = cn_ranap_rx_initiating_msg_co(&pdu->choice.initiatingMessage, message); break; case RANAP_RANAP_PDU_PR_successfulOutcome: - rc = cn_ranap_rx_successful_msg_co(ctx, &pdu->choice.successfulOutcome, message); + rc = cn_ranap_rx_successful_msg_co(&pdu->choice.successfulOutcome, message); break; case RANAP_RANAP_PDU_PR_unsuccessfulOutcome: LOGP(DRANAP, LOGL_NOTICE, "Received unsupported RANAP " @@ -244,7 +241,7 @@ rc = -1; break; case RANAP_RANAP_PDU_PR_outcome: - rc = cn_ranap_rx_outcome_msg_co(ctx, &pdu->choice.outcome, message); + rc = cn_ranap_rx_outcome_msg_co(&pdu->choice.outcome, message); break; default: LOGP(DRANAP, LOGL_INFO, @@ -283,7 +280,7 @@ } /* decode a connection-oriented RANAP message */ -int ranap_cn_rx_co_decode(void *ctx, ranap_message *message, uint8_t *data, size_t len) +int ranap_cn_rx_co_decode_2(ranap_message *message, uint8_t *data, size_t len) { RANAP_RANAP_PDU_t *pdu = NULL; asn_dec_rval_t dec_ret; @@ -299,13 +296,18 @@ message->direction = pdu->present; - rc = _cn_ranap_rx_co(ctx, pdu, message); + rc = _cn_ranap_rx_co(pdu, message); ASN_STRUCT_FREE(asn_DEF_RANAP_RANAP_PDU, pdu); return rc; } +int ranap_cn_rx_co_decode(void *unused, ranap_message *message, uint8_t *data, size_t len) +{ + return ranap_cn_rx_co_decode_2(message, data, len); +} + /* receive a connection-oriented RANAP message and call * cn_ranap_handle_co() with the resulting ranap_message struct */ int ranap_cn_rx_co(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len) @@ -313,7 +315,7 @@ ranap_message message; int rc; - rc = ranap_cn_rx_co_decode(ctx, &message, data, len); + rc = ranap_cn_rx_co_decode_2(&message, data, len); if (rc == 0) (*cb)(ctx, &message); @@ -326,8 +328,7 @@ return rc; } -static int cn_ranap_rx_initiating_msg_cl(void *ctx, RANAP_InitiatingMessage_t *imsg, - ranap_message *message) +static int cn_ranap_rx_initiating_msg_cl(RANAP_InitiatingMessage_t *imsg, ranap_message *message) { int rc = 0; @@ -412,8 +413,7 @@ } } -static int cn_ranap_rx_successful_msg_cl(void *ctx, RANAP_SuccessfulOutcome_t *imsg, - ranap_message *message) +static int cn_ranap_rx_successful_msg_cl(RANAP_SuccessfulOutcome_t *imsg, ranap_message *message) { int rc = 0; @@ -475,7 +475,7 @@ } } -static int _cn_ranap_rx_cl(void *ctx, RANAP_RANAP_PDU_t *pdu, ranap_message *message) +static int _cn_ranap_rx_cl(RANAP_RANAP_PDU_t *pdu, ranap_message *message) { int rc = 0; @@ -483,12 +483,10 @@ switch (pdu->present) { case RANAP_RANAP_PDU_PR_initiatingMessage: - rc = cn_ranap_rx_initiating_msg_cl(ctx, &pdu->choice.initiatingMessage, - message); + rc = cn_ranap_rx_initiating_msg_cl(&pdu->choice.initiatingMessage, message); break; case RANAP_RANAP_PDU_PR_successfulOutcome: - rc = cn_ranap_rx_successful_msg_cl(ctx, &pdu->choice.successfulOutcome, - message); + rc = cn_ranap_rx_successful_msg_cl(&pdu->choice.successfulOutcome, message); break; case RANAP_RANAP_PDU_PR_unsuccessfulOutcome: LOGP(DRANAP, LOGL_NOTICE, "Received unsupported RANAP " @@ -528,7 +526,7 @@ } /* decode a connection-less RANAP message */ -int ranap_cn_rx_cl_decode(void *ctx, ranap_message *message, uint8_t *data, size_t len) +int ranap_cn_rx_cl_decode_2(ranap_message *message, uint8_t *data, size_t len) { RANAP_RANAP_PDU_t *pdu = NULL; asn_dec_rval_t dec_ret; @@ -544,13 +542,18 @@ message->direction = pdu->present; - rc = _cn_ranap_rx_cl(ctx, pdu, message); + rc = _cn_ranap_rx_cl(pdu, message); ASN_STRUCT_FREE(asn_DEF_RANAP_RANAP_PDU, pdu); return rc; } +int ranap_cn_rx_cl_decode(void *unused, ranap_message *message, uint8_t *data, size_t len) +{ + return ranap_cn_rx_cl_decode_2(message, data, len); +} + /* receive a connection-less RANAP message and call * cn_ranap_handle_co() with the resulting ranap_message struct */ int ranap_cn_rx_cl(ranap_handle_cb cb, void *ctx, uint8_t *data, size_t len) @@ -558,7 +561,7 @@ ranap_message message; int rc; - rc = ranap_cn_rx_cl_decode(ctx, &message, data, len); + rc = ranap_cn_rx_cl_decode_2(&message, data, len); if (rc == 0) (*cb)(ctx, &message); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/30142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I8936197d7ae7ffddbe8ee99d909d74ac5b3ab227 Gerrit-Change-Number: 30142 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in osmo-iuh[master]: asn1: fix visibility warnings from generated code

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/30081 to look at the new patch set (#3). Change subject: asn1: fix visibility warnings from generated code ...................................................................... asn1: fix visibility warnings from generated code Fix warnings from generated asn1 code in order to build osmo-iuh with werror in a future patch: ../../include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h:29:23: error: ‘struct HNBAP_CriticalityDiagnostics_IE_List__Member’ declared inside parameter list will not be visible outside of this definition or declaration [-Werror] These visibility warnings come from "SEQUENCE … OF SEQUENCE" definitions in the asn1 source files, as described in detail here: https://github.com/vlm/asn1c/issues/430 It is not possible to tell gcc to just ignore these warnings since they don't have their own type (unlike e.g. -Wuninitialized). Also it seems like a huge effort to patch this in asn1c. So work around the problem the same way the author of the issue worked around it by rewriting the lines to "SEQUENCE … OF …-Value" and adding a "…-Value ::= SEQUENCE" line below. Add a script in asn1/utils/asn1_restructure_sequence_of_sequence.py for the transformation and apply it. Related: OS#4462 Change-Id: If84445ed2e0df604b581684dcf83f8520b7da84c --- M asn1/hnbap/HNBAP-IEs.asn M asn1/ranap/RANAP-IEs.asn M asn1/ranap/RANAP-PDU-Contents.asn M asn1/ranap/RANAP-PDU.asn M asn1/rua/RUA-IEs.asn M asn1/sabp/SABP-IEs.asn A asn1/utils/asn1_restructure_sequence_of_sequence.py A include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List-Value.h M include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h M include/osmocom/hnbap/Makefile.am M include/osmocom/ranap/Makefile.am A include/osmocom/ranap/RANAP_AuthorisedPLMNs-Value.h M include/osmocom/ranap/RANAP_AuthorisedPLMNs.h A include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List-Value.h M include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h A include/osmocom/ranap/RANAP_DataVolumeList-Value.h M include/osmocom/ranap/RANAP_DataVolumeList.h A include/osmocom/ranap/RANAP_EUTRANFrequencies-Value.h M include/osmocom/ranap/RANAP_EUTRANFrequencies.h A include/osmocom/ranap/RANAP_GA-Polygon-Value.h M include/osmocom/ranap/RANAP_GA-Polygon.h A include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs-Value.h M include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h A include/osmocom/ranap/RANAP_LA-LIST-Value.h M include/osmocom/ranap/RANAP_LA-LIST.h A include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs-Value.h M include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h A include/osmocom/ranap/RANAP_MessageStructure-Value.h M include/osmocom/ranap/RANAP_MessageStructure.h A include/osmocom/ranap/RANAP_PLMNs-in-shared-network-Value.h M include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h A include/osmocom/ranap/RANAP_RABDataVolumeReport-Value.h M include/osmocom/ranap/RANAP_RABDataVolumeReport.h A include/osmocom/ranap/RANAP_RABParametersList-Value.h M include/osmocom/ranap/RANAP_RABParametersList.h A include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs-Value.h M include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h M include/osmocom/rua/Makefile.am A include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List-Value.h M include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h M include/osmocom/sabp/Makefile.am A include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List-Value.h M include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h A include/osmocom/sabp/SABP_MessageStructure-Value.h M include/osmocom/sabp/SABP_MessageStructure.h A src/hnbap/HNBAP_CriticalityDiagnostics-IE-List-Value.c M src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c M src/hnbap/Makefile.am M src/ranap/Makefile.am A src/ranap/RANAP_AuthorisedPLMNs-Value.c M src/ranap/RANAP_AuthorisedPLMNs.c A src/ranap/RANAP_CriticalityDiagnostics-IE-List-Value.c M src/ranap/RANAP_CriticalityDiagnostics-IE-List.c A src/ranap/RANAP_DataVolumeList-Value.c M src/ranap/RANAP_DataVolumeList.c A src/ranap/RANAP_EUTRANFrequencies-Value.c M src/ranap/RANAP_EUTRANFrequencies.c A src/ranap/RANAP_GA-Polygon-Value.c M src/ranap/RANAP_GA-Polygon.c A src/ranap/RANAP_JoinedMBMSBearerService-IEs-Value.c M src/ranap/RANAP_JoinedMBMSBearerService-IEs.c A src/ranap/RANAP_LA-LIST-Value.c M src/ranap/RANAP_LA-LIST.c A src/ranap/RANAP_LeftMBMSBearerService-IEs-Value.c M src/ranap/RANAP_LeftMBMSBearerService-IEs.c A src/ranap/RANAP_MessageStructure-Value.c M src/ranap/RANAP_MessageStructure.c A src/ranap/RANAP_PLMNs-in-shared-network-Value.c M src/ranap/RANAP_PLMNs-in-shared-network.c A src/ranap/RANAP_RABDataVolumeReport-Value.c M src/ranap/RANAP_RABDataVolumeReport.c A src/ranap/RANAP_RABParametersList-Value.c M src/ranap/RANAP_RABParametersList.c A src/ranap/RANAP_UnsuccessfulLinking-IEs-Value.c M src/ranap/RANAP_UnsuccessfulLinking-IEs.c M src/rua/Makefile.am A src/rua/RUA_CriticalityDiagnostics-IE-List-Value.c M src/rua/RUA_CriticalityDiagnostics-IE-List.c M src/sabp/Makefile.am A src/sabp/SABP_CriticalityDiagnostics-IE-List-Value.c M src/sabp/SABP_CriticalityDiagnostics-IE-List.c A src/sabp/SABP_MessageStructure-Value.c M src/sabp/SABP_MessageStructure.c 83 files changed, 2,504 insertions(+), 1,695 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/81/30081/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/30081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: If84445ed2e0df604b581684dcf83f8520b7da84c Gerrit-Change-Number: 30081 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022