May 2023 - gerrit-log - lists.osmocom.org

[M] Change in osmo-bts[master]: paging: parse PCUIF data indication outside of paging.c

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32733 ) Change subject: paging: parse PCUIF data indication outside of paging.c ...................................................................... paging: parse PCUIF data indication outside of paging.c The function paging_add_macblock takes a data and length parameter. The first three byte of that string are the last three digits of the IMSI from which the paging group is calculated. As the layout of this data buffer is a property of the PCUIF interface API, we should do this separation outside of paging.c. Also we should supply the IMSI as a valid null terminated string since PCUIF v.11 also uses this format. Change-Id: I9f3799916e8102bf1ce0f21891f2d24f43091f01 Related: OS#5927 --- M include/osmo-bts/paging.h M src/common/paging.c M src/common/pcu_sock.c 3 files changed, 42 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/33/32733/1 diff --git a/include/osmo-bts/paging.h b/include/osmo-bts/paging.h index f1ae8e3..1afb254 100644 --- a/include/osmo-bts/paging.h +++ b/include/osmo-bts/paging.h @@ -37,8 +37,8 @@ /* Add a ready formatted MAC block message to the paging queue, this can be an IMMEDIATE ASSIGNMENT, or a * PAGING COMMAND (from the PCU) */ -int paging_add_macblock(struct paging_state *ps, - const uint8_t *data, uint8_t len); +int paging_add_macblock(struct paging_state *ps, const char *imsi, + const uint8_t *macblock, uint8_t macblock_len); /* generate paging message for given gsm time */ int paging_gen_msg(struct paging_state *ps, uint8_t *out_buf, struct gsm_time *gt, diff --git a/src/common/paging.c b/src/common/paging.c index 284b71c..5e11a98 100644 --- a/src/common/paging.c +++ b/src/common/paging.c @@ -269,12 +269,14 @@ /* Add a ready formatted MAC block message to the paging queue, this can be an IMMEDIATE ASSIGNMENT, or a * PAGING COMMAND (from the PCU) */ -int paging_add_macblock(struct paging_state *ps, - const uint8_t *data, uint8_t len) +int paging_add_macblock(struct paging_state *ps, const char *imsi, + const uint8_t *macblock, uint8_t macblock_len) { struct llist_head *group_q; struct paging_record *pr; - uint16_t imsi, paging_group; + uint16_t paging_group; + uint16_t _imsi; + size_t imsi_len = strlen(imsi); check_congestion(ps); @@ -285,17 +287,21 @@ return -ENOSPC; } - if (len != GSM_MACBLOCK_LEN + 3) { - LOGP(DPAG, LOGL_ERROR, "MAC block with invalid length %d (GSM_MACBLOCK_LEN + 3)\n", len); + if (macblock_len != GSM_MACBLOCK_LEN) { + LOGP(DPAG, LOGL_ERROR, "MAC block with invalid length %d (expecting GSM_MACBLOCK_LEN)\n", macblock_len); return -EINVAL; } - len -= 3; - imsi = 100 * ((*(data++)) - '0'); - imsi += 10 * ((*(data++)) - '0'); - imsi += (*(data++)) - '0'; - paging_group = gsm0502_calc_paging_group(&ps->chan_desc, imsi); - + /* Tha paging group is calculated from the last three digits of the IMSI */ + if (imsi_len < 3) { + LOGP(DPAG, LOGL_ERROR, "IMSI with invalid length %zu (expecting at least the last 3 digits)\n", imsi_len); + return -EINVAL; + } + imsi = imsi + imsi_len - 3; + _imsi = 100 * ((*(imsi++)) - '0'); + _imsi += 10 * ((*(imsi++)) - '0'); + _imsi += (*(imsi++)) - '0'; + paging_group = gsm0502_calc_paging_group(&ps->chan_desc, _imsi); group_q = &ps->paging_queue[paging_group]; pr = talloc_zero(ps, struct paging_record); @@ -305,7 +311,7 @@ LOGP(DPAG, LOGL_INFO, "Add MAC block to paging queue (group=%u)\n", paging_group); - memcpy(pr->u.macblock.msg, data, GSM_MACBLOCK_LEN); + memcpy(pr->u.macblock.msg, macblock, GSM_MACBLOCK_LEN); /* enqueue the new message to the HEAD of the queue */ llist_add(&pr->list, group_q); diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 00debad..2b5b99c 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -667,6 +667,7 @@ struct gsm_bts_trx_ts *ts; struct msgb *msg; int rc = 0; + char imsi[4] = { 0 }; LOGP(DPCU, LOGL_DEBUG, "Data request received: sapi=%s arfcn=%d " "block=%d data=%s\n", sapi_string[data_req->sapi], @@ -675,7 +676,8 @@ switch (data_req->sapi) { case PCU_IF_SAPI_PCH: - paging_add_macblock(bts->paging_state, data_req->data, data_req->len); + memcpy(imsi, data_req->data, 3); + paging_add_macblock(bts->paging_state, imsi, data_req->data + 3, data_req->len-3); break; case PCU_IF_SAPI_AGCH: msg = msgb_alloc(data_req->len, "pcu_agch"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9f3799916e8102bf1ce0f21891f2d24f43091f01 Gerrit-Change-Number: 32733 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[S] Change in osmo-bts[master]: paging: do not confirm PAGING COMMAND messages

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32734 ) Change subject: paging: do not confirm PAGING COMMAND messages ...................................................................... paging: do not confirm PAGING COMMAND messages when osmo-bts receives a MAC block from osmo-pcu through the PCUIF it puts it in the review queue without further interpreting it. This also means that it will send confirmations to the PCU for IMMEDIATE ASSIGNMENT and PAGING COMMAND. This is not entirely correct because only IMMEDIATE ASSIGNMENT messages shouldbe confirmed. osmo-pcu has no problem with this since it silently drops the confirmations for PAGING COMMAND messages. This peculiarity of the PCUIF implementation makes the confirmation logic hard to understand, so let's add some logic to osmo-bts that makes sure that only IMMEDIATE ASSIGNMENT messages are confirmed. Related: OS#5927 Change-Id: I8b8264d28b1b1deb08774cdba58dd4c6dafe115d --- M include/osmo-bts/paging.h M src/common/paging.c M src/common/pcu_sock.c 3 files changed, 35 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/34/32734/1 diff --git a/include/osmo-bts/paging.h b/include/osmo-bts/paging.h index 1afb254..45ff754 100644 --- a/include/osmo-bts/paging.h +++ b/include/osmo-bts/paging.h @@ -37,7 +37,7 @@ /* Add a ready formatted MAC block message to the paging queue, this can be an IMMEDIATE ASSIGNMENT, or a * PAGING COMMAND (from the PCU) */ -int paging_add_macblock(struct paging_state *ps, const char *imsi, +int paging_add_macblock(struct paging_state *ps, const char *imsi, bool confirm, const uint8_t *macblock, uint8_t macblock_len); /* generate paging message for given gsm time */ diff --git a/src/common/paging.c b/src/common/paging.c index 5e11a98..4698c7c 100644 --- a/src/common/paging.c +++ b/src/common/paging.c @@ -63,6 +63,7 @@ } normal; struct { uint8_t msg[GSM_MACBLOCK_LEN]; + bool confirm; } macblock; } u; }; @@ -269,7 +270,7 @@ /* Add a ready formatted MAC block message to the paging queue, this can be an IMMEDIATE ASSIGNMENT, or a * PAGING COMMAND (from the PCU) */ -int paging_add_macblock(struct paging_state *ps, const char *imsi, +int paging_add_macblock(struct paging_state *ps, const char *imsi, bool confirm, const uint8_t *macblock, uint8_t macblock_len) { struct llist_head *group_q; @@ -312,6 +313,7 @@ LOGP(DPAG, LOGL_INFO, "Add MAC block to paging queue (group=%u)\n", paging_group); memcpy(pr->u.macblock.msg, macblock, GSM_MACBLOCK_LEN); + pr->u.macblock.confirm = confirm; /* enqueue the new message to the HEAD of the queue */ llist_add(&pr->list, group_q); @@ -640,8 +642,10 @@ /* get MAC block message and free record */ memcpy(out_buf, pr[num_pr]->u.macblock.msg, GSM_MACBLOCK_LEN); - pcu_tx_pch_data_cnf(gt->fn, pr[num_pr]->u.macblock.msg, - GSM_MACBLOCK_LEN); + if (pr[num_pr]->u.macblock.confirm) { + pcu_tx_pch_data_cnf(gt->fn, pr[num_pr]->u.macblock.msg, + GSM_MACBLOCK_LEN); + } talloc_free(pr[num_pr]); return GSM_MACBLOCK_LEN; } diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 2b5b99c..1d1ef08 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -668,6 +668,8 @@ struct msgb *msg; int rc = 0; char imsi[4] = { 0 }; + struct gsm48_imm_ass *gsm48_imm_ass; + bool confirm = false; LOGP(DPCU, LOGL_DEBUG, "Data request received: sapi=%s arfcn=%d " "block=%d data=%s\n", sapi_string[data_req->sapi], @@ -677,7 +679,10 @@ switch (data_req->sapi) { case PCU_IF_SAPI_PCH: memcpy(imsi, data_req->data, 3); - paging_add_macblock(bts->paging_state, imsi, data_req->data + 3, data_req->len-3); + gsm48_imm_ass = (struct gsm48_imm_ass *)data_req->data + 3; + if (gsm48_imm_ass->msg_type == GSM48_MT_RR_IMM_ASS) + confirm = true; + paging_add_macblock(bts->paging_state, imsi, confirm, data_req->data + 3, data_req->len-3); break; case PCU_IF_SAPI_AGCH: msg = msgb_alloc(data_req->len, "pcu_agch"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8b8264d28b1b1deb08774cdba58dd4c6dafe115d Gerrit-Change-Number: 32734 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[M] Change in osmo-pcu[master]: gprs_rlcmac: also use direct TLLI PCUIF for paging MAC blocks

by dexter

Attention is currently required from: jolly, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32694 ) Change subject: gprs_rlcmac: also use direct TLLI PCUIF for paging MAC blocks ...................................................................... Patch Set 2: (2 comments) Patchset: PS2: > Thanks for making that clear. To be honest I also do not see a why pagings should be confirmed. […] So, I now know for sure: osmo-bts confirms IMMEDIATE ASSIGNMENT and PAGING COMMAND, but osmo-pcu silently drops confirmations for PAGING COMMAND. This means I just have to fix this patch so that it uses the PCUIF V.11 interface correctly. We also do not have to worry about the TLLI, its irrelevant. PS2: Thanks for your helpful review comments. I will now rework this patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I99cfe373fa157cfb32b74c113ad9935347653a71 Gerrit-Change-Number: 32694 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 16 May 2023 13:46:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in osmo-bsc[master]: ctrl: Add getting neighbor list

by matanp

Attention is currently required from: neels, pespin, fixeria. matanp has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32565 ) Change subject: ctrl: Add getting neighbor list ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: > @matanp, thanks for your patches! I am impressed by your level of expertise in C and FLOSS community […] Thanks a lot! I am actually not that good in C, but I believe contributing to open source projects and getting code reviews is the best way to become better. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icba0b7d92f4c67e617d707ca651d674f0d1ba8a7 Gerrit-Change-Number: 32565 Gerrit-PatchSet: 4 Gerrit-Owner: matanp <matan1008(a)gmail.com> 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-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 16 May 2023 12:38:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in osmo-hnbgw[master]: fix missing write-back of rnc-id

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32716 ) Change subject: fix missing write-back of rnc-id ...................................................................... Patch Set 4: (1 comment) File src/osmo-hnbgw/hnbgw_vty.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/32716/comment/fe65ae38_21c79160 PS4, Line 423: vty_out(vty, " rnc-id %u%s", g_hnbgw->config.rnc_id, VTY_NEWLINE); I think rnc-id sounds more important and hence should probably be put before timers and logging related stuff. What do you think? -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ide006379b26949e34371bd316a22c130ea09da82 Gerrit-Change-Number: 32716 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 16 May 2023 12:36:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in osmo-hnbgw[master]: vty test: show missing write-back of 'rnc-id'

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32715 ) Change subject: vty test: show missing write-back of 'rnc-id' ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I9eecda8678c32abbeaf39344ccdb14ed5a0828ce Gerrit-Change-Number: 32715 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 16 May 2023 12:35:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in osmo-cbc[master]: README.md: Document generation of SBcAP code from ASN.1 files

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/32730 ) Change subject: README.md: Document generation of SBcAP code from ASN.1 files ...................................................................... README.md: Document generation of SBcAP code from ASN.1 files Change-Id: Id6edb2dcbd39ca101110f1ca57fcd67bf08c0ef0 --- M README.md 1 file changed, 36 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/README.md b/README.md index 6cb375e..8f98dad 100644 --- a/README.md +++ b/README.md @@ -67,3 +67,30 @@ The current patch queue for osmo-cbc can be seen at https://gerrit.osmocom.org/#/q/project:osmo-cbc+status:open + + +Generating asn1c code +--------------------- + +Upstream master as1nc from [vlm](https://github.com/vlm/asn1c) [doesn't support +APER encoding](https://github.com/vlm/asn1c/issues/452). Nevertheless, the +upstream fork maintained by a big contributor +[mouse07410](https://github.com/mouse07410/asn1c) does support it, and it is +used in osmo-cbc to generate the SBc-AP code from ASN.1 files present in +src/sbcap/asn1/. + +In order to regenerate the code, one shall adjust the ASN1C_SKELETON_PATH and +ASN1C_BIN_PATH in configure.ac to point to the built & installed asn1c from +mouse07410 (usually `vlm_master` branch). Last generated code was built using +commit hash 08b293e8aa342d465d26805d1d66f3595b2ce261. + +Then, do the usual `autoreconf -fi && ./configure`, using a buildir != srcdir +(important, in order to avoid ending up with tempotary files in srcdir and +making it difficult to stash the relevant changes). + +Finally, run `make -C src/ regen`, which will regenerate the files and copy over +the skeletons, with git possibily showing changes in the following paths: +- include/osmocom/sbcap/ +- src/sbcap/gen/ +- src/sbcap/skel/ + -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/32730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Id6edb2dcbd39ca101110f1ca57fcd67bf08c0ef0 Gerrit-Change-Number: 32730 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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-MessageType: merged

2 years, 1 month

1
0
0 0

[M] Change in osmo-cbc[master]: sbcap: Update asn1c skeleton files

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/32723 ) Change subject: sbcap: Update asn1c skeleton files ...................................................................... sbcap: Update asn1c skeleton files Update skeleton files using newest asn1c with APER support [1], commit 08b293e8aa342d465d26805d1d66f3595b2ce261. This contains among others, fix to automatically disable stack overflow checks [2] when using ASan, in order to avoid failing during unit test run. [1] https://github.com/mouse07410/asn1c/tree/vlm_master [2] https://github.com/mouse07410/asn1c/pull/128 Related: OS#6025 Change-Id: I385d14d4be308b991a48ce1033087f07bd1f47ea --- M include/osmocom/sbcap/SBcAP_Concurrent-Warning-Message-Indicator.h M include/osmocom/sbcap/SBcAP_Criticality.h M include/osmocom/sbcap/SBcAP_Error-Indication.h M include/osmocom/sbcap/SBcAP_PWS-Failure-Indication.h M include/osmocom/sbcap/SBcAP_PWS-Restart-Indication.h M include/osmocom/sbcap/SBcAP_Presence.h M include/osmocom/sbcap/SBcAP_RAT-Selector-5GS.h M include/osmocom/sbcap/SBcAP_Send-Stop-Warning-Indication.h M include/osmocom/sbcap/SBcAP_Send-Write-Replace-Warning-Indication.h M include/osmocom/sbcap/SBcAP_Stop-All-Indicator.h M include/osmocom/sbcap/SBcAP_Stop-Warning-Indication.h M include/osmocom/sbcap/SBcAP_Stop-Warning-Request.h M include/osmocom/sbcap/SBcAP_Stop-Warning-Response.h M include/osmocom/sbcap/SBcAP_TriggeringMessage.h M include/osmocom/sbcap/SBcAP_TypeOfError.h M include/osmocom/sbcap/SBcAP_Write-Replace-Warning-Indication.h M include/osmocom/sbcap/SBcAP_Write-Replace-Warning-Request.h M include/osmocom/sbcap/SBcAP_Write-Replace-Warning-Response.h M src/sbcap/gen/SBcAP_Error-Indication.c M src/sbcap/gen/SBcAP_PWS-Failure-Indication.c M src/sbcap/gen/SBcAP_PWS-Restart-Indication.c M src/sbcap/gen/SBcAP_Stop-Warning-Indication.c M src/sbcap/gen/SBcAP_Stop-Warning-Request.c M src/sbcap/gen/SBcAP_Stop-Warning-Response.c M src/sbcap/gen/SBcAP_Write-Replace-Warning-Indication.c M src/sbcap/gen/SBcAP_Write-Replace-Warning-Request.c M src/sbcap/gen/SBcAP_Write-Replace-Warning-Response.c M src/sbcap/gen/asn_application.c M src/sbcap/gen/constr_CHOICE_aper.c M src/sbcap/gen/constr_SEQUENCE.c M src/sbcap/skel/asn_application.h M src/sbcap/skel/asn_internal.h M src/sbcap/skel/jer_encoder.h 33 files changed, 150 insertions(+), 91 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/include/osmocom/sbcap/SBcAP_Concurrent-Warning-Message-Indicator.h b/include/osmocom/sbcap/SBcAP_Concurrent-Warning-Message-Indicator.h index fe60dd3..bd4482c 100644 --- a/include/osmocom/sbcap/SBcAP_Concurrent-Warning-Message-Indicator.h +++ b/include/osmocom/sbcap/SBcAP_Concurrent-Warning-Message-Indicator.h @@ -29,12 +29,12 @@ /* Implementation */ extern asn_per_constraints_t asn_PER_type_SBcAP_Concurrent_Warning_Message_Indicator_constr_1; extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Concurrent_Warning_Message_Indicator; -extern const asn_INTEGER_specifics_t asn_SPC_Concurrent_Warning_Message_Indicator_specs_1; -asn_struct_free_f Concurrent_Warning_Message_Indicator_free; -asn_struct_print_f Concurrent_Warning_Message_Indicator_print; -asn_constr_check_f Concurrent_Warning_Message_Indicator_constraint; -per_type_decoder_f Concurrent_Warning_Message_Indicator_decode_aper; -per_type_encoder_f Concurrent_Warning_Message_Indicator_encode_aper; +extern const asn_INTEGER_specifics_t asn_SPC_SBcAP_Concurrent_Warning_Message_Indicator_specs_1; +asn_struct_free_f SBcAP_Concurrent_Warning_Message_Indicator_free; +asn_struct_print_f SBcAP_Concurrent_Warning_Message_Indicator_print; +asn_constr_check_f SBcAP_Concurrent_Warning_Message_Indicator_constraint; +per_type_decoder_f SBcAP_Concurrent_Warning_Message_Indicator_decode_aper; +per_type_encoder_f SBcAP_Concurrent_Warning_Message_Indicator_encode_aper; #ifdef __cplusplus } diff --git a/include/osmocom/sbcap/SBcAP_Criticality.h b/include/osmocom/sbcap/SBcAP_Criticality.h index be50041..420c7e8 100644 --- a/include/osmocom/sbcap/SBcAP_Criticality.h +++ b/include/osmocom/sbcap/SBcAP_Criticality.h @@ -31,12 +31,12 @@ /* Implementation */ extern asn_per_constraints_t asn_PER_type_SBcAP_Criticality_constr_1; extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Criticality; -extern const asn_INTEGER_specifics_t asn_SPC_Criticality_specs_1; -asn_struct_free_f Criticality_free; -asn_struct_print_f Criticality_print; -asn_constr_check_f Criticality_constraint; -per_type_decoder_f Criticality_decode_aper; -per_type_encoder_f Criticality_encode_aper; +extern const asn_INTEGER_specifics_t asn_SPC_SBcAP_Criticality_specs_1; +asn_struct_free_f SBcAP_Criticality_free; +asn_struct_print_f SBcAP_Criticality_print; +asn_constr_check_f SBcAP_Criticality_constraint; +per_type_decoder_f SBcAP_Criticality_decode_aper; +per_type_encoder_f SBcAP_Criticality_encode_aper; #ifdef __cplusplus } diff --git a/include/osmocom/sbcap/SBcAP_Error-Indication.h b/include/osmocom/sbcap/SBcAP_Error-Indication.h index a354434..eb4a97a 100644 --- a/include/osmocom/sbcap/SBcAP_Error-Indication.h +++ b/include/osmocom/sbcap/SBcAP_Error-Indication.h @@ -33,6 +33,8 @@ /* Implementation */ extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Error_Indication; +extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Error_Indication_specs_1; +extern asn_TYPE_member_t asn_MBR_SBcAP_Error_Indication_1[1]; #ifdef __cplusplus } diff --git a/include/osmocom/sbcap/SBcAP_PWS-Failure-Indication.h b/include/osmocom/sbcap/SBcAP_PWS-Failure-Indication.h index ce67645..995ceae 100644 --- a/include/osmocom/sbcap/SBcAP_PWS-Failure-Indication.h +++ b/include/osmocom/sbcap/SBcAP_PWS-Failure-Indication.h @@ -37,6 +37,8 @@ /* Implementation */ extern asn_TYPE_descriptor_t asn_DEF_SBcAP_PWS_Failure_Indication; +extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_PWS_Failure_Indication_specs_1; +extern asn_TYPE_member_t asn_MBR_SBcAP_PWS_Failure_Indication_1[2]; #ifdef __cplusplus } diff --git a/include/osmocom/sbcap/SBcAP_PWS-Restart-Indication.h b/include/osmocom/sbcap/SBcAP_PWS-Restart-Indication.h index faf4de2..093143b 100644 --- a/include/osmocom/sbcap/SBcAP_PWS-Restart-Indication.h +++ b/include/osmocom/sbcap/SBcAP_PWS-Restart-Indication.h @@ -37,6 +37,8 @@ /* Implementation */ extern asn_TYPE_descriptor_t asn_DEF_SBcAP_PWS_Restart_Indication; +extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_PWS_Restart_Indication_specs_1; +extern asn_TYPE_member_t asn_MBR_SBcAP_PWS_Restart_Indication_1[2]; #ifdef __cplusplus } diff --git a/include/osmocom/sbcap/SBcAP_Presence.h b/include/osmocom/sbcap/SBcAP_Presence.h index c33c2f2..7b7f156 100644 --- a/include/osmocom/sbcap/SBcAP_Presence.h +++ b/include/osmocom/sbcap/SBcAP_Presence.h @@ -31,12 +31,12 @@ /* Implementation */ extern asn_per_constraints_t asn_PER_type_SBcAP_Presence_constr_1; extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Presence; -extern const asn_INTEGER_specifics_t asn_SPC_Presence_specs_1; -asn_struct_free_f Presence_free; -asn_struct_print_f Presence_print; -asn_constr_check_f Presence_constraint; -per_type_decoder_f Presence_decode_aper; -per_type_encoder_f Presence_encode_aper; +extern const asn_INTEGER_specifics_t asn_SPC_SBcAP_Presence_specs_1; +asn_struct_free_f SBcAP_Presence_free; +asn_struct_print_f SBcAP_Presence_print; +asn_constr_check_f SBcAP_Presence_constraint; +per_type_decoder_f SBcAP_Presence_decode_aper; +per_type_encoder_f SBcAP_Presence_encode_aper; #ifdef __cplusplus } diff --git a/include/osmocom/sbcap/SBcAP_RAT-Selector-5GS.h b/include/osmocom/sbcap/SBcAP_RAT-Selector-5GS.h index fc38ac0..fc53844 100644 --- a/include/osmocom/sbcap/SBcAP_RAT-Selector-5GS.h +++ b/include/osmocom/sbcap/SBcAP_RAT-Selector-5GS.h @@ -29,12 +29,12 @@ /* Implementation */ extern asn_per_constraints_t asn_PER_type_SBcAP_RAT_Selector_5GS_constr_1; extern asn_TYPE_descriptor_t asn_DEF_SBcAP_RAT_Selector_5GS; -extern const asn_INTEGER_specifics_t asn_SPC_RAT_Selector_5GS_specs_1; -asn_struct_free_f RAT_Selector_5GS_free; -asn_struct_print_f RAT_Selector_5GS_print; -asn_constr_check_f RAT_Selector_5GS_constraint; -per_type_decoder_f RAT_Selector_5GS_decode_aper; -per_type_encoder_f RAT_Selector_5GS_encode_aper; +extern const asn_INTEGER_specifics_t asn_SPC_SBcAP_RAT_Selector_5GS_specs_1; +asn_struct_free_f SBcAP_RAT_Selector_5GS_free; +asn_struct_print_f SBcAP_RAT_Selector_5GS_print; +asn_constr_check_f SBcAP_RAT_Selector_5GS_constraint; +per_type_decoder_f SBcAP_RAT_Selector_5GS_decode_aper; +per_type_encoder_f SBcAP_RAT_Selector_5GS_encode_aper; #ifdef __cplusplus } diff --git a/include/osmocom/sbcap/SBcAP_Send-Stop-Warning-Indication.h b/include/osmocom/sbcap/SBcAP_Send-Stop-Warning-Indication.h index 7e5c795..4b06cae 100644 --- a/include/osmocom/sbcap/SBcAP_Send-Stop-Warning-Indication.h +++ b/include/osmocom/sbcap/SBcAP_Send-Stop-Warning-Indication.h @@ -29,12 +29,12 @@ /* Implementation */ extern asn_per_constraints_t asn_PER_type_SBcAP_Send_Stop_Warning_Indication_constr_1; extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Send_Stop_Warning_Indication; -extern const asn_INTEGER_specifics_t asn_SPC_Send_Stop_Warning_Indication_specs_1; -asn_struct_free_f Send_Stop_Warning_Indication_free; -asn_struct_print_f Send_Stop_Warning_Indication_print; -asn_constr_check_f Send_Stop_Warning_Indication_constraint; -per_type_decoder_f Send_Stop_Warning_Indication_decode_aper; -per_type_encoder_f Send_Stop_Warning_Indication_encode_aper; +extern const asn_INTEGER_specifics_t asn_SPC_SBcAP_Send_Stop_Warning_Indication_specs_1; +asn_struct_free_f SBcAP_Send_Stop_Warning_Indication_free; +asn_struct_print_f SBcAP_Send_Stop_Warning_Indication_print; +asn_constr_check_f SBcAP_Send_Stop_Warning_Indication_constraint; +per_type_decoder_f SBcAP_Send_Stop_Warning_Indication_decode_aper; +per_type_encoder_f SBcAP_Send_Stop_Warning_Indication_encode_aper; #ifdef __cplusplus } diff --git a/include/osmocom/sbcap/SBcAP_Send-Write-Replace-Warning-Indication.h b/include/osmocom/sbcap/SBcAP_Send-Write-Replace-Warning-Indication.h index a029277..2a147f1 100644 --- a/include/osmocom/sbcap/SBcAP_Send-Write-Replace-Warning-Indication.h +++ b/include/osmocom/sbcap/SBcAP_Send-Write-Replace-Warning-Indication.h @@ -29,12 +29,12 @@ /* Implementation */ extern asn_per_constraints_t asn_PER_type_SBcAP_Send_Write_Replace_Warning_Indication_constr_1; extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Send_Write_Replace_Warning_Indication; -extern const asn_INTEGER_specifics_t asn_SPC_Send_Write_Replace_Warning_Indication_specs_1; -asn_struct_free_f Send_Write_Replace_Warning_Indication_free; -asn_struct_print_f Send_Write_Replace_Warning_Indication_print; -asn_constr_check_f Send_Write_Replace_Warning_Indication_constraint; -per_type_decoder_f Send_Write_Replace_Warning_Indication_decode_aper; -per_type_encoder_f Send_Write_Replace_Warning_Indication_encode_aper; +extern const asn_INTEGER_specifics_t asn_SPC_SBcAP_Send_Write_Replace_Warning_Indication_specs_1; +asn_struct_free_f SBcAP_Send_Write_Replace_Warning_Indication_free; +asn_struct_print_f SBcAP_Send_Write_Replace_Warning_Indication_print; +asn_constr_check_f SBcAP_Send_Write_Replace_Warning_Indication_constraint; +per_type_decoder_f SBcAP_Send_Write_Replace_Warning_Indication_decode_aper; +per_type_encoder_f SBcAP_Send_Write_Replace_Warning_Indication_encode_aper; #ifdef __cplusplus } diff --git a/include/osmocom/sbcap/SBcAP_Stop-All-Indicator.h b/include/osmocom/sbcap/SBcAP_Stop-All-Indicator.h index 52d049f..002111a 100644 --- a/include/osmocom/sbcap/SBcAP_Stop-All-Indicator.h +++ b/include/osmocom/sbcap/SBcAP_Stop-All-Indicator.h @@ -29,12 +29,12 @@ /* Implementation */ extern asn_per_constraints_t asn_PER_type_SBcAP_Stop_All_Indicator_constr_1; extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Stop_All_Indicator; -extern const asn_INTEGER_specifics_t asn_SPC_Stop_All_Indicator_specs_1; -asn_struct_free_f Stop_All_Indicator_free; -asn_struct_print_f Stop_All_Indicator_print; -asn_constr_check_f Stop_All_Indicator_constraint; -per_type_decoder_f Stop_All_Indicator_decode_aper; -per_type_encoder_f Stop_All_Indicator_encode_aper; +extern const asn_INTEGER_specifics_t asn_SPC_SBcAP_Stop_All_Indicator_specs_1; +asn_struct_free_f SBcAP_Stop_All_Indicator_free; +asn_struct_print_f SBcAP_Stop_All_Indicator_print; +asn_constr_check_f SBcAP_Stop_All_Indicator_constraint; +per_type_decoder_f SBcAP_Stop_All_Indicator_decode_aper; +per_type_encoder_f SBcAP_Stop_All_Indicator_encode_aper; #ifdef __cplusplus } diff --git a/include/osmocom/sbcap/SBcAP_Stop-Warning-Indication.h b/include/osmocom/sbcap/SBcAP_Stop-Warning-Indication.h index 5f00635..4ab243d 100644 --- a/include/osmocom/sbcap/SBcAP_Stop-Warning-Indication.h +++ b/include/osmocom/sbcap/SBcAP_Stop-Warning-Indication.h @@ -37,6 +37,8 @@ /* Implementation */ extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Stop_Warning_Indication; +extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Stop_Warning_Indication_specs_1; +extern asn_TYPE_member_t asn_MBR_SBcAP_Stop_Warning_Indication_1[2]; #ifdef __cplusplus } diff --git a/include/osmocom/sbcap/SBcAP_Stop-Warning-Request.h b/include/osmocom/sbcap/SBcAP_Stop-Warning-Request.h index b4466b8..d25ac6d 100644 --- a/include/osmocom/sbcap/SBcAP_Stop-Warning-Request.h +++ b/include/osmocom/sbcap/SBcAP_Stop-Warning-Request.h @@ -37,6 +37,8 @@ /* Implementation */ extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Stop_Warning_Request; +extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Stop_Warning_Request_specs_1; +extern asn_TYPE_member_t asn_MBR_SBcAP_Stop_Warning_Request_1[2]; #ifdef __cplusplus } diff --git a/include/osmocom/sbcap/SBcAP_Stop-Warning-Response.h b/include/osmocom/sbcap/SBcAP_Stop-Warning-Response.h index e3b085f..df01d02 100644 --- a/include/osmocom/sbcap/SBcAP_Stop-Warning-Response.h +++ b/include/osmocom/sbcap/SBcAP_Stop-Warning-Response.h @@ -37,6 +37,8 @@ /* Implementation */ extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Stop_Warning_Response; +extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Stop_Warning_Response_specs_1; +extern asn_TYPE_member_t asn_MBR_SBcAP_Stop_Warning_Response_1[2]; #ifdef __cplusplus } diff --git a/include/osmocom/sbcap/SBcAP_TriggeringMessage.h b/include/osmocom/sbcap/SBcAP_TriggeringMessage.h index 771d281..ac31b8c 100644 --- a/include/osmocom/sbcap/SBcAP_TriggeringMessage.h +++ b/include/osmocom/sbcap/SBcAP_TriggeringMessage.h @@ -32,12 +32,12 @@ /* Implementation */ extern asn_per_constraints_t asn_PER_type_SBcAP_TriggeringMessage_constr_1; extern asn_TYPE_descriptor_t asn_DEF_SBcAP_TriggeringMessage; -extern const asn_INTEGER_specifics_t asn_SPC_TriggeringMessage_specs_1; -asn_struct_free_f TriggeringMessage_free; -asn_struct_print_f TriggeringMessage_print; -asn_constr_check_f TriggeringMessage_constraint; -per_type_decoder_f TriggeringMessage_decode_aper; -per_type_encoder_f TriggeringMessage_encode_aper; +extern const asn_INTEGER_specifics_t asn_SPC_SBcAP_TriggeringMessage_specs_1; +asn_struct_free_f SBcAP_TriggeringMessage_free; +asn_struct_print_f SBcAP_TriggeringMessage_print; +asn_constr_check_f SBcAP_TriggeringMessage_constraint; +per_type_decoder_f SBcAP_TriggeringMessage_decode_aper; +per_type_encoder_f SBcAP_TriggeringMessage_encode_aper; #ifdef __cplusplus } diff --git a/include/osmocom/sbcap/SBcAP_TypeOfError.h b/include/osmocom/sbcap/SBcAP_TypeOfError.h index 0185e67..6389f4c 100644 --- a/include/osmocom/sbcap/SBcAP_TypeOfError.h +++ b/include/osmocom/sbcap/SBcAP_TypeOfError.h @@ -33,12 +33,12 @@ /* Implementation */ extern asn_per_constraints_t asn_PER_type_SBcAP_TypeOfError_constr_1; extern asn_TYPE_descriptor_t asn_DEF_SBcAP_TypeOfError; -extern const asn_INTEGER_specifics_t asn_SPC_TypeOfError_specs_1; -asn_struct_free_f TypeOfError_free; -asn_struct_print_f TypeOfError_print; -asn_constr_check_f TypeOfError_constraint; -per_type_decoder_f TypeOfError_decode_aper; -per_type_encoder_f TypeOfError_encode_aper; +extern const asn_INTEGER_specifics_t asn_SPC_SBcAP_TypeOfError_specs_1; +asn_struct_free_f SBcAP_TypeOfError_free; +asn_struct_print_f SBcAP_TypeOfError_print; +asn_constr_check_f SBcAP_TypeOfError_constraint; +per_type_decoder_f SBcAP_TypeOfError_decode_aper; +per_type_encoder_f SBcAP_TypeOfError_encode_aper; #ifdef __cplusplus } diff --git a/include/osmocom/sbcap/SBcAP_Write-Replace-Warning-Indication.h b/include/osmocom/sbcap/SBcAP_Write-Replace-Warning-Indication.h index 37114b9..d1123fb 100644 --- a/include/osmocom/sbcap/SBcAP_Write-Replace-Warning-Indication.h +++ b/include/osmocom/sbcap/SBcAP_Write-Replace-Warning-Indication.h @@ -37,6 +37,8 @@ /* Implementation */ extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Write_Replace_Warning_Indication; +extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Write_Replace_Warning_Indication_specs_1; +extern asn_TYPE_member_t asn_MBR_SBcAP_Write_Replace_Warning_Indication_1[2]; #ifdef __cplusplus } diff --git a/include/osmocom/sbcap/SBcAP_Write-Replace-Warning-Request.h b/include/osmocom/sbcap/SBcAP_Write-Replace-Warning-Request.h index 958f655..24f3f96 100644 --- a/include/osmocom/sbcap/SBcAP_Write-Replace-Warning-Request.h +++ b/include/osmocom/sbcap/SBcAP_Write-Replace-Warning-Request.h @@ -37,6 +37,8 @@ /* Implementation */ extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Write_Replace_Warning_Request; +extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Write_Replace_Warning_Request_specs_1; +extern asn_TYPE_member_t asn_MBR_SBcAP_Write_Replace_Warning_Request_1[2]; #ifdef __cplusplus } diff --git a/include/osmocom/sbcap/SBcAP_Write-Replace-Warning-Response.h b/include/osmocom/sbcap/SBcAP_Write-Replace-Warning-Response.h index 28199a5..6257817 100644 --- a/include/osmocom/sbcap/SBcAP_Write-Replace-Warning-Response.h +++ b/include/osmocom/sbcap/SBcAP_Write-Replace-Warning-Response.h @@ -37,6 +37,8 @@ /* Implementation */ extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Write_Replace_Warning_Response; +extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Write_Replace_Warning_Response_specs_1; +extern asn_TYPE_member_t asn_MBR_SBcAP_Write_Replace_Warning_Response_1[2]; #ifdef __cplusplus } diff --git a/src/sbcap/gen/SBcAP_Error-Indication.c b/src/sbcap/gen/SBcAP_Error-Indication.c index d1447b1..fd90085 100644 --- a/src/sbcap/gen/SBcAP_Error-Indication.c +++ b/src/sbcap/gen/SBcAP_Error-Indication.c @@ -7,7 +7,7 @@ #include <osmocom/sbcap/SBcAP_Error-Indication.h> -static asn_TYPE_member_t asn_MBR_SBcAP_Error_Indication_1[] = { +asn_TYPE_member_t asn_MBR_SBcAP_Error_Indication_1[] = { { ATF_NOFLAGS, 0, offsetof(struct SBcAP_Error_Indication, protocolIEs), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ @@ -32,7 +32,7 @@ static const asn_TYPE_tag2member_t asn_MAP_SBcAP_Error_Indication_tag2el_1[] = { { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* protocolIEs */ }; -static asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Error_Indication_specs_1 = { +asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Error_Indication_specs_1 = { sizeof(struct SBcAP_Error_Indication), offsetof(struct SBcAP_Error_Indication, _asn_ctx), asn_MAP_SBcAP_Error_Indication_tag2el_1, diff --git a/src/sbcap/gen/SBcAP_PWS-Failure-Indication.c b/src/sbcap/gen/SBcAP_PWS-Failure-Indication.c index 9ff0dcb..962d07d 100644 --- a/src/sbcap/gen/SBcAP_PWS-Failure-Indication.c +++ b/src/sbcap/gen/SBcAP_PWS-Failure-Indication.c @@ -7,7 +7,7 @@ #include <osmocom/sbcap/SBcAP_PWS-Failure-Indication.h> -static asn_TYPE_member_t asn_MBR_SBcAP_PWS_Failure_Indication_1[] = { +asn_TYPE_member_t asn_MBR_SBcAP_PWS_Failure_Indication_1[] = { { ATF_NOFLAGS, 0, offsetof(struct SBcAP_PWS_Failure_Indication, protocolIEs), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ @@ -51,7 +51,7 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* protocolIEs */ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* protocolExtensions */ }; -static asn_SEQUENCE_specifics_t asn_SPC_SBcAP_PWS_Failure_Indication_specs_1 = { +asn_SEQUENCE_specifics_t asn_SPC_SBcAP_PWS_Failure_Indication_specs_1 = { sizeof(struct SBcAP_PWS_Failure_Indication), offsetof(struct SBcAP_PWS_Failure_Indication, _asn_ctx), asn_MAP_SBcAP_PWS_Failure_Indication_tag2el_1, diff --git a/src/sbcap/gen/SBcAP_PWS-Restart-Indication.c b/src/sbcap/gen/SBcAP_PWS-Restart-Indication.c index 445b77f..74dd155 100644 --- a/src/sbcap/gen/SBcAP_PWS-Restart-Indication.c +++ b/src/sbcap/gen/SBcAP_PWS-Restart-Indication.c @@ -7,7 +7,7 @@ #include <osmocom/sbcap/SBcAP_PWS-Restart-Indication.h> -static asn_TYPE_member_t asn_MBR_SBcAP_PWS_Restart_Indication_1[] = { +asn_TYPE_member_t asn_MBR_SBcAP_PWS_Restart_Indication_1[] = { { ATF_NOFLAGS, 0, offsetof(struct SBcAP_PWS_Restart_Indication, protocolIEs), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ @@ -51,7 +51,7 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* protocolIEs */ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* protocolExtensions */ }; -static asn_SEQUENCE_specifics_t asn_SPC_SBcAP_PWS_Restart_Indication_specs_1 = { +asn_SEQUENCE_specifics_t asn_SPC_SBcAP_PWS_Restart_Indication_specs_1 = { sizeof(struct SBcAP_PWS_Restart_Indication), offsetof(struct SBcAP_PWS_Restart_Indication, _asn_ctx), asn_MAP_SBcAP_PWS_Restart_Indication_tag2el_1, diff --git a/src/sbcap/gen/SBcAP_Stop-Warning-Indication.c b/src/sbcap/gen/SBcAP_Stop-Warning-Indication.c index eada371..1f673b1 100644 --- a/src/sbcap/gen/SBcAP_Stop-Warning-Indication.c +++ b/src/sbcap/gen/SBcAP_Stop-Warning-Indication.c @@ -7,7 +7,7 @@ #include <osmocom/sbcap/SBcAP_Stop-Warning-Indication.h> -static asn_TYPE_member_t asn_MBR_SBcAP_Stop_Warning_Indication_1[] = { +asn_TYPE_member_t asn_MBR_SBcAP_Stop_Warning_Indication_1[] = { { ATF_NOFLAGS, 0, offsetof(struct SBcAP_Stop_Warning_Indication, protocolIEs), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ @@ -51,7 +51,7 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* protocolIEs */ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* protocolExtensions */ }; -static asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Stop_Warning_Indication_specs_1 = { +asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Stop_Warning_Indication_specs_1 = { sizeof(struct SBcAP_Stop_Warning_Indication), offsetof(struct SBcAP_Stop_Warning_Indication, _asn_ctx), asn_MAP_SBcAP_Stop_Warning_Indication_tag2el_1, diff --git a/src/sbcap/gen/SBcAP_Stop-Warning-Request.c b/src/sbcap/gen/SBcAP_Stop-Warning-Request.c index 43fff39..b7bb498 100644 --- a/src/sbcap/gen/SBcAP_Stop-Warning-Request.c +++ b/src/sbcap/gen/SBcAP_Stop-Warning-Request.c @@ -7,7 +7,7 @@ #include <osmocom/sbcap/SBcAP_Stop-Warning-Request.h> -static asn_TYPE_member_t asn_MBR_SBcAP_Stop_Warning_Request_1[] = { +asn_TYPE_member_t asn_MBR_SBcAP_Stop_Warning_Request_1[] = { { ATF_NOFLAGS, 0, offsetof(struct SBcAP_Stop_Warning_Request, protocolIEs), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ @@ -51,7 +51,7 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* protocolIEs */ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* protocolExtensions */ }; -static asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Stop_Warning_Request_specs_1 = { +asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Stop_Warning_Request_specs_1 = { sizeof(struct SBcAP_Stop_Warning_Request), offsetof(struct SBcAP_Stop_Warning_Request, _asn_ctx), asn_MAP_SBcAP_Stop_Warning_Request_tag2el_1, diff --git a/src/sbcap/gen/SBcAP_Stop-Warning-Response.c b/src/sbcap/gen/SBcAP_Stop-Warning-Response.c index 2e2332b..53d5f10 100644 --- a/src/sbcap/gen/SBcAP_Stop-Warning-Response.c +++ b/src/sbcap/gen/SBcAP_Stop-Warning-Response.c @@ -7,7 +7,7 @@ #include <osmocom/sbcap/SBcAP_Stop-Warning-Response.h> -static asn_TYPE_member_t asn_MBR_SBcAP_Stop_Warning_Response_1[] = { +asn_TYPE_member_t asn_MBR_SBcAP_Stop_Warning_Response_1[] = { { ATF_NOFLAGS, 0, offsetof(struct SBcAP_Stop_Warning_Response, protocolIEs), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ @@ -51,7 +51,7 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* protocolIEs */ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* protocolExtensions */ }; -static asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Stop_Warning_Response_specs_1 = { +asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Stop_Warning_Response_specs_1 = { sizeof(struct SBcAP_Stop_Warning_Response), offsetof(struct SBcAP_Stop_Warning_Response, _asn_ctx), asn_MAP_SBcAP_Stop_Warning_Response_tag2el_1, diff --git a/src/sbcap/gen/SBcAP_Write-Replace-Warning-Indication.c b/src/sbcap/gen/SBcAP_Write-Replace-Warning-Indication.c index 1416bbb..53f3dbd 100644 --- a/src/sbcap/gen/SBcAP_Write-Replace-Warning-Indication.c +++ b/src/sbcap/gen/SBcAP_Write-Replace-Warning-Indication.c @@ -7,7 +7,7 @@ #include <osmocom/sbcap/SBcAP_Write-Replace-Warning-Indication.h> -static asn_TYPE_member_t asn_MBR_SBcAP_Write_Replace_Warning_Indication_1[] = { +asn_TYPE_member_t asn_MBR_SBcAP_Write_Replace_Warning_Indication_1[] = { { ATF_NOFLAGS, 0, offsetof(struct SBcAP_Write_Replace_Warning_Indication, protocolIEs), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ @@ -51,7 +51,7 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* protocolIEs */ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* protocolExtensions */ }; -static asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Write_Replace_Warning_Indication_specs_1 = { +asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Write_Replace_Warning_Indication_specs_1 = { sizeof(struct SBcAP_Write_Replace_Warning_Indication), offsetof(struct SBcAP_Write_Replace_Warning_Indication, _asn_ctx), asn_MAP_SBcAP_Write_Replace_Warning_Indication_tag2el_1, diff --git a/src/sbcap/gen/SBcAP_Write-Replace-Warning-Request.c b/src/sbcap/gen/SBcAP_Write-Replace-Warning-Request.c index 079261b..a52ae32 100644 --- a/src/sbcap/gen/SBcAP_Write-Replace-Warning-Request.c +++ b/src/sbcap/gen/SBcAP_Write-Replace-Warning-Request.c @@ -7,7 +7,7 @@ #include <osmocom/sbcap/SBcAP_Write-Replace-Warning-Request.h> -static asn_TYPE_member_t asn_MBR_SBcAP_Write_Replace_Warning_Request_1[] = { +asn_TYPE_member_t asn_MBR_SBcAP_Write_Replace_Warning_Request_1[] = { { ATF_NOFLAGS, 0, offsetof(struct SBcAP_Write_Replace_Warning_Request, protocolIEs), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ @@ -51,7 +51,7 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* protocolIEs */ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* protocolExtensions */ }; -static asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Write_Replace_Warning_Request_specs_1 = { +asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Write_Replace_Warning_Request_specs_1 = { sizeof(struct SBcAP_Write_Replace_Warning_Request), offsetof(struct SBcAP_Write_Replace_Warning_Request, _asn_ctx), asn_MAP_SBcAP_Write_Replace_Warning_Request_tag2el_1, diff --git a/src/sbcap/gen/SBcAP_Write-Replace-Warning-Response.c b/src/sbcap/gen/SBcAP_Write-Replace-Warning-Response.c index 0c8dfd7..5d9bdb0 100644 --- a/src/sbcap/gen/SBcAP_Write-Replace-Warning-Response.c +++ b/src/sbcap/gen/SBcAP_Write-Replace-Warning-Response.c @@ -7,7 +7,7 @@ #include <osmocom/sbcap/SBcAP_Write-Replace-Warning-Response.h> -static asn_TYPE_member_t asn_MBR_SBcAP_Write_Replace_Warning_Response_1[] = { +asn_TYPE_member_t asn_MBR_SBcAP_Write_Replace_Warning_Response_1[] = { { ATF_NOFLAGS, 0, offsetof(struct SBcAP_Write_Replace_Warning_Response, protocolIEs), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ @@ -51,7 +51,7 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* protocolIEs */ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* protocolExtensions */ }; -static asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Write_Replace_Warning_Response_specs_1 = { +asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Write_Replace_Warning_Response_specs_1 = { sizeof(struct SBcAP_Write_Replace_Warning_Response), offsetof(struct SBcAP_Write_Replace_Warning_Response, _asn_ctx), asn_MAP_SBcAP_Write_Replace_Warning_Response_tag2el_1, diff --git a/src/sbcap/gen/asn_application.c b/src/sbcap/gen/asn_application.c index 37f032c..7992185 100644 --- a/src/sbcap/gen/asn_application.c +++ b/src/sbcap/gen/asn_application.c @@ -432,7 +432,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) - case ATS_BASIC_JER: + case ATS_JER: if(td->op->jer_encoder) { er = jer_encode(td, sptr, callback, callback_key); if(er.encoded == -1) { diff --git a/src/sbcap/gen/constr_CHOICE_aper.c b/src/sbcap/gen/constr_CHOICE_aper.c index 88daaf2..41040aa 100644 --- a/src/sbcap/gen/constr_CHOICE_aper.c +++ b/src/sbcap/gen/constr_CHOICE_aper.c @@ -53,8 +53,8 @@ if(specs->ext_start == -1) ASN__DECODE_FAILED; - if (ct && ct->upper_bound >= ct->lower_bound) { - value = aper_get_nsnnwn(pd, ct->upper_bound - ct->lower_bound + 1); + if(specs && specs->tag2el_count > specs->ext_start) { + value = aper_get_nsnnwn(pd, specs->tag2el_count - specs->ext_start); /* extension elements range */ if(value < 0) ASN__DECODE_STARVED; value += specs->ext_start; if((unsigned)value >= td->elements_count) diff --git a/src/sbcap/gen/constr_SEQUENCE.c b/src/sbcap/gen/constr_SEQUENCE.c index 045d01e..8397d0c 100644 --- a/src/sbcap/gen/constr_SEQUENCE.c +++ b/src/sbcap/gen/constr_SEQUENCE.c @@ -124,6 +124,8 @@ for(edx = 0; edx < td->elements_count; edx++) { asn_TYPE_member_t *elm = &td->elements[edx]; const void *memb_ptr; + asn_constr_check_f *constr; + int ret; if(elm->flags & ATF_POINTER) { memb_ptr = *(const void * const *)((const char *)sptr + elm->memb_offset); @@ -139,14 +141,12 @@ memb_ptr = (const void *)((const char *)sptr + elm->memb_offset); } - if(elm->encoding_constraints.general_constraints) { - int ret = elm->encoding_constraints.general_constraints(elm->type, memb_ptr, - ctfailcb, app_key); - if(ret) return ret; - } else { - return elm->type->encoding_constraints.general_constraints(elm->type, - memb_ptr, ctfailcb, app_key); - } + constr = elm->encoding_constraints.general_constraints; + if(!constr) + constr = elm->type->encoding_constraints.general_constraints; + + ret = constr(elm->type, memb_ptr, ctfailcb, app_key); + if(ret) return ret; } return 0; diff --git a/src/sbcap/skel/asn_application.h b/src/sbcap/skel/asn_application.h index a31fa60..bf10cd3 100644 --- a/src/sbcap/skel/asn_application.h +++ b/src/sbcap/skel/asn_application.h @@ -61,7 +61,7 @@ */ ATS_BASIC_XER, ATS_CANONICAL_XER, - ATS_BASIC_JER, + ATS_JER, }; /* diff --git a/src/sbcap/skel/asn_internal.h b/src/sbcap/skel/asn_internal.h index 96485ae..9b6dc20 100644 --- a/src/sbcap/skel/asn_internal.h +++ b/src/sbcap/skel/asn_internal.h @@ -137,8 +137,25 @@ /* * Check stack against overflow, if limit is set. */ + +/* Since GCC 13, AddressSanitizer started defaulting to +* ASAN_OPTIONS="detect_stack_use_after_return=1", which makes this check +* fail due to apparently jumping stack pointers. +* Hence, disable this check if building with ASan, as documented in: +* GCC: https://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html +* Clang: https://clang.llvm.org/docs/AddressSanitizer.html#conditional-compilation-w… +*/ +#if defined(__SANITIZE_ADDRESS__) + #define ASN__SANITIZE_ENABLED 1 +#elif defined(__has_feature) +#if __has_feature(address_sanitizer) + #define ASN__SANITIZE_ENABLED 1 +#endif +#endif + #define ASN__DEFAULT_STACK_MAX (30000) -#ifdef ASN_DISABLE_STACK_OVERFLOW_CHECK + +#if defined(ASN__SANITIZE_ENABLED) || defined(ASN_DISABLE_STACK_OVERFLOW_CHECK) static int CC_NOTUSED ASN__STACK_OVERFLOW_CHECK(const asn_codec_ctx_t *ctx) { (void)ctx; diff --git a/src/sbcap/skel/jer_encoder.h b/src/sbcap/skel/jer_encoder.h index dc03ca2..672976d 100644 --- a/src/sbcap/skel/jer_encoder.h +++ b/src/sbcap/skel/jer_encoder.h @@ -13,15 +13,20 @@ struct asn_TYPE_descriptor_s; /* Forward declaration */ -/* Flags used by the jer_encode() and (*jer_type_encoder_f), defined below */ +/* Flags used by the jer_encode() and (*jer_type_encoder_f), defined below + * + * This isn't actually used, it might be used in the future to support + * both normal JSON and prettified JSON output or removed. + * It came from XER + */ enum jer_encoder_flags_e { /* Mode of encoding */ - JER_F_BASIC = 0x01, /* BASIC-JER (pretty-printing) */ + JER_F = 0x01, /* JER (pretty-printing) */ }; /* * The JER encoder of any type. May be invoked by the application. - * Produces CANONICAL-JER and BASIC-JER depending on the (jer_flags). + * Produces JER output. */ asn_enc_rval_t jer_encode(const struct asn_TYPE_descriptor_s *type_descriptor, const void *struct_ptr, /* Structure to be encoded */ @@ -30,7 +35,7 @@ ); /* - * The variant of the above function which dumps the BASIC-JER (JER_F_BASIC) + * The variant of the above function which dumps the JER * output into the chosen file pointer. * RETURN VALUES: * 0: The structure is printed. @@ -42,9 +47,9 @@ /* * A helper function that uses JER encoding/decoding to verify that: - * - Both structures encode into the same BASIC JER. + * - Both structures encode into the same JER. * - Both resulting JER byte streams can be decoded back. - * - Both decoded structures encode into the same BASIC JER (round-trip). + * - Both decoded structures encode into the same JER (round-trip). * All of this verifies equivalence between structures and a round-trip. * ARGUMENTS: * (opt_debug_stream) - If specified, prints ongoing details. -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/32723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I385d14d4be308b991a48ce1033087f07bd1f47ea Gerrit-Change-Number: 32723 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in osmo-bsc[master]: ctrl: Add getting neighbor list

by neels

Attention is currently required from: pespin, fixeria, matanp. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32565 ) Change subject: ctrl: Add getting neighbor list ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: @matanp, thanks for your patches! I am impressed by your level of expertise in C and FLOSS community conduct. Welcome at Osmocom! -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icba0b7d92f4c67e617d707ca651d674f0d1ba8a7 Gerrit-Change-Number: 32565 Gerrit-PatchSet: 4 Gerrit-Owner: matanp <matan1008(a)gmail.com> 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-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: matanp <matan1008(a)gmail.com> Gerrit-Comment-Date: Tue, 16 May 2023 12:29:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in osmo-bsc[master]: ctrl: Add getting neighbor list

by neels

Attention is currently required from: pespin, fixeria, matanp. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32565 ) Change subject: ctrl: Add getting neighbor list ...................................................................... Patch Set 4: Code-Review+1 (1 comment) Patchset: PS4: it would be really cool to add a CTRL transcript test to verify the new commands ... but I see osmo-bsc has no CTRL transcript tests at all yet, so adding those should rather be a separate patch. Hence this patch is perfect as it is. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32565 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icba0b7d92f4c67e617d707ca651d674f0d1ba8a7 Gerrit-Change-Number: 32565 Gerrit-PatchSet: 4 Gerrit-Owner: matanp <matan1008(a)gmail.com> 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-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: matanp <matan1008(a)gmail.com> Gerrit-Comment-Date: Tue, 16 May 2023 12:22:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2023