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

Change in osmo-pcu[master]: rlc.h: Fix typo in param name

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31154 ) Change subject: rlc.h: Fix typo in param name ...................................................................... rlc.h: Fix typo in param name The function definition in rlc.cpp already uses the correct param name. Change-Id: Ifd55fca3c04b72cef3a8f27d6826bc8529e85ec7 --- M src/rlc.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/rlc.h b/src/rlc.h index 73a537f..a9d5d0b 100644 --- a/src/rlc.h +++ b/src/rlc.h @@ -313,7 +313,7 @@ uint16_t first_bsn, uint16_t *lost, uint16_t *received); int move_window(); - void show_state(char *show_rbb); + void show_state(char *show_v_b); int count_unacked(); uint16_t m_v_s; /* send state */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ifd55fca3c04b72cef3a8f27d6826bc8529e85ec7 Gerrit-Change-Number: 31154 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: Move spec related definitions for general use to types.h

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31151 ) Change subject: rlcmac: Move spec related definitions for general use to types.h ...................................................................... rlcmac: Move spec related definitions for general use to types.h Move types defined by spec not directly/solely intended for the CSN1 encoder/decoder operation to a separate types.h header. More and more types will be added there which will be used by the data domain inside and outside the library. Change-Id: Ib0fdae48fc3e76d701d21644826e5ffd8553fecb --- M include/osmocom/gprs/rlcmac/Makefile.am M include/osmocom/gprs/rlcmac/csn1_defs.h M include/osmocom/gprs/rlcmac/llc_queue.h M include/osmocom/gprs/rlcmac/rlcmac.h A include/osmocom/gprs/rlcmac/types.h M src/rlcmac/Makefile.am M src/rlcmac/csn1_ts_44_060.c A src/rlcmac/ts_44_060.c M src/rlcmac/ts_44_064.c M tests/rlcmac/csn1_ts_44_060_test.c 10 files changed, 72 insertions(+), 44 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/gprs/rlcmac/Makefile.am b/include/osmocom/gprs/rlcmac/Makefile.am index 091882a..e797480 100644 --- a/include/osmocom/gprs/rlcmac/Makefile.am +++ b/include/osmocom/gprs/rlcmac/Makefile.am @@ -9,6 +9,7 @@ csn1_defs.h \ rlcmac.h \ rlcmac_prim.h \ + types.h \ $(NULL) rlcmacdir = $(includedir)/osmocom/gprs/rlcmac diff --git a/include/osmocom/gprs/rlcmac/csn1_defs.h b/include/osmocom/gprs/rlcmac/csn1_defs.h index a68267d..459dde2 100644 --- a/include/osmocom/gprs/rlcmac/csn1_defs.h +++ b/include/osmocom/gprs/rlcmac/csn1_defs.h @@ -5404,21 +5404,6 @@ EGPRS_PacketChannelRequestContent_t Content; } EGPRS_PacketChannelRequest_t; -typedef enum { - EGPRS_PKT_CHAN_REQ_ONE_PHASE = 0, - EGPRS_PKT_CHAN_REQ_SHORT, - EGPRS_PKT_CHAN_REQ_ONE_PHASE_RED_LATENCY, - EGPRS_PKT_CHAN_REQ_TWO_PHASE, - EGPRS_PKT_CHAN_REQ_SIGNALLING, - EGPRS_PKT_CHAN_REQ_ONE_PHASE_UNACK, - EGPRS_PKT_CHAN_REQ_DEDICATED_CHANNEL, - EGPRS_PKT_CHAN_REQ_EMERGENCY_CALL, - EGPRS_PKT_CHAN_REQ_TWO_PHASE_IPA, - EGPRS_PKT_CHAN_REQ_SIGNALLING_IPA, -} EGPRS_PacketChannelRequestType_t; - -extern const struct value_string osmo_gprs_rlcmac_egprs_pkt_ch_req_type_names[]; - int osmo_gprs_rlcmac_decode_uplink(struct bitvec *vector, RlcMacUplink_t *data); int osmo_gprs_rlcmac_decode_downlink(struct bitvec *vector, RlcMacDownlink_t *data); int osmo_gprs_rlcmac_encode_downlink(struct bitvec *vector, RlcMacDownlink_t *data); diff --git a/include/osmocom/gprs/rlcmac/llc_queue.h b/include/osmocom/gprs/rlcmac/llc_queue.h index 7e941fb..a0a91e4 100644 --- a/include/osmocom/gprs/rlcmac/llc_queue.h +++ b/include/osmocom/gprs/rlcmac/llc_queue.h @@ -9,6 +9,7 @@ #include <osmocom/gprs/rlcmac/codel.h> #include <osmocom/gprs/rlcmac/rlcmac_prim.h> +#include <osmocom/gprs/rlcmac/types.h> #include <osmocom/gprs/rlcmac/rlcmac.h> struct gprs_rlcmac_entity; diff --git a/include/osmocom/gprs/rlcmac/rlcmac.h b/include/osmocom/gprs/rlcmac/rlcmac.h index e433a08..d7bfb0a 100644 --- a/include/osmocom/gprs/rlcmac/rlcmac.h +++ b/include/osmocom/gprs/rlcmac/rlcmac.h @@ -13,20 +13,6 @@ OSMO_GPRS_RLCMAC_LOCATION_PCU, }; -/* Section TS 44.064 6.2.3 Service Access Point Identifier (SAPI) */ -enum osmo_gprs_rlcmac_llc_sapi { - OSMO_GPRS_RLCMAC_LLC_SAPI_GMM = 1, - OSMO_GPRS_RLCMAC_LLC_SAPI_TOM2 = 2, - OSMO_GPRS_RLCMAC_LLC_SAPI_SNDCP3 = 3, - OSMO_GPRS_RLCMAC_LLC_SAPI_SNDCP5 = 5, - OSMO_GPRS_RLCMAC_LLC_SAPI_SMS = 7, - OSMO_GPRS_RLCMAC_LLC_SAPI_TOM8 = 8, - OSMO_GPRS_RLCMAC_LLC_SAPI_SNDCP9 = 9, - OSMO_GPRS_RLCMAC_LLC_SAPI_SNDCP11 = 11, -}; - -extern const struct value_string osmo_gprs_rlcmac_llc_sapi_names[]; - int osmo_gprs_rlcmac_init(enum osmo_gprs_rlcmac_location location); enum osmo_gprs_rlcmac_log_cat { diff --git a/include/osmocom/gprs/rlcmac/types.h b/include/osmocom/gprs/rlcmac/types.h new file mode 100644 index 0000000..e503fb4 --- /dev/null +++ b/include/osmocom/gprs/rlcmac/types.h @@ -0,0 +1,30 @@ +/* Types & defines from TS 44.060, TS 44.064 */ +#pragma once + +/* TS 44.060 Table 11.2.5a.2 "EGPRS Packet channel request" */ +enum osmo_gprs_rlcmac_egprs_pkt_ch_req_type { + OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_ONE_PHASE = 0, + OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_SHORT, + OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_ONE_PHASE_RED_LATENCY, + OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_TWO_PHASE, + OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_SIGNALLING, + OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_ONE_PHASE_UNACK, + OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_DEDICATED_CHANNEL, + OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_EMERGENCY_CALL, + OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_TWO_PHASE_IPA, + OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_SIGNALLING_IPA, +}; +extern const struct value_string osmo_gprs_rlcmac_egprs_pkt_ch_req_type_names[]; + +/* TS 44.064 Section 6.2.3 Service Access Point Identifier (SAPI) */ +enum osmo_gprs_rlcmac_llc_sapi { + OSMO_GPRS_RLCMAC_LLC_SAPI_GMM = 1, + OSMO_GPRS_RLCMAC_LLC_SAPI_TOM2 = 2, + OSMO_GPRS_RLCMAC_LLC_SAPI_SNDCP3 = 3, + OSMO_GPRS_RLCMAC_LLC_SAPI_SNDCP5 = 5, + OSMO_GPRS_RLCMAC_LLC_SAPI_SMS = 7, + OSMO_GPRS_RLCMAC_LLC_SAPI_TOM8 = 8, + OSMO_GPRS_RLCMAC_LLC_SAPI_SNDCP9 = 9, + OSMO_GPRS_RLCMAC_LLC_SAPI_SNDCP11 = 11, +}; +extern const struct value_string osmo_gprs_rlcmac_llc_sapi_names[]; diff --git a/src/rlcmac/Makefile.am b/src/rlcmac/Makefile.am index 4150f84..676abe0 100644 --- a/src/rlcmac/Makefile.am +++ b/src/rlcmac/Makefile.am @@ -30,6 +30,7 @@ llc_queue.c \ rlcmac.c \ rlcmac_prim.c \ + ts_44_060.c \ ts_44_064.c \ misc.c \ $(NULL) diff --git a/src/rlcmac/csn1_ts_44_060.c b/src/rlcmac/csn1_ts_44_060.c index 0ebfbed..5cc9c4b 100644 --- a/src/rlcmac/csn1_ts_44_060.c +++ b/src/rlcmac/csn1_ts_44_060.c @@ -5261,20 +5261,6 @@ } } -const struct value_string osmo_gprs_rlcmac_egprs_pkt_ch_req_type_names[] = { - { EGPRS_PKT_CHAN_REQ_ONE_PHASE, "One Phase Access" }, - { EGPRS_PKT_CHAN_REQ_SHORT, "Short Access" }, - { EGPRS_PKT_CHAN_REQ_ONE_PHASE_RED_LATENCY, "One Phase Access (Reduced Latency MS)" }, - { EGPRS_PKT_CHAN_REQ_TWO_PHASE, "Two Phase Access" }, - { EGPRS_PKT_CHAN_REQ_SIGNALLING, "Signalling" }, - { EGPRS_PKT_CHAN_REQ_ONE_PHASE_UNACK, "One Phase Access (RLC unack mode)" }, - { EGPRS_PKT_CHAN_REQ_DEDICATED_CHANNEL, "Dedicated Channel Request" }, - { EGPRS_PKT_CHAN_REQ_EMERGENCY_CALL, "Emergency call" }, - { EGPRS_PKT_CHAN_REQ_TWO_PHASE_IPA, "Two Phase Access (by IPA capable MS)" }, - { EGPRS_PKT_CHAN_REQ_SIGNALLING_IPA, "Signalling (by IPA capable MS)" }, - { 0, NULL } -}; - int osmo_gprs_rlcmac_decode_egprs_pkt_ch_req(guint16 ra, EGPRS_PacketChannelRequest_t *req) { unsigned readIndex = 0; diff --git a/src/rlcmac/ts_44_060.c b/src/rlcmac/ts_44_060.c new file mode 100644 index 0000000..931c262 --- /dev/null +++ b/src/rlcmac/ts_44_060.c @@ -0,0 +1,37 @@ +/* GPRS RLC/MAC definitions from TS 44.064 (LLC) */ +/* + * (C) 2023 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * + * 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/rlcmac/types.h> + +const struct value_string osmo_gprs_rlcmac_egprs_pkt_ch_req_type_names[] = { + { OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_ONE_PHASE, "One Phase Access" }, + { OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_SHORT, "Short Access" }, + { OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_ONE_PHASE_RED_LATENCY, "One Phase Access (Reduced Latency MS)" }, + { OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_TWO_PHASE, "Two Phase Access" }, + { OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_SIGNALLING, "Signalling" }, + { OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_ONE_PHASE_UNACK, "One Phase Access (RLC unack mode)" }, + { OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_DEDICATED_CHANNEL, "Dedicated Channel Request" }, + { OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_EMERGENCY_CALL, "Emergency call" }, + { OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_TWO_PHASE_IPA, "Two Phase Access (by IPA capable MS)" }, + { OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_SIGNALLING_IPA, "Signalling (by IPA capable MS)" }, + { 0, NULL } +}; diff --git a/src/rlcmac/ts_44_064.c b/src/rlcmac/ts_44_064.c index 5ad9af5..e781d24 100644 --- a/src/rlcmac/ts_44_064.c +++ b/src/rlcmac/ts_44_064.c @@ -20,7 +20,7 @@ */ #include <osmocom/core/utils.h> -#include <osmocom/gprs/rlcmac/rlcmac.h> +#include <osmocom/gprs/rlcmac/types.h> const struct value_string osmo_gprs_rlcmac_llc_sapi_names[] = { { OSMO_GPRS_RLCMAC_LLC_SAPI_GMM, "GMM" }, diff --git a/tests/rlcmac/csn1_ts_44_060_test.c b/tests/rlcmac/csn1_ts_44_060_test.c index 1591102..06342b9 100644 --- a/tests/rlcmac/csn1_ts_44_060_test.c +++ b/tests/rlcmac/csn1_ts_44_060_test.c @@ -24,6 +24,7 @@ #include <osmocom/csn1/csn1.h> #include <osmocom/gprs/rlcmac/csn1_defs.h> +#include <osmocom/gprs/rlcmac/types.h> static void testRlcMacDownlink(void *test_ctx) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ib0fdae48fc3e76d701d21644826e5ffd8553fecb Gerrit-Change-Number: 31151 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

2 years, 6 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: Rename ts_*.c -> csn1_ts_*.c

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31150 ) Change subject: rlcmac: Rename ts_*.c -> csn1_ts_*.c ...................................................................... rlcmac: Rename ts_*.c -> csn1_ts_*.c Done for files containing mostly (99%) of CSN1 related structrs and encdec functions. File ts_44_064.c is kept as is since it's not CSN1 related. File csn1_ts_44_060.c still contains some enums and value_string which will be split into ts_44_060.c in a follow up commit. Change-Id: I93ad9f90e7496b81ccfe679a614589373f244166 --- M .checkpatch.conf M src/rlcmac/Makefile.am R src/rlcmac/csn1_ts_24_008.c R src/rlcmac/csn1_ts_44_018.c R src/rlcmac/csn1_ts_44_060.c M tests/rlcmac/Makefile.am R tests/rlcmac/csn1_ts_44_018_test.c R tests/rlcmac/csn1_ts_44_018_test.err R tests/rlcmac/csn1_ts_44_018_test.ok R tests/rlcmac/csn1_ts_44_060_test.c R tests/rlcmac/csn1_ts_44_060_test.err R tests/rlcmac/csn1_ts_44_060_test.ok M tests/testsuite.at 13 files changed, 26 insertions(+), 26 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/.checkpatch.conf b/.checkpatch.conf index d91a723..31f2b03 100644 --- a/.checkpatch.conf +++ b/.checkpatch.conf @@ -1,9 +1,9 @@ --exclude ^src/csn1/csn1.c$ --exclude ^src/csn1/csn1_(enc|dec).c$ --exclude ^include/osmocom/csn1/csn1.h$ ---exclude ^src/rlcmac/ts_24_008.c$ ---exclude ^src/rlcmac/ts_44_018.c$ ---exclude ^src/rlcmac/ts_44_060.c$ +--exclude ^src/rlcmac/csn1_ts_24_008.c$ +--exclude ^src/rlcmac/csn1_ts_44_018.c$ +--exclude ^src/rlcmac/csn1_ts_44_060.c$ --exclude ^include/osmocom/gprs/rlcmac/csn1_defs.h$ --exclude ^include/osmocom/gprs/sndcp/v42bis_private.h$ --exclude ^include/osmocom/gprs/sndcp/v42bis.h$ diff --git a/src/rlcmac/Makefile.am b/src/rlcmac/Makefile.am index 47e88b6..4150f84 100644 --- a/src/rlcmac/Makefile.am +++ b/src/rlcmac/Makefile.am @@ -22,14 +22,14 @@ $(NULL) libosmo_gprs_rlcmac_la_SOURCES = \ + csn1_ts_24_008.c \ + csn1_ts_44_018.c \ + csn1_ts_44_060.c \ codel.c \ gre.c \ llc_queue.c \ rlcmac.c \ rlcmac_prim.c \ - ts_24_008.c \ - ts_44_018.c \ - ts_44_060.c \ ts_44_064.c \ misc.c \ $(NULL) diff --git a/src/rlcmac/ts_24_008.c b/src/rlcmac/csn1_ts_24_008.c similarity index 100% rename from src/rlcmac/ts_24_008.c rename to src/rlcmac/csn1_ts_24_008.c diff --git a/src/rlcmac/ts_44_018.c b/src/rlcmac/csn1_ts_44_018.c similarity index 100% rename from src/rlcmac/ts_44_018.c rename to src/rlcmac/csn1_ts_44_018.c diff --git a/src/rlcmac/ts_44_060.c b/src/rlcmac/csn1_ts_44_060.c similarity index 100% rename from src/rlcmac/ts_44_060.c rename to src/rlcmac/csn1_ts_44_060.c diff --git a/tests/rlcmac/Makefile.am b/tests/rlcmac/Makefile.am index b840b1f..9ea8f16 100644 --- a/tests/rlcmac/Makefile.am +++ b/tests/rlcmac/Makefile.am @@ -9,15 +9,15 @@ $(NULL) check_PROGRAMS = \ - ts_44_018_test \ - ts_44_060_test \ + csn1_ts_44_018_test \ + csn1_ts_44_060_test \ $(NULL) EXTRA_DIST = \ - ts_44_018_test.ok \ - ts_44_018_test.err \ - ts_44_060_test.ok \ - ts_44_060_test.err \ + csn1_ts_44_018_test.ok \ + csn1_ts_44_018_test.err \ + csn1_ts_44_060_test.ok \ + csn1_ts_44_060_test.err \ $(NULL) # Common LDADD entries @@ -27,8 +27,8 @@ $(top_builddir)/src/rlcmac/libosmo-gprs-rlcmac.la \ $(NULL) -ts_44_018_test_SOURCES = ts_44_018_test.c -ts_44_018_test_LDADD = $(LDADD) +csn1_ts_44_018_test_SOURCES = csn1_ts_44_018_test.c +csn1_ts_44_018_test_LDADD = $(LDADD) -ts_44_060_test_SOURCES = ts_44_060_test.c -ts_44_060_test_LDADD = $(LDADD) +csn1_ts_44_060_test_SOURCES = csn1_ts_44_060_test.c +csn1_ts_44_060_test_LDADD = $(LDADD) diff --git a/tests/rlcmac/ts_44_018_test.c b/tests/rlcmac/csn1_ts_44_018_test.c similarity index 100% rename from tests/rlcmac/ts_44_018_test.c rename to tests/rlcmac/csn1_ts_44_018_test.c diff --git a/tests/rlcmac/ts_44_018_test.err b/tests/rlcmac/csn1_ts_44_018_test.err similarity index 100% rename from tests/rlcmac/ts_44_018_test.err rename to tests/rlcmac/csn1_ts_44_018_test.err diff --git a/tests/rlcmac/ts_44_018_test.ok b/tests/rlcmac/csn1_ts_44_018_test.ok similarity index 100% rename from tests/rlcmac/ts_44_018_test.ok rename to tests/rlcmac/csn1_ts_44_018_test.ok diff --git a/tests/rlcmac/ts_44_060_test.c b/tests/rlcmac/csn1_ts_44_060_test.c similarity index 100% rename from tests/rlcmac/ts_44_060_test.c rename to tests/rlcmac/csn1_ts_44_060_test.c diff --git a/tests/rlcmac/ts_44_060_test.err b/tests/rlcmac/csn1_ts_44_060_test.err similarity index 100% rename from tests/rlcmac/ts_44_060_test.err rename to tests/rlcmac/csn1_ts_44_060_test.err diff --git a/tests/rlcmac/ts_44_060_test.ok b/tests/rlcmac/csn1_ts_44_060_test.ok similarity index 100% rename from tests/rlcmac/ts_44_060_test.ok rename to tests/rlcmac/csn1_ts_44_060_test.ok diff --git a/tests/testsuite.at b/tests/testsuite.at index 84cbb4e..87e95b6 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -29,18 +29,18 @@ AT_CHECK([$abs_top_builddir/tests/llc/xid_codec_test], [0], [expout], [experr]) AT_CLEANUP -AT_SETUP([rlcmac/ts_44_018]) -AT_KEYWORDS([rlcmac ts_44_018]) -cat $abs_srcdir/rlcmac/ts_44_018_test.ok > expout -cat $abs_srcdir/rlcmac/ts_44_018_test.err > experr -AT_CHECK([$abs_top_builddir/tests/rlcmac/ts_44_018_test], [0], [expout], [experr]) +AT_SETUP([rlcmac/csn1_ts_44_018]) +AT_KEYWORDS([rlcmac csn1_ts_44_018]) +cat $abs_srcdir/rlcmac/csn1_ts_44_018_test.ok > expout +cat $abs_srcdir/rlcmac/csn1_ts_44_018_test.err > experr +AT_CHECK([$abs_top_builddir/tests/rlcmac/csn1_ts_44_018_test], [0], [expout], [experr]) AT_CLEANUP -AT_SETUP([rlcmac/ts_44_060]) -AT_KEYWORDS([rlcmac ts_44_060]) -cat $abs_srcdir/rlcmac/ts_44_060_test.ok > expout -cat $abs_srcdir/rlcmac/ts_44_060_test.err > experr -AT_CHECK([$abs_top_builddir/tests/rlcmac/ts_44_060_test], [0], [expout], [experr]) +AT_SETUP([rlcmac/csn1_ts_44_060]) +AT_KEYWORDS([rlcmac csn1_ts_44_060]) +cat $abs_srcdir/rlcmac/csn1_ts_44_060_test.ok > expout +cat $abs_srcdir/rlcmac/csn1_ts_44_060_test.err > experr +AT_CHECK([$abs_top_builddir/tests/rlcmac/csn1_ts_44_060_test], [0], [expout], [experr]) AT_CLEANUP AT_SETUP([sndcp/sndcp_prim]) -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I93ad9f90e7496b81ccfe679a614589373f244166 Gerrit-Change-Number: 31150 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> 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, 6 months

1
0
0 0

Change in libosmo-gprs[master]: rlcmac: Refactor msg_type enums and value_string

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31152 ) Change subject: rlcmac: Refactor msg_type enums and value_string ...................................................................... rlcmac: Refactor msg_type enums and value_string Add prefixes, clean formatting, move to proper place, etc. Change-Id: Ic55782d90c0d7876fc37d1da130b859857c11447 --- M include/osmocom/gprs/rlcmac/csn1_defs.h M include/osmocom/gprs/rlcmac/types.h M src/rlcmac/csn1_ts_44_060.c M src/rlcmac/ts_44_060.c 4 files changed, 199 insertions(+), 191 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/gprs/rlcmac/csn1_defs.h b/include/osmocom/gprs/rlcmac/csn1_defs.h index 459dde2..5e4b599 100644 --- a/include/osmocom/gprs/rlcmac/csn1_defs.h +++ b/include/osmocom/gprs/rlcmac/csn1_defs.h @@ -5071,59 +5071,6 @@ */ /* < Downlink RLC/MAC control message > */ -#define MT_PACKET_CELL_CHANGE_ORDER 0x01 -#define MT_PACKET_DOWNLINK_ASSIGNMENT 0x02 -#define MT_PACKET_MEASUREMENT_ORDER 0x03 -#define MT_PACKET_POLLING_REQ 0x04 -#define MT_PACKET_POWER_CONTROL_TIMING_ADVANCE 0x05 -#define MT_PACKET_QUEUEING_NOTIFICATION 0x06 -#define MT_PACKET_TIMESLOT_RECONFIGURE 0x07 -#define MT_PACKET_TBF_RELEASE 0x08 -#define MT_PACKET_UPLINK_ACK_NACK 0x09 -#define MT_PACKET_UPLINK_ASSIGNMENT 0x0A -#define MT_PACKET_CELL_CHANGE_CONTINUE 0x0B -#define MT_PACKET_NEIGHBOUR_CELL_DATA 0x0C -#define MT_PACKET_SERVING_CELL_DATA 0x0D -#define MT_PACKET_HANDOVER_COMMAND 0x15 -#define MT_PACKET_PHYSICAL_INFORMATION 0x16 -#define MT_PACKET_ACCESS_REJECT 0x21 -#define MT_PACKET_PAGING_REQUEST 0x22 -#define MT_PACKET_PDCH_RELEASE 0x23 -#define MT_PACKET_PRACH_PARAMETERS 0x24 -#define MT_PACKET_DOWNLINK_DUMMY_CONTROL_BLOCK 0x25 -#define MT_PACKET_SYSTEM_INFO_6 0x30 -#define MT_PACKET_SYSTEM_INFO_1 0x31 -#define MT_PACKET_SYSTEM_INFO_2 0x32 -#define MT_PACKET_SYSTEM_INFO_3 0x33 -#define MT_PACKET_SYSTEM_INFO_3_BIS 0x34 -#define MT_PACKET_SYSTEM_INFO_4 0x35 -#define MT_PACKET_SYSTEM_INFO_5 0x36 -#define MT_PACKET_SYSTEM_INFO_13 0x37 -#define MT_PACKET_SYSTEM_INFO_7 0x38 -#define MT_PACKET_SYSTEM_INFO_8 0x39 -#define MT_PACKET_SYSTEM_INFO_14 0x3A -#define MT_PACKET_SYSTEM_INFO_3_TER 0x3C -#define MT_PACKET_SYSTEM_INFO_3_QUATER 0x3D -#define MT_PACKET_SYSTEM_INFO_15 0x3E - -/* < Uplink RLC/MAC control message > */ -#define MT_PACKET_CELL_CHANGE_FAILURE 0x00 -#define MT_PACKET_CONTROL_ACK 0x01 -#define MT_PACKET_DOWNLINK_ACK_NACK 0x02 -#define MT_PACKET_UPLINK_DUMMY_CONTROL_BLOCK 0x03 -#define MT_PACKET_MEASUREMENT_REPORT 0x04 -#define MT_PACKET_RESOURCE_REQUEST 0x05 -#define MT_PACKET_MOBILE_TBF_STATUS 0x06 -#define MT_PACKET_PSI_STATUS 0x07 -#define MT_EGPRS_PACKET_DOWNLINK_ACK_NACK 0x08 -#define MT_PACKET_PAUSE 0x09 -#define MT_PACKET_ENHANCED_MEASUREMENT_REPORT 0x0A -#define MT_ADDITIONAL_MS_RAC 0x0B -#define MT_PACKET_CELL_CHANGE_NOTIFICATION 0x0C -#define MT_PACKET_SI_STATUS 0x0D -#define MT_ENHANCED_MEASUREMENT_REPORT 0x04 - -/* < Downlink RLC/MAC control message > */ typedef struct { union diff --git a/include/osmocom/gprs/rlcmac/types.h b/include/osmocom/gprs/rlcmac/types.h index e503fb4..ce97dd4 100644 --- a/include/osmocom/gprs/rlcmac/types.h +++ b/include/osmocom/gprs/rlcmac/types.h @@ -28,3 +28,62 @@ OSMO_GPRS_RLCMAC_LLC_SAPI_SNDCP11 = 11, }; extern const struct value_string osmo_gprs_rlcmac_llc_sapi_names[]; + +/* TS 44.060 11.2.0.1 Downlink RLC/MAC messages */ +enum osmo_gprs_rlcmac_dl_msg_type { + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_CELL_CHANGE_ORDER = 0x01, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_DOWNLINK_ASSIGNMENT = 0x02, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_MEASUREMENT_ORDER = 0x03, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_POLLING_REQ = 0x04, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_POWER_CONTROL_TIMING_ADVANCE = 0x05, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_QUEUEING_NOTIFICATION = 0x06, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_TIMESLOT_RECONFIGURE = 0x07, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_TBF_RELEASE = 0x08, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_UPLINK_ACK_NACK = 0x09, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_UPLINK_ASSIGNMENT = 0x0A, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_CELL_CHANGE_CONTINUE = 0x0B, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_NEIGHBOUR_CELL_DATA = 0x0C, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SERVING_CELL_DATA = 0x0D, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_HANDOVER_COMMAND = 0x15, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PHYSICAL_INFORMATION = 0x16, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_ACCESS_REJECT = 0x21, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PAGING_REQUEST = 0x22, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PDCH_RELEASE = 0x23, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PRACH_PARAMETERS = 0x24, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_DOWNLINK_DUMMY_CONTROL_BLOCK = 0x25, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_6 = 0x30, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_1 = 0x31, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_2 = 0x32, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_3 = 0x33, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_3_BIS = 0x34, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_4 = 0x35, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_5 = 0x36, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_13 = 0x37, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_7 = 0x38, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_8 = 0x39, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_14 = 0x3A, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_3_TER = 0x3C, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_3_QUATER = 0x3D, + OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_15 = 0x3E, +}; +extern const struct value_string osmo_gprs_rlcmac_dl_msg_type_names[]; + +/* TS 44.060 11.2.0.2 Uplink RLC/MAC messages */ +enum osmo_gprs_rlcmac_ul_msg_type { + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CELL_CHANGE_FAILURE = 0x00, + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CONTROL_ACK = 0x01, + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_DOWNLINK_ACK_NACK = 0x02, + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_UPLINK_DUMMY_CONTROL_BLOCK = 0x03, + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_MEASUREMENT_REPORT = 0x04, + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_RESOURCE_REQUEST = 0x05, + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_MOBILE_TBF_STATUS = 0x06, + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_PSI_STATUS = 0x07, + OSMO_GPRS_RLCMAC_UL_MSGT_EGPRS_PACKET_DOWNLINK_ACK_NACK = 0x08, + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_PAUSE = 0x09, + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_ENHANCED_MEASUREMENT_REPORT = 0x0A, + OSMO_GPRS_RLCMAC_UL_MSGT_ADDITIONAL_MS_RAC = 0x0B, + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CELL_CHANGE_NOTIFICATION = 0x0C, + OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_SI_STATUS = 0x0D, + OSMO_GPRS_RLCMAC_UL_MSGT_ENHANCED_MEASUREMENT_REPORT = 0x04, +}; +extern const struct value_string osmo_gprs_rlcmac_ul_msg_type_names[]; diff --git a/src/rlcmac/csn1_ts_44_060.c b/src/rlcmac/csn1_ts_44_060.c index 5cc9c4b..296c498 100644 --- a/src/rlcmac/csn1_ts_44_060.c +++ b/src/rlcmac/csn1_ts_44_060.c @@ -30,6 +30,7 @@ #include <osmocom/csn1/csn1.h> #include <osmocom/gprs/rlcmac/csn1_defs.h> +#include <osmocom/gprs/rlcmac/types.h> #include <osmocom/gprs/rlcmac/rlcmac_private.h> /* Payload type as defined in TS 44.060 / 10.4.7 */ @@ -4407,62 +4408,6 @@ // ---------------------------------------------------------------------------- // osmo-pcu RLCMAC APIs // ---------------------------------------------------------------------------- -static const struct value_string rlcmac_ul_msg_names[] = { - { MT_PACKET_CELL_CHANGE_FAILURE, "Pkt Cell Change Failure" }, - { MT_PACKET_CONTROL_ACK, "Pkt Control Ack" }, - { MT_PACKET_DOWNLINK_ACK_NACK , "Pkt DL ACK/NACK" }, - { MT_PACKET_UPLINK_DUMMY_CONTROL_BLOCK, "Pkt UL Dummy Ctrl Block" }, - { MT_PACKET_MEASUREMENT_REPORT, "Pkt Meas Report" }, - { MT_PACKET_RESOURCE_REQUEST, "Pkt Resource Req" }, - { MT_PACKET_MOBILE_TBF_STATUS, "Pkt Mobile TBF Status" }, - { MT_PACKET_PSI_STATUS, "Pkt PSI Status" }, - { MT_EGPRS_PACKET_DOWNLINK_ACK_NACK, "EGPRS Pkt DL ACK/NACK" }, - { MT_PACKET_PAUSE, "Pkt Pause" }, - { MT_PACKET_ENHANCED_MEASUREMENT_REPORT,"Pkt Enchanced Meas Report" }, - { MT_ADDITIONAL_MS_RAC, "Additional MS RAC" }, - { MT_PACKET_CELL_CHANGE_NOTIFICATION, "Pkt Cell Change Notification" }, - { MT_PACKET_SI_STATUS, "Pkt SI Status" }, - { MT_ENHANCED_MEASUREMENT_REPORT, "Enchanced Meas Report" }, - { 0, NULL } -}; - -static const struct value_string rlcmac_dl_msg_names[] = { - { MT_PACKET_CELL_CHANGE_ORDER, "Pkt Cell Change Order" }, - { MT_PACKET_DOWNLINK_ASSIGNMENT, "Pkt DL ASS" }, - { MT_PACKET_MEASUREMENT_ORDER, "Pkt Meas Order" }, - { MT_PACKET_POLLING_REQ, "Pkt Polling Req" }, - { MT_PACKET_POWER_CONTROL_TIMING_ADVANCE, "Pkt PWR CTRL TA" }, - { MT_PACKET_QUEUEING_NOTIFICATION, "Pkt Queueing Notification" }, - { MT_PACKET_TIMESLOT_RECONFIGURE, "Pkt TS Reconf" }, - { MT_PACKET_TBF_RELEASE, "Pkt TBF Release" }, - { MT_PACKET_UPLINK_ACK_NACK, "Pkt UL ACK/NACK" }, - { MT_PACKET_UPLINK_ASSIGNMENT, "Pkt UL ASS" }, - { MT_PACKET_CELL_CHANGE_CONTINUE, "Pkt Cell Change Continue" }, - { MT_PACKET_NEIGHBOUR_CELL_DATA, "Pkt Neightbour Cell Data" }, - { MT_PACKET_SERVING_CELL_DATA, "Pkt Serving Cell Data" }, - { MT_PACKET_HANDOVER_COMMAND, "Pkt Handover Cmd" }, - { MT_PACKET_PHYSICAL_INFORMATION, "Pkt Physical Info" }, - { MT_PACKET_ACCESS_REJECT, "Pkt Access Reject" }, - { MT_PACKET_PAGING_REQUEST, "Pkt Paging Request" }, - { MT_PACKET_PDCH_RELEASE, "Pkt PDCH Release" }, - { MT_PACKET_PRACH_PARAMETERS, "Pkt PRACH Params" }, - { MT_PACKET_DOWNLINK_DUMMY_CONTROL_BLOCK, "Pkt DL Dummy Ctrl Block" }, - { MT_PACKET_SYSTEM_INFO_6, "Pkt SI 6" }, - { MT_PACKET_SYSTEM_INFO_1, "Pkt SI 1" }, - { MT_PACKET_SYSTEM_INFO_2, "Pkt SI 2" }, - { MT_PACKET_SYSTEM_INFO_3, "Pkt SI 3" }, - { MT_PACKET_SYSTEM_INFO_3_BIS, "Pkt SI 3bis" }, - { MT_PACKET_SYSTEM_INFO_4, "Pkt SI 4" }, - { MT_PACKET_SYSTEM_INFO_5, "Pkt SI 5" }, - { MT_PACKET_SYSTEM_INFO_13, "Pkt SI 13" }, - { MT_PACKET_SYSTEM_INFO_7, "Pkt SI 7" }, - { MT_PACKET_SYSTEM_INFO_8, "Pkt SI 8" }, - { MT_PACKET_SYSTEM_INFO_14, "Pkt SI 14" }, - { MT_PACKET_SYSTEM_INFO_3_TER, "Pkt SI 3ter" }, - { MT_PACKET_SYSTEM_INFO_3_QUATER, "Pkt SI 3quater" }, - { MT_PACKET_SYSTEM_INFO_15, "Pkt SI 15" }, - { 0, NULL } -}; /* Returns 0 on success, negative on error. */ int osmo_gprs_rlcmac_decode_uplink(struct bitvec *vector, RlcMacUplink_t * data) @@ -4491,12 +4436,12 @@ readIndex = 0; /* recursive osmo_csn1_stream_decode call uses LOGPC everywhere, so we need to start the log somewhere... */ - msg_type_name = get_value_string(rlcmac_ul_msg_names, data->u.MESSAGE_TYPE); + msg_type_name = get_value_string(osmo_gprs_rlcmac_ul_msg_type_names, data->u.MESSAGE_TYPE); LOGP(DLCSN1, LOGL_INFO, "osmo_csn1_stream_decode (type: %s (%d)): ", msg_type_name, data->u.MESSAGE_TYPE); switch (data->u.MESSAGE_TYPE) { - case MT_PACKET_CELL_CHANGE_FAILURE: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CELL_CHANGE_FAILURE: { /* * data is the pointer to the unpack struct that hold the unpack value @@ -4506,68 +4451,68 @@ ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Cell_Change_Failure_t), vector, &readIndex, &data->u.Packet_Cell_Change_Failure); break; } - case MT_PACKET_CONTROL_ACK: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CONTROL_ACK: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Control_Acknowledgement_t), vector, &readIndex, &data->u.Packet_Control_Acknowledgement); break; } - case MT_PACKET_DOWNLINK_ACK_NACK: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_DOWNLINK_ACK_NACK: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Downlink_Ack_Nack_t), vector, &readIndex, &data->u.Packet_Downlink_Ack_Nack); break; } - case MT_PACKET_UPLINK_DUMMY_CONTROL_BLOCK: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_UPLINK_DUMMY_CONTROL_BLOCK: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Uplink_Dummy_Control_Block_t), vector, &readIndex, &data->u.Packet_Uplink_Dummy_Control_Block); break; } - case MT_PACKET_MEASUREMENT_REPORT: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_MEASUREMENT_REPORT: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Measurement_Report_t), vector, &readIndex, &data->u.Packet_Measurement_Report); break; } - case MT_PACKET_RESOURCE_REQUEST: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_RESOURCE_REQUEST: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Resource_Request_t), vector, &readIndex, &data->u.Packet_Resource_Request); break; } - case MT_PACKET_MOBILE_TBF_STATUS: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_MOBILE_TBF_STATUS: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Mobile_TBF_Status_t), vector, &readIndex, &data->u.Packet_Mobile_TBF_Status); break; } - case MT_PACKET_PSI_STATUS: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_PSI_STATUS: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_PSI_Status_t), vector, &readIndex, &data->u.Packet_PSI_Status); break; } - case MT_EGPRS_PACKET_DOWNLINK_ACK_NACK: + case OSMO_GPRS_RLCMAC_UL_MSGT_EGPRS_PACKET_DOWNLINK_ACK_NACK: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(EGPRS_PD_AckNack_t), vector, &readIndex, &data->u.Egprs_Packet_Downlink_Ack_Nack); break; } - case MT_PACKET_PAUSE: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_PAUSE: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Pause_t), vector, &readIndex, &data->u.Packet_Pause); break; } - case MT_PACKET_ENHANCED_MEASUREMENT_REPORT: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_ENHANCED_MEASUREMENT_REPORT: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Enh_Measurement_Report_t), vector, &readIndex, &data->u.Packet_Enh_Measurement_Report); break; } - case MT_ADDITIONAL_MS_RAC: + case OSMO_GPRS_RLCMAC_UL_MSGT_ADDITIONAL_MS_RAC: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Additional_MS_Rad_Access_Cap_t), vector, &readIndex, &data->u.Additional_MS_Rad_Access_Cap); break; } - case MT_PACKET_CELL_CHANGE_NOTIFICATION: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CELL_CHANGE_NOTIFICATION: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Cell_Change_Notification_t), vector, &readIndex, &data->u.Packet_Cell_Change_Notification); break; } - case MT_PACKET_SI_STATUS: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_SI_STATUS: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_SI_Status_t), vector, &readIndex, &data->u.Packet_SI_Status); break; @@ -4653,133 +4598,133 @@ osmo_csn1_stream_init(&ar, bit_offset, bit_length); /* recursive osmo_csn1_stream_decode call uses LOGPC everywhere, so we need to start the log somewhere... */ - msg_type_name = get_value_string(rlcmac_dl_msg_names, data->u.MESSAGE_TYPE); + msg_type_name = get_value_string(osmo_gprs_rlcmac_dl_msg_type_names, data->u.MESSAGE_TYPE); LOGP(DLCSN1, LOGL_INFO, "osmo_csn1_stream_decode (type: %s (%d): ", msg_type_name, data->u.MESSAGE_TYPE); switch (data->u.MESSAGE_TYPE) { - case MT_PACKET_ACCESS_REJECT: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_ACCESS_REJECT: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Access_Reject_t), vector, &readIndex, &data->u.Packet_Access_Reject); break; } - case MT_PACKET_CELL_CHANGE_ORDER: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_CELL_CHANGE_ORDER: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Cell_Change_Order_t), vector, &readIndex, &data->u.Packet_Cell_Change_Order); break; } - case MT_PACKET_CELL_CHANGE_CONTINUE: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_CELL_CHANGE_CONTINUE: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Cell_Change_Continue_t), vector, &readIndex, &data->u.Packet_Cell_Change_Continue); break; } - case MT_PACKET_DOWNLINK_ASSIGNMENT: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_DOWNLINK_ASSIGNMENT: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Downlink_Assignment_t), vector, &readIndex, &data->u.Packet_Downlink_Assignment); break; } - case MT_PACKET_MEASUREMENT_ORDER: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_MEASUREMENT_ORDER: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Measurement_Order_t), vector, &readIndex, &data->u.Packet_Measurement_Order); break; } - case MT_PACKET_NEIGHBOUR_CELL_DATA: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_NEIGHBOUR_CELL_DATA: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Neighbour_Cell_Data_t), vector, &readIndex, &data->u.Packet_Neighbour_Cell_Data); break; } - case MT_PACKET_SERVING_CELL_DATA: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SERVING_CELL_DATA: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Serving_Cell_Data_t), vector, &readIndex, &data->u.Packet_Serving_Cell_Data); break; } - case MT_PACKET_PAGING_REQUEST: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PAGING_REQUEST: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Paging_Request_t), vector, &readIndex, &data->u.Packet_Paging_Request); break; } - case MT_PACKET_PDCH_RELEASE: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PDCH_RELEASE: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_PDCH_Release_t), vector, &readIndex, &data->u.Packet_PDCH_Release); break; } - case MT_PACKET_POLLING_REQ: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_POLLING_REQ: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Polling_Request_t), vector, &readIndex, &data->u.Packet_Polling_Request); break; } - case MT_PACKET_POWER_CONTROL_TIMING_ADVANCE: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_POWER_CONTROL_TIMING_ADVANCE: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Power_Control_Timing_Advance_t), vector, &readIndex, &data->u.Packet_Power_Control_Timing_Advance); break; } - case MT_PACKET_PRACH_PARAMETERS: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PRACH_PARAMETERS: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_PRACH_Parameters_t), vector, &readIndex, &data->u.Packet_PRACH_Parameters); break; } - case MT_PACKET_QUEUEING_NOTIFICATION: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_QUEUEING_NOTIFICATION: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Queueing_Notification_t), vector, &readIndex, &data->u.Packet_Queueing_Notification); break; } - case MT_PACKET_TIMESLOT_RECONFIGURE: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_TIMESLOT_RECONFIGURE: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Timeslot_Reconfigure_t), vector, &readIndex, &data->u.Packet_Timeslot_Reconfigure); break; } - case MT_PACKET_TBF_RELEASE: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_TBF_RELEASE: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_TBF_Release_t), vector, &readIndex, &data->u.Packet_TBF_Release); break; } - case MT_PACKET_UPLINK_ACK_NACK: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_UPLINK_ACK_NACK: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Uplink_Ack_Nack_t), vector, &readIndex, &data->u.Packet_Uplink_Ack_Nack); break; } - case MT_PACKET_UPLINK_ASSIGNMENT: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_UPLINK_ASSIGNMENT: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Uplink_Assignment_t), vector, &readIndex, &data->u.Packet_Uplink_Assignment); break; } - case MT_PACKET_HANDOVER_COMMAND: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_HANDOVER_COMMAND: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Handover_Command_t), vector, &readIndex, &data->u.Packet_Handover_Command); break; } - case MT_PACKET_PHYSICAL_INFORMATION: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PHYSICAL_INFORMATION: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_PhysicalInformation_t), vector, &readIndex, &data->u.Packet_Handover_Command); break; } - case MT_PACKET_DOWNLINK_DUMMY_CONTROL_BLOCK: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_DOWNLINK_DUMMY_CONTROL_BLOCK: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(Packet_Downlink_Dummy_Control_Block_t), vector, &readIndex, &data->u.Packet_Downlink_Dummy_Control_Block); break; } - case MT_PACKET_SYSTEM_INFO_1: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_1: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(PSI1_t), vector, &readIndex, &data->u.PSI1); break; } - case MT_PACKET_SYSTEM_INFO_2: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_2: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(PSI2_t), vector, &readIndex, &data->u.PSI2); break; } - case MT_PACKET_SYSTEM_INFO_3: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_3: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(PSI3_t), vector, &readIndex, &data->u.PSI3); break; } - case MT_PACKET_SYSTEM_INFO_5: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_5: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(PSI5_t), vector, &readIndex, &data->u.PSI5); break; } - case MT_PACKET_SYSTEM_INFO_13: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_13: { ret = osmo_csn1_stream_decode(&ar, CSNDESCR(PSI13_t), vector, &readIndex, &data->u.PSI13); break; @@ -4814,12 +4759,12 @@ writeIndex = 0; /* recursive osmo_csn1_stream_encode call uses LOGPC everywhere, so we need to start the log somewhere... */ - msg_type_name = get_value_string(rlcmac_ul_msg_names, data->u.MESSAGE_TYPE); + msg_type_name = get_value_string(osmo_gprs_rlcmac_ul_msg_type_names, data->u.MESSAGE_TYPE); LOGP(DLCSN1, LOGL_INFO, "osmo_csn1_stream_encode (type: %s (%d)): ", msg_type_name, data->u.MESSAGE_TYPE); switch (data->u.MESSAGE_TYPE) { - case MT_PACKET_CELL_CHANGE_FAILURE: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CELL_CHANGE_FAILURE: { /* * data is the pointer to the unpack struct that hold the unpack value @@ -4829,68 +4774,68 @@ ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Cell_Change_Failure_t), vector, &writeIndex, &data->u.Packet_Cell_Change_Failure); break; } - case MT_PACKET_CONTROL_ACK: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CONTROL_ACK: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Control_Acknowledgement_t), vector, &writeIndex, &data->u.Packet_Control_Acknowledgement); break; } - case MT_PACKET_DOWNLINK_ACK_NACK: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_DOWNLINK_ACK_NACK: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Downlink_Ack_Nack_t), vector, &writeIndex, &data->u.Packet_Downlink_Ack_Nack); break; } - case MT_PACKET_UPLINK_DUMMY_CONTROL_BLOCK: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_UPLINK_DUMMY_CONTROL_BLOCK: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Uplink_Dummy_Control_Block_t), vector, &writeIndex, &data->u.Packet_Uplink_Dummy_Control_Block); break; } - case MT_PACKET_MEASUREMENT_REPORT: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_MEASUREMENT_REPORT: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Measurement_Report_t), vector, &writeIndex, &data->u.Packet_Measurement_Report); break; } - case MT_PACKET_RESOURCE_REQUEST: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_RESOURCE_REQUEST: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Resource_Request_t), vector, &writeIndex, &data->u.Packet_Resource_Request); break; } - case MT_PACKET_MOBILE_TBF_STATUS: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_MOBILE_TBF_STATUS: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Mobile_TBF_Status_t), vector, &writeIndex, &data->u.Packet_Mobile_TBF_Status); break; } - case MT_PACKET_PSI_STATUS: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_PSI_STATUS: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_PSI_Status_t), vector, &writeIndex, &data->u.Packet_PSI_Status); break; } - case MT_EGPRS_PACKET_DOWNLINK_ACK_NACK: + case OSMO_GPRS_RLCMAC_UL_MSGT_EGPRS_PACKET_DOWNLINK_ACK_NACK: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(EGPRS_PD_AckNack_t), vector, &writeIndex, &data->u.Egprs_Packet_Downlink_Ack_Nack); break; } - case MT_PACKET_PAUSE: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_PAUSE: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Pause_t), vector, &writeIndex, &data->u.Packet_Pause); break; } - case MT_PACKET_ENHANCED_MEASUREMENT_REPORT: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_ENHANCED_MEASUREMENT_REPORT: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Enh_Measurement_Report_t), vector, &writeIndex, &data->u.Packet_Enh_Measurement_Report); break; } - case MT_ADDITIONAL_MS_RAC: + case OSMO_GPRS_RLCMAC_UL_MSGT_ADDITIONAL_MS_RAC: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Additional_MS_Rad_Access_Cap_t), vector, &writeIndex, &data->u.Additional_MS_Rad_Access_Cap); break; } - case MT_PACKET_CELL_CHANGE_NOTIFICATION: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CELL_CHANGE_NOTIFICATION: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Cell_Change_Notification_t), vector, &writeIndex, &data->u.Packet_Cell_Change_Notification); break; } - case MT_PACKET_SI_STATUS: + case OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_SI_STATUS: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_SI_Status_t), vector, &writeIndex, &data->u.Packet_SI_Status); break; @@ -4975,132 +4920,132 @@ /* recursive osmo_csn1_stream_encode call uses LOGPC everywhere, so we need to start the log somewhere... */ - msg_type_name = get_value_string(rlcmac_dl_msg_names, data->u.MESSAGE_TYPE); + msg_type_name = get_value_string(osmo_gprs_rlcmac_dl_msg_type_names, data->u.MESSAGE_TYPE); LOGP(DLCSN1, LOGL_INFO, "osmo_csn1_stream_encode (type: %s (%d)): ", msg_type_name, data->u.MESSAGE_TYPE); switch (data->u.MESSAGE_TYPE) { - case MT_PACKET_ACCESS_REJECT: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_ACCESS_REJECT: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Access_Reject_t), vector, &writeIndex, &data->u.Packet_Access_Reject); break; } - case MT_PACKET_CELL_CHANGE_ORDER: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_CELL_CHANGE_ORDER: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Cell_Change_Order_t), vector, &writeIndex, &data->u.Packet_Cell_Change_Order); break; } - case MT_PACKET_CELL_CHANGE_CONTINUE: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_CELL_CHANGE_CONTINUE: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Cell_Change_Continue_t), vector, &writeIndex, &data->u.Packet_Cell_Change_Continue); break; } - case MT_PACKET_DOWNLINK_ASSIGNMENT: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_DOWNLINK_ASSIGNMENT: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Downlink_Assignment_t), vector, &writeIndex, &data->u.Packet_Downlink_Assignment); break; } - case MT_PACKET_MEASUREMENT_ORDER: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_MEASUREMENT_ORDER: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Measurement_Order_t), vector, &writeIndex, &data->u.Packet_Measurement_Order); break; } - case MT_PACKET_NEIGHBOUR_CELL_DATA: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_NEIGHBOUR_CELL_DATA: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Neighbour_Cell_Data_t), vector, &writeIndex, &data->u.Packet_Neighbour_Cell_Data); break; } - case MT_PACKET_SERVING_CELL_DATA: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SERVING_CELL_DATA: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Serving_Cell_Data_t), vector, &writeIndex, &data->u.Packet_Serving_Cell_Data); break; } - case MT_PACKET_PAGING_REQUEST: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PAGING_REQUEST: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Paging_Request_t), vector, &writeIndex, &data->u.Packet_Paging_Request); break; } - case MT_PACKET_PDCH_RELEASE: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PDCH_RELEASE: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_PDCH_Release_t), vector, &writeIndex, &data->u.Packet_PDCH_Release); break; } - case MT_PACKET_POLLING_REQ: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_POLLING_REQ: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Polling_Request_t), vector, &writeIndex, &data->u.Packet_Polling_Request); break; } - case MT_PACKET_POWER_CONTROL_TIMING_ADVANCE: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_POWER_CONTROL_TIMING_ADVANCE: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Power_Control_Timing_Advance_t), vector, &writeIndex, &data->u.Packet_Power_Control_Timing_Advance); break; } - case MT_PACKET_PRACH_PARAMETERS: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PRACH_PARAMETERS: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_PRACH_Parameters_t), vector, &writeIndex, &data->u.Packet_PRACH_Parameters); break; } - case MT_PACKET_QUEUEING_NOTIFICATION: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_QUEUEING_NOTIFICATION: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Queueing_Notification_t), vector, &writeIndex, &data->u.Packet_Queueing_Notification); break; } - case MT_PACKET_TIMESLOT_RECONFIGURE: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_TIMESLOT_RECONFIGURE: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Timeslot_Reconfigure_t), vector, &writeIndex, &data->u.Packet_Timeslot_Reconfigure); break; } - case MT_PACKET_TBF_RELEASE: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_TBF_RELEASE: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_TBF_Release_t), vector, &writeIndex, &data->u.Packet_TBF_Release); break; } - case MT_PACKET_UPLINK_ACK_NACK: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_UPLINK_ACK_NACK: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Uplink_Ack_Nack_t), vector, &writeIndex, &data->u.Packet_Uplink_Ack_Nack); break; } - case MT_PACKET_UPLINK_ASSIGNMENT: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_UPLINK_ASSIGNMENT: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Uplink_Assignment_t), vector, &writeIndex, &data->u.Packet_Uplink_Assignment); break; } - case MT_PACKET_HANDOVER_COMMAND: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_HANDOVER_COMMAND: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Handover_Command_t), vector, &writeIndex, &data->u.Packet_Handover_Command); break; } - case MT_PACKET_PHYSICAL_INFORMATION: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PHYSICAL_INFORMATION: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_PhysicalInformation_t), vector, &writeIndex, &data->u.Packet_Handover_Command); break; } - case MT_PACKET_DOWNLINK_DUMMY_CONTROL_BLOCK: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_DOWNLINK_DUMMY_CONTROL_BLOCK: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(Packet_Downlink_Dummy_Control_Block_t), vector, &writeIndex, &data->u.Packet_Downlink_Dummy_Control_Block); break; } - case MT_PACKET_SYSTEM_INFO_1: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_1: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(PSI1_t), vector, &writeIndex, &data->u.PSI1); break; } - case MT_PACKET_SYSTEM_INFO_2: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_2: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(PSI2_t), vector, &writeIndex, &data->u.PSI2); break; } - case MT_PACKET_SYSTEM_INFO_3: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_3: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(PSI3_t), vector, &writeIndex, &data->u.PSI3); break; } - case MT_PACKET_SYSTEM_INFO_5: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_5: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(PSI5_t), vector, &writeIndex, &data->u.PSI5); break; } - case MT_PACKET_SYSTEM_INFO_13: + case OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_13: { ret = osmo_csn1_stream_encode(&ar, CSNDESCR(PSI13_t), vector, &writeIndex, &data->u.PSI13); break; diff --git a/src/rlcmac/ts_44_060.c b/src/rlcmac/ts_44_060.c index 931c262..665e576 100644 --- a/src/rlcmac/ts_44_060.c +++ b/src/rlcmac/ts_44_060.c @@ -35,3 +35,60 @@ { OSMO_GPRS_RLCMAC_EGPRS_PKT_CH_REQ_SIGNALLING_IPA, "Signalling (by IPA capable MS)" }, { 0, NULL } }; + +const struct value_string osmo_gprs_rlcmac_dl_msg_type_names[] = { + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_CELL_CHANGE_ORDER, "Pkt Cell Change Order" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_DOWNLINK_ASSIGNMENT, "Pkt DL ASS" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_MEASUREMENT_ORDER, "Pkt Meas Order" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_POLLING_REQ, "Pkt Polling Req" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_POWER_CONTROL_TIMING_ADVANCE, "Pkt PWR CTRL TA" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_QUEUEING_NOTIFICATION, "Pkt Queueing Notification" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_TIMESLOT_RECONFIGURE, "Pkt TS Reconf" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_TBF_RELEASE, "Pkt TBF Release" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_UPLINK_ACK_NACK, "Pkt UL ACK/NACK" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_UPLINK_ASSIGNMENT, "Pkt UL ASS" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_CELL_CHANGE_CONTINUE, "Pkt Cell Change Continue" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_NEIGHBOUR_CELL_DATA, "Pkt Neightbour Cell Data" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SERVING_CELL_DATA, "Pkt Serving Cell Data" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_HANDOVER_COMMAND, "Pkt Handover Cmd" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PHYSICAL_INFORMATION, "Pkt Physical Info" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_ACCESS_REJECT, "Pkt Access Reject" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PAGING_REQUEST, "Pkt Paging Request" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PDCH_RELEASE, "Pkt PDCH Release" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_PRACH_PARAMETERS, "Pkt PRACH Params" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_DOWNLINK_DUMMY_CONTROL_BLOCK, "Pkt DL Dummy Ctrl Block" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_6, "Pkt SI 6" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_1, "Pkt SI 1" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_2, "Pkt SI 2" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_3, "Pkt SI 3" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_3_BIS, "Pkt SI 3bis" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_4, "Pkt SI 4" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_5, "Pkt SI 5" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_13, "Pkt SI 13" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_7, "Pkt SI 7" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_8, "Pkt SI 8" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_14, "Pkt SI 14" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_3_TER, "Pkt SI 3ter" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_3_QUATER, "Pkt SI 3quater" }, + { OSMO_GPRS_RLCMAC_DL_MSGT_PACKET_SYSTEM_INFO_15, "Pkt SI 15" }, + { 0, NULL } +}; + +const struct value_string osmo_gprs_rlcmac_ul_msg_type_names[] = { + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CELL_CHANGE_FAILURE, "Pkt Cell Change Failure" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CONTROL_ACK, "Pkt Control Ack" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_DOWNLINK_ACK_NACK, "Pkt DL ACK/NACK" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_UPLINK_DUMMY_CONTROL_BLOCK, "Pkt UL Dummy Ctrl Block" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_MEASUREMENT_REPORT, "Pkt Meas Report" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_RESOURCE_REQUEST, "Pkt Resource Req" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_MOBILE_TBF_STATUS, "Pkt Mobile TBF Status" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_PSI_STATUS, "Pkt PSI Status" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_EGPRS_PACKET_DOWNLINK_ACK_NACK, "EGPRS Pkt DL ACK/NACK" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_PAUSE, "Pkt Pause" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_ENHANCED_MEASUREMENT_REPORT, "Pkt Enhanced Meas Report" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_ADDITIONAL_MS_RAC, "Additional MS RAC" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_CELL_CHANGE_NOTIFICATION, "Pkt Cell Change Notification" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_PACKET_SI_STATUS, "Pkt SI Status" }, + { OSMO_GPRS_RLCMAC_UL_MSGT_ENHANCED_MEASUREMENT_REPORT, "Enhanced Meas Report" }, + { 0, NULL } +}; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ic55782d90c0d7876fc37d1da130b859857c11447 Gerrit-Change-Number: 31152 Gerrit-PatchSet: 4 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

2 years, 6 months

1
0
0 0

Change in osmo-bts[master]: common: Fix memleak in get_smscb_block()

by pespin

Attention is currently required from: arehbein. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31155 ) Change subject: common: Fix memleak in get_smscb_block() ...................................................................... Patch Set 5: (2 comments) File src/common/cbch.c: https://gerrit.osmocom.org/c/osmo-bts/+/31155/comment/d1d7caa4_9d3b9f6b PS5, Line 142: block_type->lb = block_nr + 1 == msg->num_segs; Lots of missing parenthesis here, I first thought you were doing double assignment. https://gerrit.osmocom.org/c/osmo-bts/+/31155/comment/a0895e34_727e0eb7 PS5, Line 150: } else you must keep {} in "else" if the "if" block has {} (coding style). -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3dc116d6c16c80b31712b2a969f0b2a6998b03f0 Gerrit-Change-Number: 31155 Gerrit-PatchSet: 5 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Thu, 02 Feb 2023 11:17:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmocore[master]: gprs_ns2_fr: use osmo_netdev to monitor and operate network device

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31069 ) Change subject: gprs_ns2_fr: use osmo_netdev to monitor and operate network device ...................................................................... gprs_ns2_fr: use osmo_netdev to monitor and operate network device As a result libosmogb doesn't depend directly on libmnl anymore, but through libosmocore. Change-Id: Ib0e499e09c50135a5c4a361332d6120f660a1a45 --- M src/core/netdev.c M src/gb/Makefile.am M src/gb/gprs_ns2_fr.c M src/gb/gprs_ns2_internal.h M tests/Makefile.am 5 files changed, 65 insertions(+), 141 deletions(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/core/netdev.c b/src/core/netdev.c index 28eafbd..e244ed1 100644 --- a/src/core/netdev.c +++ b/src/core/netdev.c @@ -470,6 +470,29 @@ return MNL_CB_OK; } +/* Trigger an initial dump of the iface to get link information */ +static int netdev_mnl_request_initial_dump(struct osmo_mnl *omnl, unsigned int if_index) +{ + char buf[MNL_SOCKET_BUFFER_SIZE]; + struct nlmsghdr *nlh = mnl_nlmsg_put_header(buf); + struct ifinfomsg *ifm; + + nlh->nlmsg_type = RTM_GETLINK; + nlh->nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK; + nlh->nlmsg_seq = time(NULL); + + ifm = mnl_nlmsg_put_extra_header(nlh, sizeof(*ifm)); + ifm->ifi_family = AF_UNSPEC; + ifm->ifi_index = if_index; + + if (mnl_socket_sendto(omnl->mnls, nlh, nlh->nlmsg_len) < 0) { + LOGP(DLGLOBAL, LOGL_ERROR, "mnl_socket_sendto\n"); + return -EIO; + } + + return 0; +} + static int netdev_mnl_set_ifupdown(struct osmo_mnl *omnl, unsigned int if_index, const char *dev_name, bool up) { @@ -669,6 +692,10 @@ } osmo_talloc_replace_string(netdev, &netdev->dev_name, ifnamebuf); +#if ENABLE_LIBMNL + rc = netdev_mnl_request_initial_dump(netdev->netns_ctx->omnl, netdev->ifindex); +#endif + NETDEV_NETNS_EXIT(netdev, &switch_state, "register"); netdev->registered = true; diff --git a/src/gb/Makefile.am b/src/gb/Makefile.am index 1a26939..5bda374 100644 --- a/src/gb/Makefile.am +++ b/src/gb/Makefile.am @@ -6,7 +6,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall -fno-strict-aliasing \ $(TALLOC_CFLAGS) \ - $(LIBMNL_CFLAGS) \ $(NULL) # FIXME: this should eventually go into a milenage/Makefile.am diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index f85b1e4..d651601 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -55,13 +55,10 @@ #include <osmocom/core/timer.h> #include <osmocom/core/talloc.h> #include <osmocom/gprs/gprs_ns2.h> +#include <osmocom/core/netdev.h> #include <osmocom/gprs/protocol/gsm_08_16.h> #include <osmocom/gprs/protocol/gsm_08_18.h> -#ifdef ENABLE_LIBMNL -#include <osmocom/core/mnl.h> -#endif - #include "config.h" #include "common_vty.h" #include "gprs_ns2_internal.h" @@ -92,6 +89,7 @@ }; struct priv_bind { + struct osmo_netdev *netdev; char netif[IFNAMSIZ]; struct osmo_fr_link *link; int ifindex; @@ -172,6 +170,7 @@ } msgb_free(priv->backlog.lmi_msg); + osmo_netdev_free(priv->netdev); osmo_fr_link_free(priv->link); osmo_fd_close(&priv->backlog.ofd); talloc_free(priv); @@ -515,60 +514,14 @@ return fd; } -#ifdef ENABLE_LIBMNL - -#include <osmocom/core/mnl.h> -#include <linux/if_link.h> -#include <linux/rtnetlink.h> - -#ifndef ARPHRD_FRAD -#define ARPHRD_FRAD 770 -#endif - -/* validate the netlink attributes */ -static int data_attr_cb(const struct nlattr *attr, void *data) +static int gprs_n2_fr_ifupdown_ind_cb(struct osmo_netdev *netdev, bool if_running) { - const struct nlattr **tb = data; - int type = mnl_attr_get_type(attr); - - if (mnl_attr_type_valid(attr, IFLA_MAX) < 0) - return MNL_CB_OK; - - switch (type) { - case IFLA_MTU: - if (mnl_attr_validate(attr, MNL_TYPE_U32) < 0) - return MNL_CB_ERROR; - break; - case IFLA_IFNAME: - if (mnl_attr_validate(attr, MNL_TYPE_STRING) < 0) - return MNL_CB_ERROR; - break; - } - tb[type] = attr; - return MNL_CB_OK; -} - -/* find the bind for the netdev (if any) */ -static struct gprs_ns2_vc_bind *bind4netdev(struct gprs_ns2_inst *nsi, const char *ifname) -{ - struct gprs_ns2_vc_bind *bind; - - llist_for_each_entry(bind, &nsi->binding, list) { - struct priv_bind *bpriv = bind->priv; - if (!strcmp(bpriv->netif, ifname)) - return bind; - } - - return NULL; -} - -static void link_state_change(struct gprs_ns2_vc_bind *bind, bool if_running) -{ + struct gprs_ns2_vc_bind *bind = osmo_netdev_get_priv_data(netdev); struct priv_bind *bpriv = bind->priv; struct msgb *msg, *msg2; if (bpriv->if_running == if_running) - return; + return 0; LOGBIND(bind, LOGL_NOTICE, "FR net-device '%s': Physical link state changed: %s\n", bpriv->netif, if_running ? "UP" : "DOWN"); @@ -589,93 +542,36 @@ } bpriv->if_running = if_running; + return 0; } -static void mtu_change(struct gprs_ns2_vc_bind *bind, uint32_t mtu) +static int gprs_n2_fr_mtu_chg_cb(struct osmo_netdev *netdev, uint32_t new_mtu) { + struct gprs_ns2_vc_bind *bind = osmo_netdev_get_priv_data(netdev); struct priv_bind *bpriv = bind->priv; struct gprs_ns2_nse *nse; /* 2 byte DLCI header */ - if (mtu <= 2) - return; - mtu -= 2; + if (new_mtu <= 2) + return 0; + new_mtu -= 2; - if (mtu == bind->mtu) - return; + if (new_mtu == bind->mtu) + return 0; LOGBIND(bind, LOGL_INFO, "MTU changed from %d to %d.\n", - bind->mtu + 2, mtu + 2); + bind->mtu + 2, new_mtu + 2); - bind->mtu = mtu; + bind->mtu = new_mtu; if (!bpriv->if_running) - return; + return 0; llist_for_each_entry(nse, &bind->nsi->nse, list) { ns2_nse_update_mtu(nse); } + return 0; } -/* handle a single netlink message received via libmnl */ -static int linkmon_mnl_cb(const struct nlmsghdr *nlh, void *data) -{ - struct osmo_mnl *omnl = data; - struct gprs_ns2_vc_bind *bind; - struct nlattr *tb[IFLA_MAX+1] = {}; - struct ifinfomsg *ifm = mnl_nlmsg_get_payload(nlh); - struct gprs_ns2_inst *nsi; - const char *ifname; - bool if_running; - - OSMO_ASSERT(omnl); - OSMO_ASSERT(ifm); - - nsi = omnl->priv; - - if (ifm->ifi_type != ARPHRD_FRAD) - return MNL_CB_OK; - - mnl_attr_parse(nlh, sizeof(*ifm), data_attr_cb, tb); - - if (!tb[IFLA_IFNAME]) - return MNL_CB_OK; - ifname = mnl_attr_get_str(tb[IFLA_IFNAME]); - if_running = !!(ifm->ifi_flags & IFF_RUNNING); - - bind = bind4netdev(nsi, ifname); - if (!bind) - return MNL_CB_OK; - - if (tb[IFLA_MTU]) { - mtu_change(bind, mnl_attr_get_u32(tb[IFLA_MTU])); - } - - link_state_change(bind, if_running); - - return MNL_CB_OK; -} - -/* trigger one initial dump of all link information */ -static void linkmon_initial_dump(struct osmo_mnl *omnl) -{ - char buf[MNL_SOCKET_BUFFER_SIZE]; - struct nlmsghdr *nlh = mnl_nlmsg_put_header(buf); - struct rtgenmsg *rt; - - nlh->nlmsg_type = RTM_GETLINK; - nlh->nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP; - nlh->nlmsg_seq = time(NULL); - rt = mnl_nlmsg_put_extra_header(nlh, sizeof(struct rtgenmsg)); - rt->rtgen_family = AF_PACKET; - - if (mnl_socket_sendto(omnl->mnls, nlh, nlh->nlmsg_len) < 0) { - LOGP(DLNS, LOGL_ERROR, "linkmon: Cannot send rtnetlink message: %s\n", strerror(errno)); - } - - /* the response[s] will be handled just like the events */ -} -#endif /* LIBMNL */ - static int set_ifupdown(const char *netif, bool up) { int sock, rc; @@ -854,16 +750,31 @@ goto err_fr; } + priv->netdev = osmo_netdev_alloc(bind, name); + if (!priv->netdev) { + rc = -ENOENT; + goto err_fr; + } + osmo_netdev_set_priv_data(priv->netdev, bind); + osmo_netdev_set_ifupdown_ind_cb(priv->netdev, gprs_n2_fr_ifupdown_ind_cb); + osmo_netdev_set_mtu_chg_cb(priv->netdev, gprs_n2_fr_mtu_chg_cb); + rc = osmo_netdev_set_ifindex(priv->netdev, priv->ifindex); + if (rc < 0) + goto err_free_netdev; + rc = osmo_netdev_register(priv->netdev); + if (rc < 0) + goto err_free_netdev; + /* set protocol frame relay and lmi */ rc = setup_device(priv->netif, bind); if(rc < 0) { LOGBIND(bind, LOGL_ERROR, "Failed to setup the interface %s for frame relay and lmi\n", netif); - goto err_fr; + goto err_free_netdev; } rc = open_socket(priv->ifindex, bind); if (rc < 0) - goto err_fr; + goto err_free_netdev; priv->backlog.retry_us = 2500; /* start with some non-zero value; this corrsponds to 496 bytes */ osmo_timer_setup(&priv->backlog.timer, fr_backlog_timer_cb, bind); osmo_fd_setup(&priv->backlog.ofd, rc, OSMO_FD_READ, fr_netif_ofd_cb, bind, 0); @@ -871,16 +782,6 @@ if (rc < 0) goto err_fd; -#ifdef ENABLE_LIBMNL - if (!nsi->linkmon_mnl) - nsi->linkmon_mnl = osmo_mnl_init(nsi, NETLINK_ROUTE, RTMGRP_LINK, linkmon_mnl_cb, nsi); - - /* we get a new full dump after every bind. which is a bit excessive. But that's just once - * at start-up, so we can get away with it */ - if (nsi->linkmon_mnl) - linkmon_initial_dump(nsi->linkmon_mnl); -#endif - if (result) *result = bind; @@ -888,6 +789,9 @@ err_fd: close(priv->backlog.ofd.fd); +err_free_netdev: + osmo_netdev_free(priv->netdev); + priv->netdev = NULL; err_fr: osmo_fr_link_free(fr_link); priv->link = NULL; diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index 93aaa99..4f33221 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -163,9 +163,6 @@ /*! workaround for rate counter until rate counter accepts char str as index */ uint32_t nsvc_rate_ctr_idx; uint32_t bind_rate_ctr_idx; - - /*! libmnl netlink socket for link state monitoring */ - struct osmo_mnl *linkmon_mnl; }; diff --git a/tests/Makefile.am b/tests/Makefile.am index a28aa7f..c637c16 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -211,9 +211,6 @@ $(top_builddir)/src/gsm/libosmogsm.la \ $(top_builddir)/src/core/libosmocore.la \ $(top_builddir)/src/gb/libosmogb-test.la -if ENABLE_LIBMNL -gb_gprs_ns2_test_LDADD += $(LIBMNL_LIBS) -endif logging_logging_test_SOURCES = logging/logging_test.c -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib0e499e09c50135a5c4a361332d6120f660a1a45 Gerrit-Change-Number: 31069 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in libosmocore[master]: gprs_ns2_fr: use osmo_netdev to monitor and operate network device

by laforge

Attention is currently required from: pespin, lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31069 ) Change subject: gprs_ns2_fr: use osmo_netdev to monitor and operate network device ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib0e499e09c50135a5c4a361332d6120f660a1a45 Gerrit-Change-Number: 31069 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 02 Feb 2023 10:21:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-bsc[master]: doc: add mscpool-attach.dot

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31147 ) Change subject: doc: add mscpool-attach.dot ...................................................................... doc: add mscpool-attach.dot Change-Id: I4ffe0997be3d91a2a1d84998c56cba1c4eb30852 --- M doc/Makefile.am A doc/mscpool-attach.dot 2 files changed, 31 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/Makefile.am b/doc/Makefile.am index 08558e5..d68b3f6 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -26,6 +26,7 @@ $(builddir)/handover-intra-bsc-fsm.png \ $(builddir)/handover-inter-bsc-out-fsm.png \ $(builddir)/handover-inter-bsc-in-fsm.png \ + $(builddir)/mscpool-attach.png \ $(NULL) $(builddir)/%.png: $(srcdir)/%.msc diff --git a/doc/mscpool-attach.dot b/doc/mscpool-attach.dot new file mode 100644 index 0000000..f3d0a52 --- /dev/null +++ b/doc/mscpool-attach.dot @@ -0,0 +1,30 @@ +digraph G { + rankdir=LR + labelloc=t; label="OsmoBSC MSC-pool conn (re)direction" + + subgraph cluster_msc_usable { + style=dotted; label="MSC usable\n(successful BSSMAP RESET)" + + allowed [label="MSC\nallow-attach"] + notallowed [label="MSC\nno allow-attach\n(MSC should respond\nwith null-NRI)"] + } + + subgraph cluster_msc_unusable { + style=dotted; label="MSC unusable\n(no link)" + allowed_unusable [label="MSC\nallow-attach"] + notallowed_unusable [label="MSC\nno allow-attach"] + } + + TMSI_unknown_NRI [label="TMSI, NRI unknown"] + TMSI_null_NRI [label="TMSI, null-NRI"] + TMSI_known_NRI [label="TMSI, NRI known"] + + IMSI -> allowed + TMSI_unknown_NRI -> allowed + TMSI_null_NRI -> allowed + TMSI_known_NRI -> allowed + TMSI_known_NRI -> notallowed + + never [style=dotted] + never -> {allowed_unusable, notallowed_unusable} [style=dotted] +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4ffe0997be3d91a2a1d84998c56cba1c4eb30852 Gerrit-Change-Number: 31147 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmo-bsc[master]: doc: add mscpool-attach.dot

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31147 ) Change subject: doc: add mscpool-attach.dot ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4ffe0997be3d91a2a1d84998c56cba1c4eb30852 Gerrit-Change-Number: 31147 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 02 Feb 2023 10:20:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-pcu[master]: pcu_l1_if.cpp: handle immediate assignment confirmation

by laforge

Attention is currently required from: pespin, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31148 ) Change subject: pcu_l1_if.cpp: handle immediate assignment confirmation ...................................................................... Patch Set 1: (1 comment) File src/bts.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/31148/comment/af8a74ee_29b88dd4 PS1, Line 718: int bts_rcv_imm_ass_cnf_dt(struct gprs_rlcmac_bts *bts, uint32_t tlli, uint32_t fn) > Can't we simply merge this function with the one above? […] agreed, it looks like they could be merged or one could call the other. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Icf7ca34500984239ee877ee71fd9c126b5eb3480 Gerrit-Change-Number: 31148 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 02 Feb 2023 10:20:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2023