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

[L] Change in osmocom-bb[master]: mobile: VTY: rework data type/rate configuration commands
by fixeria 24 Jan '24

24 Jan '24

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35663?usp=email ) Change subject: mobile: VTY: rework data type/rate configuration commands ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35663?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7393fce82613a57275033f5c47e16bbf708a3bfb Gerrit-Change-Number: 35663 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-Comment-Date: Wed, 24 Jan 2024 13:55:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: osmo-bts-trx: add test VTY command to send arbitrary TRXC messages
by fixeria 24 Jan '24

24 Jan '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35654?usp=email ) Change subject: osmo-bts-trx: add test VTY command to send arbitrary TRXC messages ...................................................................... osmo-bts-trx: add test VTY command to send arbitrary TRXC messages Change-Id: Iabc9b702e5f1513187e24f45d9ffe06ea940c3ec --- M src/osmo-bts-trx/trx_if.c M src/osmo-bts-trx/trx_if.h M src/osmo-bts-trx/trx_vty.c 3 files changed, 50 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index 89078a3..b6b20e9 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -227,8 +227,8 @@ * The new command will be added to the end of the control command * queue. */ -static int trx_ctrl_cmd_cb(struct trx_l1h *l1h, int critical, void *cb, const char *cmd, - const char *fmt, ...) +int trx_ctrl_cmd_cb(struct trx_l1h *l1h, int critical, void *cb, + const char *cmd, const char *fmt, ...) { struct trx_ctrl_msg *tcm; struct trx_ctrl_msg *prev = NULL; @@ -277,7 +277,6 @@ return 0; } -#define trx_ctrl_cmd(l1h, critical, cmd, fmt, ...) trx_ctrl_cmd_cb(l1h, critical, NULL, cmd, fmt, ##__VA_ARGS__) /*! Send "POWEROFF" command to TRX */ int trx_if_cmd_poweroff(struct trx_l1h *l1h, trx_if_cmd_poweronoff_cb *cb) diff --git a/src/osmo-bts-trx/trx_if.h b/src/osmo-bts-trx/trx_if.h index b838b76..3a22a1b 100644 --- a/src/osmo-bts-trx/trx_if.h +++ b/src/osmo-bts-trx/trx_if.h @@ -48,3 +48,7 @@ /* Format negotiation command */ int trx_if_cmd_setformat(struct trx_l1h *l1h, uint8_t ver, trx_if_cmd_generic_cb *cb); + +int trx_ctrl_cmd_cb(struct trx_l1h *l1h, int critical, void *cb, + const char *cmd, const char *fmt, ...); +#define trx_ctrl_cmd(l1h, critical, cmd, fmt, ...) trx_ctrl_cmd_cb(l1h, critical, NULL, cmd, fmt, ##__VA_ARGS__) diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c index 998e9cb..9056f02 100644 --- a/src/osmo-bts-trx/trx_vty.c +++ b/src/osmo-bts-trx/trx_vty.c @@ -194,6 +194,39 @@ return CMD_SUCCESS; } +DEFUN_HIDDEN(test_send_trxc, + test_send_trxc_cmd, + "test send-trxc-cmd <0-255> CMD [.ARGS]", + "Various testing commands\n" + "Send an arbitrary TRX command\n" + "Transceiver number\n" + "TRXC command\n" "TRXC command arguments\n") +{ + const struct gsm_bts_trx *trx; + const struct phy_instance *pinst; + struct trx_l1h *l1h; + int rc; + + trx = gsm_bts_trx_num(g_bts, atoi(argv[0])); + if (trx == NULL) { + vty_out(vty, "%% Could not find TRX%s", VTY_NEWLINE); + return CMD_WARNING; + } + + pinst = trx_phy_instance(trx); + l1h = pinst->u.osmotrx.hdl; + + if (argc > 2) { + char *cmd_args = argv_concat(argv, argc, 2); + rc = trx_ctrl_cmd(l1h, 0, argv[1], "%s", cmd_args); + talloc_free(cmd_args); + } else { + rc = trx_ctrl_cmd(l1h, 0, argv[1], ""); + } + + return (rc == 0) ? CMD_SUCCESS : CMD_WARNING; +} + DEFUN_USRATTR(cfg_trx_nominal_power, cfg_trx_nominal_power_cmd, X(BTS_VTY_TRX_POWERCYCLE), "nominal-tx-power <-10-100>", @@ -630,6 +663,8 @@ install_element_ve(&show_transceiver_cmd); install_element_ve(&show_phy_cmd); + install_element(ENABLE_NODE, &test_send_trxc_cmd); + install_element(TRX_NODE, &cfg_trx_nominal_power_cmd); install_element(TRX_NODE, &cfg_trx_no_nominal_power_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35654?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iabc9b702e5f1513187e24f45d9ffe06ea940c3ec Gerrit-Change-Number: 35654 Gerrit-PatchSet: 2 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-MessageType: merged

1 0

[S] Change in osmo-ci[master]: jobs/update-osmo-ci: remove build3
by laforge 24 Jan '24

24 Jan '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35670?usp=email ) Change subject: jobs/update-osmo-ci: remove build3 ...................................................................... jobs/update-osmo-ci: remove build3 Related: OS#6186 Change-Id: I63bbac0a767c30f8d3e4552024172bd689122d61 --- M jobs/update-osmo-ci-on-slaves.yml 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml index 2b1d81f..c826175 100644 --- a/jobs/update-osmo-ci-on-slaves.yml +++ b/jobs/update-osmo-ci-on-slaves.yml @@ -8,7 +8,6 @@ values: - build2-deb10build-ansible - build2-deb11build-ansible - - build3-deb11build-ansible - build4-deb12build-ansible - gtp0-deb10fr - host2-deb11build-ansible -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35670?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I63bbac0a767c30f8d3e4552024172bd689122d61 Gerrit-Change-Number: 35670 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ci[master]: jobs/update-osmo-ci: remove build3
by laforge 24 Jan '24

24 Jan '24

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35670?usp=email ) Change subject: jobs/update-osmo-ci: remove build3 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35670?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I63bbac0a767c30f8d3e4552024172bd689122d61 Gerrit-Change-Number: 35670 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 24 Jan 2024 13:22:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: Add logging category for libosmo-cc
by pespin 24 Jan '24

24 Jan '24

Attention is currently required from: jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35572?usp=email ) Change subject: Add logging category for libosmo-cc ...................................................................... Patch Set 2: (1 comment) File include/osmocom/core/logging.h: https://gerrit.osmocom.org/c/libosmocore/+/35572/comment/31874ad6_11a066cc PS2, Line 158: #defin > this breaks ABI; it means we need to bump the LIBVERSION on next libosmocore release and hence needs […] That's why I proposed adding the category dynamically if it makes sense, because it avoids breaking the ABI. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35572?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9df433b2cfb51f04dbf16e9f8dee567a59ab5cb7 Gerrit-Change-Number: 35572 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: 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-Comment-Date: Wed, 24 Jan 2024 12:36:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: GSUP: Fix missing and wrongly sorted IEs in ts_GSUP_IE_PdpInfo
by pespin 24 Jan '24

24 Jan '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35652?usp=email ) Change subject: GSUP: Fix missing and wrongly sorted IEs in ts_GSUP_IE_PdpInfo ...................................................................... GSUP: Fix missing and wrongly sorted IEs in ts_GSUP_IE_PdpInfo Sort them to follow libosmocore implementation. Change-Id: I65e586187d7230f122644c101f8467becae6e204 --- M library/GSUP_Templates.ttcn M sgsn/SGSN_Tests.ttcn 2 files changed, 20 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/library/GSUP_Templates.ttcn b/library/GSUP_Templates.ttcn index 7146e97..ea2b489 100644 --- a/library/GSUP_Templates.ttcn +++ b/library/GSUP_Templates.ttcn @@ -175,21 +175,23 @@ } } -template GSUP_IE ts_GSUP_IE_PdpInfo(template (value) octetstring apn, - template (value) GSUP_PDP_Address pdp_address, - template (value) octetstring pdp_qos) := { +template (value) GSUP_IE ts_GSUP_IE_PdpInfo(template (value) OCT1 ctx_id, + template (value) octetstring apn, + template (value) GSUP_PDP_Address pdp_address, + template (value) octetstring pdp_qos) := { tag := OSMO_GSUP_PDP_INFO_IE, len := 0, /* overwritten */ val := { pdp_info := { - valueof(ts_GSUP_IE_APN(apn)), + valueof(ts_GSUP_IE_PDP_CONTEXT_ID(ctx_id)), valueof(ts_GSUP_IE_PDP_ADDRESS(pdp_address)), + valueof(ts_GSUP_IE_APN(apn)), valueof(ts_GSUP_IE_PDP_QOS(pdp_qos)) } } } -template (value) GSUP_IE ts_GSUP_IE_PDP_CONTEXT_ID(OCT1 ctx_id) := { +template (value) GSUP_IE ts_GSUP_IE_PDP_CONTEXT_ID(template (value) OCT1 ctx_id) := { tag := OSMO_GSUP_PDP_CONTEXT_ID_IE, len := 0, val := { @@ -197,7 +199,7 @@ } } -template GSUP_IE tr_GSUP_IE_PDP_CONTEXT_ID(template OCT1 ctx_id) := { +template (present) GSUP_IE tr_GSUP_IE_PDP_CONTEXT_ID(template OCT1 ctx_id) := { tag := OSMO_GSUP_PDP_CONTEXT_ID_IE, len := ?, val := { diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 1fd20a5..0824d6e 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -876,7 +876,7 @@ private altstep as_gmm_gsup_lu_isd() runs on BSSGP_ConnHdlr { [] GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)) { var GSUP_PDU gsup := valueof(ts_GSUP_ISD_REQ(g_pars.imsi, g_pars.msisdn)); - gsup.ies := gsup.ies & { valueof(ts_GSUP_IE_PdpInfo(char2oct("*"), ts_EuaIPv4Dyn, ''O)) }; + gsup.ies := gsup.ies & { valueof(ts_GSUP_IE_PdpInfo('00'O, char2oct("*"), ts_EuaIPv4Dyn, ''O)) }; GSUP.send(gsup); GSUP.receive(tr_GSUP_ISD_RES(g_pars.imsi)); GSUP.send(ts_GSUP_UL_RES(g_pars.imsi)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35652?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: I65e586187d7230f122644c101f8467becae6e204 Gerrit-Change-Number: 35652 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

1 0

[S] Change in osmo-ttcn3-hacks[master]: GSUP: Fix missing and wrongly sorted IEs in ts_GSUP_IE_PdpInfo
by pespin 24 Jan '24

24 Jan '24

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35652?usp=email ) Change subject: GSUP: Fix missing and wrongly sorted IEs in ts_GSUP_IE_PdpInfo ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35652?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: I65e586187d7230f122644c101f8467becae6e204 Gerrit-Change-Number: 35652 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 24 Jan 2024 12:34:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: GSUP: Fix missing and wrongly sorted IEs in ts_GSUP_IE_PdpInfo
by pespin 24 Jan '24

24 Jan '24

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35652?usp=email ) Change subject: GSUP: Fix missing and wrongly sorted IEs in ts_GSUP_IE_PdpInfo ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > do we guarantee any specific order of IEs in the GSUP spec? I don't think so. Proof of it is that TTCN3, erlang and libosmocore all used different orders. But I still think it makes sense to try to keep them similar. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35652?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: I65e586187d7230f122644c101f8467becae6e204 Gerrit-Change-Number: 35652 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 24 Jan 2024 12:34:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: GSUP: Fix PDPInfoCompl IE
by pespin 24 Jan '24

24 Jan '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35651?usp=email ) Change subject: GSUP: Fix PDPInfoCompl IE ...................................................................... GSUP: Fix PDPInfoCompl IE Change-Id: I7b6e584f12828019fc9c0f961a0c8692c0b44b1c --- M library/GSUP_Templates.ttcn M library/GSUP_Types.ttcn 2 files changed, 28 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/library/GSUP_Templates.ttcn b/library/GSUP_Templates.ttcn index 634cfc3..7146e97 100644 --- a/library/GSUP_Templates.ttcn +++ b/library/GSUP_Templates.ttcn @@ -159,6 +159,22 @@ } } +template (value) GSUP_IE ts_GSUP_IE_PdpInfoCompl := { + tag := OSMO_GSUP_PDP_INFO_COMPL_IE, + len := 0, /* overwritten */ + val := { + pdp_info_compl := ''O + } +} + +template (present) GSUP_IE tr_GSUP_IE_PdpInfoCompl := { + tag := OSMO_GSUP_PDP_INFO_COMPL_IE, + len := 0, /* overwritten */ + val := { + pdp_info_compl := ''O + } +} + template GSUP_IE ts_GSUP_IE_PdpInfo(template (value) octetstring apn, template (value) GSUP_PDP_Address pdp_address, template (value) octetstring pdp_qos) := { diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index 666d8d0..07356f7 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -244,6 +244,7 @@ cause, tag = OSMO_GSUP_CAUSE_IE; cancel_type, tag = OSMO_GSUP_CANCEL_TYPE_IE; auth_tuple, tag = OSMO_GSUP_AUTH_TUPLE_IE; + pdp_info_compl, tag = OSMO_GSUP_PDP_INFO_COMPL_IE; auts, tag = OSMO_GSUP_AUTS_IE; rand, tag = OSMO_GSUP_RAND_IE; sres, tag = OSMO_GSUP_SRES_IE; @@ -301,8 +302,8 @@ hexstring imsi, integer cause, GSUP_CancelType cancel_type, - //boolean pdp_info_compl, - //boolean freeze_ptmsi, + octetstring pdp_info_compl, + //octetstring freeze_ptmsi, GSUP_IEs auth_tuple, octetstring auts, octetstring rand, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35651?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: I7b6e584f12828019fc9c0f961a0c8692c0b44b1c Gerrit-Change-Number: 35651 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-ttcn3-hacks[master]: GSUP: Convert PDP-Type IE to PDP-Address IE
by pespin 24 Jan '24

24 Jan '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35629?usp=email ) Change subject: GSUP: Convert PDP-Type IE to PDP-Address IE ...................................................................... GSUP: Convert PDP-Type IE to PDP-Address IE The previous PDP-Type IE should have been a PDP-Address from the start, since having only PDP-Type with no address is only a specific case (dynamic addressing). This becomes clear by looking at other similar protocols like: * MAP: APN-Configuration IE has servedPartyIP-IP{v4,v6}-Address IEs * Diameter S6b, 3GPP TS 29.272 7.3.35 APN-Configuration contains Served-Party-IP-Address AVPs * Diameter SWx, 3GPP TS 29.273 APN-Configuration. * GTPv1C Ts 29.060 7.7.29 PDP Context containing PDP Address. Since PDP-Type on its own really makes no sense, being it a special case of PDP-Address, let's keep the IE by renaming it (keeping old name too for API backward compat) and extend it to support lengths > 2 bytes. Old implementation of libosmogsm gsup actually ignored lengths > 2 bytes, so we are safe acting against older implementations here, both on the sending and receiving side on the wire. Change-Id: I3e92368fff61694bcef6a48320595b59ae8f54ca Related: OS#6091 Related: libosmocore.git Change-Id I775ff9c3be165d9f30d6ab55d03f99b6104eadd6 Related: osmo-gsm-manuals.git Change-Id I775ff9c3be165d9f30d6ab55d03f99b6104eadd6 --- M library/GSUP_Templates.ttcn M library/GSUP_Types.ttcn M sgsn/SGSN_Tests.ttcn 3 files changed, 91 insertions(+), 12 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/GSUP_Templates.ttcn b/library/GSUP_Templates.ttcn index 0e9a2e5..634cfc3 100644 --- a/library/GSUP_Templates.ttcn +++ b/library/GSUP_Templates.ttcn @@ -59,7 +59,15 @@ digits := digits } - +template (value) GSUP_PDP_Address ts_GSUP_PDP_Address_IPv4(template (omit) OCT4 ip_addr) := { + ipv4 := { + pdp_typeorg := '0001'B, + spare := '1111'B, + pdp_typenum := '21'O, + ipv4_address := ip_addr + } +} +template (value) GSUP_PDP_Address ts_EuaIPv4Dyn := ts_GSUP_PDP_Address_IPv4(omit); template GSUP_IE ts_GSUP_IE_AuthTuple2G(octetstring rand, octetstring sres, octetstring kc) := { @@ -151,13 +159,15 @@ } } -template GSUP_IE ts_GSUP_IE_PdpInfo(octetstring apn, octetstring pdp_type, octetstring pdp_qos) := { +template GSUP_IE ts_GSUP_IE_PdpInfo(template (value) octetstring apn, + template (value) GSUP_PDP_Address pdp_address, + template (value) octetstring pdp_qos) := { tag := OSMO_GSUP_PDP_INFO_IE, len := 0, /* overwritten */ val := { pdp_info := { valueof(ts_GSUP_IE_APN(apn)), - valueof(ts_GSUP_IE_PDP_TYPE(pdp_type)), + valueof(ts_GSUP_IE_PDP_ADDRESS(pdp_address)), valueof(ts_GSUP_IE_PDP_QOS(pdp_qos)) } } @@ -180,15 +190,15 @@ } -template (value) GSUP_IE ts_GSUP_IE_PDP_TYPE(OCT2 pdp_type) := { - tag := OSMO_GSUP_PDP_TYPE_IE, +template (value) GSUP_IE ts_GSUP_IE_PDP_ADDRESS(template (value) GSUP_PDP_Address pdp_address) := { + tag := OSMO_GSUP_PDP_ADDRESS_IE, len := 0, val := { - pdp_type := pdp_type + pdp_address := pdp_address } } -template (value) GSUP_IE ts_GSUP_IE_PDP_QOS(octetstring pdp_qos) := { +template (value) GSUP_IE ts_GSUP_IE_PDP_QOS(template (value) octetstring pdp_qos) := { tag := OSMO_GSUP_PDP_QOS_IE, len := 0, val := { @@ -633,7 +643,7 @@ } } -template (value) GSUP_IE ts_GSUP_IE_APN(octetstring apn) := { +template (value) GSUP_IE ts_GSUP_IE_APN(template (value) octetstring apn) := { tag := OSMO_GSUP_ACCESS_POINT_NAME_IE, len := 0, /* overwritten */ val := { diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index f9faeb7..666d8d0 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -29,7 +29,7 @@ OSMO_GSUP_MSISDN_IE ('08'O), OSMO_GSUP_HLR_NUMBER_IE ('09'O), OSMO_GSUP_PDP_CONTEXT_ID_IE ('10'O), - OSMO_GSUP_PDP_TYPE_IE ('11'O), + OSMO_GSUP_PDP_ADDRESS_IE ('11'O), OSMO_GSUP_ACCESS_POINT_NAME_IE ('12'O), OSMO_GSUP_PDP_QOS_IE ('13'O), OSMO_GSUP_CHARG_CHAR_IE ('14'O), @@ -196,6 +196,45 @@ octetstring pdu }; +type union GSUP_PDP_Address { + GSUP_PDP_Address_IPv4 ipv4, + GSUP_PDP_Address_IPv6 ipv6, + GSUP_PDP_Address_IPv4v6 ipv4v6, + GSUP_PDP_Address_unknown other +} with { variant "TAG(ipv4, pdp_typenum = '21'O; + ipv6, pdp_typenum = '57'O; + ipv4v6, pdp_typenum = '8D'O; + other, OTHERWISE;)" }; + +type record GSUP_PDP_Address_IPv4 { + BIT4 pdp_typeorg, + BIT4 spare, + OCT1 pdp_typenum, + OCT4 ipv4_address optional +}; + +type record GSUP_PDP_Address_IPv6 { + BIT4 pdp_typeorg, + BIT4 spare, + OCT1 pdp_typenum, + OCT16 ipv6_address optional +}; + +type record GSUP_PDP_Address_IPv4v6 { + BIT4 pdp_typeorg, + BIT4 spare, + OCT1 pdp_typenum, + OCT4 ipv4_address optional, + OCT16 ipv6_address optional +}; + +type record GSUP_PDP_Address_unknown { + BIT4 pdp_typeorg, + BIT4 spare, + OCT1 pdp_typenum, + octetstring addr optional +}; + type record GSUP_IE { GSUP_IEI tag, uint8_t len, @@ -219,7 +258,7 @@ pdp_info, tag = OSMO_GSUP_PDP_INFO_IE; apn, tag = OSMO_GSUP_ACCESS_POINT_NAME_IE; pdp_qos, tag = OSMO_GSUP_PDP_QOS_IE; - pdp_type, tag = OSMO_GSUP_PDP_TYPE_IE; + pdp_address, tag = OSMO_GSUP_PDP_ADDRESS_IE; charg_char, tag = OSMO_GSUP_CHARG_CHAR_IE; pdp_ctx_id, tag = OSMO_GSUP_PDP_CONTEXT_ID_IE; session_state, tag = OSMO_GSUP_SESSION_STATE_IE; @@ -281,7 +320,7 @@ OCT1 pdp_ctx_id, octetstring apn, octetstring pdp_qos, - OCT2 pdp_type, + GSUP_PDP_Address pdp_address, octetstring charg_char, /* Session information */ GSUP_SessionState session_state, diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 13c0be1..1fd20a5 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -876,7 +876,7 @@ private altstep as_gmm_gsup_lu_isd() runs on BSSGP_ConnHdlr { [] GSUP.receive(tr_GSUP_UL_REQ(g_pars.imsi)) { var GSUP_PDU gsup := valueof(ts_GSUP_ISD_REQ(g_pars.imsi, g_pars.msisdn)); - gsup.ies := gsup.ies & { valueof(ts_GSUP_IE_PdpInfo(char2oct("*"), '0121'O, ''O)) }; + gsup.ies := gsup.ies & { valueof(ts_GSUP_IE_PdpInfo(char2oct("*"), ts_EuaIPv4Dyn, ''O)) }; GSUP.send(gsup); GSUP.receive(tr_GSUP_ISD_RES(g_pars.imsi)); GSUP.send(ts_GSUP_UL_RES(g_pars.imsi)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35629?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: I3e92368fff61694bcef6a48320595b59ae8f54ca Gerrit-Change-Number: 35629 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0