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

[M] Change in osmo-ttcn3-hacks[master]: pgw: Set Gy CCA Result-Code based on settings

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36344?usp=email ) Change subject: pgw: Set Gy CCA Result-Code based on settings ...................................................................... pgw: Set Gy CCA Result-Code based on settings This allows the test to change the Result-Code being transmitted during Gy CCA at any time. Related: SYS#6845 Change-Id: I2c3b1057908c1c76a55c41a7f45728a0fdee3cf0 --- M ggsn_tests/GGSN_Tests.ttcn M library/DIAMETER_ts32_299_Templates.ttcn M pgw/PGW_Tests.ttcn 3 files changed, 63 insertions(+), 22 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 55720ee..74c2e8c 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -686,7 +686,7 @@ } } else { tx_dia := ts_DIA_Gy_CCA(g_rx_gy.hop_by_hop_id, g_rx_gy.end_to_end_id, sess_id, - req_type, req_num); + DIAMETER_SUCCESS, req_type, req_num); } Gy_UNIT.send(tx_dia); } diff --git a/library/DIAMETER_ts32_299_Templates.ttcn b/library/DIAMETER_ts32_299_Templates.ttcn index c308659..55402ab 100644 --- a/library/DIAMETER_ts32_299_Templates.ttcn +++ b/library/DIAMETER_ts32_299_Templates.ttcn @@ -53,13 +53,14 @@ 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) DIAMETER_Resultcode res_code, 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_ResultCode(res_code), ts_AVP_OriginHost("ocs.localdomain"), ts_AVP_OriginRealm("localdomain"), ts_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index fb893fc..997c42d 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -132,6 +132,14 @@ OCT4 teid_remote optional }; +type record SessionParsGy { + /* In seconds. 0 => disabled, !0 => grant over CC-Time period */ + integer validity_time, + + /* Result-Code to use when sending Gy CCA, usually DIAMETER_SUCCESS */ + DIAMETER_Resultcode cca_res_code +}; + /* configuration data for a given Session */ type record SessionPars { hexstring imsi, @@ -159,8 +167,7 @@ charstring tun_dev_name, charstring tun_netns_name optional, - /* In seconds. 0 => disabled, !0 => grant over CC-Time period */ - integer gy_validity_time + SessionParsGy gy } template (value) SessionPars @@ -188,7 +195,10 @@ }, tun_dev_name := tundev, tun_netns_name := tundev, - gy_validity_time := 0 + gy := { + validity_time := 0, + cca_res_code := DIAMETER_SUCCESS + } } @@ -575,26 +585,43 @@ return tpl; } +function f_ts_DIA_Gy_CCA(PDU_DIAMETER rx_gy) +runs on PGW_Session_CT return template (value) PDU_DIAMETER +{ + var template (value) PDU_DIAMETER tx_dia; + var template (omit) AVP avp; + var octetstring sess_id; + var AVP_Unsigned32 req_num; + var DCC_NONE_CC_Request_Type req_type; + var DIAMETER_Resultcode cca_res_code_success := DIAMETER_SUCCESS; + + avp := f_DIAMETER_get_avp(rx_gy, c_AVP_Code_BASE_NONE_Session_Id); + sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); + + avp := f_DIAMETER_get_avp(rx_gy, c_AVP_Code_DCC_NONE_CC_Request_Type); + req_type := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Type); + + avp := f_DIAMETER_get_avp(rx_gy, c_AVP_Code_DCC_NONE_CC_Request_Number); + req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); + + if (g_pars.gy.cca_res_code != cca_res_code_success) { + tx_dia := ts_DIA_Gy_CCA(rx_gy.hop_by_hop_id, rx_gy.end_to_end_id, sess_id, + g_pars.gy.cca_res_code, req_type, req_num); + } else if (g_pars.gy.validity_time > 0) { + tx_dia := ts_DIA_Gy_CCA_ValidityTime(rx_gy.hop_by_hop_id, rx_gy.end_to_end_id, sess_id, + req_type, req_num, g_pars.gy.validity_time); + } else { + tx_dia := ts_DIA_Gy_CCA(rx_gy.hop_by_hop_id, rx_gy.end_to_end_id, sess_id, + g_pars.gy.cca_res_code, req_type, req_num); + } + return tx_dia; +} + private altstep as_DIA_Gy_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT { [] Gy.receive(f_tr_DIA_Gy_CCR(req_type := req_type)) -> value g_rx_gy { 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(g_rx_gy, c_AVP_Code_BASE_NONE_Session_Id); - sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); - - avp := f_DIAMETER_get_avp(g_rx_gy, c_AVP_Code_DCC_NONE_CC_Request_Number); - req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); - if (g_pars.gy_validity_time > 0) { - tx_dia := ts_DIA_Gy_CCA_ValidityTime(g_rx_gy.hop_by_hop_id, g_rx_gy.end_to_end_id, sess_id, - req_type, req_num, g_pars.gy_validity_time); - } else { - tx_dia := ts_DIA_Gy_CCA(g_rx_gy.hop_by_hop_id, g_rx_gy.end_to_end_id, sess_id, - req_type, req_num); - } + tx_dia := f_ts_DIA_Gy_CCA(g_rx_gy); Gy.send(tx_dia); } [] Gy.receive(PDU_DIAMETER:?) -> value g_rx_gy { @@ -1046,7 +1073,7 @@ testcase TC_gy_charging_cc_time() runs on PGW_Test_CT { var PGW_Session_CT vc_conn; var SessionPars pars := valueof(t_SessionPars('001010123456789'H, "tun23")); - pars.gy_validity_time := 3; /* Grant access for 3 seconds, needs to be re-validated afterwards */ + pars.gy.validity_time := 3; /* Grant access for 3 seconds, needs to be re-validated afterwards */ f_init(); vc_conn := f_start_handler(refers(f_TC_gy_charging_cc_time), pars); vc_conn.done; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36344?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2c3b1057908c1c76a55c41a7f45728a0fdee3cf0 Gerrit-Change-Number: 36344 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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 year, 5 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: pgw: Introduce test TC_gy_ccr_update_rejected

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36352?usp=email ) Change subject: pgw: Introduce test TC_gy_ccr_update_rejected ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36352?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie58ae2a5e870b183fa1c56c90c94f5eee56386e0 Gerrit-Change-Number: 36352 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 12:25:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: pgw: Set Gy CCA Result-Code based on settings

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36344?usp=email ) Change subject: pgw: Set Gy CCA Result-Code based on settings ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36344?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2c3b1057908c1c76a55c41a7f45728a0fdee3cf0 Gerrit-Change-Number: 36344 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 12:25:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: pgw: Introduce test TC_gy_ccr_update_rejected

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36352?usp=email ) Change subject: pgw: Introduce test TC_gy_ccr_update_rejected ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36352?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie58ae2a5e870b183fa1c56c90c94f5eee56386e0 Gerrit-Change-Number: 36352 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 12:22:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: pgw: Set Gy CCA Result-Code based on settings

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36344?usp=email ) Change subject: pgw: Set Gy CCA Result-Code based on settings ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36344?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2c3b1057908c1c76a55c41a7f45728a0fdee3cf0 Gerrit-Change-Number: 36344 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 12:21:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in libosmo-netif[master]: stream_cli.c: Handle read / recvfrom error and close connection

by jolly

Attention is currently required from: laforge, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36354?usp=email ) Change subject: stream_cli.c: Handle read / recvfrom error and close connection ...................................................................... Patch Set 1: (2 comments) File src/stream_cli.c: https://gerrit.osmocom.org/c/libosmo-netif/+/36354/comment/adbcef04_2249e1dd PS1, Line 453: LOGSCLI(cli, LOGL_INFO, "received result %d in response to read\n", res); > LOGL_NOTICE or ERROR Done https://gerrit.osmocom.org/c/libosmo-netif/+/36354/comment/7c7948df_aebba322 PS1, Line 508: LOGSCLI(cli, LOGL_INFO, "received result %d in response to recvmsg\n", res); > LOGL_NOTICE or ERROR Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36354?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I55426de6b49cb4cb0797e50dfeae11f2efc29b15 Gerrit-Change-Number: 36354 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 11:49:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in libosmo-netif[master]: stream_cli.c: Handle read / recvfrom error and close connection

by jolly

Attention is currently required from: jolly, laforge. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/36354?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: stream_cli.c: Handle read / recvfrom error and close connection ...................................................................... stream_cli.c: Handle read / recvfrom error and close connection If read or recvfrom fails or returns 0, the connection must be closed. This is already done when a write / send fails. In both cases the disconnect callback is called to notify the user's client. Not handling the error may cause an infinite loop of read or recvfrom failures. Related: OS#6405 Change-Id: I55426de6b49cb4cb0797e50dfeae11f2efc29b15 --- M src/stream_cli.c 1 file changed, 28 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/54/36354/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36354?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I55426de6b49cb4cb0797e50dfeae11f2efc29b15 Gerrit-Change-Number: 36354 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[M] Change in osmo-mgw[master]: Change msgb ownership in processing of received msgb

by fixeria

Attention is currently required from: dexter, laforge, neels, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36361?usp=email ) Change subject: Change msgb ownership in processing of received msgb ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36361?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6a331f3c6b2eb51ea312ac6ef8c357185ddb79cf Gerrit-Change-Number: 36361 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 11:48:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in osmo-mgw[master]: remove osmo_fd from mgcp_create_bind()

by fixeria

Attention is currently required from: dexter, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36360?usp=email ) Change subject: remove osmo_fd from mgcp_create_bind() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36360?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I4a3b66a14fdfbc867daca0f0a05f694d5e0d7b66 Gerrit-Change-Number: 36360 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Mar 2024 11:47:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in docker-playground[master]: openbts-umts: fix apt: use archive.debian.org

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36366?usp=email ) Change subject: openbts-umts: fix apt: use archive.debian.org ...................................................................... openbts-umts: fix apt: use archive.debian.org This helps to get access to Debian 8 repositories in 2024. Change-Id: Ia869476feeb67e2b3313b5d75ca01eaff41597ba --- M openbts-umts/Dockerfile A openbts-umts/sources.list 2 files changed, 18 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/openbts-umts/Dockerfile b/openbts-umts/Dockerfile index 0fee2ff..4c357c6 100644 --- a/openbts-umts/Dockerfile +++ b/openbts-umts/Dockerfile @@ -4,6 +4,9 @@ FROM debian:jessie +# https://unix.stackexchange.com/a/755022 +COPY sources.list /etc/apt/sources.list + RUN apt-get update && \ apt-get install -y --no-install-recommends \ --no-install-suggests \ diff --git a/openbts-umts/sources.list b/openbts-umts/sources.list new file mode 100644 index 0000000..2908463 --- /dev/null +++ b/openbts-umts/sources.list @@ -0,0 +1,4 @@ +# https://unix.stackexchange.com/a/755022 +# Keys Expired But I ~~Want~~ Need To Hold On To The Past +deb [trusted=yes] http://archive.debian.org/debian jessie main +deb [trusted=yes] http://archive.debian.org/debian-security jessie/updates main -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36366?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia869476feeb67e2b3313b5d75ca01eaff41597ba Gerrit-Change-Number: 36366 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2024