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

Change in osmo-ttcn3-hacks[master]: pgw: Initial Gy support

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27853 ) Change subject: pgw: Initial Gy support ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27853 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: I04cf78cb4bc73de59f803c01208a7ef9056cb14f Gerrit-Change-Number: 27853 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Apr 2022 19:53:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: pgw: Support having several DIAMETER_ConnHdlr per PGW_Session_CT

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27852 ) Change subject: pgw: Support having several DIAMETER_ConnHdlr per PGW_Session_CT ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27852 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: I28f1ac0a013e479058f28a6feff6901b33f6c247 Gerrit-Change-Number: 27852 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Apr 2022 19:53:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: fix scheduling of dummy FACCH/H and FACCH/F

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27805 ) Change subject: osmo-bts-trx: fix scheduling of dummy FACCH/H and FACCH/F ...................................................................... osmo-bts-trx: fix scheduling of dummy FACCH/H and FACCH/F * dl_ongoing_facch must be set for correct FACCH/H scheduling; * dl_facch_bursts must be set for FACCH overpower to work. Change-Id: Ief12eb67ad80de3b71f5226858dc2e0c8ae76948 Related: SYS#5919, OS#4823 --- M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c 2 files changed, 3 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index 8fee874..a4ca9bf 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -559,6 +559,7 @@ LOGL1SB(DL1P, LOGL_DEBUG, l1ts, br, "No TCH or FACCH prim for transmit.\n"); gsm0503_tch_fr_encode(*bursts_p, dummy, sizeof(dummy), 1); + chan_state->dl_facch_bursts = 8; goto send_burst; } diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 0db9c18..55a185e 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -408,6 +408,8 @@ LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No TCH or FACCH prim for transmit.\n"); gsm0503_tch_hr_encode(*bursts_p, dummy, sizeof(dummy)); + chan_state->dl_ongoing_facch = 1; + chan_state->dl_facch_bursts = 6; goto send_burst; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ief12eb67ad80de3b71f5226858dc2e0c8ae76948 Gerrit-Change-Number: 27805 Gerrit-PatchSet: 4 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: prioritize FACCH in s/tx_tch_common()/tch_dl_dequeue()/s

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27804 ) Change subject: osmo-bts-trx: prioritize FACCH in s/tx_tch_common()/tch_dl_dequeue()/s ...................................................................... osmo-bts-trx: prioritize FACCH in s/tx_tch_common()/tch_dl_dequeue()/s Unlike SACCH, FACCH has no dedicated slots on the multiframe layout. It's multiplexed together with TCH (speech or data) frames basically by replacing (stealing) them. This is common for both TCH/F and TCH/H, with the only difference that FACCH/H steals two TCH frames (not just one) due to a longer interleaving period. Let's implement the multiplexing in the common function, which is used to dequeue to be transmitted frames - this slightly reduces code duplication. Use a new name, so that it's clear what it does. Change-Id: I9822b1a17185d5487f0f6d3ed0203e806c053d7d Related: SYS#5919, OS#4823 --- M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c 2 files changed, 41 insertions(+), 41 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index fb19dd2..8fee874 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -322,8 +322,7 @@ /* common section for generation of TCH bursts (TCH/H and TCH/F). * FIXME: this function is over-complicated, refactor / get rid of it. */ -void tx_tch_common(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br, - struct msgb **_msg_tch, struct msgb **_msg_facch) +struct msgb *tch_dl_dequeue(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br) { struct msgb *msg1, *msg2, *msg_tch = NULL, *msg_facch = NULL; struct l1sched_chan_state *chan_state = &l1ts->chan_state[br->chan]; @@ -365,7 +364,8 @@ LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, "Failed to encode AMR_BAD frame (rc=%d), " "not sending BFI\n", len); - return; + len = 0; + break; } memset(tch_data + 2, 0, len - 2); break; @@ -420,8 +420,19 @@ msg_facch = NULL; } + /* prioritize FACCH over speech */ + if (msg_facch) { + /* Unlike SACCH, FACCH has no dedicated slots on the multiframe layout. + * It's multiplexed together with TCH (speech or data) frames basically + * by replacing (stealing) them. This is common for both TCH/F and + * TCH/H, with the only difference that FACCH/H steals two TCH frames + * (not just one) due to a longer interleaving period. */ + msgb_free(msg_tch); + return msg_facch; + } + /* check validity of message, get AMR ft and cmr */ - if (!msg_facch && msg_tch) { + if (msg_tch) { int len; uint8_t cmr_codec; int cmr, ft, i; @@ -501,22 +512,19 @@ /* free message */ msgb_free(msg_tch); msg_tch = NULL; - goto send_frame; } } -send_frame: - *_msg_tch = msg_tch; - *_msg_facch = msg_facch; + return msg_tch; } /* obtain a to-be-transmitted TCH/F (Full Traffic Channel) burst */ int tx_tchf_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br) { - struct msgb *msg_tch = NULL, *msg_facch = NULL; struct l1sched_chan_state *chan_state = &l1ts->chan_state[br->chan]; uint8_t tch_mode = chan_state->tch_mode; ubit_t *burst, **bursts_p = &chan_state->dl_bursts; + struct msgb *msg; /* send burst, if we already got a frame */ if (br->bid > 0) { @@ -525,8 +533,6 @@ goto send_burst; } - tx_tch_common(l1ts, br, &msg_tch, &msg_facch); - /* BURST BYPASS */ /* allocate burst memory, if not already, @@ -540,8 +546,11 @@ memset(*bursts_p + 464, 0, 464); } + /* dequeue a message to be transmitted */ + msg = tch_dl_dequeue(l1ts, br); + /* no message at all, send a dummy L2 frame on FACCH */ - if (!msg_tch && !msg_facch) { + if (msg == NULL) { static const uint8_t dummy[GSM_MACBLOCK_LEN] = { 0x03, 0x03, 0x01, /* TODO: use randomized padding */ 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, @@ -553,28 +562,24 @@ goto send_burst; } - /* encode bursts (prioritize FACCH) */ - if (msg_facch) { - gsm0503_tch_fr_encode(*bursts_p, msg_facch->l2h, msgb_l2len(msg_facch), - 1); + /* populate the buffer with bursts */ + if (msgb_l2len(msg) == GSM_MACBLOCK_LEN) { + gsm0503_tch_fr_encode(*bursts_p, msg->l2h, msgb_l2len(msg), 1); chan_state->dl_facch_bursts = 8; } else if (tch_mode == GSM48_CMODE_SPEECH_AMR) /* the first FN 4,13,21 defines that CMI is included in frame, * the first FN 0,8,17 defines that CMR is included in frame. */ - gsm0503_tch_afs_encode(*bursts_p, msg_tch->l2h + 2, - msgb_l2len(msg_tch) - 2, !dl_amr_fn_is_cmi(br->fn), + gsm0503_tch_afs_encode(*bursts_p, msg->l2h + 2, + msgb_l2len(msg) - 2, !dl_amr_fn_is_cmi(br->fn), chan_state->codec, chan_state->codecs, chan_state->dl_ft, chan_state->dl_cmr); else - gsm0503_tch_fr_encode(*bursts_p, msg_tch->l2h, msgb_l2len(msg_tch), 1); + gsm0503_tch_fr_encode(*bursts_p, msg->l2h, msgb_l2len(msg), 1); /* free message */ - if (msg_tch) - msgb_free(msg_tch); - if (msg_facch) - msgb_free(msg_facch); + msgb_free(msg); send_burst: /* compose burst */ diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 2281fb7..dcfbe3e 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -353,17 +353,15 @@ /* common section for generation of TCH bursts (TCH/H and TCH/F). * FIXME: this function is over-complicated, refactor / get rid of it. */ -extern void tx_tch_common(struct l1sched_ts *l1ts, - const struct trx_dl_burst_req *br, - struct msgb **_msg_tch, struct msgb **_msg_facch); +extern struct msgb *tch_dl_dequeue(struct l1sched_ts *l1ts, const struct trx_dl_burst_req *br); /* obtain a to-be-transmitted TCH/H (Half Traffic Channel) burst */ int tx_tchh_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br) { - struct msgb *msg_tch = NULL, *msg_facch = NULL; struct l1sched_chan_state *chan_state = &l1ts->chan_state[br->chan]; uint8_t tch_mode = chan_state->tch_mode; ubit_t *burst, **bursts_p = &chan_state->dl_bursts; + struct msgb *msg; /* send burst, if we already got a frame */ if (br->bid > 0) { @@ -372,9 +370,6 @@ goto send_burst; } - /* get TCH and/or FACCH */ - tx_tch_common(l1ts, br, &msg_tch, &msg_facch); - /* BURST BYPASS */ /* allocate burst memory, if not already, @@ -393,8 +388,11 @@ } } + /* dequeue a message to be transmitted */ + msg = tch_dl_dequeue(l1ts, br); + /* no message at all, send a dummy L2 frame on FACCH */ - if (!msg_tch && !msg_facch && !chan_state->dl_ongoing_facch) { + if (msg == NULL && !chan_state->dl_ongoing_facch) { static const uint8_t dummy[GSM_MACBLOCK_LEN] = { 0x03, 0x03, 0x01, /* TODO: use randomized padding */ 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, @@ -406,9 +404,9 @@ goto send_burst; } - /* encode bursts (prioritize FACCH) */ - if (msg_facch) { - gsm0503_tch_hr_encode(*bursts_p, msg_facch->l2h, msgb_l2len(msg_facch)); + /* populate the buffer with bursts */ + if (msgb_l2len(msg) == GSM_MACBLOCK_LEN) { + gsm0503_tch_hr_encode(*bursts_p, msg->l2h, msgb_l2len(msg)); chan_state->dl_ongoing_facch = 1; /* first of two TCH frames */ chan_state->dl_facch_bursts = 6; } else if (chan_state->dl_ongoing_facch) /* second of two TCH frames */ @@ -417,19 +415,16 @@ /* the first FN 4,13,21 or 5,14,22 defines that CMI is included * in frame, the first FN 0,8,17 or 1,9,18 defines that CMR is * included in frame. */ - gsm0503_tch_ahs_encode(*bursts_p, msg_tch->l2h + 2, - msgb_l2len(msg_tch) - 2, !dl_amr_fn_is_cmi(br->fn), + gsm0503_tch_ahs_encode(*bursts_p, msg->l2h + 2, + msgb_l2len(msg) - 2, !dl_amr_fn_is_cmi(br->fn), chan_state->codec, chan_state->codecs, chan_state->dl_ft, chan_state->dl_cmr); else - gsm0503_tch_hr_encode(*bursts_p, msg_tch->l2h, msgb_l2len(msg_tch)); + gsm0503_tch_hr_encode(*bursts_p, msg->l2h, msgb_l2len(msg)); /* free message */ - if (msg_tch) - msgb_free(msg_tch); - if (msg_facch) - msgb_free(msg_facch); + msgb_free(msg); send_burst: /* compose burst */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9822b1a17185d5487f0f6d3ed0203e806c053d7d Gerrit-Change-Number: 27804 Gerrit-PatchSet: 3 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: tx_tchh_fn(): make handling of FACCH/H cleaner

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27835 ) Change subject: osmo-bts-trx: tx_tchh_fn(): make handling of FACCH/H cleaner ...................................................................... osmo-bts-trx: tx_tchh_fn(): make handling of FACCH/H cleaner If set, chan_state->dl_ongoing_facch indicates that we're sending the 2 (out of 6) middle bursts of FACCH/H. In this case there is no room for encoding an additional frame, because both even and odd numbered bits are occupied by a previously encoded FACCH/H. Right after calling tch_dl_dequeue(): * do not check the dequeued message against NULL, * do not compare the message length to GSM_MACBLOCK_LEN, * immediately free() it and jump to the sending part. Change-Id: Ib923b8f5cc1063e9fc18acd2bdd003fd09f4b70f Related: SYS#5919, OS#4823 --- M src/osmo-bts-trx/sched_lchan_tchh.c 1 file changed, 9 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index dcfbe3e..0db9c18 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -391,8 +391,15 @@ /* dequeue a message to be transmitted */ msg = tch_dl_dequeue(l1ts, br); + /* if we're sending 2 middle bursts of FACCH/H */ + if (chan_state->dl_ongoing_facch) { + msgb_free(msg); /* drop 2nd speech frame */ + chan_state->dl_ongoing_facch = 0; + goto send_burst; + } + /* no message at all, send a dummy L2 frame on FACCH */ - if (msg == NULL && !chan_state->dl_ongoing_facch) { + if (msg == NULL) { static const uint8_t dummy[GSM_MACBLOCK_LEN] = { 0x03, 0x03, 0x01, /* TODO: use randomized padding */ 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, @@ -409,9 +416,7 @@ gsm0503_tch_hr_encode(*bursts_p, msg->l2h, msgb_l2len(msg)); chan_state->dl_ongoing_facch = 1; /* first of two TCH frames */ chan_state->dl_facch_bursts = 6; - } else if (chan_state->dl_ongoing_facch) /* second of two TCH frames */ - chan_state->dl_ongoing_facch = 0; /* we are done with FACCH */ - else if (tch_mode == GSM48_CMODE_SPEECH_AMR) + } else if (tch_mode == GSM48_CMODE_SPEECH_AMR) /* the first FN 4,13,21 or 5,14,22 defines that CMI is included * in frame, the first FN 0,8,17 or 1,9,18 defines that CMR is * included in frame. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib923b8f5cc1063e9fc18acd2bdd003fd09f4b70f Gerrit-Change-Number: 27835 Gerrit-PatchSet: 3 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: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: fix scheduling of dummy FACCH/H and FACCH/F

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27805 ) Change subject: osmo-bts-trx: fix scheduling of dummy FACCH/H and FACCH/F ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ief12eb67ad80de3b71f5226858dc2e0c8ae76948 Gerrit-Change-Number: 27805 Gerrit-PatchSet: 3 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Apr 2022 19:50:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: lchan_fsm.c: Fix misleading comment

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27856 ) Change subject: lchan_fsm.c: Fix misleading comment ...................................................................... lchan_fsm.c: Fix misleading comment From Vadim in https://gerrit.osmocom.org/c/osmo-bsc/+/27818 By checking !(link_id & 0xc0) we actually make sure that this is not SACCH. So the comment "but not if the link_id contains a TCH flag" is wrong, there is simply no such thing like "a TCH flag". Change-Id: I8f0f6d7bf952426fd2f27802f1499d6ee8981982 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/56/27856/1 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 0b23f6c..5df6c57 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1198,8 +1198,7 @@ lchan->sapis[sapi] = LCHAN_SAPI_UNUSED; rll_indication(lchan, link_id, BSC_RLLR_IND_REL_IND); - /* Releasing SAPI 0 means the conn becomes invalid; but not if the link_id contains a TCH flag. - * (TODO: is this the correct interpretation?) */ + /* Releasing SAPI 0 means the conn becomes invalid; but not if the link_id contains a SACCH flag. */ if (lchan->conn && sapi == 0 && !(link_id & 0xc0)) { LOG_LCHAN(lchan, LOGL_DEBUG, "lchan is releasing\n"); gscon_lchan_releasing(lchan->conn, lchan); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8f0f6d7bf952426fd2f27802f1499d6ee8981982 Gerrit-Change-Number: 27856 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: Fix compile errors on #warning with '-Wall' on gcc-11.2

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27819 to look at the new patch set (#2). Change subject: Fix compile errors on #warning with '-Wall' on gcc-11.2 ...................................................................... Fix compile errors on #warning with '-Wall' on gcc-11.2 pcu_sock.c: In function ‘pcu_tx_info_ind’: pcu_sock.c:197:2: error: #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" [-Werror=cpp] 197 | #warning "isn't dl_tbf_ext wrong?: * 10 and no ntohs" | ^~~~~~~ pcu_sock.c:199:2: error: #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" [-Werror=cpp] 199 | #warning "isn't ul_tbf_ext wrong?: * 10 and no ntohs" | ^~~~~~~ they made it here from osmo-bts.git (b4999b60d48bcbb5aa575973d068e07ab672e095 states that the PCUIF support was copied from there). The gitlog shows that these warnings were added in 744f745d7a508605254afa8f78412ad410d153b0 by jolly (in 2012!) together with the PCUIF support, and before c1368d4ebe49f8e01f1f5fff3bc3583cb5960c1d these warnings were in German: "ist dl_tbf_ext nicht falsch?" As nobody has bothered for the past ten years, degrade them to comments. Change-Id: I9ef7e18f56aa86b48f0ffeec58406260736170f3 --- M src/osmo-bsc/pcu_sock.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/19/27819/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9ef7e18f56aa86b48f0ffeec58406260736170f3 Gerrit-Change-Number: 27819 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: prioritize FACCH in s/tx_tch_common()/tch_dl_dequeue()/s

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27804 ) Change subject: osmo-bts-trx: prioritize FACCH in s/tx_tch_common()/tch_dl_dequeue()/s ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: 1+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9822b1a17185d5487f0f6d3ed0203e806c053d7d Gerrit-Change-Number: 27804 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 20 Apr 2022 19:50:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bsc[master]: lchan_fsm: Ignore other SAPIs of RLL_REL_IND for SAPI=0 is received

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27818 ) Change subject: lchan_fsm: Ignore other SAPIs of RLL_REL_IND for SAPI=0 is received ...................................................................... lchan_fsm: Ignore other SAPIs of RLL_REL_IND for SAPI=0 is received If the BTS tells us SAPI=0 is gone, there is no point in trying to keep the lchan around for SAPI=3, as it is not possible to operate GSM with SAPI=0 gone. This occurred with RBS6000, which don't seem to send RLL REL IND for SAPI3 after doing so for SAPI0. However, rather than an ericsson-specific hack, let's make this the general rule: If SAPI=0 is gone, don't stop the lchan from being released. Change-Id: Ia9caa5b0a5efdc459d94621367376927959a6e65 Related: OS#5530 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 00bb605..0b23f6c 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1203,6 +1203,13 @@ if (lchan->conn && sapi == 0 && !(link_id & 0xc0)) { LOG_LCHAN(lchan, LOGL_DEBUG, "lchan is releasing\n"); gscon_lchan_releasing(lchan->conn, lchan); + + /* if SAPI=0 is gone, it makes no sense if other SAPIs are still around, + * this is not a valid configuration and we should forget about them. + * This is particularly relevant in case of Ericsson RBS6000, which doesn't + * seem to send a RLL_REL_IND for SAPI=3 if there was already one for SAPI=0 */ + for_each_active_sapi(sapi, 1, lchan) + lchan->sapis[sapi] = LCHAN_SAPI_UNUSED; } /* The caller shall check whether all SAPIs are released and cause a state chg */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia9caa5b0a5efdc459d94621367376927959a6e65 Gerrit-Change-Number: 27818 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022