July 2024 - gerrit-log - lists.osmocom.org

[S] Change in osmo-e1d[master]: configure.ac: lower libusb-1.0 requirement to 1.0.20

by falconia

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/37318?usp=email ) Change subject: configure.ac: lower libusb-1.0 requirement to 1.0.20 ...................................................................... configure.ac: lower libusb-1.0 requirement to 1.0.20 Current configure.ac requires libusb version to be >= 1.0.21. Slackware 14.2 has libusb version 1.0.20. Lowering the requirement in configure.ac produces a successful build, i.e., the actual code does not use any libusb APIs that are new with version 1.0.21. Change-Id: I15586757e2985184359a4488c79f2c587affeb56 --- M configure.ac 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/18/37318/1 diff --git a/configure.ac b/configure.ac index 8bec040..cea8eb4 100644 --- a/configure.ac +++ b/configure.ac @@ -38,7 +38,7 @@ PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.9.0) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.9.0) PKG_CHECK_MODULES(LIBOSMOUSB, libosmousb >= 1.9.0) -PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.21) +PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.20) AC_CONFIG_MACRO_DIR([m4]) -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/37318?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I15586757e2985184359a4488c79f2c587affeb56 Gerrit-Change-Number: 37318 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

11 months, 3 weeks

1
0
0 0

[S] Change in osmo-e1d[master]: e1_ts_stop: clear tx_started flag

by falconia

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/37319?usp=email ) Change subject: e1_ts_stop: clear tx_started flag ...................................................................... e1_ts_stop: clear tx_started flag ts->raw.tx_started flag gets set in the channelized mux process when bytes begin arriving from the raw TS client application. However, there is no reset of this flag anywhere, hence if a user opens some TS, then kills that client application, then opens it again (with the same or different client app), there is a flood of error messages about TS read underflow. Solution: clear the tx_started flag when the TS is stopped. Change-Id: I28ff68208f1d3d20dc57c5306fec74bd2f884cb1 --- M src/ctl.c 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/19/37319/1 diff --git a/src/ctl.c b/src/ctl.c index e63589b..a9818b3 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -119,6 +119,7 @@ ts->raw.rx_buf = NULL; ts->raw.rx_buf_size = 0; ts->raw.rx_buf_used = 0; + ts->raw.tx_started = false; } static void -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/37319?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I28ff68208f1d3d20dc57c5306fec74bd2f884cb1 Gerrit-Change-Number: 37319 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

11 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: IMS: Fix INVITE Contact header validation

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37314?usp=email ) Change subject: asterisk: IMS: Fix INVITE Contact header validation ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37314?usp=email 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: Icfc055859527c9c09ba0fa2648a85ac2ac2fa0bb Gerrit-Change-Number: 37314 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Jul 2024 02:09:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 3 weeks

1
0
0 0

[M] Change in osmo-mgw[master]: mgcp_test: add CRCX for IUFP in sendrecv

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/37281?usp=email ) Change subject: mgcp_test: add CRCX for IUFP in sendrecv ...................................................................... mgcp_test: add CRCX for IUFP in sendrecv Note, there are also ttcn3 tests sending the same to osmo-mgw being submitted along with these patches, and the ttcn3 tests currently fail: osmo-mgw rejects the connection mode "sendrecv" in the first CRCX. Change-Id: Icdb1085b8e44ac4cff6c457163349b81e81bf765 --- M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 2 files changed, 116 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index c6a0f6e..2e06639 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -436,6 +436,44 @@ "a=rtpmap:96 VND.3GPP.IUFP/16000\r\n" \ "a=ptime:20\r\n" +/* Do a CRCX in m=sendrecv */ +#define CRCX_PORT_0_IUFP_SENDRECV \ + "CRCX 4 1@mgw MGCP 1.0\r\n" \ + "M: sendrecv\r\n" \ + "C: 2\r\n" \ + "L: p:20\r\n" \ + "\r\n" \ + "v=0\r\n" \ + "c=IN IP4 123.12.12.123\r\n" \ + "m=audio 0 RTP/AVP 96\r\n" \ + "a=rtpmap:96 VND.3GPP.IUFP/16000\r\n" \ + "a=ptime:20\r\n" + +/* Do a CRCX using sendrecv mode in the SDP part */ +#define CRCX_PORT_0_IUFP_SENDRECV2 \ + "CRCX 4 1@mgw MGCP 1.0\r\n" \ + "C: 2\r\n" \ + "L: p:20\r\n" \ + "\r\n" \ + "v=0\r\n" \ + "c=IN IP4 123.12.12.123\r\n" \ + "a=sendrecv\r\n" \ + "m=audio 0 RTP/AVP 96\r\n" \ + "a=rtpmap:96 VND.3GPP.IUFP/16000\r\n" \ + "a=ptime:20\r\n" + +/* Do a CRCX entirely omitting a mode, i.e. implcit sendrecv */ +#define CRCX_PORT_0_IUFP_SENDRECV3 \ + "CRCX 4 1@mgw MGCP 1.0\r\n" \ + "C: 2\r\n" \ + "L: p:20\r\n" \ + "\r\n" \ + "v=0\r\n" \ + "c=IN IP4 123.12.12.123\r\n" \ + "m=audio 0 RTP/AVP 96\r\n" \ + "a=rtpmap:96 VND.3GPP.IUFP/16000\r\n" \ + "a=ptime:20\r\n" + #define DLCX \ "DLCX 7 1@mgw MGCP 1.0\r\n" \ "I: %s\r\n" \ @@ -675,6 +713,9 @@ {"RQNT_NULL", RQNT_NULL, RQNT_NULL_RET}, {"CRCX_PORT_0", CRCX_PORT_0, CRCX_PORT_0_RET, 97}, {"CRCX_PORT_0_IUFP", CRCX_PORT_0_IUFP, CRCX_PORT_0_IUFP_RET, 96}, + {"CRCX_PORT_0_IUFP_SENDRECV", CRCX_PORT_0_IUFP_SENDRECV, CRCX_PORT_0_IUFP_RET, 96}, + {"CRCX_PORT_0_IUFP_SENDRECV2", CRCX_PORT_0_IUFP_SENDRECV2, CRCX_PORT_0_IUFP_RET, 96}, + {"CRCX_PORT_0_IUFP_SENDRECV3", CRCX_PORT_0_IUFP_SENDRECV3, CRCX_PORT_0_IUFP_RET, 96}, }; static const struct mgcp_test retransmit[] = { diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok index 68b9fc7..5dc00cd 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok @@ -656,6 +656,68 @@ (response contains a connection id) ================================================ +Testing CRCX_PORT_0_IUFP_SENDRECV +creating message from statically defined input: +---------8<--------- +CRCX 4 1@mgw MGCP 1.0 +M: sendrecv +C: 2 +L: p:20 + +v=0 +c=IN IP4 123.12.12.123 +m=audio 0 RTP/AVP 96 +a=rtpmap:96 VND.3GPP.IUFP/16000 +a=ptime:20 + +---------8<--------- +checking response: +using message with patched conn_id for comparison +Response matches our expectations. +(response contains a connection id) + +================================================ +Testing CRCX_PORT_0_IUFP_SENDRECV2 +creating message from statically defined input: +---------8<--------- +CRCX 4 1@mgw MGCP 1.0 +C: 2 +L: p:20 + +v=0 +c=IN IP4 123.12.12.123 +a=sendrecv +m=audio 0 RTP/AVP 96 +a=rtpmap:96 VND.3GPP.IUFP/16000 +a=ptime:20 + +---------8<--------- +checking response: +using message with patched conn_id for comparison +Response matches our expectations. +(response contains a connection id) + +================================================ +Testing CRCX_PORT_0_IUFP_SENDRECV3 +creating message from statically defined input: +---------8<--------- +CRCX 4 1@mgw MGCP 1.0 +C: 2 +L: p:20 + +v=0 +c=IN IP4 123.12.12.123 +m=audio 0 RTP/AVP 96 +a=rtpmap:96 VND.3GPP.IUFP/16000 +a=ptime:20 + +---------8<--------- +checking response: +using message with patched conn_id for comparison +Response matches our expectations. +(response contains a connection id) + +================================================ Testing CRCX creating message from statically defined input: ---------8<--------- -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/37281?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Icdb1085b8e44ac4cff6c457163349b81e81bf765 Gerrit-Change-Number: 37281 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

11 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: IMS: Validate Accept header in MO INVITE

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37313?usp=email ) Change subject: asterisk: IMS: Validate Accept header in MO INVITE ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37313?usp=email 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: I7e419ae1cde384590b54c87c198cc411640c4594 Gerrit-Change-Number: 37313 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Jul 2024 02:09:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months, 3 weeks

1
0
0 0

[M] Change in osmo-mgw[master]: mgcp_test.c: fix various missing '\r' and '\n'

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/37278?usp=email ) Change subject: mgcp_test.c: fix various missing '\r' and '\n' ...................................................................... mgcp_test.c: fix various missing '\r' and '\n' The only valid line endings are '\n' and '\r\n'. We usually use '\r\n' like we were in MSDOS. MGCP, RFC3435 3.1: Headers and session descriptions are encoded as a set of text lines, separated by a carriage return and line feed character (or, optionally, a single line-feed character). SDP, RFC8866 5: The sequence CRLF (0x0d0a) is used to end a line, although parsers SHOULD be tolerant and also accept lines terminated with a single newline character. There should probably be tests for '\n' line endings, but mixing them in the same MGCP message is ridiculous. Change-Id: I6d530535a3a5f1d1a0716ab9e4a8079ba1de242e --- M tests/mgcp/mgcp_test.c M tests/mgcp/mgcp_test.ok 2 files changed, 49 insertions(+), 22 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, approved diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index 65756e0..b2b8b82 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -131,11 +131,11 @@ #define MDCX4_ADDR0000 \ "MDCX 18983216 1@mgw MGCP 1.0\r\n" \ - "M: sendrecv\r" \ + "M: sendrecv\r\n" \ "C: 2\r\n" \ "I: %s\r\n" \ "L: p:20, a:AMR, nt:IN\r\n" \ - "\n" \ + "\r\n" \ "v=0\r\n" \ "o=- %s 23 IN IP4 0.0.0.0\r\n" \ "c=IN IP4 0.0.0.0\r\n" \ @@ -149,11 +149,11 @@ #define MDCX4 \ "MDCX 18983217 1@mgw MGCP 1.0\r\n" \ - "M: sendrecv\r" \ + "M: sendrecv\r\n" \ "C: 2\r\n" \ "I: %s\r\n" \ "L: p:20, a:AMR, nt:IN\r\n" \ - "\n" \ + "\r\n" \ "v=0\r\n" \ "o=- %s 23 IN IP4 5.6.7.8\r\n" \ "c=IN IP4 5.6.7.8\r\n" \ @@ -188,11 +188,11 @@ #define MDCX4_PT1 \ "MDCX 18983218 1@mgw MGCP 1.0\r\n" \ - "M: SENDRECV\r" \ + "M: SENDRECV\r\n" \ "C: 2\r\n" \ "I: %s\r\n" \ "L: p:20-40, a:AMR, nt:IN\r\n" \ - "\n" \ + "\r\n" \ "v=0\r\n" \ "o=- %s 23 IN IP4 5.6.7.8\r\n" \ "c=IN IP4 5.6.7.8\r\n" \ @@ -203,11 +203,11 @@ #define MDCX4_PT2 \ "MDCX 18983219 1@mgw MGCP 1.0\r\n" \ - "M: sendrecv\r" \ + "M: sendrecv\r\n" \ "C: 2\r\n" \ "I: %s\r\n" \ "L: p:20-20, a:AMR, nt:IN\r\n" \ - "\n" \ + "\r\n" \ "v=0\r\n" \ "o=- %s 23 IN IP4 5.6.7.8\r\n" \ "c=IN IP4 5.6.7.8\r\n" \ @@ -218,11 +218,11 @@ #define MDCX4_PT3 \ "MDCX 18983220 1@mgw MGCP 1.0\r\n" \ - "M: sendrecv\r" \ + "M: sendrecv\r\n" \ "C: 2\r\n" \ "I: %s\r\n" \ "L: a:AMR, nt:IN\r\n" \ - "\n" \ + "\r\n" \ "v=0\r\n" \ "o=- %s 23 IN IP4 5.6.7.8\r\n" \ "c=IN IP4 5.6.7.8\r\n" \ @@ -234,11 +234,11 @@ /* Test different upper/lower case in options */ #define MDCX4_PT4 \ "MDCX 18983221 1@mgw MGCP 1.0\r\n" \ - "m: sendrecv\r" \ + "m: sendrecv\r\n" \ "c: 2\r\n" \ "i: %s\r\n" \ "l: A:amr, NT:IN\r\n" \ - "\n" \ + "\r\n" \ "v=0\r\n" \ "o=- %s 23 IN IP4 5.6.7.8\r\n" \ "c=IN IP4 5.6.7.8\r\n" \ @@ -249,11 +249,11 @@ #define MDCX4_SO \ "MDCX 18983222 1@mgw MGCP 1.0\r\n" \ - "M: sendonly\r" \ + "M: sendonly\r\n" \ "C: 2\r\n" \ "I: %s\r\n" \ "L: p:20, a:AMR, nt:IN\r\n" \ - "\n" \ + "\r\n" \ "v=0\r\n" \ "o=- %s 23 IN IP4 5.6.7.8\r\n" \ "c=IN IP4 5.6.7.8\r\n" \ @@ -264,7 +264,7 @@ #define MDCX4_RO \ "MDCX 18983223 1@mgw MGCP 1.0\r\n" \ - "M: recvonly\r" \ + "M: recvonly\r\n" \ "C: 2\r\n" \ "I: %s\r\n" \ "L: p:20, a:AMR, nt:IN\r\n" @@ -338,14 +338,14 @@ "a=ptime:40\r\n" #define CRCX_ZYN \ - "CRCX 2 1@mgw MGCP 1.0\r" \ - "M: recvonly\r" \ + "CRCX 2 1@mgw MGCP 1.0\r\n" \ + "M: recvonly\r\n" \ "C: 2\r\n" \ - "\n" \ - "v=0\r" \ - "c=IN IP4 123.12.12.123\r" \ - "m=audio 5904 RTP/AVP 97\r" \ - "a=rtpmap:97 GSM-EFR/8000\r" + "\r\n" \ + "v=0\r\n" \ + "c=IN IP4 123.12.12.123\r\n" \ + "m=audio 5904 RTP/AVP 97\r\n" \ + "a=rtpmap:97 GSM-EFR/8000\r\n" #define CRCX_ZYN_RET \ "200 2 OK\r\n" \ diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok index a81d9dd..6dfb608 100644 --- a/tests/mgcp/mgcp_test.ok +++ b/tests/mgcp/mgcp_test.ok Binary files differ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/37278?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6d530535a3a5f1d1a0716ab9e4a8079ba1de242e Gerrit-Change-Number: 37278 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

11 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: IMS: Fix INVITE Contact header validation

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37314?usp=email ) Change subject: asterisk: IMS: Fix INVITE Contact header validation ...................................................................... asterisk: IMS: Fix INVITE Contact header validation Related: SYS#6984 Change-Id: Icfc055859527c9c09ba0fa2648a85ac2ac2fa0bb --- M asterisk/IMS_ConnectionHandler.ttcn 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/37314/1 diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index 29a77ec..95f6852 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -382,7 +382,7 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str(g_name & ": Received unexpected empty Contact attributes (omit)")); } - f_sip_param_match_value_or_fail(caddr.contactParams, "+g.3gpp.icsi-ref", "\"urn\\%3Aurn-7\\%3A3gpp-service.ims.icsi.mmtel\""); + f_sip_param_match_value_or_fail(caddr.contactParams, "+g.3gpp.icsi-ref", "\"urn%3Aurn-7%3A3gpp-service.ims.icsi.mmtel\""); f_sip_param_match_value_or_fail(caddr.contactParams, "+sip.instance", "\"<urn:gsma:imei:" & g_pars.subscr.imei & ">\""); f_sip_param_match_value_or_fail(caddr.contactParams, "audio", omit); @@ -479,7 +479,7 @@ } /* GSMA FCM.01 3.2.3.3: "The INVITE request contains Within the Contact header [...] the IMS * Communication Service Identifier's (ICSI) for IMS Multimedia Telephony" */ - f_sip_param_match_value_or_fail(caddr.contactParams, "+g.3gpp.icsi-ref", "\"urn\\%3Aurn-7\\%3A3gpp-service.ims.icsi.mmtel\""); + f_sip_param_match_value_or_fail(caddr.contactParams, "+g.3gpp.icsi-ref", "\"urn%3Aurn-7%3A3gpp-service.ims.icsi.mmtel\""); /* "The UE must include the audio media feature tag, as defined in IETF RFC 3840, * in the Contact header field of the SIP INVITE request, and in the Contact header * field of the SIP response to the SIP INVITE request" */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37314?usp=email 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: Icfc055859527c9c09ba0fa2648a85ac2ac2fa0bb Gerrit-Change-Number: 37314 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

11 months, 3 weeks

1
0
0 0

[S] Change in osmo-e1d[master]: mux_demux.c cosmetic: fix indent level in _e1_tx_raw()

by falconia

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/37320?usp=email ) Change subject: mux_demux.c cosmetic: fix indent level in _e1_tx_raw() ...................................................................... mux_demux.c cosmetic: fix indent level in _e1_tx_raw() Change-Id: Ie0674d6500c9f66b58a7fca8bf28dada035d28d0 --- M src/mux_demux.c 1 file changed, 18 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/20/37320/1 diff --git a/src/mux_demux.c b/src/mux_demux.c index dd8ca45..a0ae717 100644 --- a/src/mux_demux.c +++ b/src/mux_demux.c @@ -48,19 +48,19 @@ static int _e1_tx_raw(struct e1_ts *ts, uint8_t *buf, int len) { - int l; + int l; - l = read(ts->fd, buf, len); - /* FIXME: handle underflow */ + l = read(ts->fd, buf, len); + /* FIXME: handle underflow */ - /* If we're not started yet, we 'fake' data until the other side - * send something */ - if (l < 0 && errno == EAGAIN && !ts->raw.tx_started) - return len; + /* If we're not started yet, we 'fake' data until the other side + * send something */ + if (l < 0 && errno == EAGAIN && !ts->raw.tx_started) + return len; - ts->raw.tx_started = true; + ts->raw.tx_started = true; - return l; + return l; } static int -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/37320?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ie0674d6500c9f66b58a7fca8bf28dada035d28d0 Gerrit-Change-Number: 37320 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

11 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: mme: Verify GUTI -> RAI/PTMSI translation is correct

by daniel

daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37296?usp=email ) Change subject: mme: Verify GUTI -> RAI/PTMSI translation is correct ...................................................................... mme: Verify GUTI -> RAI/PTMSI translation is correct Change-Id: Id1afd55f84c91a765fa12a22979ef0351b6d6554 --- M mme/MME_Tests.ttcn 1 file changed, 25 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified lynxis lazus: Looks good to me, approved diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index 3ea17dd..76c9c7e 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -962,10 +962,14 @@ } -private altstep as_gtp_sgsn_context_2g_to_4g(OCT4 new_sgsn_teid := 'ABABABAB'O, GTPv1C_Templates.GTP_RATType rat_type := GTP_RAT_TYPE_EUTRAN) runs on ConnHdlr { +private altstep as_gtp_sgsn_context_2g_to_4g(OCT4 new_sgsn_teid := 'ABABABAB'O, GTPv1C_Templates.GTP_RATType rat_type := GTP_RAT_TYPE_EUTRAN, + RoutingAreaIdentity rai, + OCT4 ptmsi, + OCT3 ptmsi_sig +) runs on ConnHdlr { var Gtp1cUnitdata gtpc_pdu; - [] GTP.receive(tr_GTPC_SGSNContextReq(g_gn_iface_peer, tr_SGSNContextReqPDU(rat_type := int2oct(enum2int(rat_type), 1)))) -> value gtpc_pdu { + [] GTP.receive(tr_GTPC_SGSNContextReq(g_gn_iface_peer, tr_SGSNContextReqPDU(rai := rai, ptmsi := ts_PTMSI(ptmsi), ptmsi_sig := ts_PTMSI_sig(ptmsi_sig), rat_type := int2oct(enum2int(rat_type), 1)))) -> value gtpc_pdu { var template (value) PDP_Context_GTPC pdp_ctx; var template (value) GTPC_PDUs SGSNContextRespPDU; var Gtp1cUnitdata gtpc_pdu_ack; @@ -1457,25 +1461,25 @@ vc_conn.done; } -/* 3GPP TS 23.401 D.3.6, TS 23.003 2.8.2.2 */ -private function rai_ptmsi2_guti(in RoutingAreaIdentity rai, in OCT4 ptmsi, in OCT3 ptmsi_sig, out NAS_EPS_Types.GUTI guti) runs on ConnHdlr { +/* 3GPP TS 23.401 D.3.6, TS 23.003 2.8.2.2.2 (Mapping in the UE) */ +private function rai_ptmsi2_guti(in RoutingAreaIdentity rai, in OCT4 ptmsi, out NAS_EPS_Types.GUTI guti) { var bitstring ptmsi_bits := oct2bit(ptmsi); - var bitstring ptmsi_sig_bits := oct2bit(ptmsi_sig); + var bitstring rac_bits := oct2bit(rai.rac); var bitstring mtmsi_bits := '11'B & substr(ptmsi_bits, 2, 6) & - substr(ptmsi_sig_bits, 0, 8) & + substr(rac_bits, 0, 8) & substr(ptmsi_bits, 16, 16); guti := valueof(ts_NAS_GUTI(mcc_mnc := rai.mcc_digits & rai.mnc_digits, mmegi := rai.lac, - mmec := rai.rac, + mmec := bit2oct(substr(ptmsi_bits, 8, 8)), tmsi := bit2oct(mtmsi_bits))); } /* Test UE attached to GERAN reselecting a EUTRAN cell. In this scenario, the * new MME will attempt to obtain information of the UE from the old SGSN * through Gn interface using SGSN Context Request/Response procedure (OS#6294). */ -/* 3GPP TS 23.401 D.3.6, TS 23.003 2.8.2.1 */ +/* 3GPP TS 23.401 D.3.6, TS 23.003 2.8.2.2.2 */ private function f_TC_ue_cell_reselect_geran_to_eutran(ConnHdlrPars pars) runs on ConnHdlr { f_init_handler(pars); f_gtp_register_imsi(g_pars.ue_pars.imsi); @@ -1496,10 +1500,12 @@ var template (value) EPS_MobileIdentityLV old_guti; var S1APEM_Config cfg; timer T := 5.0; + var bitstring ptmsi_bits := oct2bit(ptmsi); + var OCT4 ptmsi_exp := bit2oct('11'B & substr(ptmsi_bits, 2, 30)); rai := valueof(ts_RoutingAreaIdentity(mp_gn_local_mcc, mp_gn_local_mnc, int2oct(mp_gn_local_lac, 2), int2oct(mp_gn_local_rac, 1))); - rai_ptmsi2_guti(rai, ptmsi, ptmsi_sig, guti_val); + rai_ptmsi2_guti(rai, ptmsi, guti_val); old_guti := ts_EPS_MobileId_GUTI_(guti_val); nas_tau := ts_PDU_NAS_EPS_TrackingAreaUpdateRequest(old_guti, @@ -1520,7 +1526,7 @@ }; S1AP.send(cfg); - as_gtp_sgsn_context_2g_to_4g(new_sgsn_teid); + as_gtp_sgsn_context_2g_to_4g(new_sgsn_teid, GTP_RAT_TYPE_EUTRAN, rai, ptmsi_exp, ptmsi_sig); /* We now expect the MME to send a Create Session Request to the SGW-C */ T.start; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37296?usp=email 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: Id1afd55f84c91a765fa12a22979ef0351b6d6554 Gerrit-Change-Number: 37296 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

11 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: mgw: add TC_crcx_iufp_sendrecv and _recvonly

by neels

Attention is currently required from: fixeria. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37283?usp=email ) Change subject: mgw: add TC_crcx_iufp_sendrecv and _recvonly ...................................................................... Patch Set 1: (1 comment) File mgw/MGCP_Test.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37283/comment/2867beb6_6598… PS1, Line 2850: not ispresent(resp.sdp) > This is not needed, since `ispresent()` is safe against `foo.omit.bar`. `not ispresent(resp.sdp. […] I copied it from elsewhere, so I'll rather keep it the same, and put hopes in a separate patch that fixes all the occurences of this code snippet... -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37283?usp=email 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: I00fd854f058f7f53e2f579e8481ca2b9253f08e3 Gerrit-Change-Number: 37283 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 02 Jul 2024 01:59:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

11 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2024