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

Change in osmo-msc[master]: smpp: don't enqueue write messages if ESME is disconnected

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28126 ) Change subject: smpp: don't enqueue write messages if ESME is disconnected ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I10a270f1d555782be272f4d78da43190618a9950 Gerrit-Change-Number: 28126 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 16 May 2022 15:45:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-msc[master]: smpp: Fix use-after-free bug when ESME disconnects but has write pending

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28125 ) Change subject: smpp: Fix use-after-free bug when ESME disconnects but has write pending ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I441d3b05c2f2556c530783a7f66c73adf6d845a1 Gerrit-Change-Number: 28125 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 16 May 2022 15:45:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-msc[master]: smpp: don't enqueue write messages if ESME is disconnected

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/28126 ) Change subject: smpp: don't enqueue write messages if ESME is disconnected ...................................................................... smpp: don't enqueue write messages if ESME is disconnected If the ESME has been disconnected (dead socket) but still is in memory (other users hold a use count), we shouldn't enqueue messages to the write queue. This prevents messages like DSMPP write_queue.c:112 wqueue(0x7f8bc392f6e0) is full. Rejecting msgb Change-Id: I10a270f1d555782be272f4d78da43190618a9950 Closes: OS#3278 --- M src/libmsc/smpp_smsc.c 1 file changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/26/28126/1 diff --git a/src/libmsc/smpp_smsc.c b/src/libmsc/smpp_smsc.c index 6712032..34391c2 100644 --- a/src/libmsc/smpp_smsc.c +++ b/src/libmsc/smpp_smsc.c @@ -347,8 +347,15 @@ #define PACK_AND_SEND(esme, ptr) pack_and_send(esme, (ptr)->command_id, ptr) static int pack_and_send(struct osmo_esme *esme, uint32_t type, void *ptr) { - struct msgb *msg = msgb_alloc(4096, "SMPP_Tx"); + struct msgb *msg; int rc, rlen; + + /* the socket was closed. Avoid allocating + enqueueing msgb, see + * https://osmocom.org/issues/3278 */ + if (esme->wqueue.bfd.fd == -1) + return -EIO; + + msg = msgb_alloc(4096, "SMPP_Tx"); if (!msg) return -ENOMEM; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I10a270f1d555782be272f4d78da43190618a9950 Gerrit-Change-Number: 28126 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-msc[master]: smpp: Fix use-after-free bug when ESME disconnects but has write pending

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28125 ) Change subject: smpp: Fix use-after-free bug when ESME disconnects but has write pending ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I441d3b05c2f2556c530783a7f66c73adf6d845a1 Gerrit-Change-Number: 28125 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 16 May 2022 15:37:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-msc[master]: smpp: Fix use-after-free bug when ESME disconnects but has write pending

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/28125 ) Change subject: smpp: Fix use-after-free bug when ESME disconnects but has write pending ...................................................................... smpp: Fix use-after-free bug when ESME disconnects but has write pending When the SMPP code free's an ESME it also free's the related write_queue and the osmo_fd contained therein. So if this happens while we are in esme_link_read_cb(), we must return -EBADF to make osmo_wqueue_bfd_cb() of libosmocore avoid further accessing related memory. Change-Id: I441d3b05c2f2556c530783a7f66c73adf6d845a1 Closes: OS#5565 --- M src/libmsc/smpp_smsc.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/25/28125/1 diff --git a/src/libmsc/smpp_smsc.c b/src/libmsc/smpp_smsc.c index 4581865..6712032 100644 --- a/src/libmsc/smpp_smsc.c +++ b/src/libmsc/smpp_smsc.c @@ -888,7 +888,7 @@ esme->acl->esme = NULL; smpp_esme_put(esme); - return 0; + return -EBADF; } /* call-back of write queue once it wishes to write a message to the socket */ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I441d3b05c2f2556c530783a7f66c73adf6d845a1 Gerrit-Change-Number: 28125 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Append MS TimeZone IE to CreatePDPCtxReq

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28123 ) Change subject: ggsn: Append MS TimeZone IE to CreatePDPCtxReq ...................................................................... ggsn: Append MS TimeZone IE to CreatePDPCtxReq TS 29.060 states that it shall be included for primary PDP context activation if the information is available, so let's add it by default. Change-Id: I8c7e491a07cadfe09403504a82d34e412673a531 --- M ggsn_tests/GGSN_Tests.ttcn M library/GTP_Templates.ttcn 2 files changed, 51 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 c1ef7fb..c18e78e 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -100,7 +100,8 @@ OCT1 ratType optional, UserLocationInformation uli optional, OCT2 charging_char optional, - OCT8 imeisv optional + OCT8 imeisv optional, + MS_TimeZone ms_tz optional } type component GT_CT { @@ -359,7 +360,8 @@ } }, charging_char := '0000'O, - imeisv := f_rnd_imeisv() + imeisv := f_rnd_imeisv(), + ms_tz := f_ts_MS_TimeZone('03'O, '01'B) } /* send GTP-C for a given context and increment sequence number */ @@ -520,7 +522,7 @@ 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, ctx.charging_char, ctx.imeisv)); + ctx.uli, ctx.charging_char, ctx.imeisv, ctx.ms_tz)); T_default.start; d := activate(pingpong()); if (Gx_PROC.checkstate("Connected")) { @@ -2016,7 +2018,8 @@ 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].charging_char, ctx[next_req_ctx].imeisv)); + ctx[next_req_ctx].uli, ctx[next_req_ctx].charging_char, ctx[next_req_ctx].imeisv, + ctx[next_req_ctx].ms_tz)); next_req_ctx := next_req_ctx + 1; if (next_req_ctx < num_ctx) { T_next.start; @@ -2130,7 +2133,8 @@ 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.charging_char, ctx.imeisv)); + ctx.uli, ctx.charging_char, ctx.imeisv, + ctx.ms_tz)); next_req_ctx := next_req_ctx + 1; } T_next.start; diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index 22d8632..493da8f 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -139,6 +139,42 @@ imeisv := imeisv } + // MS Time Zone - 7.7.52 + template (value) MS_TimeZone ts_MS_TimeZone(template (value) OCT1 timeZone := '00'O, + template (value) BIT2 daylightSavingTime := '00'B) := { + type_gtpc := '99'O, + lengthf := 2, + timeZone := timeZone, + daylightSavingTime := daylightSavingTime, + spare1 := '000'B, + sgsnAttempsToUpdateMS := '0'B, /* propietary, use it as spare */ + spare2 := '00'B + } + function f_ts_MS_TimeZone(template (omit) OCT1 timeZone, template (omit) BIT2 daylightSavingTime) + return template (omit) MS_TimeZone { + if (istemplatekind(timeZone, "omit") and istemplatekind(daylightSavingTime, "omit")) { + return omit; + } + if (istemplatekind(timeZone, "omit")) { + return ts_MS_TimeZone(daylightSavingTime := daylightSavingTime); + } + if (istemplatekind(daylightSavingTime, "omit")) { + return ts_MS_TimeZone(timeZone); + } + return ts_MS_TimeZone(timeZone, daylightSavingTime); + } + + template (present) MS_TimeZone tr_MS_TimeZone(template (present) OCT1 timeZone := ?, + template (present) BIT2 daylightSavingTime := ?) := { + type_gtpc := '99'O, + lengthf := 2, + timeZone := timeZone, + daylightSavingTime := daylightSavingTime, + spare1 := '000'B, + sgsnAttempsToUpdateMS := '0'B, /* propietary, use it as spare */ + spare2 := '00'B + } + /* Charging Characteristics IE TS 29.060 7.7.23 */ template ChargingCharacteristics_GTPC ts_ChargingCharacteristics(template (value) OCT2 chargingChar) := { type_gtpc := '1A'O, @@ -400,7 +436,8 @@ template (omit) OCT1 ratType := omit, template (omit) UserLocationInformation uli := omit, template (omit) OCT2 charging_char := omit, - template (omit) OCT8 imeisv := omit) := { + template (omit) OCT8 imeisv := omit, + template(omit) MS_TimeZone ms_tz := omit) := { createPDPContextRequest := { imsi := ts_Imsi(imsi), rai := omit, @@ -441,7 +478,7 @@ aPN_Restriction := omit, ratType := f_ts_RATType(ratType), userLocationInformation := uli, - mS_TimeZone := omit, + mS_TimeZone := ms_tz, imeisv := f_ts_IMEISV(imeisv), camelChargingInformationContainer := omit, additionalTraceInfo := omit, @@ -465,13 +502,14 @@ template (omit) OCT1 ratType := omit, template (omit) UserLocationInformation uli := omit, template (omit) OCT2 charging_char := omit, - template (omit) OCT8 imeisv := omit) := { + template (omit) OCT8 imeisv := omit, + template(omit) MS_TimeZone ms_tz := 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, - charging_char, imeisv)), seq) + charging_char, imeisv, ms_tz)), seq) } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28123 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: I8c7e491a07cadfe09403504a82d34e412673a531 Gerrit-Change-Number: 28123 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 MS TimeZone 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/+/28123 ) Change subject: ggsn: Append MS TimeZone IE to CreatePDPCtxReq ...................................................................... Patch Set 2: Code-Review+2 (3 comments) File library/GTP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28123/comment/84d0a819_23d0… PS1, Line 143: template > template (value) Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28123/comment/eeac4434_7d04… PS1, Line 144: template (value) BIT2 daylightSavingTime := '00'B) := { > Something is wrong with this line. Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28123/comment/91019ef1_386f… PS1, Line 168: template (present) BIT2 daylightSavingTime := ?) := { > Something is wrong with this line. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28123 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: I8c7e491a07cadfe09403504a82d34e412673a531 Gerrit-Change-Number: 28123 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: Mon, 16 May 2022 15:12:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Append MS TimeZone IE to CreatePDPCtxReq

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28123 to look at the new patch set (#2). Change subject: ggsn: Append MS TimeZone IE to CreatePDPCtxReq ...................................................................... ggsn: Append MS TimeZone IE to CreatePDPCtxReq TS 29.060 states that it shall be included for primary PDP context activation if the information is available, so let's add it by default. Change-Id: I8c7e491a07cadfe09403504a82d34e412673a531 --- M ggsn_tests/GGSN_Tests.ttcn M library/GTP_Templates.ttcn 2 files changed, 51 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/23/28123/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28123 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: I8c7e491a07cadfe09403504a82d34e412673a531 Gerrit-Change-Number: 28123 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Append MS TimeZone 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/+/28123 ) Change subject: ggsn: Append MS TimeZone IE to CreatePDPCtxReq ...................................................................... Patch Set 1: (3 comments) File library/GTP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28123/comment/66ebf617_ebc6… PS1, Line 143: template template (value) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28123/comment/78f559dd_4e24… PS1, Line 144: template (value) BIT2 daylightSavingTime := '00'B) := { Something is wrong with this line. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28123/comment/4ecae63c_bd7e… PS1, Line 168: template (present) BIT2 daylightSavingTime := ?) := { Something is wrong with this line. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28123 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: I8c7e491a07cadfe09403504a82d34e412673a531 Gerrit-Change-Number: 28123 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 16 May 2022 14:49:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-msc[master]: tests: Remove sms.db{-wal,-shm} files, not just sms.db

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28124 ) Change subject: tests: Remove sms.db{-wal,-shm} files, not just sms.db ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iecd380f598edbd1635361e4c340d54d092739919 Gerrit-Change-Number: 28124 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 16 May 2022 14:44:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2022