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

[S] Change in osmo-gsm-manuals[master]: gsup.adoc: Update spec reference s/TS 09.60/TS 29.060/
by laforge 19 Jan '24

19 Jan '24

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/35623?usp=email ) Change subject: gsup.adoc: Update spec reference s/TS 09.60/TS 29.060/ ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/35623?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I42f4c5ce96823a91918cb01a6263cb7075226551 Gerrit-Change-Number: 35623 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 Jan 2024 19:51:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

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

19 Jan '24

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/29/35629/1 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..69964a0 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-gsm-manuals[master]: Update spec reference s/TS 04.08/TS 24.008/
by laforge 19 Jan '24

19 Jan '24

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/35622?usp=email ) Change subject: Update spec reference s/TS 04.08/TS 24.008/ ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: not all parts of 04.08 went into 24.008, but I guess it is correct in this case. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/35622?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ie9feade73eff8c61232deffbad24ef34d97d32ac Gerrit-Change-Number: 35622 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 Jan 2024 19:51:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-hnbgw[master]: debian: fix having no manuals in osmo-hnbgw-doc
by laforge 19 Jan '24

19 Jan '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/35620?usp=email ) Change subject: debian: fix having no manuals in osmo-hnbgw-doc ...................................................................... debian: fix having no manuals in osmo-hnbgw-doc Fixes: OS#6326 Change-Id: I8daeba6b267b2f7793a26a0e1fbc74ab17401cde --- A debian/osmo-hnbgw-doc.install 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/debian/osmo-hnbgw-doc.install b/debian/osmo-hnbgw-doc.install new file mode 100644 index 0000000..596d37b --- /dev/null +++ b/debian/osmo-hnbgw-doc.install @@ -0,0 +1,2 @@ +usr/share/doc/osmo-hnbgw-doc/*.pdf + -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/35620?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I8daeba6b267b2f7793a26a0e1fbc74ab17401cde Gerrit-Change-Number: 35620 Gerrit-PatchSet: 2 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

[S] Change in osmo-hnbgw[master]: gitignore: add *.la, hnbgw_vty_reference.xml
by laforge 19 Jan '24

19 Jan '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/35619?usp=email ) Change subject: gitignore: add *.la, hnbgw_vty_reference.xml ...................................................................... gitignore: add *.la, hnbgw_vty_reference.xml Change-Id: I5c9ec6cf01d75b10a86098755064ad187de815c1 --- M .gitignore 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index a7cb104..dd102fd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *.o *.lo *.a +*.la .deps Makefile Makefile.in @@ -67,6 +68,7 @@ doc/manuals/*.check doc/manuals/generated/ doc/manuals/osmohnbgw-usermanual.xml +doc/manuals/vty/hnbgw_vty_reference.xml doc/manuals/common doc/manuals/build -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/35619?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I5c9ec6cf01d75b10a86098755064ad187de815c1 Gerrit-Change-Number: 35619 Gerrit-PatchSet: 2 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-MessageType: merged

1 0

[M] Change in libosmocore[master]: gsup: Convert PDP-Type IE to PDP-Address IE
by laforge 19 Jan '24

19 Jan '24

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35627?usp=email ) Change subject: gsup: Convert PDP-Type IE to PDP-Address IE ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35627?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: I775ff9c3be165d9f30d6ab55d03f99b6104eadd6 Gerrit-Change-Number: 35627 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 Jan 2024 19:48:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: gsup: Deprecate field pdp_type in favour of pdp_type_nr and pdp_type_org
by laforge 19 Jan '24

19 Jan '24

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35626?usp=email ) Change subject: gsup: Deprecate field pdp_type in favour of pdp_type_nr and pdp_type_org ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35626?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: Ie31c6080c90e468c01186259f2c42621e39b5cc6 Gerrit-Change-Number: 35626 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 Jan 2024 19:47:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: gsup: Fail decoding if len of PDP Type IE is less than 2 bytes
by laforge 19 Jan '24

19 Jan '24

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35624?usp=email ) Change subject: gsup: Fail decoding if len of PDP Type IE is less than 2 bytes ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35624?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: I0d024a9a4fb10beeff39ac33a9d2ed02f88f4580 Gerrit-Change-Number: 35624 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 Jan 2024 19:45:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: gsm_04_08_gprs.h: Introduce packed struct gsm48_pdp_address
by laforge 19 Jan '24

19 Jan '24

Attention is currently required from: fixeria, lynxis lazus, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35625?usp=email ) Change subject: gsm_04_08_gprs.h: Introduce packed struct gsm48_pdp_address ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35625?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: I453ced42dd36df3a6ddb5db67093df5a22cad18c Gerrit-Change-Number: 35625 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 19 Jan 2024 19:44:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-e1d[master]: Prevent memory leaks / double free of msgb in proto_clnt.c
by laforge 19 Jan '24

19 Jan '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/35609?usp=email ) Change subject: Prevent memory leaks / double free of msgb in proto_clnt.c ...................................................................... Prevent memory leaks / double free of msgb in proto_clnt.c Change-Id: Ic0c4c06ba7c1a405ec3c73100fe9e8476f4f5512 --- M src/proto_clnt.c 1 file changed, 24 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, approved laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/proto_clnt.c b/src/proto_clnt.c index 854b958..cfa9ca2 100644 --- a/src/proto_clnt.c +++ b/src/proto_clnt.c @@ -190,10 +190,13 @@ } rc = osmo_e1dp_send(&clnt->ctl_fd, msgb, -1); - if (rc < 0) + if (rc < 0) { + msgb_free(msgb); return rc; + } msgb_free(msgb); + msgb = NULL; /* Response */ int flags = fcntl(clnt->ctl_fd.fd, F_GETFL, 0); @@ -386,8 +389,10 @@ if (rc) return rc; - if (msgb_l2len(msgb) != sizeof(struct osmo_e1dp_line_info)) + if (msgb_l2len(msgb) != sizeof(struct osmo_e1dp_line_info)) { + msgb_free(msgb); return -EPIPE; + } msgb_free(msgb); @@ -417,6 +422,11 @@ if (rc) return rc; + if (msgb_l2len(msgb) != 0) { + msgb_free(msgb); + return -EPIPE; + } + msgb_free(msgb); return 0; @@ -449,8 +459,10 @@ if (rc) return rc; - if ((tsfd < 0) || (msgb_l2len(msgb) != sizeof(struct osmo_e1dp_ts_info))) + if ((tsfd < 0) || (msgb_l2len(msgb) != sizeof(struct osmo_e1dp_ts_info))) { + msgb_free(msgb); return -EPIPE; + } msgb_free(msgb); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/35609?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ic0c4c06ba7c1a405ec3c73100fe9e8476f4f5512 Gerrit-Change-Number: 35609 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

1 0