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

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

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/30088 ) Change subject: asn1tostruct: fix defines getting redefined ...................................................................... asn1tostruct: fix defines getting redefined Do not write the same define twice for two files in a struct, e.g.: #define ENHANCEDRELOCATIONCOMPLETEREQUESTIES_RANAP_EXTENDEDRNC_ID_PRESENT (1 << 0) #define ENHANCEDRELOCATIONCOMPLETEREQUESTIES_RANAP_EXTENDEDRNC_ID_PRESENT (1 << 1) #define ENHANCEDRELOCATIONCOMPLETEREQUESTIES_RANAP_RAB_SETUPLIST_ENHANCEDRELOCCOMPLETEREQ_PRESENT (1 << 2) typedef struct RANAP_EnhancedRelocationCompleteRequestIEs_s { uint16_t presenceMask; RANAP_IuSignallingConnectionIdentifier_t oldIuSigConId; RANAP_IuSignallingConnectionIdentifier_t iuSigConId; RANAP_GlobalRNC_ID_t relocation_SourceRNC_ID; RANAP_ExtendedRNC_ID_t relocation_SourceExtendedRNC_ID; ///< Optional field RANAP_GlobalRNC_ID_t relocation_TargetRNC_ID; RANAP_ExtendedRNC_ID_t relocation_TargetExtendedRNC_ID; ///< Optional field RANAP_RAB_SetupList_EnhancedRelocCompleteReq_t raB_SetupList_EnhancedRelocCompleteReq; ///< Optional field } RANAP_EnhancedRelocationCompleteRequestIEs_t; The problem is that the type is used and it may not be unique inside a struct. Change the code to use the name of the field if the type is not unique. Keep using the type otherwise so existing code doesn't need to be modified a lot to fix this. Fix for: ../include/osmocom/ranap/ranap_ies_defs.h:514: warning: "RANAP_ENHANCEDRELOCATIONINFORMATIONREQUESTIES_RANAP_IUSIGNALLINGCONNECTIONIDENTIFIER_PRESENT" redefined Change-Id: I2ecae6789899952d1dc5691ab76907abeaa71c12 --- M TODO-RELEASE M asn1/utils/asn1tostruct.py 2 files changed, 28 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 3ecddae..0ca9114 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,4 @@ # 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}_decode2 instead +all API change rename duplicate generated defines from asn1tostruct diff --git a/asn1/utils/asn1tostruct.py b/asn1/utils/asn1tostruct.py index 220517d..d71d87d 100755 --- a/asn1/utils/asn1tostruct.py +++ b/asn1/utils/asn1tostruct.py @@ -79,6 +79,29 @@ print("-p [pfx] Prefix all types with given prefix") print("-h Print this help and return") +def getUniqueIENameForDefine(ies, ie): + """ Usually the type of the IE is used for defines. However a struct may + use the same type multiple times, in that case we use the actual name + of the field. """ + unique = True + + for ie_other in ies: + if ie_other == ie: + continue + if ie_other[2] == ie[2]: + unique = False + assert ie[0] != ie_other[0], "failed to find a unique name for" \ + f" IE {ie}. Found another entry in ies {ie_other}" \ + " that has the same ie[0] value." + + if unique: + ret = ie[2] + else: + ret = ie[0] + + ret = re.sub('-', '_', ret.upper()) + return ret + try: opts, args = getopt.getopt(sys.argv[1:], "df:ho:p:", ["debug", "file", "help", "outdir", "prefix"]) except getopt.GetoptError as err: @@ -167,7 +190,7 @@ # Presence mask for ie in iesDefs[key]["ies"]: - ieupperunderscore = re.sub('-', '_', ie[2].upper()) + ieupperunderscore = getUniqueIENameForDefine(iesDefs[key]["ies"], ie) if ie[3] == "optional" or ie[3] == "conditional": f.write("#define {0:<{pad}} {1}\n".format("%s_%s%s_PRESENT" % (keyupperunderscore, prefix, ieupperunderscore), "(1 << %d)" % shift, pad=iesDefs[key]["length"] + len(keyupperunderscore) + 9)) @@ -328,7 +351,7 @@ ienameunderscorefirstlower = lowerFirstCamelWord(ienameunderscore) ietypesubst = prefix + re.sub('-', '', ie[2]) ietypeunderscore = prefix + re.sub('-', '_', ie[2]) - ieupperunderscore = prefix + re.sub('-', '_', ie[2]).upper() + ieupperunderscore = prefix + getUniqueIENameForDefine(iesDefs[key]["ies"], ie) if ie[3] == "optional": f.write(" /* Optional field */\n") elif ie[3] == "conditional": @@ -377,7 +400,7 @@ for ie in iesDefs[key]["ies"]: ietypeunderscore = prefix + re.sub('-', '_', ie[2]) - ieupperunderscore = prefix + re.sub('-', '_', ie[2]).upper() + ieupperunderscore = prefix + getUniqueIENameForDefine(iesDefs[key]["ies"], ie) if ie[3] != "mandatory": if ie[3] == "optional": f.write(" /* Optional field */\n") @@ -471,7 +494,7 @@ iename = re.sub('-', '_', re.sub('id-', '', ie[0])) ienameunderscore = prefix + re.sub('-', '_', iename) ienamefirstwordlower = lowerFirstCamelWord(iename) - ieupperunderscore = prefix + re.sub('-', '_', ie[2]).upper() + ieupperunderscore = prefix + getUniqueIENameForDefine(iesDefs[key]["ies"], ie) ietypeunderscore = prefix + re.sub('-', '_', ie[2]) if ie[3] != "mandatory": if ie[3] == "optional": -- 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: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-iuh[master]: hnbap_common: hnbap_cause_str: handle nothing val

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/30087 ) Change subject: hnbap_common: hnbap_cause_str: handle nothing val ...................................................................... hnbap_common: hnbap_cause_str: handle nothing val Fix for: ../../../src/osmo-iuh/src/hnbap_common.c:85:9: error: enumeration value ‘HNBAP_Cause_PR_NOTHING’ not handled in switch [-Werror=switch] Change-Id: Icab3052e27d1951129e3809e61357ee23c4cb588 --- M src/hnbap_common.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/hnbap_common.c b/src/hnbap_common.c index be7d570..67cc30c 100644 --- a/src/hnbap_common.c +++ b/src/hnbap_common.c @@ -103,6 +103,9 @@ get_value_string(hnbap_cause_misc_vals, cause->choice.misc)); break; + case HNBAP_Cause_PR_NOTHING: + snprintf(buf, sizeof(buf), "NOTHING"); + break; } return buf; } 2 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-iuh/+/30087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Icab3052e27d1951129e3809e61357ee23c4cb588 Gerrit-Change-Number: 30087 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-iuh[master]: test-hnbap: fix defined but not used error

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/30086 ) Change subject: test-hnbap: fix defined but not used error ...................................................................... test-hnbap: fix defined but not used error ../../../../src/osmo-iuh/src/tests/test-hnbap.c:53:28: error: ‘hnbap_reg_acc’ defined but not used [-Werror=unused-const-variable=] 53 | static const unsigned char hnbap_reg_acc[] = { | ^~~~~~~~~~~~~ Change-Id: I1fda405af9d4f1f43377ee0a81710e6e2668da13 --- M src/tests/test-hnbap.c 1 file changed, 0 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved pespin: Looks good to me, approved diff --git a/src/tests/test-hnbap.c b/src/tests/test-hnbap.c index 4857bf1..835a331 100644 --- a/src/tests/test-hnbap.c +++ b/src/tests/test-hnbap.c @@ -50,12 +50,6 @@ 0x01 }; -static const unsigned char hnbap_reg_acc[] = { -0x20, 0x01, -0x00, 0x09, 0x00, 0x00, 0x01, 0x00, 0x0e, 0x00, -0x02, 0x00, 0x00 -}; - static const unsigned char hnbap_ue_reg_req[] = { 0x00, 0x03, 0x00, 0x1a, 0x00, 0x00, 0x03, 0x00, 0x05, 0x00, 3 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-iuh/+/30086 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1fda405af9d4f1f43377ee0a81710e6e2668da13 Gerrit-Change-Number: 30086 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

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

by osmith

osmith has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index d0852fc..3ecddae 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}_decode2 instead diff --git a/include/osmocom/ranap/ranap_common_cn.h b/include/osmocom/ranap/ranap_common_cn.h index fb65049..dfc5c3d 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_decode2(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_decode2() 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_decode2(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_decode2() 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..bbc3784 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_decode2(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_decode2(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_decode2(&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_decode2(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_decode2(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_decode2(&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: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

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

by osmith

osmith has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved laforge: Looks good to me, approved 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 dfc5c3d..5f82378 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_decode2() 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_decode2() 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 bbc3784..56ac4e8 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_decode2(&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_decode2(&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); 1 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-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: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-iuh[master]: tests/hnb-test-rua: fix incompat pointer type

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/30085 ) Change subject: tests/hnb-test-rua: fix incompat pointer type ...................................................................... tests/hnb-test-rua: fix incompat pointer type Adjust the first argument of hnb_test_rua_dt_handle_ranap and hnb_test_rua_cl_handle_ranap to be "void *priv", as it is private user data. Fix for: ../../../../src/osmo-iuh/src/tests/hnb-test-rua.c:19:29: error: passing argument 1 of ‘ranap_cn_rx_co’ from incompatible pointer type [-Werror=incompatible-pointer-types] 19 | rc = ranap_cn_rx_co(hnb_test_rua_dt_handle_ranap, hnb, ies.ranaP_Message.buf, ies.ranaP_Message.size); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | void (*)(struct hnb_test *, struct ranap_message_s *) Change-Id: Id930a7f0d3d05cfcc8ba9734dd922de885853c8c --- M src/tests/hnb-test-layers.h M src/tests/hnb-test-ranap.c 2 files changed, 6 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/tests/hnb-test-layers.h b/src/tests/hnb-test-layers.h index 62369f3..6211661 100644 --- a/src/tests/hnb-test-layers.h +++ b/src/tests/hnb-test-layers.h @@ -9,10 +9,8 @@ void hnb_test_rua_cl_handle(struct hnb_test *hnb, struct ANY *in); /* RUA calls RANAP */ -void hnb_test_rua_dt_handle_ranap(struct hnb_test *hnb, - struct ranap_message_s *ranap_msg); -void hnb_test_rua_cl_handle_ranap(struct hnb_test *hnb, - struct ranap_message_s *ranap_msg); +void hnb_test_rua_dt_handle_ranap(void *priv, struct ranap_message_s *ranap_msg); +void hnb_test_rua_cl_handle_ranap(void *priv, struct ranap_message_s *ranap_msg); /* RANAP calls main with actual payload*/ void hnb_test_nas_rx_dtap(struct hnb_test *hnb, void *data, int len); diff --git a/src/tests/hnb-test-ranap.c b/src/tests/hnb-test-ranap.c index 629726b..fad5b8f 100644 --- a/src/tests/hnb-test-ranap.c +++ b/src/tests/hnb-test-ranap.c @@ -13,13 +13,13 @@ printf(#octet_string_t " = %s\n",\ printstr(&octet_string_t)) -void hnb_test_rua_dt_handle_ranap(struct hnb_test *hnb, - struct ranap_message_s *ranap_msg) +void hnb_test_rua_dt_handle_ranap(void *priv, struct ranap_message_s *ranap_msg) { int len; uint8_t *data; RANAP_PermittedIntegrityProtectionAlgorithms_t *algs; RANAP_IntegrityProtectionAlgorithm_t *first_alg; + struct hnb_test *hnb = priv; printf("rx ranap_msg->procedureCode %d\n", ranap_msg->procedureCode); @@ -58,10 +58,10 @@ } } -void hnb_test_rua_cl_handle_ranap(struct hnb_test *hnb, - struct ranap_message_s *ranap_msg) +void hnb_test_rua_cl_handle_ranap(void *priv, struct ranap_message_s *ranap_msg) { char imsi[16]; + struct hnb_test *hnb = priv; printf("rx ranap_msg->procedureCode %d\n", ranap_msg->procedureCode); 3 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-iuh/+/30085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Id930a7f0d3d05cfcc8ba9734dd922de885853c8c Gerrit-Change-Number: 30085 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

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

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/30088 ) Change subject: asn1tostruct: fix defines getting redefined ...................................................................... Patch Set 4: Code-Review+2 (2 comments) Patchset: PS4: re-applying and combining votes after rebase File asn1/utils/asn1tostruct.py: https://gerrit.osmocom.org/c/osmo-iuh/+/30088/comment/03f8c5f3_44c3c42a PS3, Line 84: use the same type multiple times, in that case we use the actual name > If somebody needs to actually use them / or debug the generated code for whatever reason, I think it […] Done -- 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: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 15 Nov 2022 10:37:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

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

by osmith

Attention is currently required from: laforge, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/30142 ) Change subject: ranap_common_cn: remove unused ctx args ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: fixed "_2" -> "2", re-applying and combining votes -- 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: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 15 Nov 2022 10:35:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in simtrace2[master]: conrtrib/upload : upload elf files

by osmith

Attention is currently required from: Hoernchen. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/30153 ) Change subject: conrtrib/upload : upload elf files ...................................................................... Patch Set 2: Code-Review-1 (3 comments) Commit Message: https://gerrit.osmocom.org/c/simtrace2/+/30153/comment/ff02b776_528cf67f PS2, Line 15: device will end up in DFU mode upon reset. I suggest to put this warning visibly elsewhere too (in a manual that already explains how to upgrade the firmware or something?), not many people will read it here in this commit message. Patchset: PS2: -1: might be a | missing File contrib/prepare_upload.sh: https://gerrit.osmocom.org/c/simtrace2/+/30153/comment/9d0039f3_6f03e6cd PS2, Line 12: b is a | missing here? -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/30153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ifceb16d385388356ac1bf8b13f5df62c643bebf8 Gerrit-Change-Number: 30153 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Tue, 15 Nov 2022 10:34:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

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

by osmith

Attention is currently required from: laforge, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/30142 ) Change subject: ranap_common_cn: remove unused ctx args ...................................................................... Patch Set 2: (1 comment) File include/osmocom/ranap/ranap_common_cn.h: https://gerrit.osmocom.org/c/osmo-iuh/+/30142/comment/35d2d769_95a445e3 PS1, Line 23: ranap_cn_rx_co_decode_2 > Ack Done -- 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: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 15 Nov 2022 10:18:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022