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

Change in libosmo-gprs[master]: llc: add value-string for enum osmo_gprs_llc_xid_type

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29480 ) Change subject: llc: add value-string for enum osmo_gprs_llc_xid_type ...................................................................... llc: add value-string for enum osmo_gprs_llc_xid_type Change-Id: I90b6a1aa4e13984f4c43245df1308d0c3f82636f --- M include/osmocom/gprs/llc/llc.h M src/llc/Makefile.am A src/llc/llc_xid.c 3 files changed, 50 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/gprs/llc/llc.h b/include/osmocom/gprs/llc/llc.h index 7a4ac03..7c4ea45 100644 --- a/include/osmocom/gprs/llc/llc.h +++ b/include/osmocom/gprs/llc/llc.h @@ -85,6 +85,13 @@ OSMO_GPRS_LLC_XID_T_RESET = 12, }; +extern const struct value_string osmo_gprs_llc_xid_type_names[]; + +static inline const char *osmo_gprs_llc_xid_type_name(enum osmo_gprs_llc_xid_type val) +{ + return get_value_string(osmo_gprs_llc_xid_type_names, val); +} + /* Section 4.5.2 Logical Link States + Annex C.2 */ enum osmo_gprs_llc_lle_state { OSMO_GPRS_LLC_LLES_UNASSIGNED = 1, /* No TLLI yet */ diff --git a/src/llc/Makefile.am b/src/llc/Makefile.am index a301a89..6c0e680 100644 --- a/src/llc/Makefile.am +++ b/src/llc/Makefile.am @@ -24,6 +24,7 @@ libosmo_gprs_llc_la_SOURCES = \ crc24.c \ llc_pdu.c \ + llc_xid.c \ misc.c \ $(NULL) diff --git a/src/llc/llc_xid.c b/src/llc/llc_xid.c new file mode 100644 index 0000000..1705e5d --- /dev/null +++ b/src/llc/llc_xid.c @@ -0,0 +1,42 @@ +/* GPRS LLC protocol implementation as per 3GPP TS 44.064 */ + +/* (C) 2009-2010 by Harald Welte <laforge(a)gnumonks.org> + * (C) 2022 by Sysmocom s.f.m.c. GmbH + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <osmocom/core/utils.h> + +#include <osmocom/gprs/llc/llc.h> + +const struct value_string osmo_gprs_llc_xid_type_names[] = { + { OSMO_GPRS_LLC_XID_T_VERSION, "LLC-Version" }, + { OSMO_GPRS_LLC_XID_T_IOV_UI, "IOV-UI" }, + { OSMO_GPRS_LLC_XID_T_IOV_I, "IOV-I" }, + { OSMO_GPRS_LLC_XID_T_T200, "T200" }, + { OSMO_GPRS_LLC_XID_T_N200, "N200" }, + { OSMO_GPRS_LLC_XID_T_N201_U, "N201-U" }, + { OSMO_GPRS_LLC_XID_T_N201_I, "N201-I" }, + { OSMO_GPRS_LLC_XID_T_mD, "mD" }, + { OSMO_GPRS_LLC_XID_T_mU, "mU" }, + { OSMO_GPRS_LLC_XID_T_kD, "kD" }, + { OSMO_GPRS_LLC_XID_T_kU, "kU" }, + { OSMO_GPRS_LLC_XID_T_L3_PAR, "L3-Params" }, + { OSMO_GPRS_LLC_XID_T_RESET, "Reset" }, + { 0, NULL } +}; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29480 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I90b6a1aa4e13984f4c43245df1308d0c3f82636f Gerrit-Change-Number: 29480 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-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-hnbgw[master]: hnbap: Improve logging around HNBAP HNB Register Request

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29496 ) Change subject: hnbap: Improve logging around HNBAP HNB Register Request ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I279ef563b38fb0dd3e6a72162db91d8503f91af8 Gerrit-Change-Number: 29496 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Sep 2022 16:52:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-hnbgw[master]: hnbap: Accept duplicated HNB Register Request on same conn

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29495 ) Change subject: hnbap: Accept duplicated HNB Register Request on same conn ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29495 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I0250350a14a87498a2c68cd0c726ee2f1e72419d Gerrit-Change-Number: 29495 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Sep 2022 16:49:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-bsc[master]: pcu_sock: add some guard space to message buffer

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29362 ) Change subject: pcu_sock: add some guard space to message buffer ...................................................................... pcu_sock: add some guard space to message buffer in osmo-pcu, the message buffer in pcu_sock_read is allocated with 1000 bytes in addition to the true size of the pcu_prim struct. Presumably this is to avoid compatibility problems in case the primitives slightly grow due to appending new struct members. Lets do the same in osmo-bts. Change-Id: I99f5204b0563f72f9da427bb7aa5451552d8c5b5 Related: OS#5198 --- M src/osmo-bsc/pcu_sock.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 1af9a9d..81198bd 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -566,7 +566,7 @@ struct msgb *msg; int rc; - msg = msgb_alloc(sizeof(*pcu_prim), "pcu_sock_rx"); + msg = msgb_alloc(sizeof(*pcu_prim) + 1000, "pcu_sock_rx"); if (!msg) return -ENOMEM; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I99f5204b0563f72f9da427bb7aa5451552d8c5b5 Gerrit-Change-Number: 29362 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-bsc[master]: pcu_sock: add some guard space to message buffer

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29362 ) Change subject: pcu_sock: add some guard space to message buffer ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I99f5204b0563f72f9da427bb7aa5451552d8c5b5 Gerrit-Change-Number: 29362 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Sep 2022 14:37:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in libosmocore[master]: improve test output for gsm0808_sc_cfg_from_gsm48_mr_cfg()

by laforge

Attention is currently required from: neels, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29474 ) Change subject: improve test output for gsm0808_sc_cfg_from_gsm48_mr_cfg() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iec7c491d9fadd37d9e43fbaac8e709c2029f8a8e Gerrit-Change-Number: 29474 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Sep 2022 14:26:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in libosmocore[master]: add gsm0808_amr_modes_from_cfg

by laforge

Attention is currently required from: neels, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29473 ) Change subject: add gsm0808_amr_modes_from_cfg ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: agreeing with pau on the value_string. It may sound expensive, but then string-formatting is not our main task, and we can avoid any out-of-bounds array overflows when going the value_string route. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29473 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icef7dd626d3d4641c66b8dd87e2047fc0ab547d1 Gerrit-Change-Number: 29473 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Sep 2022 14:25:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-bsc[master]: pcu_sock: check size of primitive

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29361 ) Change subject: pcu_sock: check size of primitive ...................................................................... pcu_sock: check size of primitive The pcu_sock interface in osmo-bts does check the size of the primitives it receives. Lets do the same in osmo-bsc as well. Change-Id: I247c6f4b5a7a22d17a060a558c4ceb9221ca7351 Related: OS#5198 --- M include/osmocom/bsc/pcu_if.h M src/osmo-bsc/pcu_sock.c 2 files changed, 21 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, approved diff --git a/include/osmocom/bsc/pcu_if.h b/include/osmocom/bsc/pcu_if.h index 1f398b4..3c34cdf 100644 --- a/include/osmocom/bsc/pcu_if.h +++ b/include/osmocom/bsc/pcu_if.h @@ -5,6 +5,8 @@ extern int pcu_direct; +#define PCUIF_HDR_SIZE (sizeof(struct gsm_pcu_if) - sizeof(((struct gsm_pcu_if *)0)->u)) + struct pcu_sock_state { struct gsm_network *net; struct osmo_fd listen_bfd; /* fd for listen socket */ diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 2cf1ab5..1af9a9d 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -448,8 +448,17 @@ return rc; } +#define CHECK_IF_MSG_SIZE(prim_len, prim_msg) \ + do { \ + size_t _len = PCUIF_HDR_SIZE + sizeof(prim_msg); \ + if (prim_len < _len) { \ + LOGP(DPCU, LOGL_ERROR, "Received %zu bytes on PCU Socket, but primitive %s " \ + "size is %zu, discarding\n", prim_len, #prim_msg, _len); \ + return -EINVAL; \ + } \ + } while (0) static int pcu_rx(struct gsm_network *net, uint8_t msg_type, - struct gsm_pcu_if *pcu_prim) + struct gsm_pcu_if *pcu_prim, size_t prim_len) { int rc = 0; struct gsm_bts *bts; @@ -460,6 +469,7 @@ switch (msg_type) { case PCU_IF_MSG_DATA_REQ: case PCU_IF_MSG_PAG_REQ: + CHECK_IF_MSG_SIZE(prim_len, pcu_prim->u.data_req); rc = pcu_rx_data_req(bts, msg_type, &pcu_prim->u.data_req); break; default: @@ -574,7 +584,14 @@ goto close; } - rc = pcu_rx(state->net, pcu_prim->msg_type, pcu_prim); + if (rc < PCUIF_HDR_SIZE) { + LOGP(DPCU, LOGL_ERROR, "Received %d bytes on PCU Socket, but primitive hdr size " + "is %zu, discarding\n", rc, PCUIF_HDR_SIZE); + msgb_free(msg); + return 0; + } + + rc = pcu_rx(state->net, pcu_prim->msg_type, pcu_prim, rc); /* as we always synchronously process the message in pcu_rx() and * its callbacks, we can free the message here. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I247c6f4b5a7a22d17a060a558c4ceb9221ca7351 Gerrit-Change-Number: 29361 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-bsc[master]: pcu_sock: check size of primitive

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29361 ) Change subject: pcu_sock: check size of primitive ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29361 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I247c6f4b5a7a22d17a060a558c4ceb9221ca7351 Gerrit-Change-Number: 29361 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Sep 2022 14:23:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-msc[master]: SMPP: move read/write callbacks to libsmpputil

by laforge

Attention is currently required from: neels, msuraev, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28848 ) Change subject: SMPP: move read/write callbacks to libsmpputil ...................................................................... Patch Set 30: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I875eb5249004d3a960aee46c5099592d18fcaa76 Gerrit-Change-Number: 28848 Gerrit-PatchSet: 30 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Sep 2022 14:22:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2022