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

[M] Change in osmo-mgw[master]: drop cfg 'sdp audio fmtp-extra'

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35437?usp=email ) Change subject: drop cfg 'sdp audio fmtp-extra' ...................................................................... drop cfg 'sdp audio fmtp-extra' There is considerable code complexity in place for this ancient hack. It dates back to 5ea1bc77a3947f541d576f95e7ecc7249fc65b9b " mgcp: Allow to freely control the a=fmtp line for experiments In case of AMR one can specify the available codecs out-of-band. Allow to configure this line statically in the configuration file. " Looking in mgcp_test.c output, the fmtp-extra tests do not even make sense: they result in fmtp for pt=126 being added, even though there is no payload type 126 listed in the SDP... Related: OS#6313 Change-Id: Icee0cd1f5a751fa760d5a9deca29089e78e7eb93 --- M include/osmocom/mgcp/mgcp_network.h M include/osmocom/mgcp/mgcp_trunk.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_sdp.c M src/libosmo-mgcp/mgcp_vty.c M tests/mgcp/mgcp_test.c 7 files changed, 42 insertions(+), 90 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/37/35437/1 diff --git a/include/osmocom/mgcp/mgcp_network.h b/include/osmocom/mgcp/mgcp_network.h index 7f87224..99c7834 100644 --- a/include/osmocom/mgcp/mgcp_network.h +++ b/include/osmocom/mgcp/mgcp_network.h @@ -111,7 +111,6 @@ int frames_per_packet; uint32_t packet_duration_ms; int maximum_packet_time; /* -1: not set */ - char *fmtp_extra; /* are we transmitting packets (true) or dropping (false) outbound packets */ bool output_enabled; /* FIXME: This parameter can be set + printed, but is nowhere used! */ diff --git a/include/osmocom/mgcp/mgcp_trunk.h b/include/osmocom/mgcp/mgcp_trunk.h index e608161..1679239 100644 --- a/include/osmocom/mgcp/mgcp_trunk.h +++ b/include/osmocom/mgcp/mgcp_trunk.h @@ -27,7 +27,6 @@ unsigned int trunk_nr; enum mgcp_trunk_type trunk_type; - char *audio_fmtp_extra; int audio_send_ptime; int audio_send_name; diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 283a213..d9bc573 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -110,8 +110,6 @@ end->rtcp.fd = -1; memset(&end->addr, 0, sizeof(end->addr)); end->rtcp_port = 0; - talloc_free(end->fmtp_extra); - end->fmtp_extra = NULL; /* Set default values */ end->frames_per_packet = 0; /* unknown */ diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 0146815..22eb12d 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1076,9 +1076,6 @@ rc = mgcp_conn_iuup_init(conn); } - conn->end.fmtp_extra = talloc_strdup(trunk->endpoints, - trunk->audio_fmtp_extra); - if (pdata->cfg->force_ptime) { conn->end.packet_duration_ms = pdata->cfg->force_ptime; conn->end.force_output_ptime = 1; diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c index a6536f2..764e031 100644 --- a/src/libosmo-mgcp/mgcp_sdp.c +++ b/src/libosmo-mgcp/mgcp_sdp.c @@ -459,34 +459,10 @@ } /* Add fmtp strings to sdp payload */ -static int add_fmtp(struct msgb *sdp, struct sdp_fmtp_param *fmtp_params, unsigned int fmtp_params_len, - const char *fmtp_extra) +static int add_fmtp(struct msgb *sdp, struct sdp_fmtp_param *fmtp_params, unsigned int fmtp_params_len) { unsigned int i; int rc; - int fmtp_extra_pt = -1; - char *fmtp_extra_pars = ""; - - /* When no fmtp parameters ara available but an fmtp extra string - * is configured, just add the fmtp extra string */ - if (fmtp_params_len == 0 && fmtp_extra) { - return msgb_printf(sdp, "%s\r\n", fmtp_extra); - } - - /* When there is fmtp extra configured we dissect it in order to drop - * in the configured extra parameters at the right place when - * generating the fmtp strings. */ - if (fmtp_extra) { - if (sscanf(fmtp_extra, "a=fmtp:%d ", &fmtp_extra_pt) != 1) - fmtp_extra_pt = -1; - - fmtp_extra_pars = strstr(fmtp_extra, " "); - - if (!fmtp_extra_pars) - fmtp_extra_pars = ""; - else - fmtp_extra_pars++; - } for (i = 0; i < fmtp_params_len; i++) { bool first = true; @@ -500,16 +476,6 @@ first = false; } - /* Append extra parameters from fmtp extra */ - if (fmtp_params[i].payload_type == fmtp_extra_pt) { - rc = msgb_printf(sdp, "%s%s", - first ? " " : ";", - fmtp_extra_pars); - first = false; - if (rc < 0) - return -EINVAL; - } - rc = msgb_printf(sdp, "\r\n"); if (rc < 0) return -EINVAL; @@ -529,7 +495,6 @@ const char *addr) { const struct mgcp_rtp_codec *codec; - const char *fmtp_extra; const char *audio_name; int payload_type; int rc; @@ -545,7 +510,6 @@ OSMO_ASSERT(addr); codec = conn->end.codec; - fmtp_extra = conn->end.fmtp_extra; audio_name = codec->audio_name; payload_type = codec->payload_type; @@ -597,7 +561,7 @@ fmtp_params[0].fmtp = OSMO_SDP_AMR_SET_OCTET_ALIGN(codec->param.amr_octet_aligned); } - rc = add_fmtp(sdp, fmtp_params, fmtp_params_len, fmtp_extra); + rc = add_fmtp(sdp, fmtp_params, fmtp_params_len); if (rc < 0) goto buffer_too_small; } diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index 784894c..b82f3df 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -111,9 +111,6 @@ VTY_NEWLINE); } else vty_out(vty, " no rtp-patch%s", VTY_NEWLINE); - if (trunk->audio_fmtp_extra) - vty_out(vty, " sdp audio fmtp-extra %s%s", - trunk->audio_fmtp_extra, VTY_NEWLINE); vty_out(vty, " %ssdp audio-payload send-ptime%s", trunk->audio_send_ptime ? "" : "no ", VTY_NEWLINE); vty_out(vty, " %ssdp audio-payload send-name%s", @@ -187,7 +184,7 @@ " Payload Type: %d Rate: %u Channels: %d %s" " Frame Duration: %u Frame Denominator: %u%s" " FPP: %d Packet Duration: %u%s" - " FMTP-Extra: %s Audio-Name: %s Sub-Type: %s%s" + " Audio-Name: %s Sub-Type: %s%s" " Output-Enabled: %d Force-PTIME: %d%s", tx_packets->current, tx_bytes->current, VTY_NEWLINE, rx_packets->current, rx_bytes->current, VTY_NEWLINE, @@ -198,7 +195,7 @@ codec->payload_type, codec->rate, codec->channels, VTY_NEWLINE, codec->frame_duration_num, codec->frame_duration_den, VTY_NEWLINE, end->frames_per_packet, end->packet_duration_ms, - VTY_NEWLINE, end->fmtp_extra, codec->audio_name, + VTY_NEWLINE, codec->audio_name, codec->subtype_name, VTY_NEWLINE, end->output_enabled, end->force_output_ptime, VTY_NEWLINE); if (mgcp_conn_rtp_is_osmux(conn)) { @@ -681,21 +678,15 @@ return CMD_SUCCESS; } -DEFUN_USRATTR(cfg_mgcp_sdp_fmtp_extra, - cfg_mgcp_sdp_fmtp_extra_cmd, - X(MGW_CMD_ATTR_NEWCONN), - "sdp audio fmtp-extra .NAME", - "Add extra fmtp for the SDP file\n" "Audio\n" "Fmtp-extra\n" - "Extra Information\n") -{ - struct mgcp_trunk *trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID); - OSMO_ASSERT(trunk); - char *txt = argv_concat(argv, argc, 0); - if (!txt) - return CMD_WARNING; +#define SDP_STR "SDP File related options\n" +#define AUDIO_STR "Audio payload options\n" - osmo_talloc_replace_string(g_cfg, &trunk->audio_fmtp_extra, txt); - talloc_free(txt); +DEFUN_DEPRECATED(cfg_mgcp_sdp_fmtp_extra, + cfg_mgcp_sdp_fmtp_extra_cmd, + "sdp audio fmtp-extra .NAME", + SDP_STR AUDIO_STR "Deprecated, without effect since osmo-mgw v1.13\n" "Deprecated, without effect\n") +{ + vty_out(vty, "%% deprecated: the config option 'sdp audio fmtp-extra' has been removed.%s", VTY_NEWLINE); return CMD_SUCCESS; } @@ -715,8 +706,6 @@ return CMD_SUCCESS; } -#define SDP_STR "SDP File related options\n" -#define AUDIO_STR "Audio payload options\n" DEFUN_DEPRECATED(cfg_mgcp_sdp_payload_number, cfg_mgcp_sdp_payload_number_cmd, "sdp audio-payload number <0-255>", @@ -1062,28 +1051,17 @@ VTY_NEWLINE); } else vty_out(vty, " no rtp-patch%s", VTY_NEWLINE); - if (trunk->audio_fmtp_extra) - vty_out(vty, " sdp audio fmtp-extra %s%s", - trunk->audio_fmtp_extra, VTY_NEWLINE); } return CMD_SUCCESS; } -DEFUN_USRATTR(cfg_trunk_sdp_fmtp_extra, +DEFUN_DEPRECATED(cfg_trunk_sdp_fmtp_extra, cfg_trunk_sdp_fmtp_extra_cmd, - X(MGW_CMD_ATTR_NEWCONN), "sdp audio fmtp-extra .NAME", - "Add extra fmtp for the SDP file\n" "Audio\n" "Fmtp-extra\n" - "Extra Information\n") + SDP_STR AUDIO_STR "Deprecated, without effect since osmo-mgw v1.13\n" "Deprecated, without effect\n") { - struct mgcp_trunk *trunk = vty->index; - char *txt = argv_concat(argv, argc, 0); - if (!txt) - return CMD_WARNING; - - osmo_talloc_replace_string(g_cfg, &trunk->audio_fmtp_extra, txt); - talloc_free(txt); + vty_out(vty, "%% deprecated: the config option 'sdp audio fmtp-extra' has been removed.%s", VTY_NEWLINE); return CMD_SUCCESS; } diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index b3c111f..6fa032e 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -127,7 +127,6 @@ "t=0 0\r\n" \ "m=audio 16006 RTP/AVP 97\r\n" \ "a=rtpmap:97 GSM-EFR/8000\r\n" \ - "a=fmtp:126 0/1/2\r\n" \ "a=ptime:40\r\n" #define MDCX4_ADDR0000 \ @@ -336,7 +335,6 @@ "t=0 0\r\n" \ "m=audio 16006 RTP/AVP 97\r\n" \ "a=rtpmap:97 GSM-EFR/8000\r\n" \ - "a=fmtp:126 0/1/2\r\n" \ "a=ptime:40\r\n" #define CRCX_ZYN \ @@ -586,7 +584,6 @@ const char *req; const char *exp_resp; int ptype; - const char *extra_fmtp; }; static const struct mgcp_test tests[] = { @@ -614,10 +611,9 @@ {"RQNT1", RQNT, RQNT1_RET}, {"RQNT2", RQNT2, RQNT2_RET}, {"DLCX", DLCX, DLCX_RET, PTYPE_IGNORE}, - {"CRCX", CRCX, CRCX_FMTP_RET, 97,.extra_fmtp = "a=fmtp:126 0/1/2"}, - {"MDCX3", MDCX3, MDCX3_FMTP_RET, PTYPE_NONE,.extra_fmtp = - "a=fmtp:126 0/1/2"}, - {"DLCX", DLCX, DLCX_RET, PTYPE_IGNORE,.extra_fmtp = "a=fmtp:126 0/1/2"}, + {"CRCX", CRCX, CRCX_FMTP_RET, 97}, + {"MDCX3", MDCX3, MDCX3_FMTP_RET, PTYPE_NONE}, + {"DLCX", DLCX, DLCX_RET, PTYPE_IGNORE}, {"CRCX", CRCX_NO_LCO_NO_SDP, CRCX_NO_LCO_NO_SDP_RET, 97}, {"CRCX", CRCX_X_OSMO_IGN, CRCX_X_OSMO_IGN_RET, 97}, {"MDCX_TOO_LONG_CI", MDCX_TOO_LONG_CI, MDCX_TOO_LONG_CI_RET}, @@ -831,9 +827,6 @@ dummy_packets = 0; - osmo_talloc_replace_string(cfg, &trunk->audio_fmtp_extra, - t->extra_fmtp); - inp = create_msg(t->req, last_conn_id); msg = mgcp_handle_message(cfg, inp); msgb_free(inp); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35437?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: Icee0cd1f5a751fa760d5a9deca29089e78e7eb93 Gerrit-Change-Number: 35437 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in docker-playground[master]: mme: Use LAC from SGSN with most significat bit set to 0

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/35432?usp=email ) Change subject: mme: Use LAC from SGSN with most significat bit set to 0 ...................................................................... mme: Use LAC from SGSN with most significat bit set to 0 Adapt to the new default value used by ttcn3 tests. Depends: osmo-ttcn3-hacks.git Change-Id Iaf89228f6f026e04d5f583211959025e6d8d4a1d Change-Id: Ifefbd9bf2ed1bce8089e3dc4c6f9fe901e72308e --- M ttcn3-mme-test-ogs/ogs/open5gs-mme-latest.yaml M ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml 2 files changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/32/35432/1 diff --git a/ttcn3-mme-test-ogs/ogs/open5gs-mme-latest.yaml b/ttcn3-mme-test-ogs/ogs/open5gs-mme-latest.yaml index 13247cd..af5d96e 100644 --- a/ttcn3-mme-test-ogs/ogs/open5gs-mme-latest.yaml +++ b/ttcn3-mme-test-ogs/ogs/open5gs-mme-latest.yaml @@ -51,7 +51,7 @@ plmn_id: mcc: 262 mnc: 42 - lac: 43690 + lac: 39594 rac: 187 ci: 1223 diff --git a/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml b/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml index 2ce3d0c..66c9b66 100644 --- a/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml +++ b/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml @@ -31,7 +31,7 @@ plmn_id: mcc: 262 mnc: 42 - lac: 43690 + lac: 39594 rac: 187 ci: 1223 metrics: -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35432?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ifefbd9bf2ed1bce8089e3dc4c6f9fe901e72308e Gerrit-Change-Number: 35432 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-mme: Set log level of open5gs-mmed to debug

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/35431?usp=email ) Change subject: ttcn3-mme: Set log level of open5gs-mmed to debug ...................................................................... ttcn3-mme: Set log level of open5gs-mmed to debug INFO is in general not enough to debug tests. Change-Id: Ic91571f0caf138dc2ac798d75b0600ad265473c3 --- M ttcn3-mme-test-ogs/ogs/open5gs-mme-latest.yaml M ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml 2 files changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/31/35431/1 diff --git a/ttcn3-mme-test-ogs/ogs/open5gs-mme-latest.yaml b/ttcn3-mme-test-ogs/ogs/open5gs-mme-latest.yaml index 35b718d..13247cd 100644 --- a/ttcn3-mme-test-ogs/ogs/open5gs-mme-latest.yaml +++ b/ttcn3-mme-test-ogs/ogs/open5gs-mme-latest.yaml @@ -1,7 +1,7 @@ # See https://github.com/open5gs/open5gs/blob/main/configs/open5gs/mme.yaml.in logger: - level: info + level: debug mme: freeDiameter: /data/freediameter.conf diff --git a/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml b/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml index 520a0b5..2ce3d0c 100644 --- a/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml +++ b/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml @@ -1,7 +1,7 @@ # See https://github.com/open5gs/open5gs/blob/main/configs/open5gs/mme.yaml.in logger: - level: info + level: debug global: max: -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35431?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic91571f0caf138dc2ac798d75b0600ad265473c3 Gerrit-Change-Number: 35431 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: mme: TC_ue_cell_reselect_eutran_to_geran: Make sure oI flag is not se...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35428?usp=email ) Change subject: mme: TC_ue_cell_reselect_eutran_to_geran: Make sure oI flag is not set in DeleteSessionReq ...................................................................... mme: TC_ue_cell_reselect_eutran_to_geran: Make sure oI flag is not set in DeleteSessionReq Make sure Operation Indication is set to 0, to tell the SGW to keep the Session up at the PGW. Change-Id: If863f260a274fec5921ed888216c1688ff115ade --- M library/GTPv2_Templates.ttcn M mme/MME_Tests.ttcn 2 files changed, 84 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/28/35428/1 diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn index 65bc559..5dea7e9 100644 --- a/library/GTPv2_Templates.ttcn +++ b/library/GTPv2_Templates.ttcn @@ -283,8 +283,74 @@ additionalOctets := * } +/* 8.12 */ +template (present) Indication +tr_GTP2C_Indication(template (present) BIT1 oI := ?) := { + elementIdentifier := '4D'O, + lengthIndicator := ?, + instance := '0000'B, + spare := '0000'B, + sGWCI := ?, + iSRAI := ?, + iSRSI := ?, + oI := oI, + dFI := ?, + hI := ?, + dTF := ?, + dAF := ?, + mSV := ?, + sI := ?, + pT := ?, + pBit := ?, + cRSI := ?, + cFSI := ?, + uIMSI := ?, + sQCI := ?, + cCRSI := *, + iSRAU := *, + mBMDT := *, + s4AF := *, + s6AF := *, + sRNI := *, + pBIC := *, + retLoc := *, + cPSR := *, + cLII := *, + cSFBI := *, + pPSI := *, + pPON_PPEI := *, + pPOF := *, + aRRL := *, + cPRAI := *, + aOPI := *, + aOSI := *, + pCRI := *, + pSCI := *, + bDWI := *, + dTCI := *, + uASI := *, + nSI := *, + wPMSI := *, + uNACCSI := *, + pNSI := *, + s11TF := *, + pMTSMI := *, + cPOPCI := *, + ePCOSI := *, + rOAAI := *, + tSPCMI := *, + spare_1 := *, + spare_2 := *, + spare_3 := *, + spare_4 := *, + spare_5 := *, + spare_6 := *, + spare_7 := *, + additionalOctets := * +} + /* 8.14 */ template (value) PDN_AddressAllocation ts_GTP2C_PdnAddrAlloc(template (value) BIT3 pdn_type, @@ -943,13 +1009,14 @@ template (present) OCT3 seq := ?, template GTP2C_Cause cause := *, template (present) uint4_t bearer_id := ?, + template Indication indicationFlags := *, template FullyQualifiedTEID sender_fteid := *) := tr_PDU_GTP2C(d_teid, seq, { deleteSessionRequest := { cause := fr_GTP2C_Cause(cause), linkedEPS_Bearer_ID := tr_GTP2C_EpsBearerId(bearer_id), uLI := *, - indicationFlags := *, + indicationFlags := indicationFlags, protocolConfigOptions := *, originatingNode := *, fullyQualifiedTEID := sender_fteid, diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index acce915..d3150a1 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -835,13 +835,13 @@ } } -private altstep as_GTP2C_DeleteSession_success() runs on ConnHdlr { +private altstep as_GTP2C_DeleteSession_success(template Indication ind_flags := *) runs on ConnHdlr { var PDU_GTPCv2 rx_msg; var BearerContextIEs rx_bctx_ies; var template (value) FullyQualifiedTEID s11_fteid_c_ie, s11_fteid_u_ie, s5c_fteid_c_ie, s5c_fteid_u_ie; var template (value) BearerContextIEs bctx_ies; - [] GTP2.receive(tr_GTP2C_DeleteSessionReq(g_pars.ue_pars.s11_teic_local)) -> value rx_msg { + [] GTP2.receive(tr_GTP2C_DeleteSessionReq(g_pars.ue_pars.s11_teic_local, indicationFlags := ind_flags)) -> value rx_msg { GTP2.send(ts_GTP2C_DeleteSessionResp(g_pars.ue_pars.s11_teic_remote, rx_msg.sequenceNumber, Request_accepted)); @@ -1355,9 +1355,10 @@ as_s1ap_handle_UeContextReleaseCmd(); /* TS 23.401 Figure D.3.5-1 Step 13: - * After Gn timer triggers, the SGW session is deleted: + * After Gn timer triggers, the SGW session is deleted. + * Make sure Operation Indication is set to 0, to tell the SGW to keep the Session up at the PGW. */ - as_GTP2C_DeleteSession_success(); + as_GTP2C_DeleteSession_success(tr_GTP2C_Indication(oI := '0'B)); /* Let MME some time to handle the Create Session Response: */ f_sleep(3.0); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35428?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: If863f260a274fec5921ed888216c1688ff115ade Gerrit-Change-Number: 35428 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: mme: Parametrize RAI+CI used by emulated SGSN

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35429?usp=email ) Change subject: mme: Parametrize RAI+CI used by emulated SGSN ...................................................................... mme: Parametrize RAI+CI used by emulated SGSN This will be used further in subsequent tests, plus it is configured in the sgsn peer list of open5gs-mmed.cfg, so it knows how to route/find SGSN peers. Change-Id: Ia7d807bb5d75d711be7d4f6fbccd8fd123da171f --- M mme/MME_Tests.ttcn 1 file changed, 23 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/35429/1 diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index d3150a1..6a375e0 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -192,7 +192,13 @@ charstring mp_gn_local_ip := "127.0.0.22"; integer mp_gn_local_port := 2123; charstring mp_gn_remote_ip := "127.0.0.2"; + /* RAI+CI served from emulated peer SGSN: */ integer mp_gn_remote_port := 2123; + hexstring mp_gn_local_mcc := '262'H; + hexstring mp_gn_local_mnc := 'f42'H; + uint16_t mp_gn_local_lac := 43690; + uint8_t mp_gn_local_rac := 187; + uint16_t mp_gn_local_ci := 1223; /* S11 interface (GTPv2C, interface between MME and SGW) */ charstring mp_s11_local_ip := "127.0.0.3"; @@ -1174,10 +1180,10 @@ var GTP_CellId geran_gtp_ci; /* Assemble data of a fictitiously GERAN cell */ - geran_gtp_ci.ra_id.rac := oct2int('BB'O); - geran_gtp_ci.ra_id.lai.mcc_mnc := '262f42'H - geran_gtp_ci.ra_id.lai.lac := oct2int('AAAA'O); - geran_gtp_ci.cell_id := oct2int('04C7'O); + geran_gtp_ci.ra_id.rac := mp_gn_local_rac; + geran_gtp_ci.ra_id.lai.mcc_mnc := mp_gn_local_mcc & mp_gn_local_mnc; + geran_gtp_ci.ra_id.lai.lac := mp_gn_local_lac; + geran_gtp_ci.cell_id := mp_gn_local_ci; const octetstring geran_si1 := '198fb100000000000000000000000000007900002b'O; const octetstring geran_si3 := '1b753000f110236ec9033c2747407900003c0b2b2b'O; const octetstring geran_si13 := '009000185a6fc9e08410ab2b2b2b2b2b2b2b2b2b2b'O; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35429?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: Ia7d807bb5d75d711be7d4f6fbccd8fd123da171f Gerrit-Change-Number: 35429 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: mme: Use LAC from SGSN with most significat bit set to 0

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35430?usp=email ) Change subject: mme: Use LAC from SGSN with most significat bit set to 0 ...................................................................... mme: Use LAC from SGSN with most significat bit set to 0 According to 3GPP TS 23.003 sec 2.8.2.2.2, LACs from GERAN are configured with MSB 0 in order to differentiate it from EUTRAN ones. This is used by MMEs to figure out if the peer is an SGSN, based on the the LAC mapped into MME group ID in GUTI . Change-Id: Iaf89228f6f026e04d5f583211959025e6d8d4a1d --- M mme/MME_Tests.ttcn 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/35430/1 diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index 6a375e0..7d0573e 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -196,7 +196,7 @@ integer mp_gn_remote_port := 2123; hexstring mp_gn_local_mcc := '262'H; hexstring mp_gn_local_mnc := 'f42'H; - uint16_t mp_gn_local_lac := 43690; + uint16_t mp_gn_local_lac := 39594; uint8_t mp_gn_local_rac := 187; uint16_t mp_gn_local_ci := 1223; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35430?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: Iaf89228f6f026e04d5f583211959025e6d8d4a1d Gerrit-Change-Number: 35430 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in pysim[master]: tests: use case-insensitive compare of hex strings

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35423?usp=email ) Change subject: tests: use case-insensitive compare of hex strings ...................................................................... tests: use case-insensitive compare of hex strings Change-Id: I080f6e173fec40c27dd3ebbf252eaddf5a0e15ba --- M tests/test_files.py 1 file changed, 13 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/tests/test_files.py b/tests/test_files.py index fe520fb..733f04c 100755 --- a/tests/test_files.py +++ b/tests/test_files.py @@ -86,7 +86,7 @@ decoded = t[2] logging.debug("Testing encode of %s", name) re_enc = inst.encode_record_hex(decoded, rec_num) - self.assertEqual(encoded, re_enc) + self.assertEqual(encoded.upper(), re_enc.upper()) def test_de_encode_record(self): """Test the decoder and encoder for a linear-fixed EF. Performs first a decoder @@ -119,7 +119,7 @@ # re-encode the decoded data logging.debug("Testing re-encode of %s", name) re_enc = inst.encode_record_hex(re_dec, rec_num) - self.assertEqual(encoded, re_enc) + self.assertEqual(encoded.upper(), re_enc.upper()) class TransRecEF_Test(unittest.TestCase): @@ -182,7 +182,7 @@ # re-encode the decoded data logging.debug("Testing re-encode of %s", name) re_enc = inst.encode_record_hex(re_dec) - self.assertEqual(encoded, re_enc) + self.assertEqual(encoded.upper(), re_enc.upper()) class TransparentEF_Test(unittest.TestCase): @@ -254,7 +254,7 @@ logging.debug("Testing re-encode of %s", name) re_dec = inst.decode_hex(encoded) re_enc = inst.encode_hex(re_dec) - self.assertEqual(encoded, re_enc) + self.assertEqual(encoded.upper(), re_enc.upper()) if __name__ == '__main__': -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35423?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I080f6e173fec40c27dd3ebbf252eaddf5a0e15ba Gerrit-Change-Number: 35423 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

[S] Change in pysim[master]: test/test_files: set maxDiff attribute

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35417?usp=email ) Change subject: test/test_files: set maxDiff attribute ...................................................................... test/test_files: set maxDiff attribute Without this the diff between expected and actual output is truncated and one instead reads the following output: Diff is 844 characters long. Set self.maxDiff to None to see it. We actually want to see the full diff to see what's not matching. Change-Id: I6e89705061454191b6db1255de7fe549ad720800 --- M tests/test_files.py 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/test_files.py b/tests/test_files.py index 733f04c..24a80a1 100755 --- a/tests/test_files.py +++ b/tests/test_files.py @@ -37,6 +37,7 @@ class LinFixed_Test(unittest.TestCase): classes = all_subclasses(LinFixedEF) + maxDiff = None def test_decode_record(self): """Test the decoder for a linear-fixed EF. Requires the given LinFixedEF subclass @@ -124,6 +125,7 @@ class TransRecEF_Test(unittest.TestCase): classes = all_subclasses(TransRecEF) + maxDiff = None def test_decode_record(self): """Test the decoder for a transparent record-oriented EF. Requires the given TransRecEF subclass @@ -186,6 +188,8 @@ class TransparentEF_Test(unittest.TestCase): + maxDiff = None + @classmethod def get_classes(cls): """get list of TransparentEF sub-classes which are not a TransRecEF subclass.""" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35417?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6e89705061454191b6db1255de7fe549ad720800 Gerrit-Change-Number: 35417 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

[M] Change in pysim[master]: fix encode/decode of xPLMNwAcT

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/35415?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: fix encode/decode of xPLMNwAcT ...................................................................... fix encode/decode of xPLMNwAcT There are some pretty intricate rules about how GSM and E-UTRAN are encoded, let's make sure we fully support both as per 3GPP TS 31.102 Release 17. As part of this, swithc from a list of access technologies to a set, as there is no order. This makes comparing in unit tests much easier. However, it also means that we need to sort the set when printing the list of AcT in pySim-read to generate deterministic output. Change-Id: I398ac2a2527bd11e9c652e49fa46d6ca8d334b88 --- M pySim/legacy/utils.py M pySim/ts_51_011.py M pySim/utils.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok M tests/test_utils.py 8 files changed, 66 insertions(+), 45 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/15/35415/6 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35415?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I398ac2a2527bd11e9c652e49fa46d6ca8d334b88 Gerrit-Change-Number: 35415 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

[L] Change in osmo-mgw[master]: mgcp_client_test: add test_parse_response()

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35422?usp=email ) Change subject: mgcp_client_test: add test_parse_response() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35422?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: I842ce65a9a70f313570857b7df53727cc572b9e6 Gerrit-Change-Number: 35422 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Dec 2023 10:01:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2023