- gerrit-log - lists.osmocom.org

Change in osmo-bsc-nat[master]: Proper exit if bsc_nat_fsm fails to start
by osmith 11 Apr '22

11 Apr '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27708 ) Change subject: Proper exit if bsc_nat_fsm fails to start ...................................................................... Proper exit if bsc_nat_fsm fails to start Instead of segfaulting later on, properly exit if the bsc_nat_fsm does not start. One reason for having it fail could be a missing mgw pool config block. Related: SYS#5560 Change-Id: Ia8bbe6ae908d5c3ce49f71b43c950497aeebb6d6 --- M include/osmocom/bsc_nat/bsc_nat_fsm.h M src/osmo-bsc-nat/bsc_nat_fsm.c M src/osmo-bsc-nat/main.c 3 files changed, 14 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/include/osmocom/bsc_nat/bsc_nat_fsm.h b/include/osmocom/bsc_nat/bsc_nat_fsm.h index a2becfb..bca97e1 100644 --- a/include/osmocom/bsc_nat/bsc_nat_fsm.h +++ b/include/osmocom/bsc_nat/bsc_nat_fsm.h @@ -20,5 +20,5 @@ #pragma once void bsc_nat_fsm_alloc(struct bsc_nat *bsc_nat); -void bsc_nat_fsm_start(struct bsc_nat *bsc_nat); +int bsc_nat_fsm_start(struct bsc_nat *bsc_nat); void bsc_nat_fsm_stop(struct bsc_nat *bsc_nat); diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 30486ce..eae2f5e 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -474,9 +474,18 @@ OSMO_ASSERT(bsc_nat->fi); } -void bsc_nat_fsm_start(struct bsc_nat *bsc_nat) +int bsc_nat_fsm_start(struct bsc_nat *bsc_nat) { - osmo_fsm_inst_dispatch(bsc_nat->fi, BSC_NAT_FSM_EV_START, NULL); + int rc = osmo_fsm_inst_dispatch(bsc_nat->fi, BSC_NAT_FSM_EV_START, NULL); + if (rc) + return rc; + + /* st_starting_on_enter() doesn't change to STARTED if e.g. vty config + * is incomplete */ + if (bsc_nat->fi->state != BSC_NAT_FSM_ST_STARTED) + return -1; + + return 0; } void bsc_nat_fsm_stop(struct bsc_nat *bsc_nat) diff --git a/src/osmo-bsc-nat/main.c b/src/osmo-bsc-nat/main.c index 6cb1e0f..e58d687 100644 --- a/src/osmo-bsc-nat/main.c +++ b/src/osmo-bsc-nat/main.c @@ -198,7 +198,8 @@ main_vty_init(argc, argv); signal_handler_init(); - bsc_nat_fsm_start(g_bsc_nat); + if (bsc_nat_fsm_start(g_bsc_nat) < 0) + exit(1); if (msc_alloc_from_addr_book() < 0) exit(1); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27708 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: Ia8bbe6ae908d5c3ce49f71b43c950497aeebb6d6 Gerrit-Change-Number: 27708 Gerrit-PatchSet: 3 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

1 0

Change in osmo-bsc-nat[master]: Proper exit if bsc_nat_fsm fails to start
by osmith 11 Apr '22

11 Apr '22

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27708 ) Change subject: Proper exit if bsc_nat_fsm fails to start ...................................................................... Patch Set 3: Code-Review+2 (1 comment) Patchset: PS3: 1+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27708 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: Ia8bbe6ae908d5c3ce49f71b43c950497aeebb6d6 Gerrit-Change-Number: 27708 Gerrit-PatchSet: 3 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: Mon, 11 Apr 2022 12:15:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-bts[master]: scheduler: rts_tchh_fn(): use a lookup table for FACCH/H
by fixeria 11 Apr '22

11 Apr '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27721 ) Change subject: scheduler: rts_tchh_fn(): use a lookup table for FACCH/H ...................................................................... Patch Set 1: Code-Review+2 (1 comment) File src/common/scheduler.c: https://gerrit.osmocom.org/c/osmo-bts/+/27721/comment/70399f72_963b68dd PS1, Line 1001: static const uint8_t sched_tchh_dl_facch_map[26] = { > Since this table is only used in the function below, you could move it there. We may actually want to use it from other code paths later, so let's keep it here for now. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3dba243e5a1b7c8008ef0178ea18ed885256c50d Gerrit-Change-Number: 27721 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Apr 2022 12:06:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: DIAMETER_Emulation: Allow up to 256 IMSI Diameter components
by pespin 11 Apr '22

11 Apr '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27731 ) Change subject: DIAMETER_Emulation: Allow up to 256 IMSI Diameter components ...................................................................... DIAMETER_Emulation: Allow up to 256 IMSI Diameter components TC_createSession_ping4_256 requries 256 concurrent connections. Change-Id: Idc305a868f827dee63a476979fc9de9fc12580c5 --- M library/DIAMETER_Emulation.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/DIAMETER_Emulation.ttcn b/library/DIAMETER_Emulation.ttcn index 0f1b9fe..8fb7230 100644 --- a/library/DIAMETER_Emulation.ttcn +++ b/library/DIAMETER_Emulation.ttcn @@ -78,9 +78,9 @@ * to send where with CLIENT.send() to vc_conn */ port DIAMETER_Conn_PT DIAMETER_CLIENT; /* currently tracked connections */ - var AssociationData DiameterAssocTable[16]; + var AssociationData DiameterAssocTable[256]; /* pending expected CRCX */ - var ExpectData DiameterExpectTable[8]; + var ExpectData DiameterExpectTable[256]; /* procedure based port to register for incoming connections */ port DIAMETEREM_PROC_PT DIAMETER_PROC; /* test port for unit data messages */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27731 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: Idc305a868f827dee63a476979fc9de9fc12580c5 Gerrit-Change-Number: 27731 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: DIAMETER_Emulation: Rename association table
by pespin 11 Apr '22

11 Apr '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27729 ) Change subject: DIAMETER_Emulation: Rename association table ...................................................................... DIAMETER_Emulation: Rename association table The table has no direct relation to SGSAP, it tracks IMSI connections in a generic way. Change-Id: I12399465549739fb99af193e7071fff8bc452b0b --- M library/DIAMETER_Emulation.ttcn 1 file changed, 23 insertions(+), 23 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/DIAMETER_Emulation.ttcn b/library/DIAMETER_Emulation.ttcn index 73fc87c..e53f4e5 100644 --- a/library/DIAMETER_Emulation.ttcn +++ b/library/DIAMETER_Emulation.ttcn @@ -78,7 +78,7 @@ * to send where with CLIENT.send() to vc_conn */ port DIAMETER_Conn_PT DIAMETER_CLIENT; /* currently tracked connections */ - var AssociationData SgsapAssociationTable[16]; + var AssociationData DiameterAssocTable[16]; /* pending expected CRCX */ var ExpectData DiameterExpectTable[8]; /* procedure based port to register for incoming connections */ @@ -131,8 +131,8 @@ private function f_imsi_known(hexstring imsi) runs on DIAMETER_Emulation_CT return boolean { var integer i; - for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { - if (SgsapAssociationTable[i].imsi == imsi) { + for (i := 0; i < sizeof(DiameterAssocTable); i := i+1) { + if (DiameterAssocTable[i].imsi == imsi) { return true; } } @@ -142,8 +142,8 @@ private function f_comp_known(DIAMETER_ConnHdlr client) runs on DIAMETER_Emulation_CT return boolean { var integer i; - for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { - if (SgsapAssociationTable[i].comp_ref == client) { + for (i := 0; i < sizeof(DiameterAssocTable); i := i+1) { + if (DiameterAssocTable[i].comp_ref == client) { return true; } } @@ -153,9 +153,9 @@ private function f_comp_by_imsi(hexstring imsi) runs on DIAMETER_Emulation_CT return DIAMETER_ConnHdlr { var integer i; - for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { - if (SgsapAssociationTable[i].imsi == imsi) { - return SgsapAssociationTable[i].comp_ref; + for (i := 0; i < sizeof(DiameterAssocTable); i := i+1) { + if (DiameterAssocTable[i].imsi == imsi) { + return DiameterAssocTable[i].comp_ref; } } setverdict(fail, "DIAMETER Association Table not found by IMSI", imsi); @@ -165,9 +165,9 @@ private function f_imsi_by_comp(DIAMETER_ConnHdlr client) runs on DIAMETER_Emulation_CT return hexstring { var integer i; - for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { - if (SgsapAssociationTable[i].comp_ref == client) { - return SgsapAssociationTable[i].imsi; + for (i := 0; i < sizeof(DiameterAssocTable); i := i+1) { + if (DiameterAssocTable[i].comp_ref == client) { + return DiameterAssocTable[i].imsi; } } setverdict(fail, "DIAMETER Association Table not found by component ", client); @@ -177,10 +177,10 @@ private function f_imsi_table_add(DIAMETER_ConnHdlr comp_ref, hexstring imsi) runs on DIAMETER_Emulation_CT { var integer i; - for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { - if (not isvalue(SgsapAssociationTable[i].imsi)) { - SgsapAssociationTable[i].imsi := imsi; - SgsapAssociationTable[i].comp_ref := comp_ref; + for (i := 0; i < sizeof(DiameterAssocTable); i := i+1) { + if (not isvalue(DiameterAssocTable[i].imsi)) { + DiameterAssocTable[i].imsi := imsi; + DiameterAssocTable[i].comp_ref := comp_ref; return; } } @@ -190,11 +190,11 @@ private function f_imsi_table_del(DIAMETER_ConnHdlr comp_ref, hexstring imsi) runs on DIAMETER_Emulation_CT { var integer i; - for (i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { - if (SgsapAssociationTable[i].comp_ref == comp_ref and - SgsapAssociationTable[i].imsi == imsi) { - SgsapAssociationTable[i].imsi := omit; - SgsapAssociationTable[i].comp_ref := null; + for (i := 0; i < sizeof(DiameterAssocTable); i := i+1) { + if (DiameterAssocTable[i].comp_ref == comp_ref and + DiameterAssocTable[i].imsi == imsi) { + DiameterAssocTable[i].imsi := omit; + DiameterAssocTable[i].comp_ref := null; return; } } @@ -205,9 +205,9 @@ private function f_imsi_table_init() runs on DIAMETER_Emulation_CT { - for (var integer i := 0; i < sizeof(SgsapAssociationTable); i := i+1) { - SgsapAssociationTable[i].comp_ref := null; - SgsapAssociationTable[i].imsi := omit; + for (var integer i := 0; i < sizeof(DiameterAssocTable); i := i+1) { + DiameterAssocTable[i].comp_ref := null; + DiameterAssocTable[i].imsi := omit; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27729 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: I12399465549739fb99af193e7071fff8bc452b0b Gerrit-Change-Number: 27729 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: DIAMETER_Emulation: Fix typo in comment
by pespin 11 Apr '22

11 Apr '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27730 ) Change subject: DIAMETER_Emulation: Fix typo in comment ...................................................................... DIAMETER_Emulation: Fix typo in comment Change-Id: I6163fc9153082598c7211b16a7c18fb95cf3d08a --- M library/DIAMETER_Emulation.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/DIAMETER_Emulation.ttcn b/library/DIAMETER_Emulation.ttcn index e53f4e5..0f1b9fe 100644 --- a/library/DIAMETER_Emulation.ttcn +++ b/library/DIAMETER_Emulation.ttcn @@ -399,7 +399,7 @@ inout DIAMETEREM_register; } with { extension "internal" }; -/* Function that can be used as create_cb and will usse the expect table */ +/* Function that can be used as create_cb and will use the expect table */ function ExpectedCreateCallback(PDU_DIAMETER msg, hexstring imsi, charstring id) runs on DIAMETER_Emulation_CT return DIAMETER_ConnHdlr { var DIAMETER_ConnHdlr ret := null; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27730 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: I6163fc9153082598c7211b16a7c18fb95cf3d08a Gerrit-Change-Number: 27730 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: ggsn: Initial testing of open5gs Gy interface
by pespin 11 Apr '22

11 Apr '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27423 ) Change subject: ggsn: Initial testing of open5gs Gy interface ...................................................................... ggsn: Initial testing of open5gs Gy interface Related: SYS#5276 Change-Id: I10027d4f8adc6b47ce97b90514d1f13e9aa3d40d --- M ggsn_tests/GGSN_Tests.ttcn M library/DIAMETER_Templates.ttcn M library/Osmocom_Types.ttcn M pgw/PGW_Tests.ttcn 4 files changed, 249 insertions(+), 15 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 203dcbf..7f6f67c 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -39,6 +39,7 @@ const integer GTP1C_PORT := 2123; const integer GTP1U_PORT := 2152; const integer PCRF_PORT := 3868; + const integer OCS_PORT := 3869; type enumerated GGSN_Impl { GGSN_IMPL_OSMOCOM, @@ -128,6 +129,10 @@ var DIAMETER_Emulation_CT vc_Gx; port DIAMETER_PT Gx_UNIT; port DIAMETEREM_PROC_PT Gx_PROC; + var DIAMETER_Emulation_CT vc_Gy; + port DIAMETER_PT Gy_UNIT; + port DIAMETEREM_PROC_PT Gy_PROC; + var integer g_gy_validity_time := 0; /* In seconds. 0 => disabled, !0 => grant over CC-Time period */ } private function f_init_vty() runs on GT_CT { @@ -203,7 +208,10 @@ unitdata_cb := refers(DiameterForwardUnitdataCallback), raw := true /* handler mode (single component for all IMSI)) */ }; - var DIAMETER_conn_parameters pars := { + var DIAMETER_conn_parameters pars; + + /* Gx setup: */ + pars := { remote_ip := m_ggsn_ip_gtpc, remote_sctp_port := -1, local_ip := m_bind_ip_gtpc, @@ -219,7 +227,25 @@ connect(vc_Gx:DIAMETER_PROC, self:Gx_PROC); vc_Gx.start(DIAMETER_Emulation.main(ops, pars, id)); + /* Gy setup: */ + pars := { + remote_ip := m_ggsn_ip_gtpc, + remote_sctp_port := -1, + local_ip := m_bind_ip_gtpc, + local_sctp_port := OCS_PORT, + origin_host := "ocs.localdomain", + origin_realm := "localdomain", + auth_app_id := c_DIAMETER_CREDIT_CONTROL_AID, + vendor_app_id := omit + }; + vc_Gy := DIAMETER_Emulation_CT.create(id); + map(vc_Gy:DIAMETER, system:DIAMETER_CODEC_PT); + connect(vc_Gy:DIAMETER_UNIT, self:Gy_UNIT); + connect(vc_Gy:DIAMETER_PROC, self:Gy_PROC); + vc_Gy.start(DIAMETER_Emulation.main(ops, pars, id)); + f_diameter_wait_capability(Gx_UNIT); + f_diameter_wait_capability(Gy_UNIT); /* Give some time for our emulation to get out of SUSPECT list of SUT (3 watchdong ping-pongs): * RFC6733 sec 5.1 * RFC3539 sec 3.4.1 [5] @@ -425,9 +451,9 @@ } } - private altstep as_DIA_CCR(DCC_NONE_CC_Request_Type req_type) runs on GT_CT { + private altstep as_DIA_Gx_CCR(DCC_NONE_CC_Request_Type req_type) runs on GT_CT { var PDU_DIAMETER rx_dia; - [] Gx_UNIT.receive(tr_DIA_CCR(req_type := req_type)) -> value rx_dia { + [] Gx_UNIT.receive(tr_DIA_Gx_CCR(req_type := req_type)) -> value rx_dia { var template (omit) AVP avp; var octetstring sess_id; var AVP_Unsigned32 req_num; @@ -438,7 +464,7 @@ avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_DCC_NONE_CC_Request_Number); req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); - Gx_UNIT.send(ts_DIA_CCA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id, + Gx_UNIT.send(ts_DIA_Gx_CCA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id, req_type, req_num)); } [] Gx_UNIT.receive(PDU_DIAMETER:?) -> value rx_dia { @@ -447,6 +473,34 @@ } } + private altstep as_DIA_Gy_CCR(DCC_NONE_CC_Request_Type req_type) runs on GT_CT { + var PDU_DIAMETER rx_dia; + [] Gy_UNIT.receive(tr_DIA_Gy_CCR(req_type := req_type)) -> value rx_dia { + var template (value) PDU_DIAMETER tx_dia; + var template (omit) AVP avp; + var octetstring sess_id; + var AVP_Unsigned32 req_num; + + avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_BASE_NONE_Session_Id); + sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); + + avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_DCC_NONE_CC_Request_Number); + req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); + if (g_gy_validity_time > 0) { + tx_dia := ts_DIA_Gy_CCA_ValidityTime(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id, + req_type, req_num, g_gy_validity_time); + } else { + tx_dia := ts_DIA_Gy_CCA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id, + req_type, req_num); + } + Gy_UNIT.send(tx_dia); + } + [] Gy_UNIT.receive(PDU_DIAMETER:?) -> value rx_dia { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Received unexpected DIAMETER Gy", rx_dia)); + } + } + /* send a PDP context activation */ function f_pdp_ctx_act(inout PdpContext ctx, template OCT1 exp_cause := '80'O) runs on GT_CT return CreatePDPContextResponse { var Gtp1cUnitdata ud; @@ -460,7 +514,10 @@ T_default.start; d := activate(pingpong()); if (Gx_PROC.checkstate("Connected")) { - as_DIA_CCR(INITIAL_REQUEST); + as_DIA_Gx_CCR(INITIAL_REQUEST); + } + if (Gy_PROC.checkstate("Connected")) { + as_DIA_Gy_CCR(INITIAL_REQUEST); } alt { [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, createPDPContextResponse, ctx.teic)) -> value ud { @@ -522,7 +579,10 @@ T_default.start; d := activate(pingpong()); if (Gx_PROC.checkstate("Connected") and expect_diameter) { - as_DIA_CCR(TERMINATION_REQUEST); + as_DIA_Gx_CCR(TERMINATION_REQUEST); + } + if (Gy_PROC.checkstate("Connected") and expect_diameter) { + as_DIA_Gy_CCR(TERMINATION_REQUEST); } alt { [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextResponse, expect_teid)) -> value ud { @@ -1938,7 +1998,8 @@ T_next.start; alt { - [Gx_PROC.checkstate("Connected")] as_DIA_CCR(INITIAL_REQUEST) { repeat; } + [Gx_PROC.checkstate("Connected")] as_DIA_Gx_CCR(INITIAL_REQUEST) { repeat; } + [Gy_PROC.checkstate("Connected")] as_DIA_Gy_CCR(INITIAL_REQUEST) { repeat; } [] pingpong(); [] T_next.timeout { f_send_gtpc(ts_GTPC_CreatePDP(g_peer_c, g_c_seq_nr, ctx[next_req_ctx].imsi, g_restart_ctr, @@ -1992,7 +2053,8 @@ rx_resp_ctx := 0; T_next.start; alt { - [Gx_PROC.checkstate("Connected")] as_DIA_CCR(TERMINATION_REQUEST) { repeat; } + [Gx_PROC.checkstate("Connected")] as_DIA_Gx_CCR(TERMINATION_REQUEST) { repeat; } + [Gy_PROC.checkstate("Connected")] as_DIA_Gy_CCR(TERMINATION_REQUEST) { repeat; } [] pingpong(); [] T_next.timeout { f_send_gtpc(ts_GTPC_DeletePDP(g_peer_c, g_c_seq_nr, ctx[next_req_ctx].teic_remote, ctx[next_req_ctx].nsapi, '1'B)); @@ -2044,7 +2106,8 @@ T_next.start; alt { - [Gx_PROC.checkstate("Connected")] as_DIA_CCR(INITIAL_REQUEST) { repeat; } + [Gx_PROC.checkstate("Connected")] as_DIA_Gx_CCR(INITIAL_REQUEST) { repeat; } + [Gy_PROC.checkstate("Connected")] as_DIA_Gy_CCR(INITIAL_REQUEST) { repeat; } [] pingpong(); [] T_next.timeout { if (cont_req) { @@ -2093,7 +2156,7 @@ rx_resp_ctx := 0; T_next.start; alt { - [Gx_PROC.checkstate("Connected")] as_DIA_CCR(TERMINATION_REQUEST) { repeat; } + [Gx_PROC.checkstate("Connected")] as_DIA_Gx_CCR(TERMINATION_REQUEST) { repeat; } [] pingpong(); [] T_next.timeout { f_send_gtpc(ts_GTPC_DeletePDP(g_peer_c, g_c_seq_nr, teic_list[next_req_ctx], '0001'B, '1'B)); @@ -2124,6 +2187,56 @@ f_shutdown_helper(); } + /* Test charging over Gy interface. */ + testcase TC_gy_charging_cc_time() runs on GT_CT { + var default d; + + g_gy_validity_time := 3; /* Grant access for 3 seconds, needs to be re-validated afterwards */ + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); + f_pdp_ctx_act(ctx); + + var OCT4 dns1_addr := f_PCO_extract_proto(ctx.pco_neg, '000d'O); + + /* Send some UL traffic: */ + var OCT4 saddr := ctx.eua.endUserAddress.endUserAddressIPv4.ipv4_address; + f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr, dns1_addr)); + f_wait_icmp4_echo_reply(ctx); + + T_default.start(10.0); + d := activate(pingpong()); + + g_gy_validity_time := 2; + /* First update reports octests/pkt on both UL/DL (see icmp ping-pong above) */ + as_DIA_Gy_CCR(UPDATE_REQUEST); + + /* Second update: 0 ul/dl pkt/octet should be reported, since nothing was sent */ + as_DIA_Gy_CCR(UPDATE_REQUEST); + + /* Third update: make sure report contains again octets/pkts for both UL/DL: */ + f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr, dns1_addr)); + f_wait_icmp4_echo_reply(ctx); + f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr, dns1_addr)); + f_wait_icmp4_echo_reply(ctx); + as_DIA_Gy_CCR(UPDATE_REQUEST); + + /* Let the CCA reach the GGSN */ + f_sleep(0.5); + deactivate(d); + T_default.stop; + + /* Send some data and validate it is reported in the TERMINATION_REQUEST + * (triggered by PFCP Session Deletion Response): */ + f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr, dns1_addr)); + f_wait_icmp4_echo_reply(ctx); + + f_pdp_ctx_del(ctx, '1'B); + + + f_shutdown_helper(); + } + control { execute(TC_pdp4_act_deact()); execute(TC_pdp4_act_deact_ipcp()); @@ -2170,5 +2283,10 @@ execute(TC_lots_of_concurrent_pdp_ctx()); /* Keep at the end, crashes older osmo-ggsn versions (OS#5469): */ execute(TC_addr_pool_exhaustion()); + + /* open5gs specific tests: */ + if (m_ggsn_impl == GGSN_IMPL_OPEN5GS) { + execute(TC_gy_charging_cc_time()); + } } } diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index f7244d8..24b9cd8 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -100,6 +100,8 @@ DIAMETER_ERROR_EAP_CODE_UNKNOWN (5048) }; +/* Gy : 3GPP TS 32.299 7.1.6, RFC4006 3.1 */ +const uint32_t c_DIAMETER_CREDIT_CONTROL_AID := 4; /* 3GPP TS 29.272 Section 7.1.8 */ const uint32_t c_DIAMETER_3GPP_Gx_AID := 16777238; const uint32_t c_DIAMETER_3GPP_S6_AID := 16777251; @@ -860,6 +862,56 @@ } } +/* RFC4006 8.16 Multiple-Services-Credit-Control AVP */ +template (value) GenericAVP ts_AVP_Multiple_Services_Credit_Control(template (value) AVP_list content) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_DCC_NONE_Multiple_Services_Credit_Control), + avp_data := { + avp_DCC_NONE_Multiple_Services_Credit_Control := content + } + } +} + +/* RFC4006 8.17 Granted-Service-Unit AVP */ +template (value) GenericAVP ts_AVP_Granted_Service_Unit(template (value) AVP_list content) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_DCC_NONE_Granted_Service_Unit), + avp_data := { + avp_DCC_NONE_Granted_Service_Unit := content + } + } +} + +/* RFC4006 8.21 CC-Time AVP */ +template (value) GenericAVP ts_AVP_CC_Time(uint32_t cc_time_val) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_DCC_NONE_CC_Time), + avp_data := { + avp_DCC_NONE_CC_Time := int2oct(cc_time_val, 4) + } + } +} + +/* RFC4006 8.23 CC-Total-Octets AVP */ +template (value) GenericAVP ts_AVP_CC_Total_Octets(uint64_t cc_total_octets_val) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_DCC_NONE_CC_Total_Octets), + avp_data := { + avp_DCC_NONE_CC_Total_Octets := int2oct(cc_total_octets_val, 8) + } + } +} + +/* RFC4006 8.33 Validity-Time AVP */ +template (value) GenericAVP ts_AVP_Validity_Time(uint32_t validity_time_val) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_DCC_NONE_Validity_Time), + avp_data := { + avp_DCC_NONE_Validity_Time := int2oct(validity_time_val, 4) + } + } +} + /* 5.3.2 Capabilities Exchange Answer */ @@ -1101,7 +1153,7 @@ /* RFC 4006 3.1. Credit-Control-Request (CCR) Command */ template (present) PDU_DIAMETER -tr_DIA_CCR(template (present) DCC_NONE_CC_Request_Type req_type := INITIAL_REQUEST) +tr_DIA_Gx_CCR(template (present) DCC_NONE_CC_Request_Type req_type := INITIAL_REQUEST) := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, app_id:=int2oct(c_DIAMETER_3GPP_Gx_AID, 4), avps := superset( @@ -1113,15 +1165,28 @@ tr_AVP_CcReqType(req_type), tr_AVP_CcReqNum(?) )); +template (present) PDU_DIAMETER +tr_DIA_Gy_CCR(template (present) DCC_NONE_CC_Request_Type req_type := INITIAL_REQUEST) +:= tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, + app_id:=int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4), + avps := superset( + tr_AVP_SessionId, + tr_AVP_OriginHost, + tr_AVP_OriginRealm, + tr_AVP_DestinationRealm, + tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), + tr_AVP_CcReqType(req_type), + tr_AVP_CcReqNum(?) + )); + /* RFC 4006 3.2. Credit-Control-Answer (CCA) Command */ template (value) PDU_DIAMETER -ts_DIA_CCA(template (value) UINT32 hbh_id, template (value) UINT32 ete_id, +ts_DIA_Gx_CCA(template (value) UINT32 hbh_id, template (value) UINT32 ete_id, template (value) octetstring sess_id, template (value) DCC_NONE_CC_Request_Type req_type, template (value) AVP_Unsigned32 req_num) - := ts_DIAMETER(flags:='01000000'B, cmd_code:=Credit_Control, app_id:=int2oct(c_DIAMETER_3GPP_Gx_AID, 4), hbh_id:=hbh_id, ete_id:=ete_id, avps := { @@ -1137,6 +1202,56 @@ // supported features // origin }); +template (value) PDU_DIAMETER +ts_DIA_Gy_CCA(template (value) UINT32 hbh_id, template (value) UINT32 ete_id, + template (value) octetstring sess_id, + template (value) DCC_NONE_CC_Request_Type req_type, + template (value) AVP_Unsigned32 req_num) +:= ts_DIAMETER(flags:='01000000'B, cmd_code:=Credit_Control, + app_id:=int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4), hbh_id:=hbh_id, ete_id:=ete_id, + avps := { + ts_AVP_SessionId(sess_id), + ts_AVP_ResultCode(DIAMETER_SUCCESS), + ts_AVP_OriginHost("ocs.localdomain"), + ts_AVP_OriginRealm("localdomain"), + ts_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), + ts_AVP_CcReqType(req_type), + ts_AVP_CcReqNum(req_num)//, + // qos + // default eps bearer qos + // supported features + // origin + }); +/* Same as ts_DIA_Gy_CCA, but with extra AVP to grant access for limited amount of seconds */ +template (value) PDU_DIAMETER +ts_DIA_Gy_CCA_ValidityTime(template (value) UINT32 hbh_id, template (value) UINT32 ete_id, + template (value) octetstring sess_id, + template (value) DCC_NONE_CC_Request_Type req_type, + template (value) AVP_Unsigned32 req_num, + uint32_t validity_time) +:= ts_DIAMETER(flags:='01000000'B, cmd_code:=Credit_Control, + app_id:=int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4), hbh_id:=hbh_id, ete_id:=ete_id, + avps := { + ts_AVP_SessionId(sess_id), + ts_AVP_ResultCode(DIAMETER_SUCCESS), + ts_AVP_OriginHost("ocs.localdomain"), + ts_AVP_OriginRealm("localdomain"), + ts_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), + ts_AVP_CcReqType(req_type), + ts_AVP_CcReqNum(req_num), + ts_AVP_Multiple_Services_Credit_Control({ + ts_AVP_Validity_Time(validity_time), + ts_AVP_Granted_Service_Unit({ + //ts_AVP_CC_Time(validity_time*2), + ts_AVP_CC_Total_Octets(1000) + }) + }) + //, + // qos + // default eps bearer qos + // supported features + // origin + }); /* RFC 6733, section 5.5.1 "Device-Watchdog-Request" */ template (value) PDU_DIAMETER diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn index 472b389..b698a2e 100644 --- a/library/Osmocom_Types.ttcn +++ b/library/Osmocom_Types.ttcn @@ -16,6 +16,7 @@ type integer uint16_t (0..65535) with { variant "unsigned 16 bit" }; type integer uint24_t (0..16777215) with { variant "unsigned 24 bit" }; type integer uint32_t (0..4294967295) with { variant "unsigned 32 bit" }; +type integer uint64_t (0..18446744073709551615) with { variant "unsigned 64 bit" }; type integer int8_t (-128..127) with { variant "8 bit" }; type integer int16_t (-32768..32767) with { variant "16 bit" }; diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index a65ca43..9846dab 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -221,7 +221,7 @@ private altstep as_DIA_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT { var PDU_DIAMETER rx_dia; - [] DIAMETER.receive(tr_DIA_CCR(req_type := req_type)) -> value rx_dia { + [] DIAMETER.receive(tr_DIA_Gx_CCR(req_type := req_type)) -> value rx_dia { var template (omit) AVP avp; var octetstring sess_id; var AVP_Unsigned32 req_num; @@ -232,7 +232,7 @@ avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_DCC_NONE_CC_Request_Number); req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); - DIAMETER.send(ts_DIA_CCA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id, + DIAMETER.send(ts_DIA_Gx_CCA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id, req_type, req_num)); } [] DIAMETER.receive(PDU_DIAMETER:?) -> value rx_dia { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27423 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: I10027d4f8adc6b47ce97b90514d1f13e9aa3d40d Gerrit-Change-Number: 27423 Gerrit-PatchSet: 5 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: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: DIAMETER_Emulation: Rename association table
by pespin 11 Apr '22

11 Apr '22

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27729 ) Change subject: DIAMETER_Emulation: Rename association table ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27729 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: I12399465549739fb99af193e7071fff8bc452b0b Gerrit-Change-Number: 27729 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Apr 2022 12:04:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: ggsn: Initial testing of open5gs Gy interface
by pespin 11 Apr '22

11 Apr '22

Attention is currently required from: osmith, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27423 ) Change subject: ggsn: Initial testing of open5gs Gy interface ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27423 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: I10027d4f8adc6b47ce97b90514d1f13e9aa3d40d Gerrit-Change-Number: 27423 Gerrit-PatchSet: 4 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: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Apr 2022 12:04:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: tune waiting timeout in TC_rsl_ms_pwr_dyn_up
by fixeria 11 Apr '22

11 Apr '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27697 ) Change subject: BTS_Tests: tune waiting timeout in TC_rsl_ms_pwr_dyn_up ...................................................................... BTS_Tests: tune waiting timeout in TC_rsl_ms_pwr_dyn_up Since recenly, osmo-bts is using P_CON_INTERVAL=2 by default. This means that the MS power loop gets triggered every 4th SACCH block (1.92s), so we need more time to reach the maximim Tx power. Change-Id: I9266f7284fcdb0afa3473f575640689e334e89a8 Related: osmo-bts.git I91c505447f68714239a4f033d4f06e91893df201 Related: OS#5517 --- M bts/BTS_Tests.ttcn 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 3a3d7cc..06fe43b 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3042,8 +3042,10 @@ 48.058 The maximum power to be used is indicated in the BS and MS Power elements respectively. */ RSL.send(ts_RSL_MS_PWR_CTRL_with_pp(g_chan_nr, pwr_max_var)); - /* wait, then check that our power level was reduced */ - timer T1 := 10.0; + /* By default, the MS power loop gets triggered every 4th SACCH block (1.92s). + * We need 9 * 4 dB steps to get from 0 dBm to 33 dBm, so 9 * 1.92s total. + * Add an extra offset to avoid race conditions: +1.92s. */ + timer T1 := 9.0 * 1.92 + 1.92; T1.start; alt { [] as_l1_sacch_l1h(l1h) { repeat; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27697 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: I9266f7284fcdb0afa3473f575640689e334e89a8 Gerrit-Change-Number: 27697 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log