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

Change in osmo-ci[master]: Reenable ttcn3-hnbgw-test

by osmith

Attention is currently required from: daniel, dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27318 ) Change subject: Reenable ttcn3-hnbgw-test ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4c7d1ee876e90d52827b2d8cc57342298dd44061 Gerrit-Change-Number: 27318 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 24 Feb 2022 13:38:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Support rx cause 'New PDP type due to network preference'

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27314 ) Change subject: ggsn: Support rx cause 'New PDP type due to network preference' ...................................................................... ggsn: Support rx cause 'New PDP type due to network preference' Related: OS#5449 Change-Id: Iace6a4bd0c2372601dc43108ec4eb78602dbcf30 --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 75 insertions(+), 34 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 bef7949..b66d7ba 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -331,9 +331,15 @@ } } - function f_handle_create_req(inout PdpContext ctx, in Gtp1cUnitdata ud, in OCT1 exp_cause := '80'O) runs on GT_CT { + function f_handle_create_req(inout PdpContext ctx, in Gtp1cUnitdata ud, in template OCT1 exp_cause := '80'O) runs on GT_CT { var CreatePDPContextResponse cpr := ud.gtpc.gtpc_pdu.createPDPContextResponse; - if (exp_cause == '80'O and exp_cause == cpr.cause.causevalue) { + + if (not match(cpr.cause.causevalue, exp_cause)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "CreatePDPContextResp: cause expectancies didn't match"); + } + + if (cpr.cause.causevalue == '80'O) { /* Accepted */ /* Check if EUA type corresponds to requested type */ if (match(ctx.eua, t_EuaIPv4(?)) and not match(cpr.endUserAddress, tr_EuaIPv4(?))){ @@ -350,34 +356,44 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "EUAv4v6 expectancies didn't match"); } - /* Check if PCO response corresponds to request */ - if (ispresent(ctx.pco_req)) { - if (match(ctx.pco_req, ts_PCO_IPv4_DNS_CONT) and - not match(cpr.protConfigOptions, tr_PCO_IPv4_DNS_CONT_resp(?))) { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - "IPv4 DNS Container requested, but missing"); - } - if (match(ctx.pco_req, ts_PCO_IPv6_DNS) and - not match(cpr.protConfigOptions, tr_PCO_IPv6_DNS_resp(?))) { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - "IPv6 DNS Container requested, but missing"); - } + } else if (cpr.cause.causevalue == '81'O) { /* Cause: New PDP type due to network preference */ + /* ETSI TS 129 060 7.3.2 Create PDP Context Response. OS#5449 */ + /* This should only happen if EUA requested type is v4v6: */ + if (not ischosen(ctx.eua.endUserAddress.endUserAddressIPv4andIPv6)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Cause not expected when requesting a non v4v6 EUA"); } - ctx.teid_remote := cpr.teidDataI.teidDataI; - ctx.teic_remote := cpr.teidControlPlane.teidControlPlane; - ctx.eua := cpr.endUserAddress; - ctx.pco_neg := cpr.protConfigOptions; - setverdict(pass); - } else if (exp_cause != '80'O and exp_cause == cpr.cause.causevalue) { - if (ispresent(cpr.endUserAddress)) { - log("EUA received on createPDPContextResponse cause=" & oct2str(cpr.cause.causevalue)); - setverdict(fail); + if (not match(cpr.endUserAddress, (tr_EuaIPv4(?), tr_EuaIPv6(?)))) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Cause not expected when requesting+receiving EUAv4v6"); } - setverdict(pass); } else { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - "CreatePDPContextResp: cause expectancies didn't match"); + if (ispresent(cpr.endUserAddress)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "EUA received on createPDPContextResponse cause=" & oct2str(cpr.cause.causevalue)); + } + setverdict(pass); + return; } + + /* Check if PCO response corresponds to request */ + if (ispresent(ctx.pco_req)) { + if (match(ctx.pco_req, ts_PCO_IPv4_DNS_CONT) and + not match(cpr.protConfigOptions, tr_PCO_IPv4_DNS_CONT_resp(?))) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "IPv4 DNS Container requested, but missing"); + } + if (match(ctx.pco_req, ts_PCO_IPv6_DNS) and + not match(cpr.protConfigOptions, tr_PCO_IPv6_DNS_resp(?))) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "IPv6 DNS Container requested, but missing"); + } + } + ctx.teid_remote := cpr.teidDataI.teidDataI; + ctx.teic_remote := cpr.teidControlPlane.teidControlPlane; + ctx.eua := cpr.endUserAddress; + ctx.pco_neg := cpr.protConfigOptions; + setverdict(pass); } function f_handle_update_req(inout PdpContext ctx, in Gtp1cUnitdata ud, in OCT1 exp_cause := '80'O) runs on GT_CT { @@ -420,8 +436,9 @@ } /* send a PDP context activation */ - function f_pdp_ctx_act(inout PdpContext ctx, OCT1 exp_cause := '80'O) runs on GT_CT { + function f_pdp_ctx_act(inout PdpContext ctx, template OCT1 exp_cause := '80'O) runs on GT_CT return CreatePDPContextResponse { var Gtp1cUnitdata ud; + var CreatePDPContextResponse cpr; var default d; log("sending CreatePDP"); @@ -436,10 +453,12 @@ alt { [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, createPDPContextResponse, ctx.teic)) -> value ud { f_handle_create_req(ctx, ud, exp_cause); + cpr := ud.gtpc.gtpc_pdu.createPDPContextResponse; } } deactivate(d); T_default.stop; + return cpr; } function f_pdp_ctx_exp_del_req(PdpContext ctx, template (omit) OCT1 expect_cause := omit, boolean expect_teardown := false) runs on GT_CT { @@ -1680,18 +1699,40 @@ /* Test IPv4v6 context activation for dynamic IPv4v6 EUA on a v4-only APN */ testcase TC_pdp46_act_deact_apn4() runs on GT_CT { + const OCT1 cause_accept := '80'O; /* Normal accept cause */ + const OCT1 cause_new_pdp_type := '81'O; /* Cause: New PDP type due to network preference */ + const OCT1 cause_unknown_pdp := 'DC'O; /* Cause: Unknown PDP address or PDP type */ + var CreatePDPContextResponse cpr; + f_init(); - /* A typical MS first attempts v4v6, and if rejected, then tries v4 and v6 separetly */ var PdpContext ctx46 := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dynv6Dyn))); - f_pdp_ctx_act(ctx46, 'DC'O); /* Cause: Unknown PDP address or PDP type */ + cpr := f_pdp_ctx_act(ctx46, (cause_unknown_pdp, cause_new_pdp_type)); - var PdpContext ctx4 := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); - f_pdp_ctx_act(ctx4, '80'O); /* Normal accept cause */ + if (cpr.cause.causevalue == cause_new_pdp_type) { + /* 3GPP TS 23.060 sec 9.2.1: "If the MS requests PDP type IPv4v6, + * but the operator preferences dictate the use of a single IP + * version only, the PDP type shall be changed to a single address + * PDP type (IPv4 or IPv6) and a reason cause shall be returned to + * the MS indicating that only the assigned PDP type is allowed. In + * this case, the MS shall not request another PDP context for the + * other PDP type during the existence of the PDP context." */ + f_pdp_ctx_del(ctx46, '1'B); + } else { + /* 3GPP TS 23.060 sec 9.2.1 NOTE 5: If the MS requests PDP type + * IPv4v6, and the PDP context is rejected due to "unknown PDP + * type", the MS can attempt to establish dual-stack connectivity + * by performing two PDP context request procedures to activate an + * IPv4 PDP context and an IPv6 PDP context, both to the same APN. A + * typical MS first attempts v4v6, and if rejected, then tries v4 + * and v6 separetly */ + var PdpContext ctx4 := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + f_pdp_ctx_act(ctx4, cause_accept); /* Normal accept cause */ - var PdpContext ctx6 := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv6Dyn))); - f_pdp_ctx_act(ctx6, 'DC'O); /* Cause: Unknown PDP address or PDP type */ + var PdpContext ctx6 := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv6Dyn))); + f_pdp_ctx_act(ctx6, cause_unknown_pdp); /* Cause: Unknown PDP address or PDP type */ - f_pdp_ctx_del(ctx4, '1'B); + f_pdp_ctx_del(ctx4, '1'B); + } } /* Validate if 2nd CtxCreateReq with increased Recovery IE causes ggsn to drop 1st one (while keeping 2nd one). */ 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27314 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: Iace6a4bd0c2372601dc43108ec4eb78602dbcf30 Gerrit-Change-Number: 27314 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: GTP_Templates: Fix runtime error in tr_EuaIPv*() templates

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27313 ) Change subject: GTP_Templates: Fix runtime error in tr_EuaIPv*() templates ...................................................................... GTP_Templates: Fix runtime error in tr_EuaIPv*() templates Doing this when receiving an IPv4 EUA thwos an error: "if (not match(cpr.endUserAddress, tr_EuaIPv4(?)) and not match(cpr.endUserAddress, tr_EuaIPv6(?)))" Dynamic test case error: Performing lengthof() operation on an octetstring template with no exact length. This happens if for instance received spare bits are set to '0000'. Change-Id: I70ad3c10e2ecfed8f733ff906272a9597b2ab9bd --- M library/GTP_Templates.ttcn 1 file changed, 40 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index 73d0bf0..049614a 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -163,6 +163,43 @@ gtpc := ts_GTP1C_PDU(echoRequest, '00000000'O, valueof(ts_EchoReqPDU), seq) } + private function f_eua_ipv4_len(template OCT4 ip_addr) return template integer { + if (istemplatekind(ip_addr, "omit")) { + return 2; + } else if (istemplatekind(ip_addr, "*")) { + return ?; + } else if (istemplatekind(ip_addr, "?")) { + return 6; + } + return 6; + } + + private function f_eua_ipv6_len(template OCT16 ip_addr) return template integer { + if (istemplatekind(ip_addr, "omit")) { + return 2; + } else if (istemplatekind(ip_addr, "*")) { + return ?; + } else if (istemplatekind(ip_addr, "?")) { + return 18; + } + return 18; + } + + private function f_eua_ipv4v6_len(template OCT4 ip_addr4, template OCT16 ip_addr6) return template integer { + var integer len := 2; + if (istemplatekind(ip_addr4, "*") or + istemplatekind(ip_addr6, "*")) { + return ?; + } + if (not istemplatekind(ip_addr4, "omit")) { + len := len + 4; + } + if (not istemplatekind(ip_addr6, "omit")) { + len := len + 16; + } + return len; + } + template EndUserAddress t_EuaIPv4(template OCT4 ip_addr) := { type_gtpc := '80'O, endUserAddress := { @@ -179,7 +216,7 @@ template EndUserAddress tr_EuaIPv4(template OCT4 ip_addr) modifies t_EuaIPv4 := { endUserAddress := { endUserAddressIPv4 := { - lengthf := 2+lengthof(ip_addr) + lengthf := f_eua_ipv4_len(ip_addr) } } } @@ -200,7 +237,7 @@ template EndUserAddress tr_EuaIPv6(template OCT16 ip_addr) modifies t_EuaIPv6 := { endUserAddress := { endUserAddressIPv6 := { - lengthf := 2+lengthof(ip_addr) + lengthf := f_eua_ipv6_len(ip_addr) } } } @@ -223,7 +260,7 @@ template EndUserAddress tr_EuaIPv4v6(template OCT4 ip_addr4, template OCT16 ip_addr6) modifies t_EuaIPv4v6 := { endUserAddress := { endUserAddressIPv4andIPv6 := { - lengthf := 2+lengthof(ip_addr4)+lengthof(ip_addr6) + lengthf := f_eua_ipv4v6_len(ip_addr4, ip_addr6) } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27313 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: I70ad3c10e2ecfed8f733ff906272a9597b2ab9bd Gerrit-Change-Number: 27313 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: GTP_Templates: Fix runtime error in tr_EuaIPv*() templates

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27313 ) Change subject: GTP_Templates: Fix runtime error in tr_EuaIPv*() templates ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27313 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: I70ad3c10e2ecfed8f733ff906272a9597b2ab9bd Gerrit-Change-Number: 27313 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 24 Feb 2022 13:34:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ci[master]: Reenable ttcn3-hnbgw-test

by daniel

Attention is currently required from: osmith, dexter. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27318 ) Change subject: Reenable ttcn3-hnbgw-test ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > Patch looks fine, but it seems not to pass yet: […] That's about osmo-gsm-tester building(?) osmo-hnbgw and it seems to complain about missing dependencies: """ configure: error: Package requirements (libosmo-mgcp-client >= 1.9.0) were not met: Package 'libosmo-mgcp-client', required by 'virtual:world', not found """ The test was successful when I ran it manually: https://jenkins.osmocom.org/jenkins/view/TTCN3/job/ttcn3-hnbgw-test/ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4c7d1ee876e90d52827b2d8cc57342298dd44061 Gerrit-Change-Number: 27318 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 24 Feb 2022 13:32:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: GTP_Templates: Fix runtime error in tr_EuaIPv*() templates

by fixeria

Attention is currently required from: pespin, daniel. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27313 ) Change subject: GTP_Templates: Fix runtime error in tr_EuaIPv*() templates ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27313 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: I70ad3c10e2ecfed8f733ff906272a9597b2ab9bd Gerrit-Change-Number: 27313 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 24 Feb 2022 13:02:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Support rx cause 'New PDP type due to network preference'

by fixeria

Attention is currently required from: pespin, daniel. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27314 ) Change subject: ggsn: Support rx cause 'New PDP type due to network preference' ...................................................................... Patch Set 2: Code-Review+2 (3 comments) File ggsn_tests/GGSN_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27314/comment/55326be4_d5b1… PS1, Line 366: if (not match(cpr.endUserAddress, tr_EuaIPv4(?)) and > Let's make it shorter: […] Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27314/comment/74a23494_66f6… PS1, Line 1704: cause_accept > Defined but not used, why? Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27314/comment/227e84f7_7ed7… PS1, Line 1705: var > const, here and the line below Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27314 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: Iace6a4bd0c2372601dc43108ec4eb78602dbcf30 Gerrit-Change-Number: 27314 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 24 Feb 2022 13:01:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: New stats for lchan life duration.

by iedemam

Attention is currently required from: laforge. iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27081 ) Change subject: New stats for lchan life duration. ...................................................................... Patch Set 12: (1 comment) Patchset: PS12: Good pointer, Neels. Updated to use osmo_time_cc's total_sum instead of a separate timestamp tracker. I'm still seeing a strange build failure in handover_tests when running make check. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 Gerrit-Change-Number: 27081 Gerrit-PatchSet: 12 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 24 Feb 2022 12:41:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: New stats for lchan life duration.

by iedemam

Attention is currently required from: iedemam, laforge. Hello Jenkins Builder, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081 to look at the new patch set (#12). Change subject: New stats for lchan life duration. ...................................................................... New stats for lchan life duration. This patch adds two stats which track cummulative lchan lifetime by type TCH and SDCCH. These new counters will accomplish two things: 1) Provide a glanceable way to see if lchan durations look healthy. When examining a site, short-lived (<5s) and long-lived (>30s) TCH lchans are difficult to tell apart. If we only see short-lived TCH lchans, there is most likely an RF or signaling problem to investigate. This new counter will expose channel ages in the VTY output 2) Provide a more accurate count for Erlangs per site. Currently, we are basing Erlangs on active TCH channel counts per stats period. This method skews high very quickly. Each active TCH in that period translates into the full 10s of activity. This counter should improve accuracy by two orders of magnitude. Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bts.c M src/osmo-bsc/bts_trx_vty.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/lchan_fsm.c 7 files changed, 89 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/27081/12 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27081 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1b0670c47cb5e0b7776eda89d1e71545ba0e3347 Gerrit-Change-Number: 27081 Gerrit-PatchSet: 12 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: initial conn-oriented forwarding

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260 ) Change subject: bsc_nat_fsm: initial conn-oriented forwarding ...................................................................... bsc_nat_fsm: initial conn-oriented forwarding Implement a simple version of forwarding Connection Request, Connection Confirm, Data Form, Released SCCP messages. This is still assuming that there is just one BSC, one MSC, the same connection ID is used in RAN and CN. Future patches will add a mapping between RAN and CN sides and allow multiple BSCs. With this patch it is possible to perform a call between two MS in the following network structure: MS1 --. BTS --- BSC --- BSCNAT --- MSC MS2 --' Related: SYS#5560 Change-Id: I3df79e4dfaa60f4fd098961ee57cda71e9773b82 --- M src/osmo-bsc-nat/bsc_nat_fsm.c 1 file changed, 87 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 3161de3..906fd94 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -69,6 +69,31 @@ return g_bsc_nat->cn; } +/* For connection-oriented messages, figure out which side is the BSCNAT, + * either the called_addr or calling_addr. */ +static int sccp_sap_get_peer_addr_in(struct bsc_nat_ss7_inst *src, struct osmo_sccp_addr **peer_addr_in, + struct osmo_sccp_addr *called_addr, struct osmo_sccp_addr *calling_addr) +{ + if (osmo_sccp_addr_ri_cmp(&src->local_sccp_addr, called_addr) == 0) { + *peer_addr_in = called_addr; + return 0; + } else if (osmo_sccp_addr_ri_cmp(&src->local_sccp_addr, calling_addr) == 0) { + *peer_addr_in = calling_addr; + return 0; + } + + char buf_called[255]; + char buf_calling[255]; + + osmo_sccp_addr_to_str_buf(buf_called, sizeof(buf_called), NULL, called_addr); + osmo_sccp_addr_to_str_buf(buf_calling, sizeof(buf_calling), NULL, calling_addr); + + LOG_SCCP(src, NULL, LOGL_ERROR, "Invalid connection oriented message, locally configured address %s" + " is neither called address %s nor calling address %s!\n", + osmo_sccp_inst_addr_name(NULL, &src->local_sccp_addr), buf_called, buf_calling); + return -1; +} + /* Figure out who will receive the message. * For now this is simplified by assuming there is only one MSC, one BSC. */ static int sccp_sap_get_peer_addr_out(struct bsc_nat_ss7_inst *src, struct osmo_sccp_addr *peer_addr_in, @@ -94,6 +119,8 @@ return 0; } +/* Handle incoming messages. For now this is simplified by assuming there is + * only one MSC, one BSC (not yet translating connection ids etc.). */ static int sccp_sap_up(struct osmo_prim_hdr *oph, void *scu) { struct bsc_nat_ss7_inst *src = osmo_sccp_user_get_priv(scu); @@ -104,20 +131,78 @@ int rc = -1; switch (OSMO_PRIM_HDR(oph)) { + case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_CONFIRM): + /* indication of connection confirm */ + LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); + + if (sccp_sap_get_peer_addr_in(src, &peer_addr_in, &prim->u.connect.called_addr, + &prim->u.connect.calling_addr) < 0) + goto error; + + if (sccp_sap_get_peer_addr_out(src, peer_addr_in, &peer_addr_out) < 0) + goto error; + + LOG_SCCP(src, peer_addr_in, LOGL_NOTICE, "Forwarding to %s in %s\n", + osmo_sccp_inst_addr_name(NULL, &peer_addr_out), + dest == g_bsc_nat->ran ? "RAN" : "CN"); + + msgb_pull_to_l2(oph->msg); + osmo_sccp_tx_conn_resp(dest->scu, prim->u.connect.conn_id, &peer_addr_out, oph->msg->data, + msgb_length(oph->msg)); + rc = 0; + break; + case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION): /* indication of new inbound connection request */ - peer_addr_in = &prim->u.connect.calling_addr; - LOG_SCCP(src, peer_addr_in, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); + LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); + + if (sccp_sap_get_peer_addr_in(src, &peer_addr_in, &prim->u.connect.called_addr, + &prim->u.connect.calling_addr) < 0) + goto error; + + if (sccp_sap_get_peer_addr_out(src, peer_addr_in, &peer_addr_out) < 0) + goto error; + + LOG_SCCP(src, peer_addr_in, LOGL_NOTICE, "Forwarding to %s in %s\n", + osmo_sccp_inst_addr_name(NULL, &peer_addr_out), + dest == g_bsc_nat->ran ? "RAN" : "CN"); + + msgb_pull_to_l2(oph->msg); + osmo_sccp_tx_conn_req(dest->scu, prim->u.connect.conn_id, &dest->local_sccp_addr, &peer_addr_out, + oph->msg->data, msgb_length(oph->msg)); + rc = 0; break; case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION): /* connection-oriented data received */ LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); + + if (sccp_sap_get_peer_addr_out(src, NULL, &peer_addr_out) < 0) + goto error; + + LOG_SCCP(src, NULL, LOGL_NOTICE, "Forwarding to %s in %s\n", + osmo_sccp_inst_addr_name(NULL, &peer_addr_out), + dest == g_bsc_nat->ran ? "RAN" : "CN"); + + msgb_pull_to_l2(oph->msg); + osmo_sccp_tx_data(dest->scu, prim->u.data.conn_id, oph->msg->data, msgb_length(oph->msg)); + rc = 0; break; case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION): /* indication of disconnect */ LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph)); + + if (sccp_sap_get_peer_addr_out(src, NULL, &peer_addr_out) < 0) + goto error; + + LOG_SCCP(src, NULL, LOGL_NOTICE, "Forwarding to %s in %s\n", + osmo_sccp_inst_addr_name(NULL, &peer_addr_out), + dest == g_bsc_nat->ran ? "RAN" : "CN"); + + osmo_sccp_tx_disconn(dest->scu, prim->u.disconnect.conn_id, &prim->u.disconnect.responding_addr, + prim->u.disconnect.cause); + rc = 0; break; case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I3df79e4dfaa60f4fd098961ee57cda71e9773b82 Gerrit-Change-Number: 27260 Gerrit-PatchSet: 5 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: initial conn-oriented forwarding

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260 ) Change subject: bsc_nat_fsm: initial conn-oriented forwarding ...................................................................... Patch Set 5: Code-Review+2 (1 comment) Patchset: PS5: 1+1=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I3df79e4dfaa60f4fd098961ee57cda71e9773b82 Gerrit-Change-Number: 27260 Gerrit-PatchSet: 5 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 24 Feb 2022 12:19:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: initial conn-oriented forwarding

by pespin

Attention is currently required from: osmith, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260 ) Change subject: bsc_nat_fsm: initial conn-oriented forwarding ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I3df79e4dfaa60f4fd098961ee57cda71e9773b82 Gerrit-Change-Number: 27260 Gerrit-PatchSet: 5 Gerrit-Owner: osmith <osmith(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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 24 Feb 2022 11:50:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: pcu: Start PCUIF related components as alive-type

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27295 ) Change subject: pcu: Start PCUIF related components as alive-type ...................................................................... pcu: Start PCUIF related components as alive-type This should prevent following race conditions at shutdown: """ 131 - Terminating component type PCUIF_Components.RAW_PCU_BTS_CT. ... PCUIF_Components.ttcn:642 Dynamic test case error: Sending data on the connection of port BTS to 131:PCUIF failed. (Broken pipe) """ Change-Id: I17b2cfed2edbea7427e608380059bb1b422ca600 --- M pcu/PCU_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 01113ab..0a67486 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -279,12 +279,12 @@ activate(as_Tguard_RAW()); /* Init PCU interface component */ - vc_PCUIF := RAW_PCUIF_CT.create("PCUIF"); + vc_PCUIF := RAW_PCUIF_CT.create("PCUIF") alive; connect(vc_PCUIF:MTC, self:PCUIF); map(vc_PCUIF:PCU, system:PCU); /* Create one BTS component (we may want more some day) */ - vc_BTS := RAW_PCU_BTS_CT.create("BTS"); + vc_BTS := RAW_PCU_BTS_CT.create("BTS") alive; connect(vc_BTS:PCUIF, vc_PCUIF:BTS); connect(vc_BTS:TC, self:BTS); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27295 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: I17b2cfed2edbea7427e608380059bb1b422ca600 Gerrit-Change-Number: 27295 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Start BSSGP_CT and NS_CT as alive-type component in all testsuites

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27294 ) Change subject: Start BSSGP_CT and NS_CT as alive-type component in all testsuites ...................................................................... Start BSSGP_CT and NS_CT as alive-type component in all testsuites This was already done in PCU_Tests and Gbproxy_Tests, let's to it everywhere. Change-Id: I6e3b08710b4502e2b9805f7c9f7bd89f34e4085c --- M fr-net/FRNET_Tests.ttcn M fr/FR_Tests.ttcn M sgsn/SGSN_Tests.ttcn 3 files changed, 6 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/fr-net/FRNET_Tests.ttcn b/fr-net/FRNET_Tests.ttcn index 614750f..0a6af59 100644 --- a/fr-net/FRNET_Tests.ttcn +++ b/fr-net/FRNET_Tests.ttcn @@ -88,8 +88,8 @@ private function f_init_gb(inout GbInstance gb, charstring id, integer offset) runs on test_CT { var charstring id_idx := id & int2str(offset); - gb.vc_NS := NS_CT.create(id_idx & "-NSemu"); - gb.vc_BSSGP := BSSGP_CT.create(id_idx & "-BSSGPemu"); + gb.vc_NS := NS_CT.create(id_idx & "-NSemu") alive; + gb.vc_BSSGP := BSSGP_CT.create(id_idx & "-BSSGPemu") alive; connect(gb.vc_BSSGP:BSCP, gb.vc_NS:NS_SP); gb.vc_NS.start(NSStart(mp_nsconfig[offset], id_idx)); gb.vc_BSSGP.start(BssgpStart(gb.cfg, testcasename())); diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index 1e662fe..b7a56c3 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -89,8 +89,8 @@ /* initialize one Gb interface */ private function f_init_gb(inout GbInstance gb, charstring id, integer offset) runs on test_CT { var charstring id_idx := id & int2str(offset); - gb.vc_NS := NS_CT.create(id_idx & "-NSemu"); - gb.vc_BSSGP := BSSGP_CT.create(id_idx & "-BSSGPemu"); + gb.vc_NS := NS_CT.create(id_idx & "-NSemu") alive; + gb.vc_BSSGP := BSSGP_CT.create(id_idx & "-BSSGPemu") alive; connect(gb.vc_BSSGP:BSCP, gb.vc_NS:NS_SP); gb.vc_NS.start(NSStart(mp_nsconfig[offset], id_idx)); connect(self:BSSGP_PROC[offset], gb.vc_BSSGP:PROC); diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 3386f71..c29095f 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -257,8 +257,8 @@ } private function f_init_gb(inout GbInstance gb, charstring id, integer offset) runs on test_CT { - gb.vc_NS := NS_CT.create(id & "-NS" & int2str(offset)); - gb.vc_BSSGP := BSSGP_CT.create(id & "-BSSGP" & int2str(offset)); + gb.vc_NS := NS_CT.create(id & "-NS" & int2str(offset)) alive; + gb.vc_BSSGP := BSSGP_CT.create(id & "-BSSGP" & int2str(offset)) alive; /* connect lower end of BSSGP emulation with NS upper port */ connect(gb.vc_BSSGP:BSCP, gb.vc_NS:NS_SP); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27294 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: I6e3b08710b4502e2b9805f7c9f7bd89f34e4085c Gerrit-Change-Number: 27294 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: pcu: usse alive-type for NS and BSSGP created components

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27293 ) Change subject: pcu: usse alive-type for NS and BSSGP created components ...................................................................... pcu: usse alive-type for NS and BSSGP created components Internal BVC components in BSSGP are now created as alive. We have to create also BSSGP one as alive in order to avoid having the BVC component sending stuff to the BSSGP when it has already been killed: BSSGP_Emulation.ttcnpp:1133 Dynamic test case error: Sending data on the connection of port BVC to 486:BVC failed. (Broken pipe) Change-Id: I369a5e2246204416c2f29a114bde6bc21f7eaf4f --- M pcu/SGSN_Components.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/SGSN_Components.ttcn b/pcu/SGSN_Components.ttcn index a55d791..bbac9b0 100644 --- a/pcu/SGSN_Components.ttcn +++ b/pcu/SGSN_Components.ttcn @@ -108,8 +108,8 @@ g_initialized := true; /* create a new NS component */ - ns_component := NS_CT.create; - bssgp_component := BSSGP_CT.create; + ns_component := NS_CT.create alive; + bssgp_component := BSSGP_CT.create alive; /* connect lower-end of BSSGP with BSSGP_CODEC_PORT (maps to NS_PT*/ connect(bssgp_component:BSCP, ns_component:NS_SP); connect(self:PROC, bssgp_component:PROC); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27293 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: I369a5e2246204416c2f29a114bde6bc21f7eaf4f Gerrit-Change-Number: 27293 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: usse alive-type for internal BVC created components

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27289 ) Change subject: BSSGP_Emulation: usse alive-type for internal BVC created components ...................................................................... BSSGP_Emulation: usse alive-type for internal BVC created components Otherwise, during shutdown of all components we may end up in a situation where the BVC is already killed and BSSGP Emulation receives a packet which tries to forward to BVC and fails. This can be seen quite a lot in PCU_Tests.TC_pcuif_suspend: """ PCU_Tests.ttcn:394 setverdict(pass): none -> pass ... PCUIF_Components.ttcn:246 Stopping test component execution. ... GPRS_Components.ttcn:222 Connection of port BSSGP[0] to TC_pcuif_suspend-BVCI1234(6):BSSGP_SP was closed unexpectedly by the peer. ... GPRS_Components.ttcn:222 Port BSSGP[0] was disconnected from TC_pcuif_suspend-BVCI1234(6):BSSGP_SP. ... Component type BSSGP_Emulation.BSSGP_BVC_CT was shut down inside testcase TC_pcuif_suspend ... BSSGP_Emulation.ttcnpp:317 Dynamic test case error: Sending data on the connection of port BVC to 6:BVC failed. (Broken pipe) """ Change-Id: Ib0adcf64eb5ca876cd9e9b91f2b597804c03bdc2 --- M library/BSSGP_Emulation.ttcnpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp index e0b5dee..1b628b3 100644 --- a/library/BSSGP_Emulation.ttcnpp +++ b/library/BSSGP_Emulation.ttcnpp @@ -198,7 +198,7 @@ var BssgpBvcConfig bvc_cfg := g_cfg.bvc[i]; var charstring bvc_id := id & "-BVCI" & int2str(bvc_cfg.bvci); /* create, connect and start the BVC component */ - var BSSGP_BVC_CT bvc_ct := BSSGP_BVC_CT.create(bvc_id); + var BSSGP_BVC_CT bvc_ct := BSSGP_BVC_CT.create(bvc_id) alive; connect(bvc_ct:BVC, self:BVC); bvc_ct.start(f_bssgp_bvc_main(bvc_cfg, g_cfg.sgsn_role, g_cfg.nsei, bvc_id)); /* populate the BVC state table */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27289 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: Ib0adcf64eb5ca876cd9e9b91f2b597804c03bdc2 Gerrit-Change-Number: 27289 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: pcu: Fix race condition in TC_t3141

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27287 ) Change subject: pcu: Fix race condition in TC_t3141 ...................................................................... pcu: Fix race condition in TC_t3141 The test was expecting to always receive at least 1 DL packet with USF_UNUSED, but since we implemented idle blocks in PCUIF that may not always be the case anymore. If the TBF is freed in between last requested block and next one, there may be no TBF and hence no MS listening on the TS, so PCU will optimize and send an idle block. Change-Id: Ia301c01a3f5c3fd0b11d8f20e39061aa7abc6127 --- M pcu/PCU_Tests.ttcn 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 7fcab4a..01113ab 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -1428,6 +1428,15 @@ block_nr := nr.blk_nr)); repeat; } + [ul_tbf_usf_req] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, + tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), + omit)) { + /* TBF was dropped by T3141, and PCU answered with an IDLE block to + our last RTS.req because there's no longer any MS listening on + the TS. */ + setverdict(pass); + break; + } [] T_3141.timeout { log("T_3141 expired but TBF is still active, unexpected"); f_shutdown(__BFILE__, __LINE__); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27287 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: Ia301c01a3f5c3fd0b11d8f20e39061aa7abc6127 Gerrit-Change-Number: 27287 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: Fix ttcn3 runtime warning

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27288 ) Change subject: BSSGP_Emulation: Fix ttcn3 runtime warning ...................................................................... BSSGP_Emulation: Fix ttcn3 runtime warning Should fix following TTCN3 warning during runtime of PCU_Tests.TC_pcuif_suspend: """ BSSGP_Emulation.ttcnpp:462 Timeout operation on timer g_T2 failed: The timer is not started. """ Change-Id: Ic74572a21b5abee8e530741466360ff7e16a357d --- M library/BSSGP_Emulation.ttcnpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp index 23c8d03..e0b5dee 100644 --- a/library/BSSGP_Emulation.ttcnpp +++ b/library/BSSGP_Emulation.ttcnpp @@ -459,7 +459,7 @@ } } } - [] g_T2.timeout { + [g_T2.running] g_T2.timeout { setverdict(fail, "Timeout waiting for BVC-RESET-ACK on BVCI=0"); BSCP.send(f_BnsUdReq(ts_BSSGP_STATUS(udi.bvci, BSSGP_CAUSE_BVCI_UNKNOWN, udi.bssgp), 0, 0)); g_T2.start; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27288 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: Ic74572a21b5abee8e530741466360ff7e16a357d Gerrit-Change-Number: 27288 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Support rx cause 'New PDP type due to network preference'

by pespin

Attention is currently required from: pespin, daniel. Hello Jenkins Builder, fixeria, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27314 to look at the new patch set (#2). Change subject: ggsn: Support rx cause 'New PDP type due to network preference' ...................................................................... ggsn: Support rx cause 'New PDP type due to network preference' Related: OS#5449 Change-Id: Iace6a4bd0c2372601dc43108ec4eb78602dbcf30 --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 75 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/27314/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27314 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: Iace6a4bd0c2372601dc43108ec4eb78602dbcf30 Gerrit-Change-Number: 27314 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: GTP_Templates: Fix runtime error in tr_EuaIPv*() templates

by pespin

Attention is currently required from: pespin, daniel. Hello Jenkins Builder, fixeria, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27313 to look at the new patch set (#2). Change subject: GTP_Templates: Fix runtime error in tr_EuaIPv*() templates ...................................................................... GTP_Templates: Fix runtime error in tr_EuaIPv*() templates Doing this when receiving an IPv4 EUA thwos an error: "if (not match(cpr.endUserAddress, tr_EuaIPv4(?)) and not match(cpr.endUserAddress, tr_EuaIPv6(?)))" Dynamic test case error: Performing lengthof() operation on an octetstring template with no exact length. This happens if for instance received spare bits are set to '0000'. Change-Id: I70ad3c10e2ecfed8f733ff906272a9597b2ab9bd --- M library/GTP_Templates.ttcn 1 file changed, 40 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/13/27313/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27313 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: I70ad3c10e2ecfed8f733ff906272a9597b2ab9bd Gerrit-Change-Number: 27313 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

Change in osmo-ci[master]: Reenable ttcn3-hnbgw-test

by osmith

Attention is currently required from: daniel. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27318 ) Change subject: Reenable ttcn3-hnbgw-test ...................................................................... Patch Set 2: -Code-Review (1 comment) Patchset: PS2: Patch looks fine, but it seems not to pass yet: https://jenkins.osmocom.org/jenkins/job/osmo-gsm-tester_build-osmo-hnbgw/34… (I did not start the job, just saw the mail.) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4c7d1ee876e90d52827b2d8cc57342298dd44061 Gerrit-Change-Number: 27318 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 24 Feb 2022 10:50:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ci[master]: Reenable ttcn3-hnbgw-test

by osmith

Attention is currently required from: daniel. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27318 ) Change subject: Reenable ttcn3-hnbgw-test ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4c7d1ee876e90d52827b2d8cc57342298dd44061 Gerrit-Change-Number: 27318 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 24 Feb 2022 10:49:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ci[master]: Reenable ttcn3-hnbgw-test

by daniel

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/27318 to look at the new patch set (#2). Change subject: Reenable ttcn3-hnbgw-test ...................................................................... Reenable ttcn3-hnbgw-test Now that mgw support is in osmo-hnbgw master and docker/ttcn3 testsuite is working we can enable the test again. Change-Id: I4c7d1ee876e90d52827b2d8cc57342298dd44061 Related: OS#5152 --- M jobs/ttcn3-testsuites.yml 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/18/27318/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4c7d1ee876e90d52827b2d8cc57342298dd44061 Gerrit-Change-Number: 27318 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

Change in osmo-ci[master]: Reenable ttcn3-hnbgw-test

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/27318 ) Change subject: Reenable ttcn3-hnbgw-test ...................................................................... Reenable ttcn3-hnbgw-test Now that mgw support is in osmo-hnbgw master and docker/ttcn3 testsuite is working we can enable the test again. Change-Id: I4c7d1ee876e90d52827b2d8cc57342298dd44061 Related: OS#5152 --- M jobs/ttcn3-testsuites.yml 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/18/27318/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 5df5553..172cfec 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -145,7 +145,6 @@ - ttcn3-hnbgw-test: blocking: "^(ttcn3|TTCN3-.*)-hnbgw-test.*" timer: 40 13 * * * - disabled: true # debian-stretch latest stable - nplab-m3ua-test-latest: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4c7d1ee876e90d52827b2d8cc57342298dd44061 Gerrit-Change-Number: 27318 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-hnbgw[master]: running.adoc: explain MGW configuration

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/26797 ) Change subject: running.adoc: explain MGW configuration ...................................................................... running.adoc: explain MGW configuration OsmoHNBGW now requires a co-located OsmoMGW instance. Lets add add some info on how to configure it. Change-Id: Id47f4f365cee78ce28d1534c4e3e98a59bdb0621 Related: OS#5152 --- M doc/manuals/chapters/running.adoc 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/97/26797/1 diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index f40027a..5d3422e 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -117,3 +117,19 @@ local-ip 10.9.8.7 local-port 29169 ---- + +==== Configure co-located media gateway + +OsmoHNBGW requires a co-located OsmoMGW instace. The purpose of the co-located +media gateway is to relay the RTP traffic between hNodeB and core network. The +configuration is done under the hnbgw node along with iucs and iups. + +An example configuration for OsmoHNBGW's MGCP client: + +---- +hnbgw + mgcp + mgw remote-ip 127.0.0.1 + mgw remote-port 2427 + mgw reset-endpoint rtpbridge/* +---- -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/26797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Id47f4f365cee78ce28d1534c4e3e98a59bdb0621 Gerrit-Change-Number: 26797 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

3
11
0 0

Change in osmo-hnbgw[master]: overview.adoc: update network diagram

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/26796 ) Change subject: overview.adoc: update network diagram ...................................................................... overview.adoc: update network diagram The network diagram in the manual lacks the recently added co located MGW. Change-Id: Ica1782a407f6b944aa26748b54055168f5d250c3 Related: OS#5152 --- M doc/manuals/chapters/overview.adoc 1 file changed, 14 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/96/26796/1 diff --git a/doc/manuals/chapters/overview.adoc b/doc/manuals/chapters/overview.adoc index 2368b4f..fa8dda0 100644 --- a/doc/manuals/chapters/overview.adoc +++ b/doc/manuals/chapters/overview.adoc @@ -15,16 +15,20 @@ [[fig-3g]] .Typical 3G network architecture used with OsmoHNBGW ---- - +------------+ +--------+ +----------+ +---------+ - UE <-->| hNodeB |<--Iuh---->| HNB-GW |<--IuCS-->| OsmoMSC |<--GSUP-->| OsmoHLR | - UE <-->| femto cell | ...-->| | ...-->| | | | - | | | | +----------+ +---------| - +------------+<--GTP-U | | - \ | | +------+ +------+ - | | |<--IuPS-->| SGSN |<--GTP-C-->| GGSN | - | +--------+ ...-->| | GTP-U-->| | - | +------+ / +------+ - \_______________________________/ + +------------+ +--------+ +---------+ +---------+ + UE <-->| hNodeB |<----Iuh----->| HNB-GW |<--IuCS-->| OsmoMSC |<--GSUP-->| OsmoHLR | + UE <-->| femto cell | | | | | | | + | | | | +---------+ +---------+ + | |<---IuPF--\ | | + | |<--GTP-U | | | +------+ +------+ + +------------+ \ | | |<--IuPS-->| SGSN |<--GTP-C-->| GGSN | + | | +--------+ | | GTP-U-->| | + | | +------+ / +------+ + | | +-----+ +-----+ | + | \-->| MGW |<----IuPF--->| MGW | | + | | | | | | + | +-----+ +-----+ | + \___________________________________/ ---- The HNB-GW performs a translation interface between the IuCS/IuPS interfaces on the one hand -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/26796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ica1782a407f6b944aa26748b54055168f5d250c3 Gerrit-Change-Number: 26796 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

3
16
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: initial conn-oriented forwarding

by laforge

Attention is currently required from: osmith, pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260 ) Change subject: bsc_nat_fsm: initial conn-oriented forwarding ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I3df79e4dfaa60f4fd098961ee57cda71e9773b82 Gerrit-Change-Number: 27260 Gerrit-PatchSet: 5 Gerrit-Owner: osmith <osmith(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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 24 Feb 2022 10:13:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-e1-hardware[master]: manual: add info and renders to show to set TE/NT mode

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27317 ) Change subject: manual: add info and renders to show to set TE/NT mode ...................................................................... manual: add info and renders to show to set TE/NT mode The page break is currently a bit ugly, but I didn't see an easy way to fix it. The images and info text should make the process much clearer. Change-Id: I5999dc60850da2cd02d9bbc7db5727cdebf041c6 --- M doc/manuals/chapters/hardware.adoc A doc/manuals/images/nt_t.png A doc/manuals/images/te_t.png 3 files changed, 14 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved tnt: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/doc/manuals/chapters/hardware.adoc b/doc/manuals/chapters/hardware.adoc index 4a1de14..4549cf4 100644 --- a/doc/manuals/chapters/hardware.adoc +++ b/doc/manuals/chapters/hardware.adoc @@ -69,6 +69,20 @@ different pin-out. Particularly, you cannot use an Ethernet cross-over cable as an E1 cross-over! +==== Switching between TE/NT mode + +To change the mode, unscrew the 2 PH0 screws on the side with the 2 RJ45 jacks. You'll also need to unscrew the nut on the SMA jack on the other side. +After that, the cover plate and rubber gasket around the 2 RJ45 jacks can be removed. The PCB can be slid out of the case. + +[frame="none"] +[grid="none"] +|=== +|image:images/te_t.png[width=250,title="icE1usb jumpered for TE mode"] |image:images/nt_t.png[width=250,title="icE1usb jumpered for NT mode"] +| *TE mode* (default) | *NT mode* | +|=== + +Each 2x4 jumper block is connected to the nearest RJ45 connector. + === Connectors on USB side image::images/icE1usb-usb_side.jpg[width=400,title="USB side of icE1usb"] diff --git a/doc/manuals/images/nt_t.png b/doc/manuals/images/nt_t.png new file mode 100644 index 0000000..73143b7 --- /dev/null +++ b/doc/manuals/images/nt_t.png Binary files differ diff --git a/doc/manuals/images/te_t.png b/doc/manuals/images/te_t.png new file mode 100644 index 0000000..54d8343 --- /dev/null +++ b/doc/manuals/images/te_t.png Binary files differ -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I5999dc60850da2cd02d9bbc7db5727cdebf041c6 Gerrit-Change-Number: 27317 Gerrit-PatchSet: 3 Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-e1-hardware[master]: manual: fix link to gateware

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27315 ) Change subject: manual: fix link to gateware ...................................................................... manual: fix link to gateware Change-Id: Iad107b33d182e3d9343dfb4e533360740e9c85df --- M doc/manuals/chapters/firmware.adoc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/firmware.adoc b/doc/manuals/chapters/firmware.adoc index 5ae5fb1..5e4a11c 100644 --- a/doc/manuals/chapters/firmware.adoc +++ b/doc/manuals/chapters/firmware.adoc @@ -49,7 +49,7 @@ https://ftp.osmocom.org/binaries/icE1usb/firmware/latest/ The latest gateware can currently only be found at the personal developer -directory of tnt at https://people.osmocom.org/tnt/e1/icE1usb-202010-bd399e96.bin +directory of tnt at https://people.osmocom.org/tnt/ice1usb/icE1usb-202010-bd399e96.bin A more official download location for the gateware will be provided shortly. ==== Upgrading the FPGA gateware -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Iad107b33d182e3d9343dfb4e533360740e9c85df Gerrit-Change-Number: 27315 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-e1-hardware[master]: manual: Document the factory default jumper setting

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27316 ) Change subject: manual: Document the factory default jumper setting ...................................................................... manual: Document the factory default jumper setting Also re-word/expand a bit on the situations in which NT mode or cross-over is needed. Change-Id: Ie726d4ca2e8605015a2f0384d2b435e1b40c1cad --- M doc/manuals/chapters/hardware.adoc 1 file changed, 7 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/hardware.adoc b/doc/manuals/chapters/hardware.adoc index 0e129c2..4a1de14 100644 --- a/doc/manuals/chapters/hardware.adoc +++ b/doc/manuals/chapters/hardware.adoc @@ -44,8 +44,13 @@ The pin-out of the connectors can be swapped between TE and NT mode using the J4 and J5 jumper blocks on the circuit board. -A GSM BTS typically implements TE pin-out, while the icE1usb should then -use NT mode pin-out if no cross-over cable is used. +The factory default setting of the jumpers is TE-mode. + +In case you're using the icE1usb with user-side equipment such as a GSM BTS, +a PBX, a Router or the like which traditionally was attached to the public +network, those devices all implement TE mode. In such situations you need +to either switch the icE1usb to NT mode (and use straight wiring), or use +an E1 cross-over cable. .Pin-out of RJ45 E1 connectors [options="header"] -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Ie726d4ca2e8605015a2f0384d2b435e1b40c1cad Gerrit-Change-Number: 27316 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmo-e1-hardware[master]: manual: Document the factory default jumper setting

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27316 ) Change subject: manual: Document the factory default jumper setting ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Ie726d4ca2e8605015a2f0384d2b435e1b40c1cad Gerrit-Change-Number: 27316 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Thu, 24 Feb 2022 10:12:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-e1-hardware[master]: manual: fix link to gateware

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27315 ) Change subject: manual: fix link to gateware ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Iad107b33d182e3d9343dfb4e533360740e9c85df Gerrit-Change-Number: 27315 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Thu, 24 Feb 2022 10:12:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-e1-hardware[master]: manual: add info and renders to show to set TE/NT mode

by laforge

Attention is currently required from: manawyrm, tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27317 ) Change subject: manual: add info and renders to show to set TE/NT mode ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I5999dc60850da2cd02d9bbc7db5727cdebf041c6 Gerrit-Change-Number: 27317 Gerrit-PatchSet: 2 Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Thu, 24 Feb 2022 10:12:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-hnbgw[master]: mgw_fsm: add MGW support to osmo-hnbgw

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/26795 ) Change subject: mgw_fsm: add MGW support to osmo-hnbgw ...................................................................... mgw_fsm: add MGW support to osmo-hnbgw osmo-hnbgw lacks support for an co-located media gateway. This makes it virtually impossible to isolate the HNB from the core network properly. Lets add MGCP support to osmo-hnbgw so that it can control a co-located media gateway to relay the RTP streams between HNB and core network. Change-Id: Ib9b62e0145184b91c56ce5d8870760bfa49cc5a4 Related: OS#515 --- M configure.ac M contrib/osmo-hnbgw.spec.in M debian/control M include/osmocom/hnbgw/context_map.h M include/osmocom/hnbgw/hnbgw.h A include/osmocom/hnbgw/mgw_fsm.h A include/osmocom/hnbgw/tdefs.h M include/osmocom/hnbgw/vty.h M src/osmo-hnbgw/Makefile.am M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_cn.c M src/osmo-hnbgw/hnbgw_rua.c M src/osmo-hnbgw/hnbgw_vty.c A src/osmo-hnbgw/mgw_fsm.c A src/osmo-hnbgw/tdefs.c 15 files changed, 705 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/95/26795/1 diff --git a/configure.ac b/configure.ac index 4dc8087..f9bca78 100644 --- a/configure.ac +++ b/configure.ac @@ -65,7 +65,7 @@ PKG_CHECK_MODULES(LIBOSMORUA, libosmo-rua >= 1.1.0) PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 1.1.0) PKG_CHECK_MODULES(LIBOSMOHNBAP, libosmo-hnbap >= 1.1.0) - +PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.9.0) dnl checks for header files AC_HEADER_STDC diff --git a/contrib/osmo-hnbgw.spec.in b/contrib/osmo-hnbgw.spec.in index 5ab0f5a..04fad1f 100644 --- a/contrib/osmo-hnbgw.spec.in +++ b/contrib/osmo-hnbgw.spec.in @@ -33,6 +33,7 @@ BuildRequires: systemd-rpm-macros %endif BuildRequires: pkgconfig(libcrypto) >= 0.9.5 +BuildRequires: pkgconfig(libosmo-mgcp-client) >= 1.9.0 BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0 BuildRequires: pkgconfig(libosmo-sigtran) >= 1.5.0 BuildRequires: pkgconfig(libosmoabis) >= 1.2.0 diff --git a/debian/control b/debian/control index 1ea3ad2..f7b1047 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ libosmo-sigtran-dev (>= 1.5.0), libosmo-abis-dev (>= 1.2.0), libosmo-netif-dev (>= 1.1.0), + libosmo-mgcp-client-dev (>= 1.9.0), libosmo-hnbap-dev (>= 1.1.0), libosmo-ranap-dev (>= 1.1.0), libosmo-rua-dev (>= 1.1.0), diff --git a/include/osmocom/hnbgw/context_map.h b/include/osmocom/hnbgw/context_map.h index 6279b91..6910fe8 100644 --- a/include/osmocom/hnbgw/context_map.h +++ b/include/osmocom/hnbgw/context_map.h @@ -35,6 +35,9 @@ uint32_t scu_conn_id; enum hnbgw_context_map_state state; + + /* FSM instance for the MGW */ + struct osmo_fsm_inst *mgw_fi; }; diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index fc8298d..9a46301 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -16,6 +16,7 @@ DHNBAP, DRUA, DRANAP, + DMGW, }; #define LOGHNB(x, ss, lvl, fmt, args ...) \ @@ -133,6 +134,7 @@ bool hnbap_allow_tmsi; /*! print hnb-id (true) or MCC-MNC-LAC-RAC-SAC (false) in logs */ bool log_prefix_hnb_id; + struct mgcp_client_conf *mgcp_client; } config; /*! SCTP listen socket for incoming connections */ struct osmo_stream_srv_link *iuh; @@ -151,6 +153,7 @@ struct osmo_sccp_addr iucs_remote_addr; struct osmo_sccp_addr iups_remote_addr; } sccp; + struct mgcp_client *mgcp_client; }; extern void *talloc_asn1_ctx; diff --git a/include/osmocom/hnbgw/mgw_fsm.h b/include/osmocom/hnbgw/mgw_fsm.h new file mode 100644 index 0000000..219026d --- /dev/null +++ b/include/osmocom/hnbgw/mgw_fsm.h @@ -0,0 +1,5 @@ +#pragma once + +int mgw_fsm_alloc_and_handle_rab_ass_req(struct hnbgw_context_map *map, struct osmo_prim_hdr *oph_rab_ass_req); +int mgw_fsm_handle_iu_release(struct hnbgw_context_map *map); +int mgw_fsm_handle_rab_ass_resp(struct hnbgw_context_map *map, struct osmo_prim_hdr *oph); diff --git a/include/osmocom/hnbgw/tdefs.h b/include/osmocom/hnbgw/tdefs.h new file mode 100644 index 0000000..4f98a36 --- /dev/null +++ b/include/osmocom/hnbgw/tdefs.h @@ -0,0 +1,6 @@ +#pragma once + +#include <osmocom/core/tdef.h> + +extern struct osmo_tdef mgw_fsm_T_defs[]; +extern struct osmo_tdef_group hnbgw_tdef_group[]; diff --git a/include/osmocom/hnbgw/vty.h b/include/osmocom/hnbgw/vty.h index 3d05da5..93b3c45 100644 --- a/include/osmocom/hnbgw/vty.h +++ b/include/osmocom/hnbgw/vty.h @@ -7,5 +7,6 @@ IUH_NODE, IUCS_NODE, IUPS_NODE, + MGCP_NODE, }; diff --git a/src/osmo-hnbgw/Makefile.am b/src/osmo-hnbgw/Makefile.am index 0948170..64d5ccd 100644 --- a/src/osmo-hnbgw/Makefile.am +++ b/src/osmo-hnbgw/Makefile.am @@ -19,6 +19,7 @@ $(LIBOSMORUA_CFLAGS) \ $(LIBOSMORANAP_CFLAGS) \ $(LIBOSMOHNBAP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(NULL) AM_LDFLAGS = \ @@ -38,6 +39,8 @@ context_map.c \ hnbgw_cn.c \ ranap_rab_ass.c \ + mgw_fsm.c \ + tdefs.c \ $(NULL) osmo_hnbgw_LDADD = \ @@ -52,5 +55,7 @@ $(LIBOSMORUA_LIBS) \ $(LIBOSMORANAP_LIBS) \ $(LIBOSMOHNBAP_LIBS) \ + $(LIBOSMOMGCPCLIENT_LIBS) \ $(LIBSCTP_LIBS) \ + $(LIBOSMOMGCPCLIENT_LIBS) \ $(NULL) diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index da15bfc..cc6197c 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -52,6 +52,8 @@ #include <osmocom/vty/command.h> #include <osmocom/vty/ports.h> +#include <osmocom/mgcp_client/mgcp_client.h> + #include <osmocom/netif/stream.h> #include <osmocom/ranap/ranap_common.h> @@ -372,6 +374,11 @@ .color = "", .description = "RAN Application Part", }, + [DMGW] = { + .name = "DMGW", .loglevel = LOGL_NOTICE, .enabled = 1, + .color = "\033[1;33m", + .description = "Media Gateway", + }, }; static const struct log_info hnbgw_log_info = { @@ -681,6 +688,19 @@ } g_hnb_gw->iuh = srv; + /* Initialize and connect MGCP client. */ + g_hnb_gw->mgcp_client = mgcp_client_init(tall_hnb_ctx, g_hnb_gw->config.mgcp_client); + if (!g_hnb_gw->mgcp_client) { + LOGP(DMGW, LOGL_ERROR, "MGW client initalization failed\n"); + return -EINVAL; + } + if (mgcp_client_connect(g_hnb_gw->mgcp_client)) { + LOGP(DMGW, LOGL_ERROR, "MGW connect failed at (%s:%u)\n", + g_hnb_gw->config.mgcp_client->remote_addr, + g_hnb_gw->config.mgcp_client->remote_port); + return -EINVAL; + } + if (hnbgw_cmdline_config.daemonize) { rc = osmo_daemonize(); if (rc < 0) { diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 7fbb691..c3deba5 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -34,6 +34,7 @@ #include <osmocom/ranap/ranap_ies_defs.h> #include <osmocom/ranap/ranap_msg_factory.h> #include <osmocom/hnbgw/context_map.h> +#include <osmocom/hnbgw/mgw_fsm.h> /*********************************************************************** * Outbound RANAP RESET to CN @@ -356,6 +357,21 @@ return 0; } + /* Intercept RAB Assignment Request, Setup MGW FSM */ + if (!map->is_ps && msgb_l2len(oph->msg) > 2) { + switch (((uint8_t*)msgb_l2(oph->msg))[1]) { + case RANAP_ProcedureCode_id_RAB_Assignment: + /* Just like rua_tx_dt(), mgw_fsm_inst_alloc() will not take ownership of oph. Instead it will + * make its own copy of the message contents, so it is safe to free oph->msg() in sccp_sap_up() + * below. */ + return mgw_fsm_alloc_and_handle_rab_ass_req(map, oph); + case RANAP_ProcedureCode_id_Iu_Release: + /* Any IU Release will terminate the MGW FSM */ + mgw_fsm_handle_iu_release(map); + break; + } + } + return rua_tx_dt(map->hnb_ctx, map->is_ps, map->rua_ctx_id, msgb_l2(oph->msg), msgb_l2len(oph->msg)); } diff --git a/src/osmo-hnbgw/hnbgw_rua.c b/src/osmo-hnbgw/hnbgw_rua.c index 24ca167..202007f 100644 --- a/src/osmo-hnbgw/hnbgw_rua.c +++ b/src/osmo-hnbgw/hnbgw_rua.c @@ -38,6 +38,8 @@ #include <osmocom/rua/rua_ies_defs.h> #include <osmocom/hnbgw/context_map.h> #include <osmocom/hnbap/HNBAP_CN-DomainIndicator.h> +#include <osmocom/hnbgw/mgw_fsm.h> +#include <osmocom/ranap/RANAP_ProcedureCode.h> static const char *cn_domain_indicator_to_str(RUA_CN_DomainIndicator_t cN_DomainIndicator) { @@ -265,6 +267,17 @@ memcpy(msg->l2h, data, len); } + /* Intercept RAB Assignment Response, inform MGW FSM. */ + if (map && !map->is_ps && !release_context_map && msgb_l2len(prim->oph.msg) > 2) + { + switch (((uint8_t*)msgb_l2(prim->oph.msg))[1]) { + case RANAP_ProcedureCode_id_RAB_Assignment: + /* Note: Just like osmo_sccp_user_sap_down(), mgw_fsm_handle_rab_as_resp() will take ownership + * of oph */ + return mgw_fsm_handle_rab_ass_resp(map, &prim->oph); + } + } + rc = osmo_sccp_user_sap_down(cn->sccp_user, &prim->oph); if (map && release_context_map) diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c index 4ad1ddb..0ec16fe 100644 --- a/src/osmo-hnbgw/hnbgw_vty.c +++ b/src/osmo-hnbgw/hnbgw_vty.c @@ -22,15 +22,19 @@ #include <osmocom/core/socket.h> #include <osmocom/vty/command.h> +#include <osmocom/vty/tdef_vty.h> #include <osmocom/hnbgw/vty.h> #include <osmocom/hnbgw/hnbgw.h> #include <osmocom/hnbgw/context_map.h> +#include <osmocom/hnbgw/tdefs.h> #include <osmocom/sigtran/protocol/sua.h> #include <osmocom/sigtran/sccp_helpers.h> #include <osmocom/netif/stream.h> +#include <osmocom/mgcp_client/mgcp_client.h> + static void *tall_hnb_ctx = NULL; static struct hnb_gw *g_hnb_gw = NULL; @@ -86,6 +90,19 @@ return CMD_SUCCESS; } +static struct cmd_node mgcp_node = { + MGCP_NODE, + "%s(config-hnbgw-mgcp)# ", + 1, +}; + +DEFUN(cfg_hnbgw_mgcp, cfg_hnbgw_mgcp_cmd, + "mgcp", "Configure MGCP client") +{ + vty->node = MGCP_NODE; + return CMD_SUCCESS; +} + int hnbgw_vty_go_parent(struct vty *vty) { switch (vty->node) { @@ -95,6 +112,10 @@ vty->node = HNBGW_NODE; vty->index = NULL; break; + case MGCP_NODE: + vty->node = HNBGW_NODE; + vty->index = NULL; + break; case HNBGW_NODE: vty->node = CONFIG_NODE; vty->index = NULL; @@ -382,6 +403,14 @@ return CMD_SUCCESS; } +static int config_write_hnbgw_mgcp(struct vty *vty) +{ + vty_out(vty, " mgcp%s", VTY_NEWLINE); + mgcp_client_config_write(vty, " "); + + return CMD_SUCCESS; +} + void hnbgw_vty_init(struct hnb_gw *gw, void *tall_ctx) { g_hnb_gw = gw; @@ -415,4 +444,13 @@ install_element_ve(&show_one_hnb_cmd); install_element_ve(&show_ue_cmd); install_element_ve(&show_talloc_cmd); + + install_element(HNBGW_NODE, &cfg_hnbgw_mgcp_cmd); + install_node(&mgcp_node, config_write_hnbgw_mgcp); + + g_hnb_gw->config.mgcp_client = talloc_zero(tall_hnb_ctx, struct mgcp_client_conf); + mgcp_client_conf_init(g_hnb_gw->config.mgcp_client); + mgcp_client_vty_init(tall_hnb_ctx, MGCP_NODE, g_hnb_gw->config.mgcp_client); + + osmo_tdef_vty_groups_init(HNBGW_NODE, hnbgw_tdef_group); } diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c new file mode 100644 index 0000000..df97c1a --- /dev/null +++ b/src/osmo-hnbgw/mgw_fsm.c @@ -0,0 +1,562 @@ +/* (C) 2021 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * + * Author: Philipp Maier + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <errno.h> + +#include <osmocom/core/msgb.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/prim.h> + +#include <osmocom/core/fsm.h> +#include <osmocom/core/byteswap.h> +#include <arpa/inet.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/sockaddr_str.h> + +#include <osmocom/ranap/ranap_common.h> +#include <osmocom/ranap/ranap_ies_defs.h> +#include <osmocom/ranap/ranap_msg_factory.h> + +#include <osmocom/ranap/ranap_ies_defs.h> +#include <osmocom/ranap/iu_helpers.h> +#include <asn1c/asn1helpers.h> + +#include <osmocom/hnbgw/hnbgw.h> +#include <osmocom/hnbgw/context_map.h> +#include <osmocom/hnbgw/ranap_rab_ass.h> + +#include <osmocom/hnbgw/hnbgw_rua.h> + +#include <osmocom/core/tdef.h> +#include <osmocom/hnbgw/tdefs.h> +#include <osmocom/mgcp_client/mgcp_client_endpoint_fsm.h> + +#define S(x) (1 << (x)) + +extern int asn1_xer_print; + +enum mgw_fsm_event { + MGW_EV_MGCP_OK, + MGW_EV_MGCP_FAIL, + MGW_EV_MGCP_TERM, + MGW_EV_RAB_ASS_RESP, + MGW_EV_RELEASE, +}; + +static const struct value_string mgw_fsm_event_names[] = { + OSMO_VALUE_STRING(MGW_EV_MGCP_OK), + OSMO_VALUE_STRING(MGW_EV_MGCP_FAIL), + OSMO_VALUE_STRING(MGW_EV_MGCP_TERM), + OSMO_VALUE_STRING(MGW_EV_RAB_ASS_RESP), + OSMO_VALUE_STRING(MGW_EV_RELEASE), + { } +}; + +enum mgw_fsm_state { + MGW_ST_CRCX_HNB, + MGW_ST_ASSIGN, + MGW_ST_MDCX_HNB, + MGW_ST_CRCX_MSC, + MGW_ST_ESTABLISHED, + MGW_ST_RELEASE, +}; + +struct mgw_fsm_priv { + /* Backpointer to HNBGW context */ + struct hnbgw_context_map *map; + + /* RAB-ID from RANAP RAB AssignmentRequest message */ + uint8_t rab_id; + + /* We have to store the RANAP RAB AssignmentRequest message, since we can not take ownership of the osmo prim + * header (oph). */ + uint8_t rab_ass_req[IUH_MSGB_SIZE]; + unsigned int rab_ass_req_len; + + /* The RANAP RAB AssignmentResponse is handled differently. In this case we must take the ownership of the + * osmo prim header */ + struct osmo_prim_hdr *oph_rab_ass_resp; + + /* MGW context */ + struct osmo_mgcpc_ep *mgcpc_ep; + struct osmo_mgcpc_ep_ci *mgcpc_ep_ci_hnb; + struct osmo_mgcpc_ep_ci *mgcpc_ep_ci_msc; + char msc_rtp_addr[INET6_ADDRSTRLEN]; + uint16_t msc_rtp_port; +}; + +struct osmo_tdef mgw_tdefs[] = { + {.T = -2427,.default_val = 5,.desc = "timeout for MGCP response from MGW" }, + { } +}; + +struct osmo_tdef_state_timeout mgw_fsm_timeouts[32] = { + [MGW_ST_CRCX_HNB] = {.T = -1001 }, + [MGW_ST_ASSIGN] = {.T = -1002 }, + [MGW_ST_MDCX_HNB] = {.T = -1003 }, + [MGW_ST_CRCX_MSC] = {.T = -1004 }, +}; + +#define mgw_fsm_state_chg(state) \ + osmo_tdef_fsm_inst_state_chg(fi, state, \ + mgw_fsm_timeouts, \ + mgw_fsm_T_defs, \ + -1) + +static void mgw_fsm_crcx_hnb_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct mgw_fsm_priv *mgw_fsm_priv = fi->priv; + struct hnbgw_context_map *map = mgw_fsm_priv->map; + const char *epname; + struct mgcp_conn_peer mgw_info; + + LOGPFSML(fi, LOGL_DEBUG, "RAB-AssignmentRequest received, creating HNB side call-leg on MGW...\n"); + + mgw_info = (struct mgcp_conn_peer) { + .call_id = (map->rua_ctx_id << 8) | mgw_fsm_priv->rab_id, + .ptime = 20, + .conn_mode = MGCP_CONN_LOOPBACK, + }; + mgw_info.codecs[0] = CODEC_IUFP; + mgw_info.codecs_len = 1; + + epname = mgcp_client_rtpbridge_wildcard(map->hnb_ctx->gw->mgcp_client); + mgw_fsm_priv->mgcpc_ep = + osmo_mgcpc_ep_alloc(fi, MGW_EV_MGCP_TERM, map->hnb_ctx->gw->mgcp_client, mgw_tdefs, fi->id, "%s", epname); + mgw_fsm_priv->mgcpc_ep_ci_hnb = osmo_mgcpc_ep_ci_add(mgw_fsm_priv->mgcpc_ep, "to-HNB"); + + osmo_mgcpc_ep_ci_request(mgw_fsm_priv->mgcpc_ep_ci_hnb, MGCP_VERB_CRCX, &mgw_info, fi, MGW_EV_MGCP_OK, + MGW_EV_MGCP_FAIL, NULL); +} + +static void mgw_fsm_crcx_hnb(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct mgw_fsm_priv *mgw_fsm_priv = fi->priv; + const struct mgcp_conn_peer *mgw_info; + int rc; + + switch (event) { + case MGW_EV_MGCP_OK: + mgw_info = osmo_mgcpc_ep_ci_get_rtp_info(mgw_fsm_priv->mgcpc_ep_ci_hnb); + if (!mgw_info) { + LOGPFSML(fi, LOGL_ERROR, "Got no response from MGW\n"); + osmo_fsm_inst_state_chg(fi, MGW_ST_RELEASE, 0, 0); + return; + } + + rc = ranap_rab_ass_req_replace_inet_addr(mgw_fsm_priv->rab_ass_req, sizeof(mgw_fsm_priv->rab_ass_req), + mgw_info->addr, mgw_info->port); + if (rc < 0) { + LOGPFSML(fi, LOGL_ERROR, + "Failed to replace RTP IP-address (%s) and Port (%u) in RAB-AssignmentRequest\n", + mgw_info->addr, mgw_info->port); + osmo_fsm_inst_state_chg(fi, MGW_ST_RELEASE, 0, 0); + mgw_fsm_priv->rab_ass_req_len = 0; + return; + } + mgw_fsm_priv->rab_ass_req_len = rc; + + mgw_fsm_state_chg(MGW_ST_ASSIGN); + return; + case MGW_EV_MGCP_FAIL: + osmo_fsm_inst_state_chg(fi, MGW_ST_RELEASE, 0, 0); + return; + default: + OSMO_ASSERT(false); + } +} + +static void mgw_fsm_assign_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct mgw_fsm_priv *mgw_fsm_priv = fi->priv; + struct hnbgw_context_map *map = mgw_fsm_priv->map; + + LOGPFSML(fi, LOGL_DEBUG, "forwarding modified RAB-AssignmentRequest to HNB\n"); + rua_tx_dt(map->hnb_ctx, map->is_ps, map->rua_ctx_id, mgw_fsm_priv->rab_ass_req, mgw_fsm_priv->rab_ass_req_len); +} + +static void mgw_fsm_assign(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct mgw_fsm_priv *mgw_fsm_priv = fi->priv; + struct osmo_prim_hdr *oph = data; + + switch (event) { + case MGW_EV_RAB_ASS_RESP: + mgw_fsm_priv->oph_rab_ass_resp = oph; + mgw_fsm_state_chg(MGW_ST_MDCX_HNB); + return; + default: + OSMO_ASSERT(false); + } +} + +static void mgw_fsm_mdcx_hnb_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct mgw_fsm_priv *mgw_fsm_priv = fi->priv; + struct hnbgw_context_map *map = mgw_fsm_priv->map; + struct mgcp_conn_peer mgw_info; + int rc; + + LOGPFSML(fi, LOGL_DEBUG, "RAB-AssignmentResponse received, completing HNB side call-leg on MGW...\n"); + + mgw_info = (struct mgcp_conn_peer) { + .call_id = map->rua_ctx_id, + .ptime = 20, + .conn_mode = MGCP_CONN_RECV_SEND, + }; + mgw_info.codecs[0] = CODEC_IUFP; + mgw_info.codecs_len = 1; + + rc = ranap_rab_ass_resp_extract_inet_addr(mgw_info.addr, &mgw_info.port, + msgb_l2(mgw_fsm_priv->oph_rab_ass_resp->msg), + msgb_l2len(mgw_fsm_priv->oph_rab_ass_resp->msg)); + if (rc < 0) { + LOGPFSML(fi, LOGL_ERROR, "Failed to extract RTP IP-address and Port from RAB-AssignmentResponse\n"); + osmo_fsm_inst_state_chg(fi, MGW_ST_RELEASE, 0, 0); + return; + } + + osmo_mgcpc_ep_ci_request(mgw_fsm_priv->mgcpc_ep_ci_hnb, MGCP_VERB_MDCX, &mgw_info, fi, MGW_EV_MGCP_OK, + MGW_EV_MGCP_FAIL, NULL); +} + +static void mgw_fsm_mdcx_hnb(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct mgw_fsm_priv *mgw_fsm_priv = fi->priv; + const struct mgcp_conn_peer *mgw_info; + + switch (event) { + case MGW_EV_MGCP_OK: + mgw_info = osmo_mgcpc_ep_ci_get_rtp_info(mgw_fsm_priv->mgcpc_ep_ci_hnb); + if (!mgw_info) { + LOGPFSML(fi, LOGL_ERROR, "Got no response from MGW\n"); + osmo_fsm_inst_state_chg(fi, MGW_ST_RELEASE, 0, 0); + return; + } + mgw_fsm_state_chg(MGW_ST_CRCX_MSC); + return; + case MGW_EV_MGCP_FAIL: + osmo_fsm_inst_state_chg(fi, MGW_ST_RELEASE, 0, 0); + return; + default: + OSMO_ASSERT(false); + } +} + +static void mgw_fsm_crcx_msc_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct mgw_fsm_priv *mgw_fsm_priv = fi->priv; + struct hnbgw_context_map *map = mgw_fsm_priv->map; + struct mgcp_conn_peer mgw_info; + + LOGPFSML(fi, LOGL_DEBUG, "creating MSC side call-leg on MGW...\n"); + + mgw_info = (struct mgcp_conn_peer) { + .call_id = (map->rua_ctx_id << 8) | mgw_fsm_priv->rab_id, + .ptime = 20, + .port = mgw_fsm_priv->msc_rtp_port, + }; + + osmo_strlcpy(mgw_info.addr, mgw_fsm_priv->msc_rtp_addr, sizeof(mgw_info.addr)); + mgw_info.codecs[0] = CODEC_IUFP; + mgw_info.codecs_len = 1; + + mgw_fsm_priv->mgcpc_ep_ci_msc = osmo_mgcpc_ep_ci_add(mgw_fsm_priv->mgcpc_ep, "to-MSC"); + osmo_mgcpc_ep_ci_request(mgw_fsm_priv->mgcpc_ep_ci_msc, MGCP_VERB_CRCX, &mgw_info, fi, MGW_EV_MGCP_OK, + MGW_EV_MGCP_FAIL, NULL); +} + +static void mgw_fsm_crcx_msc(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct mgw_fsm_priv *mgw_fsm_priv = fi->priv; + const struct mgcp_conn_peer *mgw_info; + int rc; + int msg_max_len; + + switch (event) { + case MGW_EV_MGCP_OK: + mgw_info = osmo_mgcpc_ep_ci_get_rtp_info(mgw_fsm_priv->mgcpc_ep_ci_msc); + if (!mgw_info) { + LOGPFSML(fi, LOGL_ERROR, "Got no response from MGW\n"); + osmo_fsm_inst_state_chg(fi, MGW_ST_RELEASE, 0, 0); + return; + } + + /* When the RTP IP-Address/Port is replaced the message might grow. Ensure that there is enough room in + * l2h to grow. (The current implementation should yield a message with the same size, but there is no + * guarantee for that) */ + msg_max_len = + msgb_l2len(mgw_fsm_priv->oph_rab_ass_resp->msg) + + msgb_tailroom(mgw_fsm_priv->oph_rab_ass_resp->msg); + rc = msgb_resize_area(mgw_fsm_priv->oph_rab_ass_resp->msg, mgw_fsm_priv->oph_rab_ass_resp->msg->l2h, + msgb_l2len(mgw_fsm_priv->oph_rab_ass_resp->msg), msg_max_len); + OSMO_ASSERT(rc == 0); + + /* Replace RTP IP-Address/Port. */ + rc = ranap_rab_ass_resp_replace_inet_addr(msgb_l2(mgw_fsm_priv->oph_rab_ass_resp->msg), + msgb_l2len(mgw_fsm_priv->oph_rab_ass_resp->msg), + mgw_info->addr, mgw_info->port); + if (rc < 0) { + LOGPFSML(fi, LOGL_ERROR, + "Failed to replace RTP IP-address (%s) and Port (%u) in RAB-AssignmentResponse\n", + mgw_info->addr, mgw_info->port); + osmo_fsm_inst_state_chg(fi, MGW_ST_RELEASE, 0, 0); + return; + } + + /* Resize l2h back to the actual message length */ + rc = msgb_resize_area(mgw_fsm_priv->oph_rab_ass_resp->msg, mgw_fsm_priv->oph_rab_ass_resp->msg->l2h, + msgb_l2len(mgw_fsm_priv->oph_rab_ass_resp->msg), rc); + OSMO_ASSERT(rc == 0); + + /* When the established state is entered, the modified RAB AssignmentResponse is forwarded to the MSC. + * The call is then established any way may stay for an indefinate amount of time in this state until + * there is an IU Release happening. */ + osmo_fsm_inst_state_chg(fi, MGW_ST_ESTABLISHED, 0, 0); + return; + case MGW_EV_MGCP_FAIL: + osmo_fsm_inst_state_chg(fi, MGW_ST_RELEASE, 0, 0); + return; + default: + OSMO_ASSERT(false); + } +} + +static void mgw_fsm_established_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct mgw_fsm_priv *mgw_fsm_priv = fi->priv; + struct hnbgw_context_map *map = mgw_fsm_priv->map; + struct osmo_prim_hdr *oph = mgw_fsm_priv->oph_rab_ass_resp; + struct hnb_context *hnb = map->hnb_ctx; + struct hnbgw_cnlink *cn = hnb->gw->sccp.cnlink; + int rc; + + rc = osmo_sccp_user_sap_down(cn->sccp_user, oph); + mgw_fsm_priv->oph_rab_ass_resp = NULL; + if (rc < 0) + osmo_fsm_inst_state_chg(fi, MGW_ST_RELEASE, 0, 0); + + LOGPFSML(fi, LOGL_DEBUG, "HNB and MSC side call-legs completed!\n"); +} + +static void mgw_fsm_release_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, NULL); +} + +static void mgw_fsm_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct mgw_fsm_priv *mgw_fsm_priv = fi->priv; + + switch (event) { + case MGW_EV_RELEASE: + osmo_fsm_inst_state_chg(fi, MGW_ST_RELEASE, 0, 0); + return; + case MGW_EV_MGCP_TERM: + mgw_fsm_priv->mgcpc_ep = NULL; + osmo_fsm_inst_state_chg(fi, MGW_ST_RELEASE, 0, 0); + return; + default: + OSMO_ASSERT(false); + } +} + +static int mgw_fsm_timer_cb(struct osmo_fsm_inst *fi) +{ + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); + return 0; +} + +void mgw_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) +{ + struct mgw_fsm_priv *mgw_fsm_priv = fi->priv; + struct osmo_scu_prim *scu_prim; + struct msgb *scu_msg; + + /* In case we were unable to deliver the RANAP RAB AssignmentResponse we are responsible to free it since se + * have taken ownership of the prim header */ + if (mgw_fsm_priv->oph_rab_ass_resp) { + scu_prim = (struct osmo_scu_prim *)mgw_fsm_priv->oph_rab_ass_resp; + scu_msg = scu_prim->oph.msg; + msgb_free(scu_msg); + mgw_fsm_priv->oph_rab_ass_resp = NULL; + } + + talloc_free(mgw_fsm_priv); +} + +static void mgw_fsm_pre_term(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) +{ + struct mgw_fsm_priv *mgw_fsm_priv = fi->priv; + struct hnbgw_context_map *map = mgw_fsm_priv->map; + + if (mgw_fsm_priv->mgcpc_ep) { + osmo_mgcpc_ep_clear(mgw_fsm_priv->mgcpc_ep); + mgw_fsm_priv->mgcpc_ep = NULL; + } + + /* Remove FSM from the context map. This will make this FSM unreachable for events comming from outside */ + map->mgw_fi = NULL; +} + +static const struct osmo_fsm_state mgw_fsm_states[] = { + [MGW_ST_CRCX_HNB] = { + .name = "MGW_ST_CRCX_HNB", + .onenter = mgw_fsm_crcx_hnb_onenter, + .action = mgw_fsm_crcx_hnb, + .in_event_mask = S(MGW_EV_MGCP_OK) | S(MGW_EV_MGCP_FAIL), + .out_state_mask = S(MGW_ST_ASSIGN) | S(MGW_ST_RELEASE) | S(MGW_ST_CRCX_HNB), + }, + [MGW_ST_ASSIGN] = { + .name = "MGW_ST_ASSIGN", + .onenter = mgw_fsm_assign_onenter, + .action = mgw_fsm_assign, + .in_event_mask = S(MGW_EV_RAB_ASS_RESP), + .out_state_mask = S(MGW_ST_MDCX_HNB) | S(MGW_ST_RELEASE), + }, + [MGW_ST_MDCX_HNB] = { + .name = "MGW_ST_MDCX_HNB", + .onenter = mgw_fsm_mdcx_hnb_onenter, + .action = mgw_fsm_mdcx_hnb, + .in_event_mask = S(MGW_EV_MGCP_OK) | S(MGW_EV_MGCP_FAIL), + .out_state_mask = S(MGW_ST_CRCX_MSC) | S(MGW_ST_RELEASE), + }, + [MGW_ST_CRCX_MSC] = { + .name = "MGW_ST_CRCX_MSC", + .onenter = mgw_fsm_crcx_msc_onenter, + .action = mgw_fsm_crcx_msc, + .in_event_mask = S(MGW_EV_MGCP_OK) | S(MGW_EV_MGCP_FAIL), + .out_state_mask = S(MGW_ST_ESTABLISHED) | S(MGW_ST_RELEASE), + }, + [MGW_ST_ESTABLISHED] = { + .name = "MGW_ST_ESTABLISHED", + .onenter = mgw_fsm_established_onenter, + .in_event_mask = 0, + .out_state_mask = S(MGW_ST_RELEASE), + }, + [MGW_ST_RELEASE] = { + .name = "MGW_ST_RELEASE", + .onenter = mgw_fsm_release_onenter, + .in_event_mask = 0, + .out_state_mask = 0, + }, +}; + +static struct osmo_fsm mgw_fsm = { + .name = "mgw", + .states = mgw_fsm_states, + .num_states = ARRAY_SIZE(mgw_fsm_states), + .log_subsys = DMGW, + .event_names = mgw_fsm_event_names, + .allstate_action = mgw_fsm_allstate_action, + .allstate_event_mask = S(MGW_EV_MGCP_TERM) | S(MGW_EV_RELEASE), + .timer_cb = mgw_fsm_timer_cb, + .cleanup = mgw_fsm_cleanup, + .pre_term = mgw_fsm_pre_term, +}; + +/*! Allocate MGW FSM and handle RANAP RAB AssignmentRequest). + * \ptmap[in] map hanbgw context map that is responsible for this call. + * \ptmap[in] oph osmo prim header with RANAP RAB AssignmentRequest (function does not take ownership). + * \returns 0 on success; negative on error. */ +int mgw_fsm_alloc_and_handle_rab_ass_req(struct hnbgw_context_map *map, struct osmo_prim_hdr *oph_rab_ass_req) +{ + static bool initialized = false; + struct osmo_fsm_inst *fi; + struct mgw_fsm_priv *mgw_fsm_priv; + int rc; + char fsm_name[255]; + + /* Initialize FSM if not done yet */ + if (!initialized) { + OSMO_ASSERT(osmo_fsm_register(&mgw_fsm) == 0); + initialized = true; + } + + /* When there is already an FSM, make sure that it is terminated. Under normal circumstances this situation + * should not occur. */ + if (map->mgw_fi) { + LOGPFSML(map->mgw_fi, LOGL_ERROR, "another FSM instance is about to replace this FSM!\n"); + osmo_fsm_inst_dispatch(map->mgw_fi, MGW_EV_RELEASE, NULL); + map->mgw_fi = NULL; + } + + /* Create context and keep a local copy of the RAB AssignmentRequest, we will need this copy later to + * modify and forward it. We cannot take ownership of the prim header oph_rab_ass_req. */ + mgw_fsm_priv = talloc_zero(map, struct mgw_fsm_priv); + OSMO_ASSERT(msgb_l2len(oph_rab_ass_req->msg) <= sizeof(mgw_fsm_priv->rab_ass_req)); + memcpy(mgw_fsm_priv->rab_ass_req, msgb_l2(oph_rab_ass_req->msg), msgb_l2len(oph_rab_ass_req->msg)); + mgw_fsm_priv->rab_ass_req_len = msgb_l2len(oph_rab_ass_req->msg); + + /* Parse the RAB Assignment Request now, if it is bad for some reason we will exit early and not bother with + * creating an FSM etc. */ + rc = ranap_rab_ass_req_extract_inet_addr(mgw_fsm_priv->msc_rtp_addr, &mgw_fsm_priv->msc_rtp_port, + &mgw_fsm_priv->rab_id, mgw_fsm_priv->rab_ass_req, + mgw_fsm_priv->rab_ass_req_len); + if (rc < 0) { + LOGP(DMGW, LOGL_ERROR, + "mgw_fsm_alloc_and_handle_rab_ass_req() rua_ctx_id=%d, invalid RAB-AssignmentRequest -- abort!\n", + map->rua_ctx_id); + talloc_free(mgw_fsm_priv); + return -EINVAL; + } + + /* Allocate the FSM and start it. */ + mgw_fsm_priv->map = map; + snprintf(fsm_name, sizeof(fsm_name), "mgw-fsm-%u-%u", map->rua_ctx_id, mgw_fsm_priv->rab_id); + fi = osmo_fsm_inst_alloc(&mgw_fsm, map, mgw_fsm_priv, LOGL_DEBUG, fsm_name); + map->mgw_fi = fi; + mgw_fsm_state_chg(MGW_ST_CRCX_HNB); + + return 0; +} + +/*! Handlie IU release (terminate RTP streams). + * \ptmap[in] map hanbgw context map that is responsible for this call. + * \returns 0 on success; negative on error. */ +int mgw_fsm_handle_iu_release(struct hnbgw_context_map *map) +{ + if (!map->mgw_fi) { + LOGP(DMGW, LOGL_ERROR, "mgw_fsm_handle_iu_release() rua_ctx_id=%d, no MGW fsm -- ignored!\n", + map->rua_ctx_id); + return -EINVAL; + } + + osmo_fsm_inst_dispatch(map->mgw_fi, MGW_EV_RELEASE, NULL); + return 0; +} + +/*! Handlie RANAP RAB AssignmentResponse (deliver message, complete RTP stream switching). + * \ptmap[in] map hanbgw context map that is responsible for this call. + * \ptmap[in] oph osmo prim header with RANAP RAB AssignmentResponse (function takes ownership). + * \returns 0 on success; negative on error. */ +int mgw_fsm_handle_rab_ass_resp(struct hnbgw_context_map *map, struct osmo_prim_hdr *oph) +{ + struct osmo_scu_prim *scu_prim; + struct msgb *scu_msg; + + if (!map->mgw_fi) { + LOGP(DMGW, LOGL_ERROR, "mgw_fsm_handle_rab_ass_resp() rua_ctx_id=%d, no MGW fsm -- abort!\n", + map->rua_ctx_id); + scu_prim = (struct osmo_scu_prim *)oph; + scu_msg = scu_prim->oph.msg; + msgb_free(scu_msg); + return -EINVAL; + } + + osmo_fsm_inst_dispatch(map->mgw_fi, MGW_EV_RAB_ASS_RESP, oph); + return 0; +} diff --git a/src/osmo-hnbgw/tdefs.c b/src/osmo-hnbgw/tdefs.c new file mode 100644 index 0000000..d8198f2 --- /dev/null +++ b/src/osmo-hnbgw/tdefs.c @@ -0,0 +1,30 @@ +/* (C) 2021 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * + * Author: Philipp Maier + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <osmocom/hnbgw/tdefs.h> + +struct osmo_tdef mgw_fsm_T_defs[] = { + {.T = -1001, .default_val = 5, .desc = "Timeout for HNB side call-leg (to-HNB) creation" }, + {.T = -1002, .default_val = 10, .desc = "Timeout for the HNB to respond to RAB Assignment Request" }, + {.T = -1003, .default_val = 5, .desc = "Timeout for HNB side call-leg (to-HNB) completion" }, + {.T = -1004, .default_val = 5, .desc = "Timeout for MSC side call-leg (to-MSC) completion" }, + { } +}; + +struct osmo_tdef_group hnbgw_tdef_group[] = { + {.name = "mgw", .tdefs = mgw_fsm_T_defs, .desc = "MGW (Media Gateway) interface" }, + { } +}; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/26795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ib9b62e0145184b91c56ce5d8870760bfa49cc5a4 Gerrit-Change-Number: 26795 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

4
41
0 0

Change in osmo-e1-hardware[master]: manual: add info and renders to show to set TE/NT mode

by manawyrm

Attention is currently required from: laforge, tnt. manawyrm has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27317 ) Change subject: manual: add info and renders to show to set TE/NT mode ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > Nice pics BTW 😊 A picture is worth a thousand words 😊 Thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I5999dc60850da2cd02d9bbc7db5727cdebf041c6 Gerrit-Change-Number: 27317 Gerrit-PatchSet: 2 Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Thu, 24 Feb 2022 08:39:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: tnt <tnt(a)246tNt.com> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-e1-hardware[master]: manual: add info and renders to show to set TE/NT mode

by tnt

Attention is currently required from: manawyrm, laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27317 ) Change subject: manual: add info and renders to show to set TE/NT mode ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: Nice pics BTW 😊 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I5999dc60850da2cd02d9bbc7db5727cdebf041c6 Gerrit-Change-Number: 27317 Gerrit-PatchSet: 2 Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 24 Feb 2022 08:38:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-e1-hardware[master]: manual: add info and renders to show to set TE/NT mode

by manawyrm

Attention is currently required from: laforge, tnt. manawyrm has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27317 ) Change subject: manual: add info and renders to show to set TE/NT mode ...................................................................... Patch Set 2: (1 comment) File doc/manuals/chapters/hardware.adoc: https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27317/comment/46302c0b_9430… PS1, Line 69: The icE1usb is shipped in TE configuration. Using a 1:1 patch cable, it can be connected to another device in NT mode. + > I'd remove this paragraph ( maybe just leave the default setting as a reminder ). […] Yep, hadn't seen that commit yet. I changed it accordingly. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I5999dc60850da2cd02d9bbc7db5727cdebf041c6 Gerrit-Change-Number: 27317 Gerrit-PatchSet: 2 Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Thu, 24 Feb 2022 08:28:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: tnt <tnt(a)246tNt.com> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-e1-hardware[master]: manual: add info and renders to show to set TE/NT mode

by manawyrm

Attention is currently required from: manawyrm, laforge. Hello Jenkins Builder, laforge, tnt, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27317 to look at the new patch set (#2). Change subject: manual: add info and renders to show to set TE/NT mode ...................................................................... manual: add info and renders to show to set TE/NT mode The page break is currently a bit ugly, but I didn't see an easy way to fix it. The images and info text should make the process much clearer. Change-Id: I5999dc60850da2cd02d9bbc7db5727cdebf041c6 --- M doc/manuals/chapters/hardware.adoc A doc/manuals/images/nt_t.png A doc/manuals/images/te_t.png 3 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/17/27317/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I5999dc60850da2cd02d9bbc7db5727cdebf041c6 Gerrit-Change-Number: 27317 Gerrit-PatchSet: 2 Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

Change in osmo-e1-hardware[master]: manual: add info and renders to show to set TE/NT mode

by tnt

Attention is currently required from: manawyrm, laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27317 ) Change subject: manual: add info and renders to show to set TE/NT mode ...................................................................... Patch Set 1: (1 comment) File doc/manuals/chapters/hardware.adoc: https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27317/comment/1b39f166_bfcf… PS1, Line 69: The icE1usb is shipped in TE configuration. Using a 1:1 patch cable, it can be connected to another device in NT mode. + I'd remove this paragraph ( maybe just leave the default setting as a reminder ). Because it's all taken care of in https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27316 already with a slightly more extensive explanation. So just leave this section about the "how to change mode". -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I5999dc60850da2cd02d9bbc7db5727cdebf041c6 Gerrit-Change-Number: 27317 Gerrit-PatchSet: 1 Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 24 Feb 2022 08:06:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-e1-hardware[master]: manual: Document the factory default jumper setting

by tnt

Attention is currently required from: laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27316 ) Change subject: manual: Document the factory default jumper setting ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Ie726d4ca2e8605015a2f0384d2b435e1b40c1cad Gerrit-Change-Number: 27316 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 24 Feb 2022 08:04:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-e1-hardware[master]: manual: fix link to gateware

by tnt

Attention is currently required from: laforge. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27315 ) Change subject: manual: fix link to gateware ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Iad107b33d182e3d9343dfb4e533360740e9c85df Gerrit-Change-Number: 27315 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 24 Feb 2022 08:04:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: initial conn-oriented forwarding

by osmith

Attention is currently required from: laforge, pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260 ) Change subject: bsc_nat_fsm: initial conn-oriented forwarding ...................................................................... Patch Set 4: (1 comment) File src/osmo-bsc-nat/bsc_nat_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260/comment/8b8787c4_89685204 PS3, Line 78: *peer_addr_in = called_addr; > This doesn't look good to me, you are tricking the compiler here. […] Hm, right... reverted the const change again. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I3df79e4dfaa60f4fd098961ee57cda71e9773b82 Gerrit-Change-Number: 27260 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(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: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 24 Feb 2022 07:32:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: initial conn-oriented forwarding

by osmith

Attention is currently required from: osmith, fixeria. Hello Jenkins Builder, laforge, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260 to look at the new patch set (#5). Change subject: bsc_nat_fsm: initial conn-oriented forwarding ...................................................................... bsc_nat_fsm: initial conn-oriented forwarding Implement a simple version of forwarding Connection Request, Connection Confirm, Data Form, Released SCCP messages. This is still assuming that there is just one BSC, one MSC, the same connection ID is used in RAN and CN. Future patches will add a mapping between RAN and CN sides and allow multiple BSCs. With this patch it is possible to perform a call between two MS in the following network structure: MS1 --. BTS --- BSC --- BSCNAT --- MSC MS2 --' Related: SYS#5560 Change-Id: I3df79e4dfaa60f4fd098961ee57cda71e9773b82 --- M src/osmo-bsc-nat/bsc_nat_fsm.c 1 file changed, 87 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/60/27260/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I3df79e4dfaa60f4fd098961ee57cda71e9773b82 Gerrit-Change-Number: 27260 Gerrit-PatchSet: 5 Gerrit-Owner: osmith <osmith(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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

Change in osmocom-bb[master]: mobile/subscriber.c: fix auth resp with test sim

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/27312 ) Change subject: mobile/subscriber.c: fix auth resp with test sim ...................................................................... mobile/subscriber.c: fix auth resp with test sim Do not send a dummy authentication response with the test sim. Fixes: 39dc9c46 ("mobile/subscriber.c: consider GSM_SIM_TYPE_SAP too") Change-Id: I0ee910c171d383fb2cdcaf5eb54eafe18da3430b --- M src/host/layer23/src/mobile/subscriber.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/mobile/subscriber.c index 500dd76..4009238 100644 --- a/src/host/layer23/src/mobile/subscriber.c +++ b/src/host/layer23/src/mobile/subscriber.c @@ -904,7 +904,7 @@ struct sim_hdr *nsh; /* not a SIM */ - if (!GSM_SIM_IS_READER(subscr->sim_type) + if ((subscr->sim_type != GSM_SIM_TYPE_TEST && !GSM_SIM_IS_READER(subscr->sim_type)) || !subscr->sim_valid || no_sim) { struct gsm48_mm_event *nmme; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/27312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0ee910c171d383fb2cdcaf5eb54eafe18da3430b Gerrit-Change-Number: 27312 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

Change in osmocom-bb[master]: mobile/subscriber.c: fix auth resp with test sim

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/27312 ) Change subject: mobile/subscriber.c: fix auth resp with test sim ...................................................................... Patch Set 2: (1 comment) File src/host/layer23/src/mobile/subscriber.c: https://gerrit.osmocom.org/c/osmocom-bb/+/27312/comment/1ac4bf8e_e75b6ea9 PS2, Line 908: || !subscr->sim_valid || no_sim) { > just wondering: is sim_type containing meaningul stuff if sucr->sim_valid is false? not sure... but that shouldn't impact this patch -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/27312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0ee910c171d383fb2cdcaf5eb54eafe18da3430b Gerrit-Change-Number: 27312 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 24 Feb 2022 07:26:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-e1-hardware[master]: manual: add info and renders to show to set TE/NT mode

by manawyrm

manawyrm has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27317 ) Change subject: manual: add info and renders to show to set TE/NT mode ...................................................................... manual: add info and renders to show to set TE/NT mode The page break is currently a bit ugly, but I didn't see an easy way to fix it. The images and info text should make the process much clearer. Change-Id: I5999dc60850da2cd02d9bbc7db5727cdebf041c6 --- M doc/manuals/chapters/hardware.adoc A doc/manuals/images/nt_t.png A doc/manuals/images/te_t.png 3 files changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/17/27317/1 diff --git a/doc/manuals/chapters/hardware.adoc b/doc/manuals/chapters/hardware.adoc index 0e129c2..a306648 100644 --- a/doc/manuals/chapters/hardware.adoc +++ b/doc/manuals/chapters/hardware.adoc @@ -64,6 +64,24 @@ different pin-out. Particularly, you cannot use an Ethernet cross-over cable as an E1 cross-over! +==== Switching between TE/NT mode + +The icE1usb is shipped in TE configuration. Using a 1:1 patch cable, it can be connected to another device in NT mode. + +If you want to connect to a PBX, BTS, etc., you'll need to use an E1 cross-over cable or switch to NT mode. + +To change the mode, unscrew the 2 PH0 screws on the side with the 2 RJ45 jacks. You'll also need to unscrew the nut on the SMA jack on the other side. +After that, the cover plate and rubber gasket around the 2 RJ45 jacks can be removed. The PCB can be slid out of the case. + +[frame="none"] +[grid="none"] +|=== +|image:images/te_t.png[width=250,title="icE1usb jumpered for TE mode"] |image:images/nt_t.png[width=250,title="icE1usb jumpered for NT mode"] +| *TE mode* (default) | *NT mode* | +|=== + + +Each 2x4 jumper block is connected to the nearest RJ45 connector. + === Connectors on USB side image::images/icE1usb-usb_side.jpg[width=400,title="USB side of icE1usb"] diff --git a/doc/manuals/images/nt_t.png b/doc/manuals/images/nt_t.png new file mode 100644 index 0000000..73143b7 --- /dev/null +++ b/doc/manuals/images/nt_t.png Binary files differ diff --git a/doc/manuals/images/te_t.png b/doc/manuals/images/te_t.png new file mode 100644 index 0000000..54d8343 --- /dev/null +++ b/doc/manuals/images/te_t.png Binary files differ -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I5999dc60850da2cd02d9bbc7db5727cdebf041c6 Gerrit-Change-Number: 27317 Gerrit-PatchSet: 1 Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: pcu: Start PCUIF related components as alive-type

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27295 ) Change subject: pcu: Start PCUIF related components as alive-type ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27295 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: I17b2cfed2edbea7427e608380059bb1b422ca600 Gerrit-Change-Number: 27295 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Feb 2022 21:30:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Start BSSGP_CT and NS_CT as alive-type component in all testsuites

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27294 ) Change subject: Start BSSGP_CT and NS_CT as alive-type component in all testsuites ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27294 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: I6e3b08710b4502e2b9805f7c9f7bd89f34e4085c Gerrit-Change-Number: 27294 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Feb 2022 21:30:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: pcu: usse alive-type for NS and BSSGP created components

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27293 ) Change subject: pcu: usse alive-type for NS and BSSGP created components ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27293 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: I369a5e2246204416c2f29a114bde6bc21f7eaf4f Gerrit-Change-Number: 27293 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Feb 2022 21:29:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: pcu: Fix race condition in TC_t3141

by laforge

Attention is currently required from: osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27287 ) Change subject: pcu: Fix race condition in TC_t3141 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27287 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: Ia301c01a3f5c3fd0b11d8f20e39061aa7abc6127 Gerrit-Change-Number: 27287 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Feb 2022 21:28:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

2024

2023

2022

gerrit-log February 2022