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

[M] Change in osmo-msc[master]: Add LLC and HLC information to MNCC interface definiton

by jolly

Attention is currently required from: laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35392?usp=email ) Change subject: Add LLC and HLC information to MNCC interface definiton ...................................................................... Patch Set 1: (1 comment) File include/osmocom/msc/mncc.h: https://gerrit.osmocom.org/c/osmo-msc/+/35392/comment/470efbe3_b87612d6 PS1, Line 113: #define MNCC_F_BEARER_CAP 0x00000001 : #define MNCC_F_CALLED 0x00000002 : #define MNCC_F_CALLING 0x00000004 : #define MNCC_F_REDIRECTING 0x00000008 : #define MNCC_F_CONNECTED 0x00000010 : #define MNCC_F_CAUSE 0x00000020 : #define MNCC_F_USERUSER 0x00000040 : #define MNCC_F_PROGRESS 0x00000080 : #define MNCC_F_EMERGENCY 0x00000100 : #define MNCC_F_FACILITY 0x00000200 : #define MNCC_F_SSVERSION 0x00000400 : #define MNCC_F_CCCAP 0x00000800 : #define MNCC_F_KEYPAD 0x00001000 : #define MNCC_F_SIGNAL 0x00002000 : #define MNCC_F_GCR 0x00004000 > unrelated cosmetic change. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35392?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I15f5afcf069ee6c1c4641108ceacc837bee311b5 Gerrit-Change-Number: 35392 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 19 Dec 2023 15:36:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-msc[master]: Add LLC and HLC information to MNCC interface definiton

by jolly

Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/35392?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Add LLC and HLC information to MNCC interface definiton ...................................................................... Add LLC and HLC information to MNCC interface definiton low/high layer compatibility are used for capability checking between caller and called entitiy. The information is added to the end of struct gsm_mncc increases, so that the version number needs not to be incremented. Related: OS#6152 Change-Id: I15f5afcf069ee6c1c4641108ceacc837bee311b5 --- M include/osmocom/msc/mncc.h 1 file changed, 23 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/92/35392/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35392?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I15f5afcf069ee6c1c4641108ceacc837bee311b5 Gerrit-Change-Number: 35392 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

[M] Change in libosmocore[master]: Add LLC and HLC transcoding to MNCC transcoding functions

by jolly

Attention is currently required from: pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35391?usp=email ) Change subject: Add LLC and HLC transcoding to MNCC transcoding functions ...................................................................... Patch Set 1: (3 comments) File include/osmocom/gsm/gsm48_ie.h: https://gerrit.osmocom.org/c/libosmocore/+/35391/comment/b6766107_5b40f5c3 PS1, Line 39: /* decode 'high layer complatibility' */ > "compatibility" in all lines. Done File include/osmocom/gsm/mncc.h: https://gerrit.osmocom.org/c/libosmocore/+/35391/comment/827ec537_14b5c33b PS1, Line 35: struct gsm_mncc_lowl_compat { > some spec reference on what is this about would be nice. Done File src/gsm/gsm48_ie.c: https://gerrit.osmocom.org/c/libosmocore/+/35391/comment/a2d46645_a6a3c850 PS1, Line 412: /*! Encode TS 04.08 High Layer compatibility IE (10.5.4.16) */ > AFAIU this is all really a len and a buffer, so I don't really see the need for a specific structure […] You are right, I simplified the functions by removing the 'local buffer'. I want to have a structure that provides information of content, length and maximum size. Using just a pointer would require an extra length field in the MNCC message for both LLC and HLC. Parsed values can be added to the structure in the future. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35391?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia6a2159ecf810a02f85b558026edf20b934567de Gerrit-Change-Number: 35391 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Dec 2023 15:32:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[M] Change in libosmocore[master]: Add LLC and HLC transcoding to MNCC transcoding functions

by jolly

Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35391?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Add LLC and HLC transcoding to MNCC transcoding functions ...................................................................... Add LLC and HLC transcoding to MNCC transcoding functions low/high layer compatibility are used for capability checking between caller and called entitiy. They are transparently forwarded, so there is no parsing or assembling of the elements. Related: OS#6152 Change-Id: Ia6a2159ecf810a02f85b558026edf20b934567de --- M include/osmocom/gsm/gsm48_ie.h M include/osmocom/gsm/mncc.h M src/gsm/gsm48_ie.c M src/gsm/libosmogsm.map 4 files changed, 90 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/91/35391/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35391?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia6a2159ecf810a02f85b558026edf20b934567de Gerrit-Change-Number: 35391 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: mme: Introduce test TC_ue_cell_reselect_eutran_to_geran

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35386?usp=email ) Change subject: mme: Introduce test TC_ue_cell_reselect_eutran_to_geran ...................................................................... mme: Introduce test TC_ue_cell_reselect_eutran_to_geran Initial bits to be able to test SGSN Context Request+Response emulating an UE doing cell reselection from 4G to 2G. Related: OS#6294 Change-Id: I707cb8c6b39c1440db5ccc2f02d08337b38fb564 --- M library/GTP_Templates.ttcn M mme/MME_Tests.ttcn 2 files changed, 282 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified daniel: Looks good to me, approved diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index 06ba208..839ed28 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -41,6 +41,37 @@ /* FIXME */ }; + template (value) Cause_gtpc ts_Cause_gtpc(template (value) GTP_Cause cause) := { + type_gtpc := '01'O, + causevalue := enum2oct1_Cause_gtpc_tmpl(cause) + } + private function enum2oct1_Cause_gtpc_tmpl(template GTP_Cause inp) return template OCT1 + { + if (istemplatekind(inp, "omit")) { + return omit; + } else if (istemplatekind(inp, "*")) { + return *; + } else if (istemplatekind(inp, "?")) { + return ?; + } else { + return int2oct(enum2int(valueof(inp)), 1); + } + } + template (present) Cause_gtpc tr_Cause_gtpc(template (present) GTP_Cause cause) := { + type_gtpc := '01'O, + causevalue := enum2oct1_Cause_gtpc_tmpl(cause) + } + function f_tr_Cause_gtpc(template GTP_Cause cause) return + template Cause_gtpc { + if (istemplatekind(cause, "omit")) { + return omit; + } else if (istemplatekind(cause, "*")) { + return *; + } else { + return tr_Cause_gtpc(cause); + } + } + private function f_oct_or_wc(template integer inp, integer len) return template octetstring { if (istemplatekind(inp, "omit")) { return omit; @@ -119,6 +150,18 @@ restartCounter := restart_counter } + /* Packet TMSI - 7.7.5 */ + template (value) PacketTMSI ts_PTMSI(OCT4 ptmsi) := { + type_gtpc := '05'O, + p_tmsi := ptmsi + } + + /* PTMSI Signature - 7.7.9 */ + template (value) PTMSI_Signature ts_PTMSI_sig(OCT3 ptmsi_sig) := { + type_gtpc := '0C'O, + ptmsi_Signature := ptmsi_sig + } + /* IMEI(SV) IE TS 29.060 7.7.53 */ template (value) IMEISV_gtpc ts_IMEISV(template (value) OCT8 imeisv) := { type_gtpc := '9A'O, @@ -350,7 +393,7 @@ apn_value := apn } - template (value) GSN_Address_GTPC ts_GsnAddr(octetstring ip_addr) := { + template (value) GSN_Address_GTPC ts_GsnAddr(template (value) octetstring ip_addr) := { type_gtpc := '85'O, lengthf := lengthof(ip_addr), addressf := ip_addr @@ -402,6 +445,29 @@ digits := digits, padding := 'F'H } + function f_ts_Imsi(template (omit) hexstring digits := omit) return template (omit) IMSI_gtpc { + var template (omit) IMSI_gtpc imsi; + if (istemplatekind(digits, "omit")) { + imsi := omit; + } else { + imsi := ts_Imsi(valueof(digits)); + } + return imsi; + } + template (present) IMSI_gtpc tr_Imsi(template (present) hexstring digits) := { + type_gtpc := '02'O, + digits := digits, + padding := 'F'H + } + function f_tr_Imsi(template hexstring digits := *) return template IMSI_gtpc { + if (istemplatekind(digits, "omit")) { + return omit; + } else if (istemplatekind(digits, "*")) { + return *; + } else { + return tr_Imsi(digits); + } + } function f_ts_RATType(template (omit) OCT1 ratType := omit) return template (omit) RATType { var template (omit) RATType rt; @@ -417,6 +483,17 @@ return rt; } + template (value) RoutingAreaIdentity ts_RoutingAreaIdentity(template (value) hexstring mcc_digits, + template (value) hexstring mnc_digits, + template (value) OCT2 lac, + template (value) OCT1 rac) := { + type_gtpc := '03'O, + mcc_digits := mcc_digits, + mnc_digits := mnc_digits, + lac := lac, + rac := rac + } + template (value) GeographicLocationCGI ts_GeographicLocationCGI(template (value) hexstring mcc, template (value) hexstring mnc, @@ -869,6 +946,101 @@ valueof(ts_DeletePdpRespPDU(cause, pco)), seq) } + /* SGSN Context Request - 7.5.3 */ + template (value) GTPC_PDUs ts_SGSNContextReqPDU(template (value) RoutingAreaIdentity rai, + template (value) OCT4 teic, + template (value) octetstring sgsn_addr_control, + template (omit) hexstring imsi := omit, + template (value) BIT1 msValidated := '0'B, + template (omit) TLLI tlli := omit, + template (omit) PacketTMSI ptmsi := omit, + template (omit) PTMSI_Signature ptmsi_sig := omit, + template (omit) OCT1 rat_type := omit) := { + sgsn_ContextRequest := { + imsi := f_ts_Imsi(imsi), + routingAreaIdentity := rai, + tlli := tlli, + packetTMSI := ptmsi, + ptmsi_Signature := ptmsi_sig, + ms_Validated := { + type_gtpc := '0D'O, + msValidated := msValidated, + spare := '1111111'B + }, + teidControlPlane := { + type_gtpc := '11'O, + teidControlPlane := teic + }, + sgsn_addr_controlPlane := ts_GsnAddr(sgsn_addr_control), + alternative_sgsn_addr_controlPlane := omit, + sGSN_Number := omit, + ratType := f_ts_RATType(rat_type), + hopCounter := omit, + private_extension_gtpc := omit + } + } + template (value) Gtp1cUnitdata ts_GTPC_SGSNContextReq(GtpPeer peer, uint16_t seq, + template (value) GTPC_PDUs SGSNContextReqPDU) := { + peer := peer, + gtpc := ts_GTP1C_PDU(sgsnContextRequest, '00000000'O, valueof(SGSNContextReqPDU), seq) + } + + /* SGSN Context Response - 7.5.4 */ + template (present) GTPC_PDUs tr_SGSNContextRespPDU(template (present) GTP_Cause cause := ?, + template hexstring imsi := *) := { + sgsn_ContextResponse := { + cause := tr_Cause_gtpc(cause), + imsi := f_tr_Imsi(imsi), + teidControlPlane := *, + rabContext := *, + radioPrioritySMS := *, + radioPriority := *, + packetFlowID := *, + charging_char := *, + mm_Context := *, + pdp_Context := *, + sgsn_addr_controlPlane := *, + pdpContextPriorization := *, + radioPriority_LCS := *, + mBMS_UE_Context := *, + subscribedRFSP_Index := *, + rFSP_IndexInUse := *, + colocatedGGSN_PGW_FQDN := *, + evolvedAllocationRetentionPriorityII := *, + extendedCommonFlags := *, + ue_network_capability := *, + ue_ambr := *, + apn_ambr_nsapi := *, + signallingPriorityIndication_nsapi := *, + higher_bitrates_than_16mbps_flag := *, + selectionMode_nsapi := *, + localHomeNetworkID_nsapi := *, + uE_UsageType := *, + extendedCommonFlagsII := *, + private_extension_gtpc := * + } + } + template (present) Gtp1cUnitdata tr_GTPC_SGSNContextResp(template (present) GtpPeer peer := ?, + template (present) OCT4 teid := ?, + template (present) GTPC_PDUs SGSNContextRespPDU := ?) + := tr_GTPC_MsgType(peer, sgsnContextResponse, teid, SGSNContextRespPDU); + + /* SGSN Context Acknowledge - 7.5.5 */ + template (value) GTPC_PDUs ts_SGSNContextAckPDU(template (value) GTP_Cause cause := GTP_CAUSE_REQUEST_ACCEPTED) := { + sgsn_ContextAcknowledge := { + cause := ts_Cause_gtpc(cause), + teidDataII := omit, + sgsn_AddressForUserTraffic := omit, + sgsn_Number := omit, + nodeIdentifier := omit, + private_extension_gtpc := omit + } + } + template (value) Gtp1cUnitdata ts_GTPC_SGSNContextAck(GtpPeer peer, uint16_t seq, + template (value) GTPC_PDUs SGSNContextAckPDU := ts_SGSNContextAckPDU(GTP_CAUSE_REQUEST_ACCEPTED)) := { + peer := peer, + gtpc := ts_GTP1C_PDU(sgsnContextAcknowledge, '00000000'O, valueof(SGSNContextAckPDU), seq) + } /* GTP-C RIM */ diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index eca6b04..f43bfbd 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -81,6 +81,7 @@ type record UeParams { hexstring imsi, charstring ue_ip, + NAS_EPS_Types.GUTI guti optional, /* TEI (Control) local side, S11 (SGW) */ OCT4 s11_teic_local, @@ -277,6 +278,7 @@ uep := { imsi := f_gen_imsi(imsi_suffix), ue_ip := "192.168.123.50", + guti := omit, s11_teic_local := '00000000'O, s11_teic_remote := omit, s5c_teic_local := '00000000'O, @@ -613,6 +615,14 @@ var template (value) E_RABSetupListCtxtSURes rab_setup_items; var octetstring esm_enc; var template (value) PDU_NAS_EPS nas; + var EPS_MobileIdentityTLV mi_tlv; + + S1AP.receive(tr_NAS_AttachAccept()) -> value rx_nas; + mi_tlv := rx_nas.ePS_messages.ePS_MobilityManagement.pDU_NAS_EPS_AttachAccept.gUTI; + if (mi_tlv.ePS_MobileIdentity.ePS_MobileIdentity.typeOfIdentity != '110'B) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Rx GUTI of unexpected MI type: ", mi_tlv)); + } + g_pars.ue_pars.guti := mi_tlv.ePS_MobileIdentity.ePS_MobileIdentity.oddEvenInd_identity.guti rab_setup_it := ts_S1AP_RABSetupItemCtxtSURes(rab_id := 5, tla := oct2bit(f_inet_addr(mp_mme_ip)), @@ -1186,6 +1196,91 @@ vc_conn.done; } +/* Test UE attached to EUTRAN reselecting a GERAN cell. In this scenario, the + * new SGSN will attempt to obtain information of the UE from the old SGSN (MME) + * through Gn interface using SGSN Context Request/Response procedure (OS#6294). */ +/* TS 23.003 2.8.2.1 */ +private function guti2rai_ptmsi(in NAS_EPS_Types.GUTI guti, out RoutingAreaIdentity rai, out OCT4 ptmsi, out OCT3 ptmsi_sig) runs on ConnHdlr { + var bitstring mtmsi_bits := oct2bit(guti.mTMSI); + var bitstring ptmsi_bits; + var bitstring ptmsi_sig_bits; + + rai := valueof(ts_RoutingAreaIdentity(guti.mccDigit1 & guti.mccDigit2 & guti.mccDigit3, + guti.mncDigit3 & guti.mncDigit1 & guti.mncDigit2, + guti.mMEGI, guti.mMEC)); + /* 3GPP TS 23.003 2.8.2.0: "P-TMSI shall be of 32 bits length where the two topmost bits are + * reserved and always set to '11'. Hence, for a UE which may handover to GERAN/UTRAN (based on + * subscription and UE capabilities), the corresponding bits in the M-TMSI are set to '11'" + */ + ptmsi_bits := '11'B & substr(mtmsi_bits, 2, 6) & oct2bit(guti.mMEC) & substr(mtmsi_bits, 16, 16); + ptmsi_sig_bits := substr(mtmsi_bits, 8, 8) & oct2bit('0000'O); + ptmsi := bit2oct(ptmsi_bits); + ptmsi_sig := bit2oct(ptmsi_sig_bits); + /* TODO: The UE shall fill the remaining 2 octets of the <P-TMSI signature> according to clauses 9.1.1, 9.4.1, 10.2.1, or + * 10.5.1 of 3GPP TS.33.401 [89] , as appropriate, for RAU/Attach procedures.*/ + /* TODO: 3GPP TS 33.401 9.1.1 The 16 least significant bits available in + * the P-TMSI signature field shall be filled with the truncated NAS-token + * according to 3GPP TS 23.003 [3].The truncated NAS-token is defined as the 16 + * least significant bits of the NAS-token. + * The NAS-token is derived as specified in Annex A.9. The UE shall use the uplink NAS COUNT value that it would use + * in the next NAS message to calculate the NAS-token and increase the stored uplink NAS COUNT value by 1.*/ + /* TODO: mMEC "also copied into the 8 Most Significant Bits of the NRI field within the P-TMSI" */ +} +private function f_TC_ue_cell_reselect_eutran_to_geran(ConnHdlrPars pars) runs on ConnHdlr { + var template (value) GTPC_PDUs SGSNContextReqPDU; + var RoutingAreaIdentity rai; + var OCT4 ptmsi; + var OCT3 ptmsi_sig; + var Gtp1cUnitdata gtpc_pdu; + + f_init_handler(pars); + f_gtp_register_imsi(g_pars.ue_pars.imsi); + f_attach(); + + /* TODO: take GUTI from as_s1ap_handle_IntialCtxSetupReq() in g_pars, + * convert it to P-TMSI and pass P-TMSI below */ + guti2rai_ptmsi(g_pars.ue_pars.guti, rai, ptmsi, ptmsi_sig); + + SGSNContextReqPDU := ts_SGSNContextReqPDU(rai, '00000000'O, f_inet_addr(mp_gn_local_ip), + ptmsi := ts_PTMSI(ptmsi), ptmsi_sig := ts_PTMSI_sig(ptmsi_sig)); + GTP.send(ts_GTPC_SGSNContextReq(g_gn_iface_peer, 0, SGSNContextReqPDU)); + + timer T := 5.0; + T.start; + alt { + [] GTP.receive(tr_GTPC_SGSNContextResp(g_gn_iface_peer, '00000000'O, + tr_SGSNContextRespPDU(GTP_CAUSE_REQUEST_ACCEPTED, + g_pars.ue_pars.imsi))) -> value gtpc_pdu { + setverdict(pass); + } + [] GTP.receive { + setverdict(fail, "unexpected GTPC message from MME"); + } + [] T.timeout { + setverdict(fail, "no SGSN Context Response from MME"); + } + } + + GTP.send(ts_GTPC_SGSNContextAck(g_gn_iface_peer, oct2int(gtpc_pdu.gtpc.opt_part.sequenceNumber), + ts_SGSNContextAckPDU(GTP_CAUSE_REQUEST_ACCEPTED))); + /* Give some time to process the SGSNContextACK: */ + f_sleep(3.0); +} +testcase TC_ue_cell_reselect_eutran_to_geran() runs on MTC_CT { + var charstring id := testcasename(); + + f_init_diameter(id); + f_init_s1ap(id, 4); + f_init_gtpv2_s11(id); + f_s1ap_setup(0); + f_init_gtp(id); + + var ConnHdlrPars pars := f_init_pars(ue_idx := 0); + var ConnHdlr vc_conn; + vc_conn := f_start_handler_with_pars(refers(f_TC_ue_cell_reselect_eutran_to_geran), pars); + vc_conn.done; +} + control { execute( TC_s1ap_setup_wrong_plmn() ); execute( TC_s1ap_setup_wrong_tac() ); @@ -1195,6 +1290,7 @@ execute( TC_gn_echo_request() ); execute( TC_RIM_RAN_INF() ); execute( TC_s1ap_reset() ); + execute( TC_ue_cell_reselect_eutran_to_geran() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35386?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: I707cb8c6b39c1440db5ccc2f02d08337b38fb564 Gerrit-Change-Number: 35386 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

[M] Change in osmo-msc[master]: Add LLC and HLC information to MNCC interface definiton

by laforge

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35392?usp=email ) Change subject: Add LLC and HLC information to MNCC interface definiton ...................................................................... Patch Set 1: (1 comment) File include/osmocom/msc/mncc.h: https://gerrit.osmocom.org/c/osmo-msc/+/35392/comment/b24bd595_9e6acd23 PS1, Line 113: #define MNCC_F_BEARER_CAP 0x00000001 : #define MNCC_F_CALLED 0x00000002 : #define MNCC_F_CALLING 0x00000004 : #define MNCC_F_REDIRECTING 0x00000008 : #define MNCC_F_CONNECTED 0x00000010 : #define MNCC_F_CAUSE 0x00000020 : #define MNCC_F_USERUSER 0x00000040 : #define MNCC_F_PROGRESS 0x00000080 : #define MNCC_F_EMERGENCY 0x00000100 : #define MNCC_F_FACILITY 0x00000200 : #define MNCC_F_SSVERSION 0x00000400 : #define MNCC_F_CCCAP 0x00000800 : #define MNCC_F_KEYPAD 0x00001000 : #define MNCC_F_SIGNAL 0x00002000 : #define MNCC_F_GCR 0x00004000 unrelated cosmetic change. If you want to do that, please do it in a seaparate patch that changes no functionality but just the cosmetics. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35392?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I15f5afcf069ee6c1c4641108ceacc837bee311b5 Gerrit-Change-Number: 35392 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 19 Dec 2023 14:37:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[M] Change in libosmocore[master]: Add LLC and HLC transcoding to MNCC transcoding functions

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35391?usp=email ) Change subject: Add LLC and HLC transcoding to MNCC transcoding functions ...................................................................... Patch Set 1: (1 comment) File src/gsm/gsm48_ie.c: https://gerrit.osmocom.org/c/libosmocore/+/35391/comment/1dea33a5_90babfdf PS1, Line 412: /*! Encode TS 04.08 High Layer compatibility IE (10.5.4.16) */ > All this looks a bit overkill to me, having a struct containing a len field and a buffer, and then c […] AFAIU this is all really a len and a buffer, so I don't really see the need for a specific structure to hold them. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35391?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia6a2159ecf810a02f85b558026edf20b934567de Gerrit-Change-Number: 35391 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 19 Dec 2023 14:33:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[M] Change in libosmocore[master]: Add LLC and HLC transcoding to MNCC transcoding functions

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35391?usp=email ) Change subject: Add LLC and HLC transcoding to MNCC transcoding functions ...................................................................... Patch Set 1: (3 comments) File include/osmocom/gsm/gsm48_ie.h: https://gerrit.osmocom.org/c/libosmocore/+/35391/comment/57b106c8_dca51d27 PS1, Line 39: /* decode 'high layer complatibility' */ "compatibility" in all lines. File include/osmocom/gsm/mncc.h: https://gerrit.osmocom.org/c/libosmocore/+/35391/comment/bcfd6de6_f0ebd6f0 PS1, Line 35: struct gsm_mncc_lowl_compat { some spec reference on what is this about would be nice. File src/gsm/gsm48_ie.c: https://gerrit.osmocom.org/c/libosmocore/+/35391/comment/9de75357_8b6ce68c PS1, Line 412: /*! Encode TS 04.08 High Layer compatibility IE (10.5.4.16) */ All this looks a bit overkill to me, having a struct containing a len field and a buffer, and then copying it over to yet another local buffer to then yet again copy it over to the msg... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35391?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia6a2159ecf810a02f85b558026edf20b934567de Gerrit-Change-Number: 35391 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Tue, 19 Dec 2023 14:32:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmo-msc[master]: Add LLC and HLC information forwarding to MNCC interface

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/35393?usp=email ) Change subject: Add LLC and HLC information forwarding to MNCC interface ...................................................................... Add LLC and HLC information forwarding to MNCC interface low/high layer compatibility are used for capability checking between caller and called entitiy. The transcoding is performed by libosmogsm. Related: OS#6152 Depends: libosmocore.git Ia6a2159ecf810a02f85b558026edf20b934567de Change-Id: I760980a7e17e2fa81615adc69ef85797eb0c07f1 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/93/35393/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 31fcb23..c31333f 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -645,6 +645,18 @@ gsm48_decode_called(&setup.called, TLVP_VAL(&tp, GSM48_IE_CALLED_BCD)-1); } + /* low layer compatibility */ + if (TLVP_PRESENT(&tp, GSM48_IE_LOWL_COMPAT)) { + setup.fields |= MNCC_F_LOWL_COMPAT; + gsm48_decode_lowl_compat(&setup.llc, + TLVP_VAL(&tp, GSM48_IE_LOWL_COMPAT)-1); + } + /* high layer compatibility */ + if (TLVP_PRESENT(&tp, GSM48_IE_HIGHL_COMPAT)) { + setup.fields |= MNCC_F_HIGHL_COMPAT; + gsm48_decode_highl_compat(&setup.hlc, + TLVP_VAL(&tp, GSM48_IE_HIGHL_COMPAT)-1); + } /* user-user */ if (TLVP_PRESENT(&tp, GSM48_IE_USER_USER)) { setup.fields |= MNCC_F_USERUSER; @@ -915,6 +927,12 @@ /* called party BCD number */ if (setup->fields & MNCC_F_CALLED) gsm48_encode_called(msg, &setup->called); + /* low layer compatibility */ + if (setup->fields & MNCC_F_LOWL_COMPAT) + gsm48_encode_lowl_compat(msg, &setup->llc); + /* high layer compatibility */ + if (setup->fields & MNCC_F_HIGHL_COMPAT) + gsm48_encode_highl_compat(msg, &setup->hlc); /* user-user */ if (setup->fields & MNCC_F_USERUSER) gsm48_encode_useruser(msg, 0, &setup->useruser); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35393?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I760980a7e17e2fa81615adc69ef85797eb0c07f1 Gerrit-Change-Number: 35393 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[M] Change in osmo-msc[master]: Add LLC and HLC information to MNCC interface definiton

by jolly

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/35392?usp=email ) Change subject: Add LLC and HLC information to MNCC interface definiton ...................................................................... Add LLC and HLC information to MNCC interface definiton low/high layer compatibility are used for capability checking between caller and called entitiy. The information is added to the end of struct gsm_mncc increases, so that the version number needs not to be incremented. Related: OS#6152 Change-Id: I15f5afcf069ee6c1c4641108ceacc837bee311b5 --- M include/osmocom/msc/mncc.h 1 file changed, 38 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/92/35392/1 diff --git a/include/osmocom/msc/mncc.h b/include/osmocom/msc/mncc.h index c8f3bfd..2beeb27 100644 --- a/include/osmocom/msc/mncc.h +++ b/include/osmocom/msc/mncc.h @@ -110,24 +110,26 @@ #define GSM_MAX_SSVERSION 128 #define GSM_MAX_USERUSER 128 -#define MNCC_F_BEARER_CAP 0x0001 -#define MNCC_F_CALLED 0x0002 -#define MNCC_F_CALLING 0x0004 -#define MNCC_F_REDIRECTING 0x0008 -#define MNCC_F_CONNECTED 0x0010 -#define MNCC_F_CAUSE 0x0020 -#define MNCC_F_USERUSER 0x0040 -#define MNCC_F_PROGRESS 0x0080 -#define MNCC_F_EMERGENCY 0x0100 -#define MNCC_F_FACILITY 0x0200 -#define MNCC_F_SSVERSION 0x0400 -#define MNCC_F_CCCAP 0x0800 -#define MNCC_F_KEYPAD 0x1000 -#define MNCC_F_SIGNAL 0x2000 -#define MNCC_F_GCR 0x4000 +#define MNCC_F_BEARER_CAP 0x00000001 +#define MNCC_F_CALLED 0x00000002 +#define MNCC_F_CALLING 0x00000004 +#define MNCC_F_REDIRECTING 0x00000008 +#define MNCC_F_CONNECTED 0x00000010 +#define MNCC_F_CAUSE 0x00000020 +#define MNCC_F_USERUSER 0x00000040 +#define MNCC_F_PROGRESS 0x00000080 +#define MNCC_F_EMERGENCY 0x00000100 +#define MNCC_F_FACILITY 0x00000200 +#define MNCC_F_SSVERSION 0x00000400 +#define MNCC_F_CCCAP 0x00000800 +#define MNCC_F_KEYPAD 0x00001000 +#define MNCC_F_SIGNAL 0x00002000 +#define MNCC_F_GCR 0x00004000 +#define MNCC_F_HIGHL_COMPAT 0x00008000 +#define MNCC_F_LOWL_COMPAT 0x00010000 /* UPDATEME when adding new MNCC_F_* entries above */ -#define MNCC_F_ALL 0x7fff +#define MNCC_F_ALL 0x0001ffff struct gsm_mncc { /* context based information */ @@ -170,6 +172,10 @@ /* A buffer to contain SDP ('\0' terminated) */ char sdp[1024]; + + /* Additional information that extends current socket interface version. */ + struct gsm_mncc_highl_compat hlc; + struct gsm_mncc_lowl_compat llc; }; struct gsm_data_frame { -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35392?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I15f5afcf069ee6c1c4641108ceacc837bee311b5 Gerrit-Change-Number: 35392 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2023