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

Change in osmo-bsc[master]: acc: Simplify start/stop by using new signal S_NM_RUNNING_CHG

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28079 ) Change subject: acc: Simplify start/stop by using new signal S_NM_RUNNING_CHG ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28079 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2e09bcb18a6c3bb2e88bba98579fb4854a6b0699 Gerrit-Change-Number: 28079 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 13 May 2022 14:24:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in libosmocore[master]: osmo-arfcn: Fix false positive in gcc 12.1.0

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28103 ) Change subject: osmo-arfcn: Fix false positive in gcc 12.1.0 ...................................................................... osmo-arfcn: Fix false positive in gcc 12.1.0 The pointer is initialized in all its uses, however newer gcc warns about it: """ inlined from ‘main’ at /libosmocore/utils/osmo-arfcn.c:144:16: /usr/include/bits/stdlib-float.h:27:10: error: ‘param’ may be used uninitialized [-Werror=maybe-uninitialized] """ Change-Id: If3eff4ab14a7b2a950386244c9b5f2b9adb32f99 --- M utils/osmo-arfcn.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/utils/osmo-arfcn.c b/utils/osmo-arfcn.c index 9e4534f..3d4fb50 100644 --- a/utils/osmo-arfcn.c +++ b/utils/osmo-arfcn.c @@ -93,7 +93,7 @@ { int arfcn, freq, pcs = 0, uplink = -1; int opt; - char *param; + char *param = NULL; enum program_mode mode = MODE_NONE; while ((opt = getopt(argc, argv, "pa:f:udh")) != -1) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If3eff4ab14a7b2a950386244c9b5f2b9adb32f99 Gerrit-Change-Number: 28103 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in libosmocore[master]: coding: Use ARRAY_SIZE macro

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28104 ) Change subject: coding: Use ARRAY_SIZE macro ...................................................................... coding: Use ARRAY_SIZE macro Change-Id: I6b7a2a3a7be6a1d92038ff3b249e539fcd0f639e --- M src/coding/gsm0503_coding.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c index 493f957..3ad2861 100644 --- a/src/coding/gsm0503_coding.c +++ b/src/coding/gsm0503_coding.c @@ -547,7 +547,7 @@ return res; coded_len = osmo_conv_encode(code, output, recoded); - OSMO_ASSERT(sizeof(recoded) / sizeof(recoded[0]) >= coded_len); + OSMO_ASSERT(ARRAY_SIZE(recoded) >= coded_len); /* Count bit errors */ if (n_errors) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6b7a2a3a7be6a1d92038ff3b249e539fcd0f639e Gerrit-Change-Number: 28104 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

3 years, 1 month

1
0
0 0

Change in libosmocore[master]: coding: Refactor function to avoid gcc false positive warn

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28102 ) Change subject: coding: Refactor function to avoid gcc false positive warn ...................................................................... coding: Refactor function to avoid gcc false positive warn """ /libosmocore/src/coding/gsm0503_coding.c: In function 'osmo_conv_decode_ber_punctured': /libosmocore/src/coding/gsm0503_coding.c:563:31: error: 'coded_len' may be used uninitialized [-Werror=maybe-uninitialized] 563 | *n_bits_total = coded_len; | ~~~~~~~~~~~~~~^~~~~~~~~~~ /libosmocore/src/coding/gsm0503_coding.c:541:21: note: 'coded_len' was declared here 541 | int res, i, coded_len; | ^~~~~~~~~ """ This error is really a false positive. However, it is true that the code used to be a bit more complex than required, since the 2 later conditions could be inside the first one. Let's simply do early termination to simplify the function, and get rid of the gcc warning. Change-Id: I31ebf0c4be61daf6395d9a9fac05c7fdceb8bcb9 --- M src/coding/gsm0503_coding.c 1 file changed, 5 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved pespin: Verified diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c index 835a18e..493f957 100644 --- a/src/coding/gsm0503_coding.c +++ b/src/coding/gsm0503_coding.c @@ -543,10 +543,11 @@ res = osmo_conv_decode(code, input, output); - if (n_bits_total || n_errors) { - coded_len = osmo_conv_encode(code, output, recoded); - OSMO_ASSERT(sizeof(recoded) / sizeof(recoded[0]) >= coded_len); - } + if (!n_bits_total && !n_errors) + return res; + + coded_len = osmo_conv_encode(code, output, recoded); + OSMO_ASSERT(sizeof(recoded) / sizeof(recoded[0]) >= coded_len); /* Count bit errors */ if (n_errors) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I31ebf0c4be61daf6395d9a9fac05c7fdceb8bcb9 Gerrit-Change-Number: 28102 Gerrit-PatchSet: 1 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

3 years, 1 month

1
0
0 0

Change in libosmocore[master]: coding: Refactor function to avoid gcc false positive warn

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28102 ) Change subject: coding: Refactor function to avoid gcc false positive warn ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I31ebf0c4be61daf6395d9a9fac05c7fdceb8bcb9 Gerrit-Change-Number: 28102 Gerrit-PatchSet: 1 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 13 May 2022 14:23:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in libosmocore[master]: coding: Refactor function to avoid gcc false positive warn

by pespin

Attention is currently required from: pespin, fixeria. pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28102 ) Change subject: coding: Refactor function to avoid gcc false positive warn ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I31ebf0c4be61daf6395d9a9fac05c7fdceb8bcb9 Gerrit-Change-Number: 28102 Gerrit-PatchSet: 1 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: deleteVote

3 years, 1 month

1
0
0 0

Change in libosmocore[master]: coding: Refactor function to avoid gcc false positive warn

by osmith

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28102 ) Change subject: coding: Refactor function to avoid gcc false positive warn ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I31ebf0c4be61daf6395d9a9fac05c7fdceb8bcb9 Gerrit-Change-Number: 28102 Gerrit-PatchSet: 1 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 13 May 2022 14:12:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in libosmocore[master]: coding: Use ARRAY_SIZE macro

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28104 ) Change subject: coding: Use ARRAY_SIZE macro ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6b7a2a3a7be6a1d92038ff3b249e539fcd0f639e Gerrit-Change-Number: 28104 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 13 May 2022 12:14:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Append ChargingCharacteristics IE to CreatePdpCtxReq

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28091 ) Change subject: ggsn: Append ChargingCharacteristics IE to CreatePdpCtxReq ...................................................................... ggsn: Append ChargingCharacteristics IE to CreatePdpCtxReq This IE is conditionally added if the HLR provides it to the SGSN. Let's add it by default so that we test code paths where GGSN parses it. Related: SYS#5925 Change-Id: Ia0f74041d2107afeaa36b94e33474370b7b07c0e --- M ggsn_tests/GGSN_Tests.ttcn M library/GTP_Templates.ttcn 2 files changed, 33 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index b67645d..e3d9341 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -98,7 +98,8 @@ /* TEI (Control) remote side */ OCT4 teic_remote, OCT1 ratType optional, - UserLocationInformation uli optional + UserLocationInformation uli optional, + OCT2 charging_char optional } type component GT_CT { @@ -350,7 +351,8 @@ geographicLocation := { geographicLocationCGI := ts_GeographicLocationCGI('262'H, '42F'H, '0001'O, '0002'O) } - } + }, + charging_char := '0000'O } /* send GTP-C for a given context and increment sequence number */ @@ -510,7 +512,8 @@ log("sending CreatePDP"); f_send_gtpc(ts_GTPC_CreatePDP(g_peer_c, g_c_seq_nr, ctx.imsi, g_restart_ctr, ctx.teid, ctx.teic, ctx.nsapi, ctx.eua, ctx.apn, - g_sgsn_ip_c, g_sgsn_ip_u, ctx.msisdn, ctx.pco_req, ctx.ratType, ctx.uli)); + g_sgsn_ip_c, g_sgsn_ip_u, ctx.msisdn, ctx.pco_req, ctx.ratType, + ctx.uli, ctx.charging_char)); T_default.start; d := activate(pingpong()); if (Gx_PROC.checkstate("Connected")) { @@ -2006,7 +2009,7 @@ ctx[next_req_ctx].teid, ctx[next_req_ctx].teic, ctx[next_req_ctx].nsapi, ctx[next_req_ctx].eua, ctx[next_req_ctx].apn, g_sgsn_ip_c, g_sgsn_ip_u, ctx[next_req_ctx].msisdn, ctx[next_req_ctx].pco_req, ctx[next_req_ctx].ratType, - ctx[next_req_ctx].uli)); + ctx[next_req_ctx].uli, ctx[next_req_ctx].charging_char)); next_req_ctx := next_req_ctx + 1; if (next_req_ctx < num_ctx) { T_next.start; @@ -2120,7 +2123,7 @@ ctx.teid, ctx.teic, ctx.nsapi, ctx.eua, ctx.apn, g_sgsn_ip_c, g_sgsn_ip_u, ctx.msisdn, ctx.pco_req, ctx.ratType, - ctx.uli)); + ctx.uli, ctx.charging_char)); next_req_ctx := next_req_ctx + 1; } T_next.start; diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index 049614a..0c5c003 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -119,6 +119,25 @@ restartCounter := restart_counter } + /* Charging Characteristics IE TS 29.060 7.7.23 */ + template ChargingCharacteristics_GTPC ts_ChargingCharacteristics(template (value) OCT2 chargingChar) := { + type_gtpc := '1A'O, + chargingChar := chargingChar + } + private function f_ts_ChargingCharacteristics(template (omit) OCT2 chargingChar) + return template (omit) ChargingCharacteristics_GTPC { + if (istemplatekind(chargingChar, "omit")) { + return omit; + } + return ts_ChargingCharacteristics(chargingChar); + } + + template ChargingCharacteristics_GTPC tr_ChargingCharacteristics(template (present) OCT2 chargingChar) := { + type_gtpc := '1A'O, + chargingChar := chargingChar + } + + /* template matching reception of GTP-C echo-request */ template Gtp1cUnitdata tr_GTPC_MsgType(template GtpPeer peer, template OCT1 msg_type, template OCT4 teid, template GTPC_PDUs pdus := ?) := { peer := peer, @@ -359,7 +378,8 @@ octetstring sgsn_ip_sign, octetstring sgsn_ip_data, octetstring msisdn, template ProtConfigOptions pco := omit, template (omit) OCT1 ratType := omit, - template (omit) UserLocationInformation uli := omit) := { + template (omit) UserLocationInformation uli := omit, + template (omit) OCT2 charging_char := omit) := { createPDPContextRequest := { imsi := ts_Imsi(imsi), rai := omit, @@ -383,7 +403,7 @@ unused := '0000'B }, linked_nsapi := omit, - charging_char := omit, + charging_char := f_ts_ChargingCharacteristics(charging_char), trace_ref := omit, trace_type := omit, endUserAddress := eua, @@ -422,12 +442,13 @@ octetstring sgsn_ip_data, octetstring msisdn, template ProtConfigOptions pco := omit, template (omit) OCT1 ratType := omit, - template (omit) UserLocationInformation uli := omit) := { + template (omit) UserLocationInformation uli := omit, + template (omit) OCT2 charging_char := omit) := { peer := peer, gtpc := ts_GTP1C_PDU(createPDPContextRequest, '00000000'O, valueof(ts_CreatePdpPDU(imsi, restart_ctr, teid_data, teid_ctrl, nsapi, eua, apn, sgsn_ip_sign, - sgsn_ip_data, msisdn, pco, ratType, uli)), seq) + sgsn_ip_data, msisdn, pco, ratType, uli, charging_char)), seq) } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28091 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: Ia0f74041d2107afeaa36b94e33474370b7b07c0e Gerrit-Change-Number: 28091 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Append ChargingCharacteristics IE to CreatePdpCtxReq

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28091 ) Change subject: ggsn: Append ChargingCharacteristics IE to CreatePdpCtxReq ...................................................................... Patch Set 2: Code-Review+2 (2 comments) File library/GTP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28091/comment/158c7dc0_5998… PS1, Line 128: template > Field 'chargingChar' is not 'optional', so please add '(present)'. […] Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28091/comment/624bb3aa_57db… PS1, Line 399: ts_ChargingCharacteristics > Indeed, sorry I started passing the whole ChargingCharacteristics_GTPC and later found it made more […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28091 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: Ia0f74041d2107afeaa36b94e33474370b7b07c0e Gerrit-Change-Number: 28091 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 13 May 2022 12:10:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2022