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

Change in osmocom-bb[master]: modem: do not depend on $(top_srcdir)/src/misc/rslms.c

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30897 ) Change subject: modem: do not depend on $(top_srcdir)/src/misc/rslms.c ...................................................................... modem: do not depend on $(top_srcdir)/src/misc/rslms.c Change-Id: Ic4d7e1956530aa10ff3125d6d857efe47ea37d38 Related: SYS#5500 --- M src/host/layer23/src/modem/Makefile.am M src/host/layer23/src/modem/app_modem.c 2 files changed, 71 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/host/layer23/src/modem/Makefile.am b/src/host/layer23/src/modem/Makefile.am index 522456a..3fa1ceb 100644 --- a/src/host/layer23/src/modem/Makefile.am +++ b/src/host/layer23/src/modem/Makefile.am @@ -15,7 +15,6 @@ modem_SOURCES = \ $(top_srcdir)/src/common/main.c \ - $(top_srcdir)/src/misc/rslms.c \ app_modem.c \ $(NULL) modem_LDADD = \ diff --git a/src/host/layer23/src/modem/app_modem.c b/src/host/layer23/src/modem/app_modem.c index 48c216d..d643991 100644 --- a/src/host/layer23/src/modem/app_modem.c +++ b/src/host/layer23/src/modem/app_modem.c @@ -39,8 +39,6 @@ #include <osmocom/bb/common/l1ctl.h> #include <osmocom/bb/common/l23_app.h> #include <osmocom/bb/common/sysinfo.h> -#include <osmocom/bb/misc/rslms.h> -#include <osmocom/bb/misc/layer3.h> #include <l1ctl_proto.h> @@ -143,7 +141,7 @@ return 0; } -int gsm48_rx_bcch(struct msgb *msg, struct osmocom_ms *ms) +static int modem_rx_bcch(struct msgb *msg, struct osmocom_ms *ms) { const struct gsm48_system_information_type_header *si_hdr = msgb_l3(msg); const uint8_t si_type = si_hdr->system_information; @@ -165,7 +163,7 @@ }; } -static int gsm48_rx_imm_ass(struct msgb *msg, struct osmocom_ms *ms) +static int modem_rx_imm_ass(struct msgb *msg, struct osmocom_ms *ms) { const struct gsm48_imm_ass *ia = msgb_l3(msg); uint8_t ch_type, ch_subch, ch_ts; @@ -243,7 +241,7 @@ return false; } -int gsm48_rx_ccch(struct msgb *msg, struct osmocom_ms *ms) +static int modem_rx_ccch(struct msgb *msg, struct osmocom_ms *ms) { const struct gsm48_system_information_type_header *sih = msgb_l3(msg); @@ -265,12 +263,76 @@ switch (sih->system_information) { case GSM48_MT_RR_IMM_ASS: - return gsm48_rx_imm_ass(msg, ms); + return modem_rx_imm_ass(msg, ms); default: return 0; } } +static int modem_rx_rslms_rll_ud(struct osmocom_ms *ms, struct msgb *msg) +{ + const struct abis_rsl_rll_hdr *rllh = msgb_l2(msg); + struct tlv_parsed tv; + + DEBUGP(DRSL, "RSLms UNIT DATA IND chan_nr=0x%02x link_id=0x%02x\n", + rllh->chan_nr, rllh->link_id); + + if (rsl_tlv_parse(&tv, rllh->data, msgb_l2len(msg) - sizeof(*rllh)) < 0) { + LOGP(DRSL, LOGL_ERROR, "%s(): rsl_tlv_parse() failed\n", __func__); + return -EINVAL; + } + + if (!TLVP_PRESENT(&tv, RSL_IE_L3_INFO)) { + LOGP(DRSL, LOGL_ERROR, "UNIT_DATA_IND without L3 INFO ?!?\n"); + return -EINVAL; + } + + msg->l3h = (uint8_t *)TLVP_VAL(&tv, RSL_IE_L3_INFO); + + switch (rllh->chan_nr) { + case RSL_CHAN_PCH_AGCH: + return modem_rx_ccch(msg, ms); + case RSL_CHAN_BCCH: + return modem_rx_bcch(msg, ms); + default: + return 0; + } +} + +static int modem_rx_rslms_rll(struct osmocom_ms *ms, struct msgb *msg) +{ + const struct abis_rsl_rll_hdr *rllh = msgb_l2(msg); + + switch (rllh->c.msg_type) { + case RSL_MT_UNIT_DATA_IND: + return modem_rx_rslms_rll_ud(ms, msg); + default: + LOGP(DRSL, LOGL_NOTICE, "Unhandled RSLms RLL message " + "(msg_type 0x%02x)\n", rllh->c.msg_type); + return -EINVAL; + } +} + +static int modem_rslms_cb(struct msgb *msg, struct lapdm_entity *le, void *ctx) +{ + const struct abis_rsl_common_hdr *rslh = msgb_l2(msg); + int rc; + + switch (rslh->msg_discr & 0xfe) { + case ABIS_RSL_MDISC_RLL: + rc = modem_rx_rslms_rll((struct osmocom_ms *)ctx, msg); + break; + default: + LOGP(DRSL, LOGL_NOTICE, "Unhandled RSLms message " + "(msg_discr 0x%02x)\n", rslh->msg_discr); + rc = -EINVAL; + break; + } + + msgb_free(msg); + return rc; +} + void layer3_app_reset(void) { memset(&app_data, 0x00, sizeof(app_data)); @@ -306,7 +368,9 @@ osmo_signal_register_handler(SS_L1CTL, &signal_cb, NULL); l1ctl_tx_reset_req(ms, L1CTL_RES_T_FULL); - return layer3_init(ms); + lapdm_channel_set_l3(&ms->lapdm_channel, &modem_rslms_cb, ms); + + return 0; } static int l23_cfg_supported(void) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic4d7e1956530aa10ff3125d6d857efe47ea37d38 Gerrit-Change-Number: 30897 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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, 5 months

1
0
0 0

Change in osmocom-bb[master]: modem: fix unusual argument order: *ms always first

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30898 ) Change subject: modem: fix unusual argument order: *ms always first ...................................................................... modem: fix unusual argument order: *ms always first Change-Id: I9fabe39575f191ce6c893a1fecaa7ac040ef0e3e Related: SYS#5500 --- M src/host/layer23/src/modem/app_modem.c 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, approved diff --git a/src/host/layer23/src/modem/app_modem.c b/src/host/layer23/src/modem/app_modem.c index d643991..c135ff3 100644 --- a/src/host/layer23/src/modem/app_modem.c +++ b/src/host/layer23/src/modem/app_modem.c @@ -141,7 +141,7 @@ return 0; } -static int modem_rx_bcch(struct msgb *msg, struct osmocom_ms *ms) +static int modem_rx_bcch(struct osmocom_ms *ms, struct msgb *msg) { const struct gsm48_system_information_type_header *si_hdr = msgb_l3(msg); const uint8_t si_type = si_hdr->system_information; @@ -163,7 +163,7 @@ }; } -static int modem_rx_imm_ass(struct msgb *msg, struct osmocom_ms *ms) +static int modem_rx_imm_ass(struct osmocom_ms *ms, struct msgb *msg) { const struct gsm48_imm_ass *ia = msgb_l3(msg); uint8_t ch_type, ch_subch, ch_ts; @@ -241,7 +241,7 @@ return false; } -static int modem_rx_ccch(struct msgb *msg, struct osmocom_ms *ms) +static int modem_rx_ccch(struct osmocom_ms *ms, struct msgb *msg) { const struct gsm48_system_information_type_header *sih = msgb_l3(msg); @@ -263,7 +263,7 @@ switch (sih->system_information) { case GSM48_MT_RR_IMM_ASS: - return modem_rx_imm_ass(msg, ms); + return modem_rx_imm_ass(ms, msg); default: return 0; } @@ -291,9 +291,9 @@ switch (rllh->chan_nr) { case RSL_CHAN_PCH_AGCH: - return modem_rx_ccch(msg, ms); + return modem_rx_ccch(ms, msg); case RSL_CHAN_BCCH: - return modem_rx_bcch(msg, ms); + return modem_rx_bcch(ms, msg); default: return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9fabe39575f191ce6c893a1fecaa7ac040ef0e3e Gerrit-Change-Number: 30898 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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, 5 months

1
0
0 0

Change in osmocom-bb[master]: modem: fix unusual argument order: *ms always first

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30898 ) Change subject: modem: fix unusual argument order: *ms always first ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9fabe39575f191ce6c893a1fecaa7ac040ef0e3e Gerrit-Change-Number: 30898 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 11 Jan 2023 15:28:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: modem: do not depend on $(top_srcdir)/src/misc/rslms.c

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30897 ) Change subject: modem: do not depend on $(top_srcdir)/src/misc/rslms.c ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic4d7e1956530aa10ff3125d6d857efe47ea37d38 Gerrit-Change-Number: 30897 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 11 Jan 2023 15:28:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: modem: passive decoding of SI{3,4,13} and IA Rest Octets

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30870 ) Change subject: modem: passive decoding of SI{3,4,13} and IA Rest Octets ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8566a3cdc9f818bed7e28ea4b1957dce735c298b Gerrit-Change-Number: 30870 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 11 Jan 2023 15:28:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23/sysinfo: implement decoding of SI13 Rest Octets

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30812 ) Change subject: layer23/sysinfo: implement decoding of SI13 Rest Octets ...................................................................... Patch Set 10: Code-Review+2 (1 comment) Patchset: PS10: +1ing and merging since I'll need to start working on modem app now most probably and fixeria may not be avialable in next days. Please submit a new patch using bools. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30812 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia6ff7d4e37816c6321b54c1f7f8d7110e557f8c5 Gerrit-Change-Number: 30812 Gerrit-PatchSet: 10 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 11 Jan 2023 15:28:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-sgsn[master]: Move extern declarations of tall_sgsn_ctx to sgsn.h

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30930 ) Change subject: Move extern declarations of tall_sgsn_ctx to sgsn.h ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ifbd54b2e92db8d4a0e0cd1c569cfd83dd85165b8 Gerrit-Change-Number: 30930 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 11 Jan 2023 14:56:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-sgsn[master]: Split gprs_sgsn.{c,h} -> {auth,mmctx,sgsn}.{c,h}

by dexter

Attention is currently required from: laforge, pespin, lynxis lazus. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30904 ) Change subject: Split gprs_sgsn.{c,h} -> {auth,mmctx,sgsn}.{c,h} ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I048a082851c1275c959649942904205b02acce2a Gerrit-Change-Number: 30904 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 11 Jan 2023 14:53:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-sgsn[master]: Move sgsn_pdp_ctx to its own file pdpctx.{c,h}

by dexter

Attention is currently required from: pespin, lynxis lazus. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30891 ) Change subject: Move sgsn_pdp_ctx to its own file pdpctx.{c,h} ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iad4da06efee7d8514ff48423bdaebc0f26413cc1 Gerrit-Change-Number: 30891 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 11 Jan 2023 14:51:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: upf/PFCP: do not imply f_inet_addr()

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30926 ) Change subject: upf/PFCP: do not imply f_inet_addr() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib068831787f4256f70a2189a5f36ca1ea1f40c9e Gerrit-Change-Number: 30926 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 11 Jan 2023 14:51:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2023