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

Change in osmo-ci[master]: ansible/gsm-tester-bts/Release.key: update

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28262 ) Change subject: ansible/gsm-tester-bts/Release.key: update ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9526481aaee8b84348de399bf2f58f4bb0d137e8 Gerrit-Change-Number: 28262 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 Jun 2022 09:50:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-ci[master]: ansible/gsm-tester-bts/Release.key: update

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28262 ) Change subject: ansible/gsm-tester-bts/Release.key: update ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9526481aaee8b84348de399bf2f58f4bb0d137e8 Gerrit-Change-Number: 28262 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 Jun 2022 09:49:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: Cosmetic: bsc_vty: tweak msc pooling strings

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28257 ) Change subject: Cosmetic: bsc_vty: tweak msc pooling strings ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic8888775a965b6d607af51b9359bd8ffc2834e16 Gerrit-Change-Number: 28257 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 Jun 2022 09:49:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-iuh[master]: Make logging message about received RANAP message more meaningful

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/28208 ) Change subject: Make logging message about received RANAP message more meaningful ...................................................................... Make logging message about received RANAP message more meaningful The message being used previously seemed to indicate something was wrong with the message. The reality is that we are simply not handling most of them, and they will end up being forwarded as they come in osmo-hnbgw. Related: SYS#5573 Change-Id: If63d942496491f1e9ee454034ec97d25764fde65 --- M src/ranap_common_cn.c M src/ranap_common_ran.c 2 files changed, 39 insertions(+), 37 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve dexter: Looks good to me, approved diff --git a/src/ranap_common_cn.c b/src/ranap_common_cn.c index e7b8339..3f6f284 100644 --- a/src/ranap_common_cn.c +++ b/src/ranap_common_cn.c @@ -74,8 +74,8 @@ rc = ranap_decode_iu_releasecommandies(&message->msg.iu_ReleaseCommandIEs, &imsg->value); break; default: - LOGP(DRANAP, LOGL_NOTICE, "Received suspicious RANAP " - "Procedure %s (CO, IM) from RNC, ignoring\n", + LOGP(DRANAP, LOGL_INFO, + "Received RANAP Procedure %s (CO, IM) from RNC. Decode not implemented\n", get_value_string(ranap_procedure_code_vals, imsg->procedureCode)); rc = -1; break; @@ -118,8 +118,8 @@ ranap_free_iu_releasecommandies(&message->msg.iu_ReleaseCommandIEs); break; default: - LOGP(DRANAP, LOGL_NOTICE, "Not freeing suspicious RANAP " - "Procedure %s (CO, IM) from RNC\n", + LOGP(DRANAP, LOGL_INFO, + "Freeing RANAP Procedure %s (CO, IM) from RNC not implemented\n", get_value_string(ranap_procedure_code_vals, message->procedureCode)); break; } @@ -150,8 +150,8 @@ rc = ranap_decode_iu_releasecompleteies(&message->msg.iu_ReleaseCompleteIEs, &imsg->value); break; default: - LOGP(DRANAP, LOGL_NOTICE, "Received suspicious RANAP " - "Procedure %s (SO) from RNC, ignoring\n", + LOGP(DRANAP, LOGL_INFO, + "Received RANAP Procedure %s (SO) from RNC. Decode not implemented\n", get_value_string(ranap_procedure_code_vals, imsg->procedureCode)); rc = -1; break; @@ -176,8 +176,8 @@ ranap_free_iu_releasecompleteies(&message->msg.iu_ReleaseCompleteIEs); break; default: - LOGP(DRANAP, LOGL_NOTICE, "Not freeing suspicious RANAP " - "Procedure %s (SO) from RNC\n", + LOGP(DRANAP, LOGL_INFO, + "Freeing RANAP Procedure %s (SO) from RNC not implemented\n", get_value_string(ranap_procedure_code_vals, message->procedureCode)); break; } @@ -200,8 +200,8 @@ rc = ranap_decode_rab_assignmentresponseies(&message->msg.raB_AssignmentResponseIEs, &imsg->value); break; default: - LOGP(DRANAP, LOGL_NOTICE, "Received suspicious RANAP " - "Procedure %s (O) from RNC, ignoring\n", + LOGP(DRANAP, LOGL_INFO, + "Received RANAP Procedure %s (O) from RNC. Decode not implemented\n", get_value_string(ranap_procedure_code_vals, imsg->procedureCode)); rc = -1; break; @@ -218,8 +218,8 @@ ranap_free_rab_assignmentresponseies(&message->msg.raB_AssignmentResponseIEs); break; default: - LOGP(DRANAP, LOGL_NOTICE, "Not freeing suspicious RANAP " - "Procedure %s (O) from RNC\n", + LOGP(DRANAP, LOGL_INFO, + "Freeing RANAP Procedure %s (O) from RNC not implemented\n", get_value_string(ranap_procedure_code_vals, message->procedureCode)); break; } @@ -247,8 +247,8 @@ rc = cn_ranap_rx_outcome_msg_co(ctx, &pdu->choice.outcome, message); break; default: - LOGP(DRANAP, LOGL_NOTICE, "Received suspicious RANAP " - "presence %s (CO) from RNC, ignoring\n", + LOGP(DRANAP, LOGL_INFO, + "Received RANAP Procedure %s (CO) from RNC. Decode not implemented\n", get_value_string(ranap_presence_vals, pdu->present)); rc = -1; break; @@ -268,15 +268,15 @@ cn_ranap_free_successful_msg_co(message); break; case RANAP_RANAP_PDU_PR_unsuccessfulOutcome: - LOGP(DRANAP, LOGL_NOTICE, "Not freeing unsupported RANAP " - "unsuccessful outcome procedure (CO) from RNC\n"); + LOGP(DRANAP, LOGL_INFO, + "Freeing RANAP unsuccessful outcome procedure (CO) from RNC not implemented\n"); break; case RANAP_RANAP_PDU_PR_outcome: cn_ranap_free_outcome_msg_co(message); break; default: - LOGP(DRANAP, LOGL_NOTICE, "Received suspicious RANAP " - "presence %s (CO) from RNC, ignoring\n", + LOGP(DRANAP, LOGL_INFO, + "Freeing RANAP Procedure %s (CO) from RNC not implemented\n", get_value_string(ranap_presence_vals, message->direction)); break; } @@ -365,8 +365,8 @@ rc = ranap_decode_pagingies(&message->msg.pagingIEs, &imsg->value); break; default: - LOGP(DRANAP, LOGL_NOTICE, "Received suspicious RANAP " - "Procedure %s (CL, IM) from RNC, ignoring\n", + LOGP(DRANAP, LOGL_INFO, + "Received RANAP Procedure %s (CL, IM) from RNC. Decode not implemented\n", get_value_string(ranap_procedure_code_vals, imsg->procedureCode)); break; } @@ -405,8 +405,8 @@ ranap_free_pagingies(&message->msg.pagingIEs); break; default: - LOGP(DRANAP, LOGL_NOTICE, "Not freeing suspicious RANAP " - "Procedure %s (CL, IM)\n", + LOGP(DRANAP, LOGL_INFO, + "Freeing RANAP Procedure %s (CL, IM) not implemented\n", get_value_string(ranap_procedure_code_vals, message->procedureCode)); break; } @@ -440,8 +440,8 @@ rc = ranap_decode_uplinkinformationexchangeresponseies(&message->msg.uplinkInformationExchangeResponseIEs, &imsg->value); break; default: - LOGP(DRANAP, LOGL_NOTICE, "Received suspicious RANAP " - "Procedure %s (CL, SO) from RNC, ignoring\n", + LOGP(DRANAP, LOGL_INFO, + "Received RANAP Procedure %s (CL, SO) from RNC. Decode not implemented\n", get_value_string(ranap_procedure_code_vals, imsg->procedureCode)); break; } @@ -468,8 +468,8 @@ ranap_free_uplinkinformationexchangeresponseies(&message->msg.uplinkInformationExchangeResponseIEs); break; default: - LOGP(DRANAP, LOGL_NOTICE, "Not freeing suspicious RANAP " - "Procedure %s (CL, SO)\n", + LOGP(DRANAP, LOGL_INFO, + "Freeing RANAP Procedure %s (CL, SO) from RNC not implemented\n", get_value_string(ranap_procedure_code_vals, message->procedureCode)); break; } @@ -497,8 +497,8 @@ pdu->choice.unsuccessfulOutcome.procedureCode)); break; default: - LOGP(DRANAP, LOGL_NOTICE, "Received suspicious RANAP " - "presence %s (CL) from RNC, ignoring\n", + LOGP(DRANAP, LOGL_INFO, + "Received RANAP Procedure %s (CL) from RNC. Decode not implemented\n", get_value_string(ranap_presence_vals, pdu->present)); break; } @@ -517,8 +517,8 @@ cn_ranap_free_successful_msg_cl(message); break; case RANAP_RANAP_PDU_PR_unsuccessfulOutcome: - LOGP(DRANAP, LOGL_NOTICE, "Not freeing unsupported RANAP " - "unsuccessful outcome procedure from RNC\n"); + LOGP(DRANAP, LOGL_INFO, + "Freeing RANAP unsuccessful outcome procedure from RNC not implemented\n"); break; default: LOGP(DRANAP, LOGL_NOTICE, "Suspicious RANAP " diff --git a/src/ranap_common_ran.c b/src/ranap_common_ran.c index f3fa519..b238021 100644 --- a/src/ranap_common_ran.c +++ b/src/ranap_common_ran.c @@ -50,7 +50,8 @@ rc = ranap_decode_iu_releasecommandies(&message->msg.iu_ReleaseCommandIEs, &imsg->value); break; default: - LOGP(DRANAP, LOGL_NOTICE, "Received suspicious RANAP Procedure %s (CO, IM) from CN, ignoring\n", + LOGP(DRANAP, LOGL_INFO, + "Received RANAP Procedure %s (CO, IM) from CN. Decode not implemented\n", get_value_string(ranap_procedure_code_vals, imsg->procedureCode)); rc = -1; break; @@ -69,8 +70,8 @@ ranap_free_iu_releasecommandies(&message->msg.iu_ReleaseCommandIEs); break; default: - LOGP(DRANAP, LOGL_NOTICE, "Not freeing suspicious RANAP " - "Procedure %s (CO, IM) from CN\n", + LOGP(DRANAP, LOGL_INFO, + "Freeing RANAP Procedure %s (CO, IM) from CN not implemented\n", get_value_string(ranap_procedure_code_vals, message->procedureCode)); break; } @@ -103,8 +104,9 @@ rc = -1; break; default: - LOGP(DRANAP, LOGL_NOTICE, "Received suspicious RANAP " - "presence %s (CO) from CN, ignoring\n", get_value_string(ranap_presence_vals, pdu->present)); + LOGP(DRANAP, LOGL_INFO, + "Received RANAP Procedure %s (CO) from CN. Decode not implemented\n", + get_value_string(ranap_presence_vals, pdu->present)); rc = -1; break; } @@ -132,8 +134,8 @@ "outcome procedure (CO) from CN\n"); break; default: - LOGP(DRANAP, LOGL_NOTICE, "Received suspicious RANAP " - "presence %s (CO) from CN, ignoring\n", + LOGP(DRANAP, LOGL_INFO, + "Freeing RANAP Procedure %s (CO) from CN not implemented\n", get_value_string(ranap_presence_vals, message->direction)); break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/28208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: If63d942496491f1e9ee454034ec97d25764fde65 Gerrit-Change-Number: 28208 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: add config files for sccplite BSC tests

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28234 ) Change subject: bsc: add config files for sccplite BSC tests ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia92b4a7fda2195ce6e6aaf0bccd808df40057896 Gerrit-Change-Number: 28234 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 Jun 2022 09:48:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: Move all SMSCB/CBC vty code to its own file

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28256 ) Change subject: Move all SMSCB/CBC vty code to its own file ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > is this purely cosmetic? might deserve a mention in the commitlog. […] Because I had to learn the code, and having 1k lines less of boilerplate code to look at is really helpful to understand it quicker. This is useful for me now and other people coming later. Also, because in general we put VTY code in _vty.c files. And yes, this commit is purely cosmetic, moving stuff around. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28256 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ifc7d1693d745dd2a3c31e3ee9610d8c634b50812 Gerrit-Change-Number: 28256 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 10 Jun 2022 09:47:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnodeb: Update primitives to audio SAPI version 1

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28253 ) Change subject: hnodeb: Update primitives to audio SAPI version 1 ...................................................................... Patch Set 2: (1 comment) File library/HNBLLIF_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28253/comment/7f178da7_fa84… PS2, Line 283: rfcis[i] := i; > looks like one indent level too deep? maybe just gerrit visualization... That's me failing to change the editor indentation config every time I switch between osmocom and open5gs code ;) I'll fix it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28253 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9af56f5e6a70b350f2fffa2e04be384d101b52ed Gerrit-Change-Number: 28253 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 10 Jun 2022 09:44:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-hnodeb[master]: hnb: move llsk fields inside substruct

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/28242 ) Change subject: hnb: move llsk fields inside substruct ...................................................................... hnb: move llsk fields inside substruct More fields will be added, let's better organize them this way. Change-Id: Idfe644a7c2eccd94b602816a86e38b56264141af --- M include/osmocom/hnodeb/hnodeb.h M src/osmo-hnodeb/gtp.c M src/osmo-hnodeb/hnb.c M src/osmo-hnodeb/llsk.c M src/osmo-hnodeb/llsk_audio.c M src/osmo-hnodeb/llsk_gtp.c M src/osmo-hnodeb/llsk_iuh.c M src/osmo-hnodeb/main.c M src/osmo-hnodeb/rua.c M src/osmo-hnodeb/vty.c 10 files changed, 46 insertions(+), 44 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/hnodeb/hnodeb.h b/include/osmocom/hnodeb/hnodeb.h index 924e1ac..5503020 100644 --- a/include/osmocom/hnodeb/hnodeb.h +++ b/include/osmocom/hnodeb/hnodeb.h @@ -88,10 +88,12 @@ } iuh; /* Lower Layer UD socket */ - struct osmo_prim_srv_link *llsk_link; - struct osmo_prim_srv *llsk; - uint8_t llsk_valid_sapi_mask; - struct osmo_timer_list llsk_defer_configure_ind_timer; + struct { + struct osmo_prim_srv_link *link; + struct osmo_prim_srv *srv; + uint8_t valid_sapi_mask; + struct osmo_timer_list defer_configure_ind_timer; + } llsk; struct { unsigned int jitter_buf_ms; diff --git a/src/osmo-hnodeb/gtp.c b/src/osmo-hnodeb/gtp.c index ef12cf6..58b28fe 100644 --- a/src/osmo-hnodeb/gtp.c +++ b/src/osmo-hnodeb/gtp.c @@ -189,7 +189,7 @@ LOGUE(ue, DGTP, LOGL_DEBUG, "Tx GTP-CONN_DATA.ind len=%u\n", msgb_l3len(msg)); gtp_prim = hnb_gtp_makeprim_conn_data_ind(conn->id, msgb_l3(msg), msgb_l3len(msg)); - if ((rc = osmo_prim_srv_send(hnb->llsk, gtp_prim->hdr.msg)) < 0) { + if ((rc = osmo_prim_srv_send(hnb->llsk.srv, gtp_prim->hdr.msg)) < 0) { LOGUE(ue, DGTP, LOGL_ERROR, "Failed Tx GTP-CONN_DATA.ind len=%u\n", msgb_l3len(msg)); } diff --git a/src/osmo-hnodeb/hnb.c b/src/osmo-hnodeb/hnb.c index 18f39b4..1d03826 100644 --- a/src/osmo-hnodeb/hnb.c +++ b/src/osmo-hnodeb/hnb.c @@ -88,9 +88,9 @@ } hnb_iuh_free(hnb); - osmo_timer_del(&hnb->llsk_defer_configure_ind_timer); - osmo_prim_srv_link_free(hnb->llsk_link); - hnb->llsk_link = NULL; + osmo_timer_del(&hnb->llsk.defer_configure_ind_timer); + osmo_prim_srv_link_free(hnb->llsk.link); + hnb->llsk.link = NULL; hnb_gtp_unbind(hnb); diff --git a/src/osmo-hnodeb/llsk.c b/src/osmo-hnodeb/llsk.c index 76d4c4a..89e8364 100644 --- a/src/osmo-hnodeb/llsk.c +++ b/src/osmo-hnodeb/llsk.c @@ -86,13 +86,13 @@ { struct hnb *hnb = (struct hnb *)osmo_prim_srv_get_priv(srv); - if (hnb->llsk) { + if (hnb->llsk.srv) { LOGP(DLLSK, LOGL_ERROR, "New connection opened while one is already active, dropping it\n"); osmo_prim_srv_close(srv); return 0; } LOGP(DLLSK, LOGL_NOTICE, "LLSK conn is UP\n"); - hnb->llsk = srv; + hnb->llsk.srv = srv; return 0; } @@ -100,37 +100,37 @@ { struct hnb *hnb = (struct hnb *)osmo_prim_srv_get_priv(srv); - if (!hnb->llsk) { + if (!hnb->llsk.srv) { LOGP(DLLSK, LOGL_ERROR, "closed_cb received but we have no active llsk conn!\n"); return 0; } /* If a later conn different than active one is dropped (because we closed it): */ - if (hnb->llsk != srv) + if (hnb->llsk.srv != srv) return 0; LOGP(DLLSK, LOGL_NOTICE, "LLSK conn is DOWN\n"); - hnb->llsk = NULL; - hnb->llsk_valid_sapi_mask = 0x0; - osmo_timer_del(&hnb->llsk_defer_configure_ind_timer); + hnb->llsk.srv = NULL; + hnb->llsk.valid_sapi_mask = 0x0; + osmo_timer_del(&hnb->llsk.defer_configure_ind_timer); hnb_shutdown(hnb, "LLSK conn dropped", false); return 0; } bool hnb_llsk_connected(const struct hnb *hnb) { - return !!hnb->llsk; + return !!hnb->llsk.srv; } bool hnb_llsk_can_be_configured(struct hnb *hnb) { if (!hnb->registered) return false; - if (!hnb->llsk) + if (!hnb->llsk.srv) return false; - if (hnb->llsk_valid_sapi_mask & (1 << HNB_PRIM_SAPI_IUH) && - hnb->llsk_valid_sapi_mask & (1 << HNB_PRIM_SAPI_AUDIO) && - hnb->llsk_valid_sapi_mask & (1 << HNB_PRIM_SAPI_GTP)) + if (hnb->llsk.valid_sapi_mask & (1 << HNB_PRIM_SAPI_IUH) && + hnb->llsk.valid_sapi_mask & (1 << HNB_PRIM_SAPI_AUDIO) && + hnb->llsk.valid_sapi_mask & (1 << HNB_PRIM_SAPI_GTP)) return true; return false; } @@ -144,13 +144,13 @@ static int llsk_rx_sapi_version_cb(struct osmo_prim_srv *prim_srv, uint32_t sapi, uint16_t rem_version) { struct hnb *hnb = (struct hnb *)osmo_prim_srv_get_priv(prim_srv); - if (sapi > sizeof(hnb->llsk_valid_sapi_mask)*8 - 1) + if (sapi > sizeof(hnb->llsk.valid_sapi_mask)*8 - 1) return -1; - hnb->llsk_valid_sapi_mask |= (1 << sapi); + hnb->llsk.valid_sapi_mask |= (1 << sapi); /* Defer CONFIGURE.req after we have confirmed the versions */ if (hnb_llsk_can_be_configured(hnb)) - osmo_timer_schedule(&hnb->llsk_defer_configure_ind_timer, 0, 0); + osmo_timer_schedule(&hnb->llsk.defer_configure_ind_timer, 0, 0); return rem_version; } @@ -177,14 +177,14 @@ int hnb_llsk_alloc(struct hnb *hnb) { - hnb->llsk_link = osmo_prim_srv_link_alloc(hnb); - osmo_prim_srv_link_set_priv(hnb->llsk_link, hnb); - osmo_prim_srv_link_set_log_category(hnb->llsk_link, DLLSK); - osmo_prim_srv_link_set_addr(hnb->llsk_link, HNB_PRIM_UD_SOCK_DEFAULT); - osmo_prim_srv_link_set_opened_conn_cb(hnb->llsk_link, llsk_opened_cb); - osmo_prim_srv_link_set_closed_conn_cb(hnb->llsk_link, llsk_closed_cb); - osmo_prim_srv_link_set_rx_sapi_version_cb(hnb->llsk_link, llsk_rx_sapi_version_cb); - osmo_prim_srv_link_set_rx_cb(hnb->llsk_link, llsk_rx_cb); - osmo_timer_setup(&hnb->llsk_defer_configure_ind_timer, llsk_defer_configure_ind_timer_cb, hnb); + hnb->llsk.link = osmo_prim_srv_link_alloc(hnb); + osmo_prim_srv_link_set_priv(hnb->llsk.link, hnb); + osmo_prim_srv_link_set_log_category(hnb->llsk.link, DLLSK); + osmo_prim_srv_link_set_addr(hnb->llsk.link, HNB_PRIM_UD_SOCK_DEFAULT); + osmo_prim_srv_link_set_opened_conn_cb(hnb->llsk.link, llsk_opened_cb); + osmo_prim_srv_link_set_closed_conn_cb(hnb->llsk.link, llsk_closed_cb); + osmo_prim_srv_link_set_rx_sapi_version_cb(hnb->llsk.link, llsk_rx_sapi_version_cb); + osmo_prim_srv_link_set_rx_cb(hnb->llsk.link, llsk_rx_cb); + osmo_timer_setup(&hnb->llsk.defer_configure_ind_timer, llsk_defer_configure_ind_timer_cb, hnb); return 0; } diff --git a/src/osmo-hnodeb/llsk_audio.c b/src/osmo-hnodeb/llsk_audio.c index da54d28..a9fe858 100644 --- a/src/osmo-hnodeb/llsk_audio.c +++ b/src/osmo-hnodeb/llsk_audio.c @@ -129,7 +129,7 @@ LOGUE(conn->ue, DLLSK, LOGL_DEBUG, "Tx AUDIO-CONN_DATA.ind conn_id=%u fn=%u fqc=%u rfci=%u data_len=%u\n", conn->id, frame_nr, fqc, rfci, len); audio_prim = hnb_audio_makeprim_conn_data_ind(conn->id, frame_nr, fqc, rfci, payload, len); - if ((rc = osmo_prim_srv_send(conn->ue->hnb->llsk, audio_prim->hdr.msg)) < 0) + if ((rc = osmo_prim_srv_send(conn->ue->hnb->llsk.srv, audio_prim->hdr.msg)) < 0) LOGUE(conn->ue, DLLSK, LOGL_ERROR, "Failed sending AUDIO-CONN_DATA.ind\n"); return rc; } @@ -141,7 +141,7 @@ LOGP(DLLSK, LOGL_ERROR, "Tx AUDIO-CONN_ESTABLISH.cnf: ctx=%u error_code=%u\n", context_id, error_code); audio_prim = hnb_audio_makeprim_conn_establish_cnf(context_id, 0, error_code, 0, HNB_PRIM_ADDR_TYPE_UNSPEC, NULL); - if ((rc = osmo_prim_srv_send(hnb->llsk, audio_prim->hdr.msg)) < 0) { + if ((rc = osmo_prim_srv_send(hnb->llsk.srv, audio_prim->hdr.msg)) < 0) { LOGP(DLLSK, LOGL_ERROR, "Failed sending AUDIO-CONN_ESTABLISH.cnf context_id=%u error_code=%u\n", context_id, error_code); } @@ -210,7 +210,7 @@ rem_addrstr, osmo_sockaddr_to_str(&conn->loc_addr)); audio_prim = hnb_audio_makeprim_conn_establish_cnf(ce_req->context_id, conn->id, 0, loc_port, ce_req->remote_rtp_address_type, &loc_uaddr); - if ((rc = osmo_prim_srv_send(hnb->llsk, audio_prim->hdr.msg)) < 0) { + if ((rc = osmo_prim_srv_send(hnb->llsk.srv, audio_prim->hdr.msg)) < 0) { LOGUE(ue, DLLSK, LOGL_ERROR, "Failed sending AUDIO-CONN_ESTABLISH.cnf error_code=0\n"); goto release_sock; } diff --git a/src/osmo-hnodeb/llsk_gtp.c b/src/osmo-hnodeb/llsk_gtp.c index 775df50..9882ecf 100644 --- a/src/osmo-hnodeb/llsk_gtp.c +++ b/src/osmo-hnodeb/llsk_gtp.c @@ -120,7 +120,7 @@ LOGP(DLLSK, LOGL_ERROR, "Tx GTP-CONN_ESTABLISH.cnf: ctx=%u error_code=%u\n", context_id, error_code); gtp_prim = hnb_gtp_makeprim_conn_establish_cnf(context_id, 0, error_code, 0, HNB_PRIM_ADDR_TYPE_UNSPEC, NULL); - if ((rc = osmo_prim_srv_send(hnb->llsk, gtp_prim->hdr.msg)) < 0) { + if ((rc = osmo_prim_srv_send(hnb->llsk.srv, gtp_prim->hdr.msg)) < 0) { LOGP(DLLSK, LOGL_ERROR, "Failed sending GTP-CONN_ESTABLISH.cnf context_id=%u error_code=%u\n", context_id, error_code); } @@ -191,7 +191,7 @@ rem_addrstr, ce_req->remote_tei, osmo_sockaddr_to_str(&conn->loc_addr), conn->loc_tei); gtp_prim = hnb_gtp_makeprim_conn_establish_cnf(ce_req->context_id, conn->id, 0, conn->loc_tei, ce_req->remote_gtpu_address_type, &loc_uaddr); - if ((rc = osmo_prim_srv_send(hnb->llsk, gtp_prim->hdr.msg)) < 0) { + if ((rc = osmo_prim_srv_send(hnb->llsk.srv, gtp_prim->hdr.msg)) < 0) { LOGUE(ue, DLLSK, LOGL_ERROR, "Failed sending GTP-CONN_ESTABLISH.cnf error_code=0\n"); goto release_sock; } diff --git a/src/osmo-hnodeb/llsk_iuh.c b/src/osmo-hnodeb/llsk_iuh.c index 00c399a..3cb9077 100644 --- a/src/osmo-hnodeb/llsk_iuh.c +++ b/src/osmo-hnodeb/llsk_iuh.c @@ -117,7 +117,7 @@ iuh_prim = hnb_iuh_makeprim_configure_ind(hnb->plmn.mcc, hnb->plmn.mnc, hnb->cell_identity, hnb->lac, hnb->rac, hnb->sac, hnb->rnc_id); - if ((rc = osmo_prim_srv_send(hnb->llsk, iuh_prim->hdr.msg)) < 0) + if ((rc = osmo_prim_srv_send(hnb->llsk.srv, iuh_prim->hdr.msg)) < 0) LOGP(DLLSK, LOGL_ERROR, "Failed sending IUH-CONFIGURE.ind\n"); return rc; } diff --git a/src/osmo-hnodeb/main.c b/src/osmo-hnodeb/main.c index 5d35c18..304ad1c 100644 --- a/src/osmo-hnodeb/main.c +++ b/src/osmo-hnodeb/main.c @@ -275,7 +275,7 @@ } /* Start listening on lower layer unix domain socket: */ - rc = osmo_prim_srv_link_open(g_hnb->llsk_link); + rc = osmo_prim_srv_link_open(g_hnb->llsk.link); if (rc < 0) { perror("Error opening lower layer socket"); exit(1); diff --git a/src/osmo-hnodeb/rua.c b/src/osmo-hnodeb/rua.c index 5b225de..e109ae0 100644 --- a/src/osmo-hnodeb/rua.c +++ b/src/osmo-hnodeb/rua.c @@ -77,7 +77,7 @@ LOGP(DLLSK, LOGL_INFO, "Tx IUH-CONN_ESTABLISH.cnf context_id=%u is_ps=%u\n", context_id, is_ps); iuh_prim = hnb_iuh_makeprim_conn_establish_cnf(context_id, is_ps, 0); - if ((rc = osmo_prim_srv_send(hnb->llsk, iuh_prim->hdr.msg)) < 0) { + if ((rc = osmo_prim_srv_send(hnb->llsk.srv, iuh_prim->hdr.msg)) < 0) { LOGP(DRUA, LOGL_ERROR, "Failed sending IUH-CONN_ESTABLISH.cnf context_id=%u is_ps=%u\n", context_id, is_ps); goto free_ret; @@ -87,7 +87,7 @@ LOGP(DLLSK, LOGL_DEBUG, "Tx IUH-CONN_DATA.ind context_id=%u is_ps=%u ranap_len=%zu\n", context_id, is_ps, ranap_buf_len); iuh_prim = hnb_iuh_makeprim_conn_data_ind(context_id, is_ps, ranap_buf, ranap_buf_len); - if ((rc = osmo_prim_srv_send(hnb->llsk, iuh_prim->hdr.msg)) < 0) { + if ((rc = osmo_prim_srv_send(hnb->llsk.srv, iuh_prim->hdr.msg)) < 0) { LOGP(DRUA, LOGL_ERROR, "Failed sending IUH-CONN_DATA.ind context_id=%u is_ps=%u ranap_len=%zu\n", context_id, is_ps, ranap_buf_len); goto free_ret; @@ -118,7 +118,7 @@ LOGP(DLLSK, LOGL_DEBUG, "Tx IUH-UNITDATA.ind ranap_len=%zu\n", ranap_buf_len); iuh_prim = hnb_iuh_makeprim_unitdata_ind(ranap_buf, ranap_buf_len); - if ((rc = osmo_prim_srv_send(hnb->llsk, iuh_prim->hdr.msg)) < 0) { + if ((rc = osmo_prim_srv_send(hnb->llsk.srv, iuh_prim->hdr.msg)) < 0) { LOGP(DRUA, LOGL_ERROR, "Failed sending IUH-CONN_DATA.ind ranap_len=%zu\n", ranap_buf_len); goto free_ret; diff --git a/src/osmo-hnodeb/vty.c b/src/osmo-hnodeb/vty.c index e84e330..f06e4cc 100644 --- a/src/osmo-hnodeb/vty.c +++ b/src/osmo-hnodeb/vty.c @@ -279,7 +279,7 @@ "Configure the Lower Layer Unix Domain Socket path\n" "UNIX socket path\n") { - osmo_prim_srv_link_set_addr(g_hnb->llsk_link, argv[0]); + osmo_prim_srv_link_set_addr(g_hnb->llsk.link, argv[0]); /* FIXME: re-open the interface? */ return CMD_SUCCESS; @@ -332,7 +332,7 @@ vty_out(vty, " remote-ip %s%s", g_hnb->iuh.remote_addr, VTY_NEWLINE); vty_out(vty, " remote-port %u%s", g_hnb->iuh.remote_port, VTY_NEWLINE); vty_out(vty, " ll-socket%s", VTY_NEWLINE); - vty_out(vty, " path %s%s", osmo_prim_srv_link_get_addr(g_hnb->llsk_link), VTY_NEWLINE); + vty_out(vty, " path %s%s", osmo_prim_srv_link_get_addr(g_hnb->llsk.link), VTY_NEWLINE); vty_out(vty, " gtp%s", VTY_NEWLINE); vty_out(vty, " local-ip %s%s", g_hnb->gtp.cfg_local_addr, VTY_NEWLINE); return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/28242 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Idfe644a7c2eccd94b602816a86e38b56264141af Gerrit-Change-Number: 28242 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-hnodeb[master]: llsk: Fix typo in log message

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/28241 ) Change subject: llsk: Fix typo in log message ...................................................................... llsk: Fix typo in log message Change-Id: I3c8be85e56df23cd68e58f0112238647add3d97f --- M src/osmo-hnodeb/llsk.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-hnodeb/llsk.c b/src/osmo-hnodeb/llsk.c index 6584dcb..76d4c4a 100644 --- a/src/osmo-hnodeb/llsk.c +++ b/src/osmo-hnodeb/llsk.c @@ -38,7 +38,7 @@ case HNB_PRIM_ADDR_TYPE_IPV6: return AF_INET6; default: - LOGP(DLLSK, LOGL_ERROR, "Rx Unknwon address type %u\n", (unsigned)t); + LOGP(DLLSK, LOGL_ERROR, "Rx unknown address type %u\n", (unsigned)t); return -1; } } @@ -169,7 +169,7 @@ case HNB_PRIM_SAPI_AUDIO: return llsk_rx_audio(hnb, oph); default: - LOGP(DLLSK, LOGL_ERROR, "Rx for unknwon SAPI %u (len=%u)\n", + LOGP(DLLSK, LOGL_ERROR, "Rx msg for unknown SAPI %u (len=%u)\n", oph->sap, msgb_length(oph->msg)); return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/28241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I3c8be85e56df23cd68e58f0112238647add3d97f Gerrit-Change-Number: 28241 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-hnodeb[master]: llsk: Validate received SAPI versions at startup

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/28250 ) Change subject: llsk: Validate received SAPI versions at startup ...................................................................... Patch Set 1: (1 comment) File include/osmocom/hnodeb/hnodeb.h: https://gerrit.osmocom.org/c/osmo-hnodeb/+/28250/comment/29b044f0_9f70b907 PS1, Line 95: uint16_t sapi_version_iuh; > might again make a nice sub-struct for llsk.sapi_version.{iuh,gtp,audio}. […] I don't think it makes much sense right now, since anyway there's already structs for most of the stuff in the in"iuh/rtp/gtp" structs at the above level. But I didn't want to put it there since this is really related to the llsk lower level internal stuff, and the other existing structs are more for high level general stuff. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/28250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I172abfee3bfadb383aa6bce6fe76306291c7cd7f Gerrit-Change-Number: 28250 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 10 Jun 2022 09:43:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log June 2022