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

Change in osmo-bsc[master]: cosmetic: vty: Fix formatting of if-else brackets

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29436 ) Change subject: cosmetic: vty: Fix formatting of if-else brackets ...................................................................... cosmetic: vty: Fix formatting of if-else brackets Change-Id: I7210616bc293913e5efec14eb52aeafb37f1244f --- M src/osmo-bsc/bts_trx_vty.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/36/29436/1 diff --git a/src/osmo-bsc/bts_trx_vty.c b/src/osmo-bsc/bts_trx_vty.c index b5275ac..6930c8d 100644 --- a/src/osmo-bsc/bts_trx_vty.c +++ b/src/osmo-bsc/bts_trx_vty.c @@ -606,8 +606,9 @@ if (lchan->conn && lchan->conn->bsub) { vty_out(vty, " Subscriber:%s", VTY_NEWLINE); bsc_subscr_dump_vty(vty, lchan->conn->bsub); - } else + } else { vty_out(vty, " No Subscriber%s", VTY_NEWLINE); + } if (is_ipaccess_bts(lchan->ts->trx->bts)) { struct in_addr ia; if (lchan->abis_ip.bound_ip) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7210616bc293913e5efec14eb52aeafb37f1244f Gerrit-Change-Number: 29436 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in libosmo-gprs[master]: llc: add -export-symbols-regex '^osmo_' to CFLAGS

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29401 ) Change subject: llc: add -export-symbols-regex '^osmo_' to CFLAGS ...................................................................... llc: add -export-symbols-regex '^osmo_' to CFLAGS Change-Id: I7fac3ef730ea4b2719002dd61289b22c424f43f4 --- M src/llc/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/src/llc/Makefile.am b/src/llc/Makefile.am index 5dc2060..e24a3b3 100644 --- a/src/llc/Makefile.am +++ b/src/llc/Makefile.am @@ -26,8 +26,8 @@ llc_pdu.c \ $(NULL) -# TODO: -export-symbols-regex '^osmo_' libosmo_gprs_llc_la_LDFLAGS = \ + -export-symbols-regex '^osmo_' \ -version-info $(LIBVERSION) \ -no-undefined \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I7fac3ef730ea4b2719002dd61289b22c424f43f4 Gerrit-Change-Number: 29401 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in libosmo-gprs[master]: llc: add -export-symbols-regex '^osmo_' to CFLAGS

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29401 ) Change subject: llc: add -export-symbols-regex '^osmo_' to CFLAGS ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > did you verify manually "before" and "after" to ensure only unwanted symbols are suppressed? It mig […] There are no known users of this library (yet), only my WIP code. Moreover at this stage not that many symbols are the subject of export: only osmo_gprs_llc_fcs(). -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I7fac3ef730ea4b2719002dd61289b22c424f43f4 Gerrit-Change-Number: 29401 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 21 Sep 2022 17:04:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-bsc[master]: Drop Osmux call setup if BTS didn't provide a remote CID

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29435 ) Change subject: Drop Osmux call setup if BTS didn't provide a remote CID ...................................................................... Drop Osmux call setup if BTS didn't provide a remote CID We expect osmo-bts to provide us with a remote CID in order to be able to set up MGW to send Osmux frames to it. Related: SYS#5987 Change-Id: Ia90e8e0d18193d64c0fa0788dbd0eb242a359b61 --- M include/osmocom/bsc/lchan.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/lchan_rtp_fsm.c 3 files changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/35/29435/1 diff --git a/include/osmocom/bsc/lchan.h b/include/osmocom/bsc/lchan.h index 2de1227..4fcfa20 100644 --- a/include/osmocom/bsc/lchan.h +++ b/include/osmocom/bsc/lchan.h @@ -303,6 +303,7 @@ struct { bool use; uint8_t local_cid; + bool remote_cid_present; uint8_t remote_cid; } osmux; } abis_ip; diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 1c60405..3b83b0e 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -2740,6 +2740,7 @@ lchan->abis_ip.connect_port = port; } if (TLVP_PRESENT(tv, RSL_IE_OSMO_OSMUX_CID)) { + lchan->abis_ip.osmux.remote_cid_present = true; lchan->abis_ip.osmux.remote_cid = tlvp_val8(tv, RSL_IE_OSMO_OSMUX_CID, 0); } diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 916823a..b788e99 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -450,6 +450,11 @@ struct in_addr addr; const char *addr_str; + if (lchan->abis_ip.osmux.use && !lchan->abis_ip.osmux.remote_cid_present) { + lchan_rtp_fail("BTS didn't provide any remote Osmux CID for the call"); + return; + } + mdcx_info = (struct mgcp_conn_peer){ .port = to_lchan->abis_ip.bound_port, .ptime = 20, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia90e8e0d18193d64c0fa0788dbd0eb242a359b61 Gerrit-Change-Number: 29435 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in libosmo-gprs[master]: llc: add definitions from 3GPP TS 44.064 section 6.4

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29399 ) Change subject: llc: add definitions from 3GPP TS 44.064 section 6.4 ...................................................................... llc: add definitions from 3GPP TS 44.064 section 6.4 Change-Id: I6d0e1a878fb80c57a901da08798620a6ea4471a4 --- M include/osmocom/gprs/llc/llc.h M src/llc/Makefile.am A src/llc/llc_pdu.c 3 files changed, 92 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve neels: 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 53e6352..5e8860c 100644 --- a/include/osmocom/gprs/llc/llc.h +++ b/include/osmocom/gprs/llc/llc.h @@ -16,6 +16,44 @@ OSMO_GPRS_LLC_SAPI_SNDCP12 = 11, }; +/* Section 6.3.0 Control field formats */ +enum osmo_gprs_llc_frame_fmt { + OSMO_GPRS_LLC_FMT_I, /* 6.3.1 Information transfer format - I */ + OSMO_GPRS_LLC_FMT_S, /* 6.3.2 Supervisory format - S */ + OSMO_GPRS_LLC_FMT_UI, /* 6.3.3 Unconfirmed Information format - UI */ + OSMO_GPRS_LLC_FMT_U, /* 6.3.4 Unnumbered format - U */ +}; + +extern const struct value_string osmo_gprs_llc_frame_fmt_names[]; + +#define osmo_gprs_llc_frame_fmt_name(val) \ + get_value_string(osmo_gprs_llc_frame_fmt_names, val) + +/* Section 6.4 Commands and responses */ +enum osmo_gprs_llc_frame_func { + /* 6.4.1 Unnumbered (U) frames */ + OSMO_GPRS_LLC_FUNC_SABM, /* 6.4.1.1 */ + OSMO_GPRS_LLC_FUNC_DISC, /* 6.4.1.2 */ + OSMO_GPRS_LLC_FUNC_UA, /* 6.4.1.3 */ + OSMO_GPRS_LLC_FUNC_DM, /* 6.4.1.4 */ + OSMO_GPRS_LLC_FUNC_FRMR, /* 6.4.1.5 */ + OSMO_GPRS_LLC_FUNC_XID, /* 6.4.1.6 */ + OSMO_GPRS_LLC_FUNC_NULL, /* 6.4.1.7 */ + /* 6.4.2 Unconfirmed Information (UI) frame */ + OSMO_GPRS_LLC_FUNC_UI, /* 6.4.2.1 */ + OSMO_GPRS_LLC_FUNC_UI_DUMMY, /* 6.4.2.2 */ + /* 6.4.3 Combined Information (I) and Supervisory (S) frames */ + OSMO_GPRS_LLC_FUNC_RR, /* 6.4.3.1 */ + OSMO_GPRS_LLC_FUNC_ACK, /* 6.4.3.2 */ + OSMO_GPRS_LLC_FUNC_SACK, /* 6.4.3.3 */ + OSMO_GPRS_LLC_FUNC_RNR, /* 6.4.3.4 */ +}; + +extern const struct value_string osmo_gprs_llc_frame_func_names[]; + +#define osmo_gprs_llc_frame_func_name(val) \ + get_value_string(osmo_gprs_llc_frame_func_names, val) + /* Section 6.4.1.6 / Table 6 */ enum osmo_gprs_llc_xid_type { OSMO_GPRS_LLC_XID_T_VERSION = 0, diff --git a/src/llc/Makefile.am b/src/llc/Makefile.am index 5f9fac3..5a4ad72 100644 --- a/src/llc/Makefile.am +++ b/src/llc/Makefile.am @@ -22,6 +22,7 @@ $(NULL) libosmo_gprs_llc_la_SOURCES = \ + llc_pdu.c \ $(NULL) # TODO: -export-symbols-regex '^osmo_' diff --git a/src/llc/llc_pdu.c b/src/llc/llc_pdu.c new file mode 100644 index 0000000..0a98416 --- /dev/null +++ b/src/llc/llc_pdu.c @@ -0,0 +1,53 @@ +/* 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_frame_fmt_names[] = { + { OSMO_GPRS_LLC_FMT_I, "I" }, + { OSMO_GPRS_LLC_FMT_S, "U" }, + { OSMO_GPRS_LLC_FMT_UI, "UI" }, + { OSMO_GPRS_LLC_FMT_U, "U" }, + { 0, NULL } +}; + +const struct value_string osmo_gprs_llc_frame_func_names[] = { + /* 6.4.1 Unnumbered (U) frames */ + { OSMO_GPRS_LLC_FUNC_SABM, "SABM" }, + { OSMO_GPRS_LLC_FUNC_DISC, "DISC" }, + { OSMO_GPRS_LLC_FUNC_UA, "UA" }, + { OSMO_GPRS_LLC_FUNC_DM, "DM" }, + { OSMO_GPRS_LLC_FUNC_FRMR, "FRMR" }, + { OSMO_GPRS_LLC_FUNC_XID, "XID" }, + { OSMO_GPRS_LLC_FUNC_NULL, "NULL" }, + /* 6.4.2 Unconfirmed Information (UI) frame */ + { OSMO_GPRS_LLC_FUNC_UI, "UI" }, + { OSMO_GPRS_LLC_FUNC_UI_DUMMY, "UI Dummy" }, + /* 6.4.3 Combined Information (I) and Supervisory (S) frames */ + { OSMO_GPRS_LLC_FUNC_RR, "RR" }, + { OSMO_GPRS_LLC_FUNC_ACK, "ACK" }, + { OSMO_GPRS_LLC_FUNC_SACK, "SACK" }, + { OSMO_GPRS_LLC_FUNC_RNR, "RNR" }, + { 0, NULL } +}; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I6d0e1a878fb80c57a901da08798620a6ea4471a4 Gerrit-Change-Number: 29399 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in libosmo-gprs[master]: llc: import FCS (CRC24) calculation API from osmo-sgsn.git

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29400 ) Change subject: llc: import FCS (CRC24) calculation API from osmo-sgsn.git ...................................................................... llc: import FCS (CRC24) calculation API from osmo-sgsn.git osmo-sgsn.git fb6cf3221ef4989441c09a650011e4a334c37d12 Changes made: * Add 'osmo_' prefix to gprs_llc_fcs(), * osmo_gprs_llc_fcs() takes size_t and returns uint32_t, * crc24_calc() takes size_t. Change-Id: Ib4465c289d9ef2a1b8ef5730c559bc799bb1f012 --- M include/osmocom/gprs/llc/llc.h M src/llc/Makefile.am A src/llc/crc24.c M src/llc/llc_pdu.c 4 files changed, 83 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve neels: 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 5e8860c..8c5134b 100644 --- a/include/osmocom/gprs/llc/llc.h +++ b/include/osmocom/gprs/llc/llc.h @@ -3,6 +3,7 @@ /* LLC (Logical Link Control) definitions from 3GPP TS 44.064 */ #include <stdint.h> +#include <stddef.h> /* Section 6.2.3 Service Access Point Identifier (SAPI) */ enum osmo_gprs_llc_sapi { @@ -128,3 +129,5 @@ uint16_t kD; uint16_t kU; }; + +uint32_t osmo_gprs_llc_fcs(const uint8_t *data, size_t len); diff --git a/src/llc/Makefile.am b/src/llc/Makefile.am index 5a4ad72..5dc2060 100644 --- a/src/llc/Makefile.am +++ b/src/llc/Makefile.am @@ -22,6 +22,7 @@ $(NULL) libosmo_gprs_llc_la_SOURCES = \ + crc24.c \ llc_pdu.c \ $(NULL) diff --git a/src/llc/crc24.c b/src/llc/crc24.c new file mode 100644 index 0000000..48be08a --- /dev/null +++ b/src/llc/crc24.c @@ -0,0 +1,66 @@ +/* GPRS LLC CRC-24 Implementation */ + +/* (C) 2008-2009 by Harald Welte <laforge(a)gnumonks.org> + * + * 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 <stdint.h> +#include <stddef.h> + +/* CRC24 table - FCS */ +static const uint32_t tbl_crc24[256] = { + 0x00000000, 0x00d6a776, 0x00f64557, 0x0020e221, 0x00b78115, 0x00612663, 0x0041c442, 0x00976334, + 0x00340991, 0x00e2aee7, 0x00c24cc6, 0x0014ebb0, 0x00838884, 0x00552ff2, 0x0075cdd3, 0x00a36aa5, + 0x00681322, 0x00beb454, 0x009e5675, 0x0048f103, 0x00df9237, 0x00093541, 0x0029d760, 0x00ff7016, + 0x005c1ab3, 0x008abdc5, 0x00aa5fe4, 0x007cf892, 0x00eb9ba6, 0x003d3cd0, 0x001ddef1, 0x00cb7987, + 0x00d02644, 0x00068132, 0x00266313, 0x00f0c465, 0x0067a751, 0x00b10027, 0x0091e206, 0x00474570, + 0x00e42fd5, 0x003288a3, 0x00126a82, 0x00c4cdf4, 0x0053aec0, 0x008509b6, 0x00a5eb97, 0x00734ce1, + 0x00b83566, 0x006e9210, 0x004e7031, 0x0098d747, 0x000fb473, 0x00d91305, 0x00f9f124, 0x002f5652, + 0x008c3cf7, 0x005a9b81, 0x007a79a0, 0x00acded6, 0x003bbde2, 0x00ed1a94, 0x00cdf8b5, 0x001b5fc3, + 0x00fb4733, 0x002de045, 0x000d0264, 0x00dba512, 0x004cc626, 0x009a6150, 0x00ba8371, 0x006c2407, + 0x00cf4ea2, 0x0019e9d4, 0x00390bf5, 0x00efac83, 0x0078cfb7, 0x00ae68c1, 0x008e8ae0, 0x00582d96, + 0x00935411, 0x0045f367, 0x00651146, 0x00b3b630, 0x0024d504, 0x00f27272, 0x00d29053, 0x00043725, + 0x00a75d80, 0x0071faf6, 0x005118d7, 0x0087bfa1, 0x0010dc95, 0x00c67be3, 0x00e699c2, 0x00303eb4, + 0x002b6177, 0x00fdc601, 0x00dd2420, 0x000b8356, 0x009ce062, 0x004a4714, 0x006aa535, 0x00bc0243, + 0x001f68e6, 0x00c9cf90, 0x00e92db1, 0x003f8ac7, 0x00a8e9f3, 0x007e4e85, 0x005eaca4, 0x00880bd2, + 0x00437255, 0x0095d523, 0x00b53702, 0x00639074, 0x00f4f340, 0x00225436, 0x0002b617, 0x00d41161, + 0x00777bc4, 0x00a1dcb2, 0x00813e93, 0x005799e5, 0x00c0fad1, 0x00165da7, 0x0036bf86, 0x00e018f0, + 0x00ad85dd, 0x007b22ab, 0x005bc08a, 0x008d67fc, 0x001a04c8, 0x00cca3be, 0x00ec419f, 0x003ae6e9, + 0x00998c4c, 0x004f2b3a, 0x006fc91b, 0x00b96e6d, 0x002e0d59, 0x00f8aa2f, 0x00d8480e, 0x000eef78, + 0x00c596ff, 0x00133189, 0x0033d3a8, 0x00e574de, 0x007217ea, 0x00a4b09c, 0x008452bd, 0x0052f5cb, + 0x00f19f6e, 0x00273818, 0x0007da39, 0x00d17d4f, 0x00461e7b, 0x0090b90d, 0x00b05b2c, 0x0066fc5a, + 0x007da399, 0x00ab04ef, 0x008be6ce, 0x005d41b8, 0x00ca228c, 0x001c85fa, 0x003c67db, 0x00eac0ad, + 0x0049aa08, 0x009f0d7e, 0x00bfef5f, 0x00694829, 0x00fe2b1d, 0x00288c6b, 0x00086e4a, 0x00dec93c, + 0x0015b0bb, 0x00c317cd, 0x00e3f5ec, 0x0035529a, 0x00a231ae, 0x007496d8, 0x005474f9, 0x0082d38f, + 0x0021b92a, 0x00f71e5c, 0x00d7fc7d, 0x00015b0b, 0x0096383f, 0x00409f49, 0x00607d68, 0x00b6da1e, + 0x0056c2ee, 0x00806598, 0x00a087b9, 0x007620cf, 0x00e143fb, 0x0037e48d, 0x001706ac, 0x00c1a1da, + 0x0062cb7f, 0x00b46c09, 0x00948e28, 0x0042295e, 0x00d54a6a, 0x0003ed1c, 0x00230f3d, 0x00f5a84b, + 0x003ed1cc, 0x00e876ba, 0x00c8949b, 0x001e33ed, 0x008950d9, 0x005ff7af, 0x007f158e, 0x00a9b2f8, + 0x000ad85d, 0x00dc7f2b, 0x00fc9d0a, 0x002a3a7c, 0x00bd5948, 0x006bfe3e, 0x004b1c1f, 0x009dbb69, + 0x0086e4aa, 0x005043dc, 0x0070a1fd, 0x00a6068b, 0x003165bf, 0x00e7c2c9, 0x00c720e8, 0x0011879e, + 0x00b2ed3b, 0x00644a4d, 0x0044a86c, 0x00920f1a, 0x00056c2e, 0x00d3cb58, 0x00f32979, 0x00258e0f, + 0x00eef788, 0x003850fe, 0x0018b2df, 0x00ce15a9, 0x0059769d, 0x008fd1eb, 0x00af33ca, 0x007994bc, + 0x00dafe19, 0x000c596f, 0x002cbb4e, 0x00fa1c38, 0x006d7f0c, 0x00bbd87a, 0x009b3a5b, 0x004d9d2d +}; + +uint32_t crc24_calc(uint32_t fcs, const uint8_t *data, size_t len) +{ + while (len--) + fcs = (fcs >> 8) ^ tbl_crc24[(fcs ^ *data++) & 0xff]; + return fcs; +} diff --git a/src/llc/llc_pdu.c b/src/llc/llc_pdu.c index 0a98416..0a936a8 100644 --- a/src/llc/llc_pdu.c +++ b/src/llc/llc_pdu.c @@ -51,3 +51,16 @@ { OSMO_GPRS_LLC_FUNC_RNR, "RNR" }, { 0, NULL } }; + +uint32_t crc24_calc(uint32_t fcs, const uint8_t *data, size_t len); + +uint32_t osmo_gprs_llc_fcs(const uint8_t *data, size_t len) +{ + uint32_t fcs_calc; + + fcs_calc = crc24_calc(0xffffff, data, len); + fcs_calc = ~fcs_calc; + fcs_calc &= 0xffffff; + + return fcs_calc; +} -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ib4465c289d9ef2a1b8ef5730c559bc799bb1f012 Gerrit-Change-Number: 29400 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in libosmo-gprs[master]: llc: add missing LLE <-> (RLC/MAC,BSSGP) primitives

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29398 ) Change subject: llc: add missing LLE <-> (RLC/MAC,BSSGP) primitives ...................................................................... llc: add missing LLE <-> (RLC/MAC,BSSGP) primitives 3GPP TS 44.064, section 7.1.2, Table 7: "LLC layer service primitives". Change-Id: I10bb63220585424584185ce2bde2d9f8fd0d8342 --- M include/osmocom/gprs/llc/llc.h 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/include/osmocom/gprs/llc/llc.h b/include/osmocom/gprs/llc/llc.h index 8a7b9d8..53e6352 100644 --- a/include/osmocom/gprs/llc/llc.h +++ b/include/osmocom/gprs/llc/llc.h @@ -55,6 +55,11 @@ OSMO_GPRS_LLC_LL_DATA, /* Req/Ind/Cnf: TLLI, L3-PDU, Ref, QoS, Radio Prio */ OSMO_GPRS_LLC_LL_UNITDATA, /* Req/Ind: TLLI, L3-PDU, QoS, Radio Prio, Ciph, ... */ OSMO_GPRS_LLC_LL_STATUS, /* Ind: TLLI, Cause */ + /* LLE <-> RLC/MAC (MS side) */ + OSMO_GPRS_LLC_GRR_DATA, /* Req/Ind: TLLI, LL-PDU, SAPI, Cause, QoS, Radio Prio */ + OSMO_GPRS_LLC_GRR_UNITDATA, /* Req/Ind: TLLI, LL-PDU, SAPI, QoS, Radio Prio */ + /* LLE <-> BSSGP (SGSN side) */ + OSMO_GPRS_LLC_BSSGP_UNITDATA, /* Req/Ind: TLLI, LL-PDU, Cell Id, QoS, RLC Confirm, SAPI, ... */ }; /* Section 4.5.2 Logical Link States + Annex C.2 */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I10bb63220585424584185ce2bde2d9f8fd0d8342 Gerrit-Change-Number: 29398 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in libosmo-gprs[master]: llc: add missing LLE <-> (RLC/MAC,BSSGP) primitives

by fixeria

Attention is currently required from: neels, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29398 ) Change subject: llc: add missing LLE <-> (RLC/MAC,BSSGP) primitives ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File include/osmocom/gprs/llc/llc.h: https://gerrit.osmocom.org/c/libosmo-gprs/+/29398/comment/d9d6a917_c022668f PS2, Line 58: /* LLE <-> RLC/MAC (MS side) */ > the eNUM already contains members for primitives of two multiple different SAPs, so it is logical to […] I see no significant benefits of having separate enums. Currently there are no known users of this library (other than my WIP code), and there have been no stable release yet, so later we can split this enum if you think it makes sense. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I10bb63220585424584185ce2bde2d9f8fd0d8342 Gerrit-Change-Number: 29398 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: 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-Comment-Date: Wed, 21 Sep 2022 16:57:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts: Add missing docker container kill at the end

by fixeria

Attention is currently required from: osmith, neels, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29434 ) Change subject: ttcn3-bts: Add missing docker container kill at the end ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > Well, I cannot explain why they are not killed, that's why I submitted this. […] No idea, maybe some Jenkins magic kills them. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id960c68b9b0781625b7ac567ad004dfdc230ffbb Gerrit-Change-Number: 29434 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Sep 2022 16:24:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts: Add missing docker container kill at the end

by pespin

Attention is currently required from: osmith, neels, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29434 ) Change subject: ttcn3-bts: Add missing docker container kill at the end ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > Could you explain why is it needed? I checked jenkins. […] Well, I cannot explain why they are not killed, that's why I submitted this. Maybe there's some magical function somewhere killing everything? -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id960c68b9b0781625b7ac567ad004dfdc230ffbb Gerrit-Change-Number: 29434 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Sep 2022 16:19:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2022