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

[S] Change in libosmocore[master]: gsmtap: add missing entries to gsmtap_type_names[]
by fixeria 10 Mar '23

10 Mar '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/31829 ) Change subject: gsmtap: add missing entries to gsmtap_type_names[] ...................................................................... gsmtap: add missing entries to gsmtap_type_names[] Change-Id: I67dc578c62f89039f35856da1f29caab4b5db1d8 Fixes: fae779ac5 "GSMTAP: Import changes from Wireshark" Fixes: f9b1e5556 "gsmtap.h: Introduce new GSMTAP type for LTE NAS messages" Fixes: 161d42a61 "gsmtap: Add definitions for E1/T1 payload (LAPD, TRAU, FR) in GSMTAP" --- M src/core/gsmtap_util.c 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/29/31829/1 diff --git a/src/core/gsmtap_util.c b/src/core/gsmtap_util.c index 1d5fbab..2e0b84e 100644 --- a/src/core/gsmtap_util.c +++ b/src/core/gsmtap_util.c @@ -583,6 +583,8 @@ { GSMTAP_TYPE_TETRA_I1, "TETRA V+D" }, { GSMTAP_TYPE_TETRA_I1_BURST, "TETRA bursts" }, { GSMTAP_TYPE_WMX_BURST, "WiMAX burst" }, + { GSMTAP_TYPE_GB_LLC, "GPRS Gb LLC" }, + { GSMTAP_TYPE_GB_SNDCP, "GPRS Gb SNDCP" }, { GSMTAP_TYPE_GMR1_UM, "GMR-1 air interfeace (MES-MS<->GTS)"}, { GSMTAP_TYPE_UMTS_RLC_MAC, "UMTS RLC/MAC" }, { GSMTAP_TYPE_UMTS_RRC, "UMTS RRC" }, @@ -591,6 +593,8 @@ { GSMTAP_TYPE_LTE_MAC_FRAMED, "LTE MAC with context hdr" }, { GSMTAP_TYPE_OSMOCORE_LOG, "libosmocore logging" }, { GSMTAP_TYPE_QC_DIAG, "Qualcomm DIAG" }, + { GSMTAP_TYPE_LTE_NAS, "LTE Non-Access Stratum" }, + { GSMTAP_TYPE_E1T1, "E1/T1 lines" }, { 0, NULL } }; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I67dc578c62f89039f35856da1f29caab4b5db1d8 Gerrit-Change-Number: 31829 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: gsmtap.h: Define a packet type for encapsulation of GSM RLP frames
by fixeria 10 Mar '23

10 Mar '23

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31805 ) Change subject: gsmtap.h: Define a packet type for encapsulation of GSM RLP frames ...................................................................... Patch Set 1: Code-Review-1 (1 comment) Patchset: PS1: You need to add the new entry to `gsmtap_type_names[]`. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibb7f0731c31e5a5cd2911f733da5510ce0f3a1d6 Gerrit-Change-Number: 31805 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 10 Mar 2023 20:31:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: pcu_sock: handle multiple BTSs with one BSC co-located PCU (in theory)
by pespin 10 Mar '23

10 Mar '23

Attention is currently required from: neels, laforge, fixeria, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31618 ) Change subject: pcu_sock: handle multiple BTSs with one BSC co-located PCU (in theory) ...................................................................... Patch Set 12: -Code-Review (1 comment) File src/osmo-bsc/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31618/comment/b7bfaf75_f556bcf8 PS12, Line 781: osmo_fd_unregister > I saw a patche from @pespin reordering `osmo_fd_unregister()` and `close()`, so that the former is c […] Definetly. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0b42c2c130106f6ffca2dd08d079e1a7bda41f0b Gerrit-Change-Number: 31618 Gerrit-PatchSet: 12 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 Mar 2023 20:30:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: constify bsc_conn_by_bsub() ptr param
by pespin 10 Mar '23

10 Mar '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31822 ) Change subject: constify bsc_conn_by_bsub() ptr param ...................................................................... constify bsc_conn_by_bsub() ptr param Change-Id: I44b1397e7771c803efdca6bf59750ca5568df365 --- M include/osmocom/bsc/osmo_bsc_sigtran.h M src/osmo-bsc/osmo_bsc_sigtran.c 2 files changed, 11 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/include/osmocom/bsc/osmo_bsc_sigtran.h b/include/osmocom/bsc/osmo_bsc_sigtran.h index df37cf4..9cc2cfc 100644 --- a/include/osmocom/bsc/osmo_bsc_sigtran.h +++ b/include/osmocom/bsc/osmo_bsc_sigtran.h @@ -26,7 +26,7 @@ /* Allocate resources to make a new connection oriented sigtran connection * (not the connection ittself!) */ enum bsc_con osmo_bsc_sigtran_new_conn(struct gsm_subscriber_connection *conn, struct bsc_msc_data *msc); -struct gsm_subscriber_connection *bsc_conn_by_bsub(struct bsc_subscr *bsub); +struct gsm_subscriber_connection *bsc_conn_by_bsub(const struct bsc_subscr *bsub); /* Open a new connection oriented sigtran connection */ int osmo_bsc_sigtran_open_conn(struct gsm_subscriber_connection *conn, struct msgb *msg); diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index 04c2e99..88ee01c 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -59,7 +59,7 @@ return NULL; } -struct gsm_subscriber_connection *bsc_conn_by_bsub(struct bsc_subscr *bsub) +struct gsm_subscriber_connection *bsc_conn_by_bsub(const struct bsc_subscr *bsub) { struct gsm_subscriber_connection *conn; if (!bsub) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I44b1397e7771c803efdca6bf59750ca5568df365 Gerrit-Change-Number: 31822 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-sccp[master]: sccp_scpc.c: Simplify conn_create()
by pespin 10 Mar '23

10 Mar '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/31826 ) Change subject: sccp_scpc.c: Simplify conn_create() ...................................................................... sccp_scpc.c: Simplify conn_create() Drop local variable with no real use, dereference sccp_instance pointer once instead of potentially thousands of times. Change-Id: Iee333fb38d7a37877c37c1de9719a6b67d9e8ed3 --- M src/sccp_scoc.c 1 file changed, 18 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index 2430462..53cdf78 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -505,7 +505,7 @@ /* Search for next free connection ID and allocate conn */ static struct sccp_connection *conn_create(struct osmo_sccp_user *user) { - uint32_t conn_id; + struct osmo_sccp_instance *sccp = user->inst; /* SUA: RFC3868 sec 3.10.4: * The source reference number is a 4 octet long integer. @@ -520,13 +520,12 @@ */ do { /* Optimized modulo operation (% 0x00FFFFFE) using bitwise AND plus CMP: */ - user->inst->next_id = (user->inst->next_id + 1) & 0x00FFFFFF; - if (OSMO_UNLIKELY(user->inst->next_id == 0x00FFFFFF)) - user->inst->next_id = 0; - conn_id = user->inst->next_id; - } while (conn_find_by_id(user->inst, conn_id)); + sccp->next_id = (sccp->next_id + 1) & 0x00FFFFFF; + if (OSMO_UNLIKELY(sccp->next_id == 0x00FFFFFF)) + sccp->next_id = 0; + } while (conn_find_by_id(sccp, sccp->next_id)); - return conn_create_id(user, conn_id); + return conn_create_id(user, sccp->next_id); } static void conn_opt_data_clear_cache(struct sccp_connection *conn) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/31826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iee333fb38d7a37877c37c1de9719a6b67d9e8ed3 Gerrit-Change-Number: 31826 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> 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-MessageType: merged

1 0

[S] Change in libosmo-sccp[master]: Avoid allocating conn_id 0x00FFFFFF
by pespin 10 Mar '23

10 Mar '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/31825 ) Change subject: Avoid allocating conn_id 0x00FFFFFF ...................................................................... Avoid allocating conn_id 0x00FFFFFF The 0x00FFFFFF source local reference is reserved in M3UA/SCCP, hence avoid allocating a conn_id with that value since later on when reused as a source local reference it would fail to be encoded. Change-Id: Ifcf710ef6024286a1cc3473d6ea3f858552b9926 --- M src/sccp_scoc.c 1 file changed, 28 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index 00e677c..2430462 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -507,10 +507,22 @@ { uint32_t conn_id; + /* SUA: RFC3868 sec 3.10.4: + * The source reference number is a 4 octet long integer. + * This is allocated by the source SUA instance. + * M3UA/SCCP: ITU-T Q.713 sec 3.3: + * The "source local reference" parameter field is a three-octet field containing a + * reference number which is generated and used by the local node to identify the + * connection section after the connection section is set up. + * The coding "all ones" is reserved for future use. + * Hence, as we currently use the connection ID also as local reference, + * let's simply use 24 bit ids to fit all link types (excluding 0x00ffffff). + */ do { - /* modulo 2^24 as we currently use the connection ID also as local - * reference, and that is limited to 24 bits */ - user->inst->next_id = (user->inst->next_id + 1) % (1 << 24); + /* Optimized modulo operation (% 0x00FFFFFE) using bitwise AND plus CMP: */ + user->inst->next_id = (user->inst->next_id + 1) & 0x00FFFFFF; + if (OSMO_UNLIKELY(user->inst->next_id == 0x00FFFFFF)) + user->inst->next_id = 0; conn_id = user->inst->next_id; } while (conn_find_by_id(user->inst, conn_id)); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/31825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ifcf710ef6024286a1cc3473d6ea3f858552b9926 Gerrit-Change-Number: 31825 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-sccp[master]: cosmetic: sccp.h: Fix trailing whitespace
by pespin 10 Mar '23

10 Mar '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/31827 ) Change subject: cosmetic: sccp.h: Fix trailing whitespace ...................................................................... cosmetic: sccp.h: Fix trailing whitespace Change-Id: I6b9cb5acffdf690f65e14dbdda7213b2e75c7ee1 --- M include/osmocom/sccp/sccp.h 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/include/osmocom/sccp/sccp.h b/include/osmocom/sccp/sccp.h index 9ff1067..fd911da 100644 --- a/include/osmocom/sccp/sccp.h +++ b/include/osmocom/sccp/sccp.h @@ -120,7 +120,7 @@ int sccp_connection_free(struct sccp_connection *connection); /** - * internal.. + * internal.. */ int sccp_connection_force_free(struct sccp_connection *conn); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/31827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I6b9cb5acffdf690f65e14dbdda7213b2e75c7ee1 Gerrit-Change-Number: 31827 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-pcu[master]: Makefile.am: remove phy specific EXTRA_DIST variables
by fixeria 10 Mar '23

10 Mar '23

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31816 ) Change subject: Makefile.am: remove phy specific EXTRA_DIST variables ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If8b9b8cfaad22a093a74c418651bc76f48f2d071 Gerrit-Change-Number: 31816 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 Mar 2023 20:24:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: pcu_sock: handle multiple BTSs with one BSC co-located PCU (in theory)
by fixeria 10 Mar '23

10 Mar '23

Attention is currently required from: neels, laforge, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31618 ) Change subject: pcu_sock: handle multiple BTSs with one BSC co-located PCU (in theory) ...................................................................... Patch Set 12: (1 comment) File src/osmo-bsc/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31618/comment/1fc28b2c_83fcc836 PS12, Line 781: osmo_fd_unregister I saw a patche from @pespin reordering `osmo_fd_unregister()` and `close()`, so that the former is called first. Here it is: https://gerrit.osmocom.org/c/osmo-mgw/+/31806. Should the same be done here? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0b42c2c130106f6ffca2dd08d079e1a7bda41f0b Gerrit-Change-Number: 31618 Gerrit-PatchSet: 12 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 Mar 2023 20:23:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: pcu_sock: check BTS type properly in pcu_info_update()
by fixeria 10 Mar '23

10 Mar '23

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31803 ) Change subject: pcu_sock: check BTS type properly in pcu_info_update() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8da26debc0e27f24fae4ee88f22f8875de13bc84 Gerrit-Change-Number: 31803 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 Mar 2023 20:17:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0