[S] Change in osmocom-bb[master]: Fix typo in sysinfo.c
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34605?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: Fix typo in sysinfo.c .. Fix typo in sysinfo.c Change-Id: I12405bef9f7910a354d9ac5153f4adc55095d747 --- M src/host/layer23/src/common/sysinfo.c 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/common/sysinfo.c b/src/host/layer23/src/common/sysinfo.c index 66b87eb..12780c2 100644 --- a/src/host/layer23/src/common/sysinfo.c +++ b/src/host/layer23/src/common/sysinfo.c @@ -255,7 +255,7 @@ print(priv, "\n"); /* cell selection */ - print(priv, "MX_TXPWR_MAX_CCCH = %d CRH = %d RXLEV_MIN = %d " + print(priv, "MS_TXPWR_MAX_CCCH = %d CRH = %d RXLEV_MIN = %d " "NECI = %d ACS = %d\n", s->ms_txpwr_max_cch, s->cell_resel_hyst_db, s->rxlev_acc_min_db, s->neci, s->acs); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34605?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I12405bef9f7910a354d9ac5153f4adc55095d747 Gerrit-Change-Number: 34605 Gerrit-PatchSet: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[L] Change in osmocom-bb[master]: ASCI: Add decoding of SYSTEM INFORMATION TYPE 10 $(ASCI)$
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34614?usp=email )
Change subject: ASCI: Add decoding of SYSTEM INFORMATION TYPE 10 $(ASCI)$
..
ASCI: Add decoding of SYSTEM INFORMATION TYPE 10 $(ASCI)$
Related: OS#5782
Change-Id: I81c7929f6d951d8eef7d08624f0b72830370c448
---
M src/host/layer23/include/osmocom/bb/common/sysinfo.h
M src/host/layer23/src/common/sysinfo.c
M src/host/layer23/src/mobile/gsm48_rr.c
3 files changed, 322 insertions(+), 4 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/host/layer23/include/osmocom/bb/common/sysinfo.h
b/src/host/layer23/include/osmocom/bb/common/sysinfo.h
index 0368901..7b118ca 100644
--- a/src/host/layer23/include/osmocom/bb/common/sysinfo.h
+++ b/src/host/layer23/include/osmocom/bb/common/sysinfo.h
@@ -18,12 +18,27 @@
#defineFREQ_TYPE_REP_5bis 0x40 /* sub channel of SI 5bis */
#defineFREQ_TYPE_REP_5ter 0x80 /* sub channel of SI 5ter */
+struct si10_cell_info {
+ uint8_t index; /* frequency index of the
frequencies received in SI5* */
+ int16_t arfcn; /* ARFCN or -1 (if not found in
SI5*) */
+ uint8_t bsic;
+ boolbarred; /* Cell is barred, values below
are invalid. */
+ boolla_different; /* Location area is
different, so CRH is valid. */
+ uint8_t cell_resel_hyst_db;
+ uint8_t ms_txpwr_max_cch;
+ uint8_t rxlev_acc_min_db;
+ uint8_t cell_resel_offset;
+ uint8_t temp_offset;
+ uint8_t penalty_time;
+};
+
/* structure of all received system information */
struct gsm48_sysinfo {
/* flags of available information */
uint8_t si1, si2, si2bis, si2ter, si3,
si4, si5, si5bis, si5ter, si6,
si13;
+ boolsi10;
/* memory maps to simply detect change in system info messages */
uint8_t si1_msg[23];
@@ -36,6 +51,7 @@
uint8_t si5b_msg[18];
uint8_t si5t_msg[18];
uint8_t si6_msg[18];
+ uint8_t si10_msg[21];
uint8_t si13_msg[23];
struct gsm_sysinfo_freqfreq[1024]; /* all frequencies */
@@ -158,6 +174,10 @@
uint8_t nb_reest_denied; /* 1 = denied */
uint8_t nb_cell_barr; /* 1 = barred */
uint16_tnb_class_barr; /* bit 10 is emergency */
+
+ /* SI 10 */
+ uint8_t si10_cell_num; /* number neighbor cells
found in SI 10 */
+ struct si10_cell_info si10_cell[32]; /* 32 neighbor cell
descriptions */
};
char *gsm_print_arfcn(uint16_t arfcn);
@@ -191,6 +211,8 @@
const struct gsm48_system_information_type_5ter
*si, int len);
int gsm48_decode_sysinfo6(struct gsm48_sysinfo *s,
const struct gsm48_system_information_type_6 *si, int
len);
+int gsm48_decode_sysinfo10(struct gsm48_sysinfo *s,
+ const struct gsm48_system_information_type_10 *si,
int len);
int gsm48_decode_sysinfo13(struct gsm48_sysinfo *s,
const struct gsm48_system_information_type_13 *si,
int len);
int gsm48_decode_mobile_alloc(struct gsm_sysinfo_freq *freq,
diff --git a/src/host/layer23/src/common/sysinfo.c
b/src/host/layer23/src/common/sysinfo.c
index 12780c2..a728eb4 100644
--- a/src/host/layer23/src/common/sysinfo.c
+++ b/src/host/layer23/src/common/sysinfo.c
@@ -601,6 +601,187 @@
return 0;
}
+/* Decode "SI 10 Rest Octets" (10.5.2.44) */
+static int gsm48_decode_si10_rest_first(struct gsm48_sysinfo *s, struct bitvec
*bv,
+ struct si10_cell_info *c)
+{
+ uint8_t ba_ind;
+
+ /* */
+ ba_ind = bitvec_get_uint(bv, 1);
+ if (ba_ind != s->nb_ba_ind_si5) {
+ LOGP(DRR, LOGL_NOTICE, "SI10: BA_IND %u != BA_IND %u of
SI5!\n", ba_ind, s->nb_ba_ind_si5);
+ return EOF;
+ }
+
+ /* { L | H } */
+ if (bitvec_get_bit_high(bv) != H) {
+ LOGP(DRR, LOGL_INFO, "SI10: No neighbor cell defined.\n");
+ return EOF;
+ }
+
+ /* */
+ c->index = bitvec_get_uint(bv, 5);
+
+ /* */
+ c->bsic = bitvec_get_uint(bv, 6);
+
+ /* { H | L } */
+ if
[S] Change in osmocom-bb[master]: Fix settings for VGCS/VBS
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34644?usp=email ) Change subject: Fix settings for VGCS/VBS .. Fix settings for VGCS/VBS The "support" flags must be copied to the settings, because they are enabled by default and may be omitted in the VTY config. Related: OS#5364 Change-Id: I81575dd3f2ade70101df32935a1c3d5469327577 --- M src/host/layer23/src/common/settings.c 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/host/layer23/src/common/settings.c b/src/host/layer23/src/common/settings.c index 288b03e..395d239 100644 --- a/src/host/layer23/src/common/settings.c +++ b/src/host/layer23/src/common/settings.c @@ -100,6 +100,8 @@ set->ch_cap = sup->ch_cap; set->min_rxlev_dbm = sup->min_rxlev_dbm; set->dsc_max = sup->dsc_max; + set->vgcs = sup->vgcs; + set->vbs = sup->vbs; if (sup->half_v1 || sup->half_v3) set->half = 1; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34644?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I81575dd3f2ade70101df32935a1c3d5469327577 Gerrit-Change-Number: 34644 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmocom-bb[master]: Fix potential NULL pointer dereferences, discovered by Coverity Scan
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34608?usp=email ) Change subject: Fix potential NULL pointer dereferences, discovered by Coverity Scan .. Fix potential NULL pointer dereferences, discovered by Coverity Scan See: CID 323362 + CID 323363 Change-Id: I47aa506014d8bddb8c8ce9b506c1c5c7b8056d30 --- M src/host/layer23/src/mobile/gsm48_mm.c 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index cec798b..810dfa7 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -3190,6 +3190,8 @@ (msg_type & GSM48_MMXX_MASK), mmh->ref, mmh->transaction_id, sapi); + if (!nmsg) + return -ENOMEM; nmmh = (struct gsm48_mmxx_hdr *)nmsg->data; nmmh->cause = cause; gsm48_mmxx_upmsg(ms, nmsg); @@ -3410,6 +3412,8 @@ (msg_type & GSM48_MMXX_MASK), mmh->ref, mmh->transaction_id, sapi); + if (!nmsg) + return -ENOMEM; nmmh = (struct gsm48_mmxx_hdr *)nmsg->data; nmmh->cause = 17; gsm48_mmxx_upmsg(ms, nmsg); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34608?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I47aa506014d8bddb8c8ce9b506c1c5c7b8056d30 Gerrit-Change-Number: 34608 Gerrit-PatchSet: 4 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[M] Change in osmocom-bb[master]: ASCI: Add VTY command to display group call neighbor cells
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34615?usp=email )
Change subject: ASCI: Add VTY command to display group call neighbor cells
..
ASCI: Add VTY command to display group call neighbor cells
Related: OS#5782
Change-Id: Ie84221507bdf247c1563b829d6cf0adb53ce161f
---
M src/host/layer23/include/osmocom/bb/common/sysinfo.h
M src/host/layer23/src/common/sysinfo.c
M src/host/layer23/src/mobile/vty_interface.c
3 files changed, 70 insertions(+), 2 deletions(-)
Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/host/layer23/include/osmocom/bb/common/sysinfo.h
b/src/host/layer23/include/osmocom/bb/common/sysinfo.h
index 7b118ca..89d38ac 100644
--- a/src/host/layer23/include/osmocom/bb/common/sysinfo.h
+++ b/src/host/layer23/include/osmocom/bb/common/sysinfo.h
@@ -185,6 +185,7 @@
int gsm48_sysinfo_dump(const struct gsm48_sysinfo *s, uint16_t arfcn,
void (*print)(void *, const char *, ...),
void *priv, uint8_t *freq_map);
+int gsm48_si10_dump(const struct gsm48_sysinfo *s, void (*print)(void *, const
char *, ...), void *priv);
int gsm48_decode_lai(struct gsm48_loc_area_id *lai, uint16_t *mcc,
uint16_t *mnc, uint16_t *lac);
int gsm48_decode_chan_h0(const struct gsm48_chan_desc *cd,
diff --git a/src/host/layer23/src/common/sysinfo.c
b/src/host/layer23/src/common/sysinfo.c
index a728eb4..356f8eb 100644
--- a/src/host/layer23/src/common/sysinfo.c
+++ b/src/host/layer23/src/common/sysinfo.c
@@ -311,6 +311,48 @@
return 0;
}
+int gsm48_si10_dump(const struct gsm48_sysinfo *s, void (*print)(void *, const
char *, ...), void *priv)
+{
+ const struct si10_cell_info *c;
+ int i;
+
+ if (!s || !s->si10) {
+ print(priv, "No group channel neighbor information
available.\n");
+ return 0;
+ }
+
+ if (!s->si10_cell_num) {
+ print(priv, "No group channel neighbors exist.\n");
+ return 0;
+ }
+
+ /* Group call neighbor cells. */
+ print(priv, "Group channel neighbor cells (current or last call):\n");
+ for (i = 0; i < s->si10_cell_num; i++) {
+ c = >si10_cell[i];
+ print(priv, " index = %d", c->index);
+ if (c->arfcn >= 0)
+ print(priv, " ARFCN = %d", c->arfcn);
+ else
+ print(priv, " ARFCN = not in SI5*");
+ print(priv, " BSIC = %d,%d", c->bsic >> 3, c->bsic & 0x7);
+ if (c->barred) {
+ print(priv, " barred");
+ continue;
+ }
+ if (c->la_different)
+ print(priv, " CRH = %d", c->cell_resel_hyst_db);
+ print(priv, " MS_TXPWR_MAX_CCCH = %d\n", c->ms_txpwr_max_cch);
+ print(priv, " RXLEV_MIN = %d", c->rxlev_acc_min_db);
+ print(priv, " CRO = %d", c->cell_resel_offset);
+ print(priv, " TEMP_OFFSET = %d", c->temp_offset);
+ print(priv, " PENALTY_TIME = %d", c->penalty_time);
+ }
+ print(priv, "\n");
+
+ return 0;
+}
+
/*
* decoding
*/
diff --git a/src/host/layer23/src/mobile/vty_interface.c
b/src/host/layer23/src/mobile/vty_interface.c
index a4b97bc..2a09608 100644
--- a/src/host/layer23/src/mobile/vty_interface.c
+++ b/src/host/layer23/src/mobile/vty_interface.c
@@ -373,10 +373,10 @@
return CMD_SUCCESS;
}
-#define ASCI_STR SHOW_STR "Display information about ASCI items\nName of MS
(see \"show ms\")\n"
+#define SHOW_ASCI_STR SHOW_STR "Display information about ASCI items\nName of
MS (see \"show ms\")\n"
DEFUN(show_asci_calls, show_asci_calls_cmd, "show asci MS_NAME calls",
- ASCI_STR "Display ongoing ASCI calls")
+ SHOW_ASCI_STR "Display ongoing ASCI calls")
{
struct osmocom_ms *ms;
@@ -389,6 +389,20 @@
return CMD_SUCCESS;
}
+DEFUN(show_asci_neighbors, show_asci_neighbors_cmd, "show asci MS_NAME
neighbors",
+ SHOW_ASCI_STR "Display neigbor cells of ongoing or last ASCI call")
+{
+ struct osmocom_ms *ms;
+
+ ms = l23_vty_get_ms(argv[0], vty);
+ if (!ms)
+ return CMD_WARNING;
+
+ gsm48_si10_dump(ms->cellsel.si, l23_vty_printf, vty);
+
+ return CMD_SUCCESS;
+}
+
DEFUN(monitor_network, monitor_network_cmd, "monitor network MS_NAME",
"Monitor...\nMonitor network information\nName of MS (see \"show ms\")")
{
@@ -2484,6 +2498,7 @@
install_element_ve(_forb_la_cmd);
install_element_ve(_forb_plmn_cmd);
install_element_ve(_asci_calls_cmd);
+ install_element_ve(_asci_neighbors_cmd);
install_element_ve(_network_cmd);
install_element_ve(_monitor_network_cmd);
install_element(ENABLE_NODE, _cmd);
--
To view, visit
[L] Change in osmocom-bb[master]: ASCI: Add VTY commands to control voice group/broadcast calls
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34495?usp=email )
Change subject: ASCI: Add VTY commands to control voice group/broadcast calls
..
ASCI: Add VTY commands to control voice group/broadcast calls
Related: OS#5364
Change-Id: Id32253b4e10b8df48e819d8a92bbcda332dd11e6
---
M src/host/layer23/include/osmocom/bb/mobile/vty.h
M src/host/layer23/src/mobile/vty_interface.c
2 files changed, 249 insertions(+), 8 deletions(-)
Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/src/host/layer23/include/osmocom/bb/mobile/vty.h
b/src/host/layer23/include/osmocom/bb/mobile/vty.h
index 4ac084e..511348b 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/vty.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/vty.h
@@ -11,6 +11,8 @@
enum ms_vty_node {
SUPPORT_NODE = _LAST_L23VTY_NODE + 1,
AUDIO_NODE,
+ VGCS_NODE,
+ VBS_NODE,
};
int ms_vty_init(void);
diff --git a/src/host/layer23/src/mobile/vty_interface.c
b/src/host/layer23/src/mobile/vty_interface.c
index feb5f84..5e5fa6d 100644
--- a/src/host/layer23/src/mobile/vty_interface.c
+++ b/src/host/layer23/src/mobile/vty_interface.c
@@ -39,6 +39,7 @@
#include
#include
#include
+#include
#include
#include
@@ -54,6 +55,18 @@
1
};
+struct cmd_node vgcs_node = {
+ VGCS_NODE,
+ "%s(group-call)# ",
+ 1
+};
+
+struct cmd_node vbs_node = {
+ VBS_NODE,
+ "%s(broadcast-call)# ",
+ 1
+};
+
int vty_check_number(struct vty *vty, const char *number)
{
int i;
@@ -79,6 +92,32 @@
return 0;
}
+int vty_check_callref(struct vty *vty, const char *number)
+{
+ int i, ii = strlen(number);
+
+ /* First check digits, so that a false command result the following
error message. */
+ for (i = 0; i < ii; i++) {
+ if (!(number[i] >= '0' && number[i] <= '9')) {
+ vty_out(vty, "Invalid digit '%c' in callref!%s",
+ number[i], VTY_NEWLINE);
+ return -EINVAL;
+ }
+ }
+
+ if (ii < 1) {
+ vty_out(vty, "Given callref has no digits!%s", VTY_NEWLINE);
+ return -EINVAL;
+ }
+
+ if (ii > 8) {
+ vty_out(vty, "Given callref is too long!%s", VTY_NEWLINE);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
static void vty_restart(struct vty *vty, struct osmocom_ms *ms)
{
if (l23_vty_reading)
@@ -334,6 +373,22 @@
return CMD_SUCCESS;
}
+#define ASCI_STR SHOW_STR "Display information about ASCI items\nName of MS
(see \"show ms\")\n"
+
+DEFUN(show_asci_calls, show_asci_calls_cmd, "show asci MS_NAME calls",
+ ASCI_STR "Display ongoing ASCI calls")
+{
+ struct osmocom_ms *ms;
+
+ ms = l23_vty_get_ms(argv[0], vty);
+ if (!ms)
+ return CMD_WARNING;
+
+ gsm44068_dump_calls(ms, l23_vty_printf, vty);
+
+ return CMD_SUCCESS;
+}
+
DEFUN(monitor_network, monitor_network_cmd, "monitor network MS_NAME",
"Monitor...\nMonitor network information\nName of MS (see \"show ms\")")
{
@@ -583,6 +638,146 @@
return CMD_SUCCESS;
}
+#define VGCS_STR "Make a voice group call\nName of MS (see \"show ms\")\n"
+#define VGCS_CMDS "(CALLREF|hangup|leave|talk|listen)"
+#define VGCS_CMDS_TXT \
+ "Voice group to call or join\nHangup voice group call\nLeave voice group
call\nBecome talker\nBecome listener"
+
+/* This command enters VGCS call node with given MS. */
+DEFUN(vgcs_enter, vgcs_enter_cmd, "group-call MS_NAME",
+ VGCS_STR)
+{
+ struct osmocom_ms *ms;
+
+ ms = l23_vty_get_ms(argv[0], vty);
+ if (!ms)
+ return CMD_WARNING;
+
+ vty->index = ms;
+ vty->node = VGCS_NODE;
+
+ return CMD_SUCCESS;
+}
+
+/* These commands perform VGCS on VGCS node. */
+DEFUN(vgcs, vgcs_cmd, VGCS_CMDS,
+ VGCS_CMDS_TXT)
+{
+ struct osmocom_ms *ms = vty->index;
+ struct gsm_settings *set;
+ const char *command;
+
+ set = >settings;
+
+ if (!set->vgcs) {
+ vty_out(vty, "VGCS not supported by this mobile, please enable
VGCS support%s", VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ if (set->ch_cap == GSM_CAP_SDCCH) {
+ vty_out(vty, "ASCI call is not supported for SDCCH only
mobile%s", VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ command = (char *)argv[0];
+ if (!strcmp(command, "hangup"))
+ gcc_bcc_hangup(ms);
+ else if (!strcmp(command, "leave"))
+ gcc_leave(ms);
+ else if (!strcmp(command, "talk"))
+ gcc_talk(ms);
+ else if (!strcmp(command, "listen"))
+ gcc_listen(ms);
+ else {
+ if
[S] Change in osmocom-bb[master]: Correctly use SUP_WRITE() macro for GSM 850
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34606?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: Correctly use SUP_WRITE() macro for GSM 850 .. Correctly use SUP_WRITE() macro for GSM 850 Change-Id: I52c99c63e38934fb26c26dba5bf2551ea311228b --- M src/host/layer23/src/mobile/vty_interface.c 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 5e5fa6d..a4b97bc 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -1213,7 +1213,7 @@ SUP_WRITE(p_gsm, "p-gsm"); SUP_WRITE(e_gsm, "e-gsm"); SUP_WRITE(r_gsm, "r-gsm"); - SUP_WRITE(pcs, "gsm-850"); + SUP_WRITE(gsm_850, "gsm-850"); SUP_WRITE(gsm_480, "gsm-480"); SUP_WRITE(gsm_450, "gsm-450"); SUP_WRITE(dcs, "dcs"); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34606?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I52c99c63e38934fb26c26dba5bf2551ea311228b Gerrit-Change-Number: 34606 Gerrit-PatchSet: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmocom-bb[master]: Correctly extract bits from SI2*/SI5*
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34604?usp=email ) Change subject: Correctly extract bits from SI2*/SI5* .. Correctly extract bits from SI2*/SI5* These bits are: * EXT-IND * BA-IND * Multiband reporting Change-Id: Ie5349464fed0a4276955235c7c87b5bcb299f20d --- M src/host/layer23/src/common/sysinfo.c 1 file changed, 26 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/host/layer23/src/common/sysinfo.c b/src/host/layer23/src/common/sysinfo.c index 7af1d93..66b87eb 100644 --- a/src/host/layer23/src/common/sysinfo.c +++ b/src/host/layer23/src/common/sysinfo.c @@ -636,8 +636,8 @@ memcpy(s->si2_msg, si, OSMO_MIN(len, sizeof(s->si2_msg))); /* Neighbor Cell Description */ - s->nb_ext_ind_si2 = (si->bcch_frequency_list[0] >> 6) & 1; - s->nb_ba_ind_si2 = (si->bcch_frequency_list[0] >> 5) & 1; + s->nb_ext_ind_si2 = (si->bcch_frequency_list[0] >> 5) & 1; + s->nb_ba_ind_si2 = (si->bcch_frequency_list[0] >> 4) & 1; decode_freq_list(s->freq, si->bcch_frequency_list, sizeof(si->bcch_frequency_list), 0xce, FREQ_TYPE_NCELL_2); @@ -657,8 +657,8 @@ memcpy(s->si2b_msg, si, OSMO_MIN(len, sizeof(s->si2b_msg))); /* Neighbor Cell Description */ - s->nb_ext_ind_si2bis = (si->bcch_frequency_list[0] >> 6) & 1; - s->nb_ba_ind_si2bis = (si->bcch_frequency_list[0] >> 5) & 1; + s->nb_ext_ind_si2bis = (si->bcch_frequency_list[0] >> 5) & 1; + s->nb_ba_ind_si2bis = (si->bcch_frequency_list[0] >> 4) & 1; decode_freq_list(s->freq, si->bcch_frequency_list, sizeof(si->bcch_frequency_list), 0xce, FREQ_TYPE_NCELL_2bis); /* RACH Control Parameter */ @@ -675,8 +675,8 @@ memcpy(s->si2t_msg, si, OSMO_MIN(len, sizeof(s->si2t_msg))); /* Neighbor Cell Description 2 */ - s->nb_multi_rep_si2ter = (si->ext_bcch_frequency_list[0] >> 6) & 3; - s->nb_ba_ind_si2ter = (si->ext_bcch_frequency_list[0] >> 5) & 1; + s->nb_multi_rep_si2ter = (si->ext_bcch_frequency_list[0] >> 5) & 3; + s->nb_ba_ind_si2ter = (si->ext_bcch_frequency_list[0] >> 4) & 1; decode_freq_list(s->freq, si->ext_bcch_frequency_list, sizeof(si->ext_bcch_frequency_list), 0x8e, FREQ_TYPE_NCELL_2ter); @@ -780,8 +780,8 @@ memcpy(s->si5_msg, si, OSMO_MIN(len, sizeof(s->si5_msg))); /* Neighbor Cell Description */ - s->nb_ext_ind_si5 = (si->bcch_frequency_list[0] >> 6) & 1; - s->nb_ba_ind_si5 = (si->bcch_frequency_list[0] >> 5) & 1; + s->nb_ext_ind_si5 = (si->bcch_frequency_list[0] >> 5) & 1; + s->nb_ba_ind_si5 = (si->bcch_frequency_list[0] >> 4) & 1; decode_freq_list(s->freq, si->bcch_frequency_list, sizeof(si->bcch_frequency_list), 0xce, FREQ_TYPE_REP_5); @@ -797,8 +797,8 @@ memcpy(s->si5b_msg, si, OSMO_MIN(len, sizeof(s->si5b_msg))); /* Neighbor Cell Description */ - s->nb_ext_ind_si5bis = (si->bcch_frequency_list[0] >> 6) & 1; - s->nb_ba_ind_si5bis = (si->bcch_frequency_list[0] >> 5) & 1; + s->nb_ext_ind_si5bis = (si->bcch_frequency_list[0] >> 5) & 1; + s->nb_ba_ind_si5bis = (si->bcch_frequency_list[0] >> 4) & 1; decode_freq_list(s->freq, si->bcch_frequency_list, sizeof(si->bcch_frequency_list), 0xce, FREQ_TYPE_REP_5bis); @@ -814,8 +814,8 @@ memcpy(s->si5t_msg, si, OSMO_MIN(len, sizeof(s->si5t_msg))); /* Neighbor Cell Description */ - s->nb_multi_rep_si5ter = (si->bcch_frequency_list[0] >> 6) & 3; - s->nb_ba_ind_si5ter = (si->bcch_frequency_list[0] >> 5) & 1; + s->nb_multi_rep_si5ter = (si->bcch_frequency_list[0] >> 5) & 3; + s->nb_ba_ind_si5ter = (si->bcch_frequency_list[0] >> 4) & 1; decode_freq_list(s->freq, si->bcch_frequency_list, sizeof(si->bcch_frequency_list), 0x8e, FREQ_TYPE_REP_5ter); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34604?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie5349464fed0a4276955235c7c87b5bcb299f20d Gerrit-Change-Number: 34604 Gerrit-PatchSet: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmocom-bb[master]: ASCI: Show NCH position in VTY together with system information
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34496?usp=email )
(
9 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: ASCI: Show NCH position in VTY together with system
information
..
ASCI: Show NCH position in VTY together with system information
Related: OS#5364
Change-Id: I5e0a9d469eb70608502dca881808621fa153b666
---
M src/host/layer23/src/common/sysinfo.c
1 file changed, 22 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/src/host/layer23/src/common/sysinfo.c
b/src/host/layer23/src/common/sysinfo.c
index 700accd..7af1d93 100644
--- a/src/host/layer23/src/common/sysinfo.c
+++ b/src/host/layer23/src/common/sysinfo.c
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include
@@ -72,6 +73,7 @@
char buffer[82];
int i, j, k, index;
int refer_pcs = gsm_refer_pcs(arfcn, s);
+ int rc;
/* available sysinfos */
print(priv, "ARFCN = %s channels 512+ refer to %s\n",
@@ -282,6 +284,16 @@
print(priv, " BS-PA-MFMS = %d Attachment = %s\n",
s->pag_mf_periods, (s->att_allowed) ? "allowed" : "denied");
print(priv, "BS-AG_BLKS_RES = %d ", s->bs_ag_blks_res);
+ if (!s->nch)
+ print(priv, "NCH not available ");
+ else {
+ uint8_t num_blocks, first_block;
+ rc = osmo_gsm48_si1ro_nch_pos_decode(s->nch_position,
_blocks, _block);
+ if (rc < 0)
+ print(priv, "NCH Position invalid ");
+ else
+ print(priv, "NCH Position %u / %u blocks ",
first_block, num_blocks);
+ }
if (s->t3212)
print(priv, "T3212 = %d sec.\n", s->t3212);
else
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34496?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I5e0a9d469eb70608502dca881808621fa153b666
Gerrit-Change-Number: 34496
Gerrit-PatchSet: 16
Gerrit-Owner: jolly
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in osmocom-bb[master]: Cleaning gsm48_mm_data_ind()
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/34603?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: Cleaning gsm48_mm_data_ind()
..
Cleaning gsm48_mm_data_ind()
Get rid of goto and double switch/case by putting connection handling
code into a separate function.
Change-Id: I12454cab06c105ccd9e2495e3a6f0640f2884885
---
M src/host/layer23/src/mobile/gsm48_mm.c
1 file changed, 59 insertions(+), 55 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/src/host/layer23/src/mobile/gsm48_mm.c
b/src/host/layer23/src/mobile/gsm48_mm.c
index 092a984..cec798b 100644
--- a/src/host/layer23/src/mobile/gsm48_mm.c
+++ b/src/host/layer23/src/mobile/gsm48_mm.c
@@ -4628,61 +4628,16 @@
#define MMDATASLLEN \
(sizeof(mmdatastatelist) / sizeof(struct mmdatastate))
-static int gsm48_mm_data_ind(struct osmocom_ms *ms, struct msgb *msg)
+static int create_conn_and_push_mm_hdr(struct gsm48_mmlayer *mm, struct msgb
*msg, int rr_est, int rr_prim)
{
- struct gsm48_mmlayer *mm = >mmlayer;
struct gsm48_rr_hdr *rrh = (struct gsm48_rr_hdr *)msg->data;
uint8_t sapi = rrh->sapi;
struct gsm48_hdr *gh = msgb_l3(msg);
uint8_t pdisc = gh->proto_discr & 0x0f;
- uint8_t msg_type = gh->msg_type & 0xbf;
uint8_t transaction_id;
uint32_t callref;
struct gsm48_mm_conn *conn;
struct gsm48_mmxx_hdr *mmh;
- int msg_supported = 0; /* determine, if message is supported at all */
- int rr_prim, rr_est = -1; /* no prim set */
- uint8_t skip_ind;
- int i, rc;
-
- /* 9.2.19 */
- if (msg_type == GSM48_MT_MM_NULL) {
- msgb_free(msg);
- return 0;
- }
-
- if (mm->state == GSM48_MM_ST_IMSI_DETACH_INIT) {
- LOGP(DMM, LOGL_NOTICE, "DATA IND ignored during IMSI "
- "detach.\n");
- msgb_free(msg);
- return 0;
- }
- /* pull the RR header */
- msgb_pull(msg, sizeof(struct gsm48_rr_hdr));
-
- /* create transaction (if not exists) and push message */
- switch (pdisc) {
- case GSM48_PDISC_CC:
- rr_prim = GSM48_MMCC_DATA_IND;
- rr_est = GSM48_MMCC_EST_IND;
- break;
- case GSM48_PDISC_NC_SS:
- rr_prim = GSM48_MMSS_DATA_IND;
- rr_est = GSM48_MMSS_EST_IND;
- break;
- case GSM48_PDISC_SMS:
- rr_prim = GSM48_MMSMS_DATA_IND;
- rr_est = GSM48_MMSMS_EST_IND;
- break;
- case GSM48_PDISC_GROUP_CC:
- rr_prim = GSM48_MMGCC_DATA_IND;
- break;
- case GSM48_PDISC_BCAST_CC:
- rr_prim = GSM48_MMBCC_DATA_IND;
- break;
- default:
- goto forward_msg;
- }
transaction_id = ((gh->proto_discr & 0xf0) ^ 0x80) >> 4; /* flip */
@@ -4699,16 +4654,13 @@
if (rr_est == -1) {
LOGP(DMM, LOGL_ERROR, "No MO connection for
pdisc=%d, transaction_id=%d\n",
pdisc, transaction_id);
- msgb_free(msg);
return -EINVAL;
}
conn = mm_conn_new(mm, pdisc, transaction_id, sapi,
mm_conn_new_ref++);
rr_prim = rr_est;
}
- if (!conn) {
- msgb_free(msg);
+ if (!conn)
return -ENOMEM;
- }
callref = conn->ref;
}
@@ -4732,8 +4684,35 @@
new_mm_state(mm, GSM48_MM_ST_MM_CONN_ACTIVE, 0);
}
+ return 0;
+}
+
+static int gsm48_mm_data_ind(struct osmocom_ms *ms, struct msgb *msg)
+{
+ struct gsm48_mmlayer *mm = >mmlayer;
+ struct gsm48_hdr *gh = msgb_l3(msg);
+ uint8_t pdisc = gh->proto_discr & 0x0f;
+ uint8_t msg_type = gh->msg_type & 0xbf;
+ int msg_supported = 0; /* determine, if message is supported at all */
+ uint8_t skip_ind;
+ int i, rc;
+
+ /* 9.2.19 */
+ if (msg_type == GSM48_MT_MM_NULL) {
+ msgb_free(msg);
+ return 0;
+ }
+
+ if (mm->state == GSM48_MM_ST_IMSI_DETACH_INIT) {
+ LOGP(DMM, LOGL_NOTICE, "DATA IND ignored during IMSI "
+ "detach.\n");
+ msgb_free(msg);
+ return 0;
+ }
+ /* pull the RR header */
+ msgb_pull(msg, sizeof(struct gsm48_rr_hdr));
+
/* forward message */
-forward_msg:
switch (pdisc) {
case GSM48_PDISC_MM:
[M] Change in osmo-ci[master]: scripts/docker-cleanup: remove containers > 24h
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/34645?usp=email )
Change subject: scripts/docker-cleanup: remove containers > 24h
..
scripts/docker-cleanup: remove containers > 24h
Remove containers starting with jenkins- or having ttcn3 in the name, if
they have been running for more than 24 hours. This can happen with the
ttcn3 testsuites, as they typically start multiple docker containers in
the background (one per Osmocom program) before they start the testsuite
docker container in the foreground. Usually the clean up trap makes sure
that all containers get killed, but we have seen that a few containers
have been running for a few months. One reason for this could be
temporary loss of connection between the jenkins server and the node
running the job.
Extend the clean script to remove the containers that were not properly
removed by the clean up trap.
Historically we used to kill docker containers of the same name before
starting a testsuite, but this had the downside that we could not start
the same testsuite multiple times in parallel. This was refactored in
docker-playground Ifcd384272c56d585e220e2588f2186dc110902ed.
Change-Id: I58c17b57c998eaba411658e83b7295d7cfcf9a23
---
M scripts/docker-cleanup.sh
1 file changed, 61 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/scripts/docker-cleanup.sh b/scripts/docker-cleanup.sh
index fe134d2..0d19d7d 100755
--- a/scripts/docker-cleanup.sh
+++ b/scripts/docker-cleanup.sh
@@ -1,6 +1,40 @@
#!/bin/sh -x
# https://osmocom.org/projects/osmocom-servers/wiki/Docker_cache_clean_up
+kill_docker_containers_running_longer_than_24h() {
+ docker ps
+ set +x
+
+ local date_24h_ago="$(date "+%s" -d"24 hours ago")"
+ docker ps --format "{{.ID}}|{{.Names}}|{{.CreatedAt}}" | while read -r
line; do
+ local id="$(echo "$line" | cut -d '|' -f 1)"
+ local name="$(echo "$line" | cut -d '|' -f 2)"
+ local created_at="$(echo "$line" | cut -d '|' -f 3 | cut -d ' '
-f 1-3)"
+ local date_created_at="$(date "+%s" -d "$created_at")"
+
+ if [ "$date_created_at" -gt "$date_24h_ago" ]; then
+ echo "$name: not running for >24h"
+ continue
+ fi
+
+ case "$name" in
+ jenkins-*|*ttcn3*) ;;
+ *)
+ echo "$name: does not match name pattern"
+ continue
+ ;;
+ esac
+
+ echo "$name ($id): has been running for >24h, killing"
+ docker kill "$id"
+ done
+
+ set -x
+ docker ps
+}
+
+kill_docker_containers_running_longer_than_24h
+
# delete all containers where we forgot to use --rm with docker run,
# older than 24 hours
docker container prune --filter "until=24h" -f
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34645?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I58c17b57c998eaba411658e83b7295d7cfcf9a23
Gerrit-Change-Number: 34645
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in osmo-ci[master]: scripts/docker-cleanup: remove containers > 24h
Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34645?usp=email ) Change subject: scripts/docker-cleanup: remove containers > 24h .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34645?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I58c17b57c998eaba411658e83b7295d7cfcf9a23 Gerrit-Change-Number: 34645 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Thu, 05 Oct 2023 05:55:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmo-bsc[master]: ASCI: Add System Information 10 support
Attention is currently required from: jolly, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34626?usp=email ) Change subject: ASCI: Add System Information 10 support .. Patch Set 2: (6 comments) Patchset: PS2: > I also don't like the timer. […] SI10 is actually not needed for the call establishment, it's needed for quicker cell change. Without SI10 a phone participating a group call would need to first tune to BCCH of each neighbor to see if the current group call is also ongoing there or not -- this would cause a gap in the call. IIUC, the payload of SI10 is expected to remain static as long as a) there are no neighbor list changes, b) no ongoing group calls being released, and c) no new group calls being established. Maybe we can trigger SI10 generation and sending if a), b), or c) happens? File src/osmo-bsc/system_information.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/abfe25bf_b72c4afd PS2, Line 1420: struct gsm_subscriber_connection *conn should be `const` https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/b988a2f5_69d6cfbe PS2, Line 1424: *n_bts, *l_bts cosmetic: better declare these two separately, so they're not hidden behind the `s_bts` assignment. Wait, they're only used within the for-loop? Then they should be moved there. https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/7c9d144a_cda5d3da PS2, Line 1428: unsigned int save_cur_bit; : struct gsm_subscriber_connection *c; both vars can be moved to the scope of use (for-loop) https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/7983ba8f_7fe8cfe7 PS2, Line 1447: 32 where this limit is coming from? is there a macro? if not, at least add a comment? https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/668a1787_e10481d1 PS2, Line 1499: /* Do spare padding. We cannot do it earlier, because encoding might corrupt it if differenctial cell info > the same "differential cell info" mentioned a few lines above I guess... Indeed, SI10 employs so-called differential encoding: you encode all the info for the first BTS and then only those parameters that differ for the remaining BTSs. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34626?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icd3101e6dd935a57f003253aaef400c2cf95a0c3 Gerrit-Change-Number: 34626 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 04 Oct 2023 19:06:51 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmo-ci[master]: scripts/docker-cleanup: remove containers > 24h
Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34645?usp=email ) Change subject: scripts/docker-cleanup: remove containers > 24h .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34645?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I58c17b57c998eaba411658e83b7295d7cfcf9a23 Gerrit-Change-Number: 34645 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 04 Oct 2023 17:21:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ci[master]: scripts/docker-cleanup: remove containers > 24h
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34645?usp=email ) Change subject: scripts/docker-cleanup: remove containers > 24h .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34645?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I58c17b57c998eaba411658e83b7295d7cfcf9a23 Gerrit-Change-Number: 34645 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 04 Oct 2023 15:59:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ci[master]: scripts/docker-cleanup: remove containers > 24h
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/34645?usp=email )
Change subject: scripts/docker-cleanup: remove containers > 24h
..
scripts/docker-cleanup: remove containers > 24h
Remove containers starting with jenkins- or having ttcn3 in the name, if
they have been running for more than 24 hours. This can happen with the
ttcn3 testsuites, as they typically start multiple docker containers in
the background (one per Osmocom program) before they start the testsuite
docker container in the foreground. Usually the clean up trap makes sure
that all containers get killed, but we have seen that a few containers
have been running for a few months. One reason for this could be
temporary loss of connection between the jenkins server and the node
running the job.
Extend the clean script to remove the containers that were not properly
removed by the clean up trap.
Historically we used to kill docker containers of the same name before
starting a testsuite, but this had the downside that we could not start
the same testsuite multiple times in parallel. This was refactored in
docker-playground Ifcd384272c56d585e220e2588f2186dc110902ed.
Change-Id: I58c17b57c998eaba411658e83b7295d7cfcf9a23
---
M scripts/docker-cleanup.sh
1 file changed, 61 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/45/34645/1
diff --git a/scripts/docker-cleanup.sh b/scripts/docker-cleanup.sh
index fe134d2..0d19d7d 100755
--- a/scripts/docker-cleanup.sh
+++ b/scripts/docker-cleanup.sh
@@ -1,6 +1,40 @@
#!/bin/sh -x
# https://osmocom.org/projects/osmocom-servers/wiki/Docker_cache_clean_up
+kill_docker_containers_running_longer_than_24h() {
+ docker ps
+ set +x
+
+ local date_24h_ago="$(date "+%s" -d"24 hours ago")"
+ docker ps --format "{{.ID}}|{{.Names}}|{{.CreatedAt}}" | while read -r
line; do
+ local id="$(echo "$line" | cut -d '|' -f 1)"
+ local name="$(echo "$line" | cut -d '|' -f 2)"
+ local created_at="$(echo "$line" | cut -d '|' -f 3 | cut -d ' '
-f 1-3)"
+ local date_created_at="$(date "+%s" -d "$created_at")"
+
+ if [ "$date_created_at" -gt "$date_24h_ago" ]; then
+ echo "$name: not running for >24h"
+ continue
+ fi
+
+ case "$name" in
+ jenkins-*|*ttcn3*) ;;
+ *)
+ echo "$name: does not match name pattern"
+ continue
+ ;;
+ esac
+
+ echo "$name ($id): has been running for >24h, killing"
+ docker kill "$id"
+ done
+
+ set -x
+ docker ps
+}
+
+kill_docker_containers_running_longer_than_24h
+
# delete all containers where we forgot to use --rm with docker run,
# older than 24 hours
docker container prune --filter "until=24h" -f
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34645?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I58c17b57c998eaba411658e83b7295d7cfcf9a23
Gerrit-Change-Number: 34645
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: check if we really use direct phy
Attention is currently required from: dexter, fixeria, fixeria, osmith.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email )
Change subject: gprs_rlcmac_sched: check if we really use direct phy
..
Patch Set 3:
(1 comment)
File src/gprs_rlcmac_sched.cpp:
https://gerrit.osmocom.org/c/osmo-pcu/+/34575/comment/22488527_24303197
PS2, Line 491: if (bts->trx[trx].fl1h) {
> When we want to send the information which BTS model is used down to the PCU
> we might consider to us […]
I'd go for having a define in pcuif which doesn't need to necessarily be the
same as present/used in osmo-bts or osmo-bsc. They could convert to it.
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec
Gerrit-Change-Number: 34575
Gerrit-PatchSet: 3
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-CC: fixeria
Gerrit-Attention: osmith
Gerrit-Attention: fixeria
Gerrit-Attention: fixeria
Gerrit-Attention: dexter
Gerrit-Comment-Date: Wed, 04 Oct 2023 15:31:46 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Comment-In-Reply-To: dexter
Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: check if we really use direct phy
Attention is currently required from: fixeria, fixeria, osmith, pespin.
dexter has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email )
Change subject: gprs_rlcmac_sched: check if we really use direct phy
..
Patch Set 3:
(1 comment)
File src/gprs_rlcmac_sched.cpp:
https://gerrit.osmocom.org/c/osmo-pcu/+/34575/comment/8e461daa_8c11c6db
PS2, Line 491: if (bts->trx[trx].fl1h) {
> I think actually the first would be to decouple the feature "direct-phy" from
> "this bts doesn't supp […]
When we want to send the information which BTS model is used down to the PCU we
might consider to use enum gsm_bts_type_variant:
https://gitea.osmocom.org/cellular-infrastructure/osmo-bts/src/branch/master/include/osmo-bts/bts.h#L44
Unfortunately I am not entirely sure how to set this up. The enum is defined in
bts.h. We may move it to pcuif_proto.h so that it becomes available to for all
entities. Or we just define a new one, but this would be redundant. Any ideas
to solve this in a more elegant way? Or is there even something in libosmocore?
I couldn't find anything.
Even more unfotunately: its already a mess, osmo-bsc already has its own
definition of that same enum:
https://gitea.osmocom.org/cellular-infrastructure/osmo-bsc/src/branch/master/include/osmocom/bsc/bts.h#L251
Maybe it could even have a healthy effect to define that enum in pcuif_proto.h
so that we always can be sure that all entities have the same definition.
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec
Gerrit-Change-Number: 34575
Gerrit-PatchSet: 3
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-CC: fixeria
Gerrit-Attention: osmith
Gerrit-Attention: pespin
Gerrit-Attention: fixeria
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Wed, 04 Oct 2023 15:25:45 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Comment-In-Reply-To: dexter
Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: rename sysmo_direct_dsp to direct_phy
dexter has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34585?usp=email )
Change subject: rename sysmo_direct_dsp to direct_phy
..
rename sysmo_direct_dsp to direct_phy
The name sysmo_direct_dsp is not entirely correct. It should be just
"sysmo" if we follow the rules that the "PCU_IF_FLAG_" prefix is
supposed to be chopped off here.
In pcuif_proto.h, we have renamed PCU_IF_FLAG_SYSMO to
PCU_IF_FLAG_DIRECT_PHY. (see Depends), so let's rename the flag here to
"direct_phy".
Related: OS#6191
Depends: osmo-pcu.git I29b7b78a3a91d062b9ea3cd72623d30618cd3f0b
Change-Id: Ib67c4441d0077822d0f9cbf29338fedeb916f287
---
M library/PCUIF_Types.ttcn
1 file changed, 22 insertions(+), 3 deletions(-)
Approvals:
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn
index 6be45df..8fb0be3 100644
--- a/library/PCUIF_Types.ttcn
+++ b/library/PCUIF_Types.ttcn
@@ -60,7 +60,7 @@
type record PCUIF_Flags {
boolean bts_active,
- boolean sysmo_direct_dsp,
+ boolean direct_phy,
BIT14 spare,
boolean cs1,
boolean cs2,
@@ -819,7 +819,7 @@
const PCUIF_Flags c_PCUIF_Flags_default := {
bts_active := true,
- sysmo_direct_dsp := false,
+ direct_phy := false,
spare := '00'B,
cs1 := true,
cs2 := true,
@@ -839,7 +839,7 @@
const PCUIF_Flags c_PCUIF_Flags_noMCS := {
bts_active := true,
- sysmo_direct_dsp := false,
+ direct_phy := false,
spare := '00'B,
cs1 := true,
cs2 := true,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34585?usp=email
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: Ib67c4441d0077822d0f9cbf29338fedeb916f287
Gerrit-Change-Number: 34585
Gerrit-PatchSet: 2
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-bts[master]: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY
dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34584?usp=email ) Change subject: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY .. pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY The PCUIF flag PCU_IF_FLAG_SYSMO was originally used by osmo-bts-sysmo to signal to the PCU that the direct PHY access for the sysmo-bts DSP should be enabled. With time, support for other BTS models was added and the flag became a synonym for "direct PHY access", so it makes sense to rename it to "PCU_IF_FLAG_DIRECT_PHY" Related: OS#6191 Depends: osmo-pcu.git I29b7b78a3a91d062b9ea3cd72623d30618cd3f0b Change-Id: Ib556a93f7d7d7dbe1e96c4a0802bc802241b2b2d --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 19 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h index b47dc75..a620993 100644 --- a/include/osmo-bts/pcuif_proto.h +++ b/include/osmo-bts/pcuif_proto.h @@ -40,7 +40,7 @@ /* flags */ #define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */ -#define PCU_IF_FLAG_SYSMO (1 << 1)/* access PDCH of sysmoBTS directly */ +#define PCU_IF_FLAG_DIRECT_PHY (1 << 1)/* access PHY directly via dedicated hardware support */ #define PCU_IF_FLAG_CS1(1 << 16) #define PCU_IF_FLAG_CS2(1 << 17) #define PCU_IF_FLAG_CS3(1 << 18) diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index f99c7d2..79b39c4 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -264,7 +264,7 @@ LOGP(DPCU, LOGL_INFO, "BTS is down\n"); if (pcu_direct) - info_ind->flags |= PCU_IF_FLAG_SYSMO; + info_ind->flags |= PCU_IF_FLAG_DIRECT_PHY; info_ind->bsic = bts->bsic; /* RAI */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34584?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib556a93f7d7d7dbe1e96c4a0802bc802241b2b2d Gerrit-Change-Number: 34584 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-pcu[master]: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY
dexter has submitted this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/34582?usp=email )
Change subject: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY
..
pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY
The PCUIF flag PCU_IF_FLAG_SYSMO was originally used by osmo-bts-sysmo
to signal to the PCU that the direct PHY access for the sysmo-bts DSP
should be enabled. With time, support for other BTS models was added and
the flag became a synonym for "direct PHY access", so it makes sense to
rename it to "PCU_IF_FLAG_DIRECT_PHY"
Related: OS#6191
Change-Id: I29b7b78a3a91d062b9ea3cd72623d30618cd3f0b
---
M include/osmocom/pcu/pcuif_proto.h
M src/pcu_l1_if.cpp
2 files changed, 20 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/include/osmocom/pcu/pcuif_proto.h
b/include/osmocom/pcu/pcuif_proto.h
index cd2a298..9df85d9 100644
--- a/include/osmocom/pcu/pcuif_proto.h
+++ b/include/osmocom/pcu/pcuif_proto.h
@@ -46,7 +46,7 @@
/* flags */
#define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */
-#define PCU_IF_FLAG_SYSMO (1 << 1)/* access PDCH of sysmoBTS directly */
+#define PCU_IF_FLAG_DIRECT_PHY (1 << 1)/* access PHY directly via dedicated
hardware support */
#define PCU_IF_FLAG_CS1(1 << 16)
#define PCU_IF_FLAG_CS2(1 << 17)
#define PCU_IF_FLAG_CS3(1 << 18)
diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp
index 4af6953..4fcec31 100644
--- a/src/pcu_l1_if.cpp
+++ b/src/pcu_l1_if.cpp
@@ -941,7 +941,7 @@
for (trx_nr = 0; trx_nr < ARRAY_SIZE(bts->trx); trx_nr++) {
bts->trx[trx_nr].arfcn = info_ind->trx[trx_nr].arfcn;
- if ((info_ind->flags & PCU_IF_FLAG_SYSMO)
+ if ((info_ind->flags & PCU_IF_FLAG_DIRECT_PHY)
&& info_ind->trx[trx_nr].hlayer1) {
#ifdef ENABLE_DIRECT_PHY
LOGP(DL1IF, LOGL_DEBUG, " TRX %d hlayer1=%x\n", trx_nr,
@@ -972,7 +972,7 @@
if (!pdch->is_enabled()) {
#ifdef ENABLE_DIRECT_PHY
if ((info_ind->flags &
- PCU_IF_FLAG_SYSMO))
+ PCU_IF_FLAG_DIRECT_PHY))
l1if_connect_pdch(
bts->trx[trx_nr].fl1h,
ts_nr);
#endif
@@ -1003,7 +1003,7 @@
} else {
if (pdch->is_enabled()) {
#ifdef ENABLE_DIRECT_PHY
- if ((info_ind->flags &
PCU_IF_FLAG_SYSMO))
+ if ((info_ind->flags &
PCU_IF_FLAG_DIRECT_PHY))
l1if_disconnect_pdch(bts->trx[trx_nr].fl1h, ts_nr);
#endif
pcu_tx_act_req(bts, pdch, 0);
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34582?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I29b7b78a3a91d062b9ea3cd72623d30618cd3f0b
Gerrit-Change-Number: 34582
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-bsc[master]: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY
dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34583?usp=email ) Change subject: pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY .. pcuif_proto: rename PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY The PCUIF flag PCU_IF_FLAG_SYSMO was originally used by osmo-bts-sysmo to signal to the PCU that the direct PHY access for the sysmo-bts DSP should be enabled. With time, support for other BTS models was added and the flag became a synonym for "direct PHY access", so it makes sense to rename it to "PCU_IF_FLAG_DIRECT_PHY" Related: OS#6191 Depends: osmo-pcu.git I29b7b78a3a91d062b9ea3cd72623d30618cd3f0b Change-Id: I23df067df99b76048667131905c4448d32d80640 --- M include/osmocom/bsc/pcuif_proto.h M src/osmo-bsc/pcu_sock.c 2 files changed, 19 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/include/osmocom/bsc/pcuif_proto.h b/include/osmocom/bsc/pcuif_proto.h index cd2a298..9df85d9 100644 --- a/include/osmocom/bsc/pcuif_proto.h +++ b/include/osmocom/bsc/pcuif_proto.h @@ -46,7 +46,7 @@ /* flags */ #define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */ -#define PCU_IF_FLAG_SYSMO (1 << 1)/* access PDCH of sysmoBTS directly */ +#define PCU_IF_FLAG_DIRECT_PHY (1 << 1)/* access PHY directly via dedicated hardware support */ #define PCU_IF_FLAG_CS1(1 << 16) #define PCU_IF_FLAG_CS2(1 << 17) #define PCU_IF_FLAG_CS3(1 << 18) diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index dc2b8e9..d279093 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -200,7 +200,7 @@ info_ind = _prim->u.info_ind; info_ind->version = PCU_IF_VERSION; info_ind->flags |= PCU_IF_FLAG_ACTIVE; - info_ind->flags |= PCU_IF_FLAG_SYSMO; + info_ind->flags |= PCU_IF_FLAG_DIRECT_PHY; /* RAI */ info_ind->mcc = bts->network->plmn.mcc; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34583?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I23df067df99b76048667131905c4448d32d80640 Gerrit-Change-Number: 34583 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[M] Change in osmo-bsc[master]: ASCI: Make neigh_list_get_arfcn() available to other users
Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34625?usp=email ) Change subject: ASCI: Make neigh_list_get_arfcn() available to other users .. Patch Set 2: Code-Review-1 (1 comment) File src/osmo-bsc/gsm_04_08_rr.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34625/comment/63b17781_62a80624 PS2, Line 946: rc you're changing the behavior here: * currently `mrc->arfcn` is set to 0 on error; * in your patch a negative value is set (`-EINVAL` casted to unsigned). -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34625?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia8a1dca4837536129d17e7784b892bcb75b9ca4b Gerrit-Change-Number: 34625 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 04 Oct 2023 13:24:27 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: Select correct neighbor list for measurement report decoding
Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34624?usp=email ) Change subject: Select correct neighbor list for measurement report decoding .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34624?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie9123928fb3ae6f10921ecf01d1b50330661da38 Gerrit-Change-Number: 34624 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 04 Oct 2023 13:19:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-trx[master]: ms: reduce rx burst queue size
Hoernchen has submitted this change. (
https://gerrit.osmocom.org/c/osmo-trx/+/34272?usp=email )
Change subject: ms: reduce rx burst queue size
..
ms: reduce rx burst queue size
This should be fine, because we can at most receive 1.5 bursts of data
at once and produce 2 bursts with previous data, so if this is insufficent the
usb buffers are late or the upper layer is stuck and we're in trouble anyway.
Change-Id: Ifb8bf2894c87e4234e3d3f65d66c1e98c8f63c53
---
M Transceiver52M/ms/ms.h
1 file changed, 13 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/Transceiver52M/ms/ms.h b/Transceiver52M/ms/ms.h
index 4d0f0cd..18a6954 100644
--- a/Transceiver52M/ms/ms.h
+++ b/Transceiver52M/ms/ms.h
@@ -44,7 +44,6 @@
#include "threadpool.h"
const unsigned int ONE_TS_BURST_LEN = (3 + 58 + 26 + 58 + 3 + 8.25) * 4
/*sps*/;
-const unsigned int NUM_RXQ_FRAMES = 1; // rx thread <-> upper rx queue
const unsigned int SCH_LEN_SPS = (ONE_TS_BURST_LEN * 8 /*ts*/ * 12 /*frames*/);
template
@@ -133,7 +132,7 @@
};
};
-using rx_queue_t = spsc_cond_timeout<8 * NUM_RXQ_FRAMES, one_burst, true,
false>;
+using rx_queue_t = spsc_cond_timeout<4, one_burst, true, false>;
enum class SCH_STATE { SEARCHING, FOUND };
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34272?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: Ifb8bf2894c87e4234e3d3f65d66c1e98c8f63c53
Gerrit-Change-Number: 34272
Gerrit-PatchSet: 6
Gerrit-Owner: Hoernchen
Gerrit-Reviewer: Hoernchen
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[L] Change in osmo-bsc[master]: ASCI: Add System Information 10 support
Attention is currently required from: fixeria, jolly, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34626?usp=email ) Change subject: ASCI: Add System Information 10 support .. Patch Set 2: (2 comments) Patchset: PS2: > This timer to trigger the SI looks a bit hackish, but I don't know/understand > the details here, so l […] I also don't like the timer. Who says that 3s is sufficient to establish all the calls? What if there's a slow (e.g. VSAT) link in between with very high RTT? The question is what kind of other alternative do we have? And: How hurtful is it if the timer expires before the MSC has established all of those calls? File src/osmo-bsc/system_information.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/242086f7_3354ebb9 PS2, Line 1499: /* Do spare padding. We cannot do it earlier, because encoding might corrupt it if differenctial cell info > differenctial? what do you mean? the same "differential cell info" mentioned a few lines above I guess... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34626?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icd3101e6dd935a57f003253aaef400c2cf95a0c3 Gerrit-Change-Number: 34626 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 04 Oct 2023 12:34:45 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: Fix settings for VGCS/VBS
Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34644?usp=email ) Change subject: Fix settings for VGCS/VBS .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34644?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I81575dd3f2ade70101df32935a1c3d5469327577 Gerrit-Change-Number: 34644 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 04 Oct 2023 12:07:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: ASCI: Add VTY command to display group call neighbor cells
Attention is currently required from: jolly, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34615?usp=email ) Change subject: ASCI: Add VTY command to display group call neighbor cells .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34615?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie84221507bdf247c1563b829d6cf0adb53ce161f Gerrit-Change-Number: 34615 Gerrit-PatchSet: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 04 Oct 2023 12:07:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmocom-bb[master]: ASCI: Add decoding of SYSTEM INFORMATION TYPE 10 $(ASCI)$
Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34614?usp=email ) Change subject: ASCI: Add decoding of SYSTEM INFORMATION TYPE 10 $(ASCI)$ .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34614?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I81c7929f6d951d8eef7d08624f0b72830370c448 Gerrit-Change-Number: 34614 Gerrit-PatchSet: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 04 Oct 2023 12:07:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmocom-bb[master]: ASCI: Add VTY commands to control voice group/broadcast calls
Attention is currently required from: jolly, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34495?usp=email ) Change subject: ASCI: Add VTY commands to control voice group/broadcast calls .. Patch Set 16: Code-Review+2 (2 comments) File src/host/layer23/src/mobile/vty_interface.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34495/comment/ab784fd9_021f7042 PS16, Line 700: These commands perform VGCS on given MS without entering the VGCS node > You can switch between talk and listen without having a full command. […] Ok then. Thanks for explaining. https://gerrit.osmocom.org/c/osmocom-bb/+/34495/comment/c280735f_f008edbd PS16, Line 735: These commands perform VBS on VBS node > Same here, do we really want a separate note? Done -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34495?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id32253b4e10b8df48e819d8a92bbcda332dd11e6 Gerrit-Change-Number: 34495 Gerrit-PatchSet: 16 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 04 Oct 2023 12:05:21 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: jolly Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: Correctly extract bits from SI2*/SI5*
Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34604?usp=email ) Change subject: Correctly extract bits from SI2*/SI5* .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34604?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie5349464fed0a4276955235c7c87b5bcb299f20d Gerrit-Change-Number: 34604 Gerrit-PatchSet: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 04 Oct 2023 12:03:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmocom-bb[master]: ASCI: Add VTY commands to control voice group/broadcast calls
Attention is currently required from: fixeria, jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34495?usp=email ) Change subject: ASCI: Add VTY commands to control voice group/broadcast calls .. Patch Set 16: Code-Review+1 (1 comment) File src/host/layer23/src/mobile/vty_interface.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34495/comment/5b302de9_640fbe03 PS16, Line 379: ASCI_STR > It is already added in the #define above. I renamed it to SHOW_ASCI_STR, to > make this clearer. Not sure what do we win by having all that ina define instead of directly, but ok... -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34495?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id32253b4e10b8df48e819d8a92bbcda332dd11e6 Gerrit-Change-Number: 34495 Gerrit-PatchSet: 16 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 04 Oct 2023 11:48:52 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: jolly Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[L] Change in osmocom-bb[master]: ASCI: Add decoding of SYSTEM INFORMATION TYPE 10 $(ASCI)$
Attention is currently required from: fixeria, jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34614?usp=email ) Change subject: ASCI: Add decoding of SYSTEM INFORMATION TYPE 10 $(ASCI)$ .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34614?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I81c7929f6d951d8eef7d08624f0b72830370c448 Gerrit-Change-Number: 34614 Gerrit-PatchSet: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 04 Oct 2023 11:46:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-gprs[master]: rlcmac: migrate from fn_cmp() to gsm0502_fncmp()
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-gprs/+/34627?usp=email )
Change subject: rlcmac: migrate from fn_cmp() to gsm0502_fncmp()
..
rlcmac: migrate from fn_cmp() to gsm0502_fncmp()
Change-Id: I3030d00c6881713a088b1739b2b5ba77bac84e46
Depends: libosmocore.git I9590f2e836fc48650decf1564b6ab46306c4fe2d
Depends: libosmocore.git Ie8bb9c49c6f81b8f4a1766547d6943f9880d1186
---
M include/osmocom/gprs/rlcmac/sched.h
M src/rlcmac/pdch_ul_controller.c
M src/rlcmac/tbf_dl_ass_fsm.c
M src/rlcmac/tbf_ul_ass_fsm.c
4 files changed, 27 insertions(+), 28 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
diff --git a/include/osmocom/gprs/rlcmac/sched.h
b/include/osmocom/gprs/rlcmac/sched.h
index a90cbc1..9e03c01 100644
--- a/include/osmocom/gprs/rlcmac/sched.h
+++ b/include/osmocom/gprs/rlcmac/sched.h
@@ -20,20 +20,6 @@
return f == 0 || f == 4 || f == 8;
}
-#define GSM_MAX_FN_THRESH (GSM_MAX_FN >> 1)
-/* 0: equal, -1: fn1 BEFORE fn2, 1: fn1 AFTER fn2 */
-static inline int fn_cmp(uint32_t fn1, uint32_t fn2)
-{
- if (fn1 == fn2)
- return 0;
- /* FN1 goes before FN2: */
- if ((fn1 < fn2 && (fn2 - fn1) < GSM_MAX_FN_THRESH) ||
- (fn1 > fn2 && (fn1 - fn2) > GSM_MAX_FN_THRESH))
- return -1;
- /* FN1 goes after FN2: */
- return 1;
-}
-
static inline uint32_t fn2bn(uint32_t fn)
{
return (fn % 52) / 4;
diff --git a/src/rlcmac/pdch_ul_controller.c b/src/rlcmac/pdch_ul_controller.c
index 7c5e41a..b6859b1 100644
--- a/src/rlcmac/pdch_ul_controller.c
+++ b/src/rlcmac/pdch_ul_controller.c
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include
#include
@@ -61,7 +62,7 @@
while (node) {
it = rb_entry(node, struct gprs_rlcmac_pdch_ulc_node, node);
- res = fn_cmp(it->fn, fn);
+ res = gsm0502_fncmp(it->fn, fn);
if (res > 0) /* it->fn AFTER fn */
node = node->rb_left;
else if (res < 0) /* it->fn BEFORE fn */
@@ -105,7 +106,7 @@
it = container_of(*n, struct gprs_rlcmac_pdch_ulc_node, node);
parent = *n;
- res = fn_cmp(item->fn, it->fn);
+ res = gsm0502_fncmp(item->fn, it->fn);
if (res < 0) { /* item->fn "BEFORE" it->fn */
n = &((*n)->rb_left);
} else if (res > 0) { /* item->fn "AFTER" it->fn */
@@ -180,7 +181,7 @@
struct rb_node *first;
while ((first = rb_first(>tree_root))) {
item = container_of(first, struct gprs_rlcmac_pdch_ulc_node,
node);
- res = fn_cmp(item->fn, fn);
+ res = gsm0502_fncmp(item->fn, fn);
if (res > 0) /* item->fn AFTER fn */
break;
if (res < 0) { /* item->fn BEFORE fn */
diff --git a/src/rlcmac/tbf_dl_ass_fsm.c b/src/rlcmac/tbf_dl_ass_fsm.c
index 9acf723..fec375f 100644
--- a/src/rlcmac/tbf_dl_ass_fsm.c
+++ b/src/rlcmac/tbf_dl_ass_fsm.c
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
#include
@@ -141,7 +142,7 @@
return;
memcpy(>iaro, ev_ccch_imm_ass->iaro, sizeof(ctx->iaro));
if (ctx->tbf_starting_time_exists &&
- fn_cmp(ctx->tbf_starting_time, ev_ccch_imm_ass->fn) > 0)
+ gsm0502_fncmp(ctx->tbf_starting_time, ev_ccch_imm_ass->fn)
> 0)
tbf_dl_ass_fsm_state_chg(fi,
GPRS_RLCMAC_TBF_DL_ASS_ST_WAIT_TBF_STARTING_TIME);
else
tbf_dl_ass_fsm_state_chg(fi,
GPRS_RLCMAC_TBF_DL_ASS_ST_COMPL);
@@ -152,7 +153,7 @@
return;
memcpy(>dl_block, ev_pacch_pkt_ass->dl_block,
sizeof(ctx->dl_block));
if (ctx->tbf_starting_time_exists &&
- fn_cmp(ctx->tbf_starting_time, ev_pacch_pkt_ass->fn) > 0)
+ gsm0502_fncmp(ctx->tbf_starting_time, ev_pacch_pkt_ass->fn)
> 0)
tbf_dl_ass_fsm_state_chg(fi,
GPRS_RLCMAC_TBF_DL_ASS_ST_WAIT_TBF_STARTING_TIME);
else
tbf_dl_ass_fsm_state_chg(fi,
GPRS_RLCMAC_TBF_DL_ASS_ST_COMPL);
@@ -175,7 +176,7 @@
return;
memcpy(>iaro, ev_ccch_imm_ass->iaro, sizeof(ctx->iaro));
if (ctx->tbf_starting_time_exists &&
- fn_cmp(ctx->tbf_starting_time, ev_ccch_imm_ass->fn) > 0)
+ gsm0502_fncmp(ctx->tbf_starting_time, ev_ccch_imm_ass->fn)
> 0)
tbf_dl_ass_fsm_state_chg(fi,
GPRS_RLCMAC_TBF_DL_ASS_ST_WAIT_TBF_STARTING_TIME);
else
tbf_dl_ass_fsm_state_chg(fi,
GPRS_RLCMAC_TBF_DL_ASS_ST_COMPL);
@@ -186,7
[M] Change in libosmo-gprs[master]: rlcmac: migrate from fn_cmp() to gsm0502_fncmp()
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34627?usp=email ) Change subject: rlcmac: migrate from fn_cmp() to gsm0502_fncmp() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34627?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I3030d00c6881713a088b1739b2b5ba77bac84e46 Gerrit-Change-Number: 34627 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 04 Oct 2023 11:40:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmo-bsc[master]: ASCI: Add System Information 10 support
Attention is currently required from: fixeria, jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34626?usp=email ) Change subject: ASCI: Add System Information 10 support .. Patch Set 2: (4 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/e2b372f0_d9e9ada0 PS2, Line 13: For each BTS, an SI 10 is gerated with all other neighbor BTS. generated Patchset: PS2: This timer to trigger the SI looks a bit hackish, but I don't know/understand the details here, so letting others provide feedback. File src/osmo-bsc/system_information.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/b6b504b7_fdbabeb6 PS2, Line 1459: if (c->lchan->ts->trx->bts->c0->arfcn != arfcn) can we maybe have a "i_bts = c->lchan->ts->trx->bts;" var here to avoid dereferencing crazy amounts of pointers twice? Also easier to read. https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/dc130a4f_99adb46a PS2, Line 1499: /* Do spare padding. We cannot do it earlier, because encoding might corrupt it if differenctial cell info differenctial? what do you mean? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34626?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icd3101e6dd935a57f003253aaef400c2cf95a0c3 Gerrit-Change-Number: 34626 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 04 Oct 2023 11:40:23 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: ASCI: Make neigh_list_get_arfcn() available to other users
Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34625?usp=email ) Change subject: ASCI: Make neigh_list_get_arfcn() available to other users .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34625?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia8a1dca4837536129d17e7784b892bcb75b9ca4b Gerrit-Change-Number: 34625 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 04 Oct 2023 11:25:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: Select correct neighbor list for measurement report decoding
Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34624?usp=email ) Change subject: Select correct neighbor list for measurement report decoding .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34624?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie9123928fb3ae6f10921ecf01d1b50330661da38 Gerrit-Change-Number: 34624 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 04 Oct 2023 11:24:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: Cleaning gsm48_mm_data_ind()
Attention is currently required from: pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34603?usp=email ) Change subject: Cleaning gsm48_mm_data_ind() .. Patch Set 2: (1 comment) File src/host/layer23/src/mobile/gsm48_mm.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34603/comment/be591f35_d65ef5a8 PS1, Line 4707: LOGP(DMM, LOGL_NOTICE, "DATA IND ignored during IMSI " > can perfectly fit in one line. This line was not changed. The diff makes the patch look as if it was moved. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34603?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I12454cab06c105ccd9e2495e3a6f0640f2884885 Gerrit-Change-Number: 34603 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 04 Oct 2023 11:22:46 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in libosmo-sccp[master]: asp: Support removing local & remote addresses
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/34612?usp=email )
Change subject: asp: Support removing local & remote addresses
..
asp: Support removing local & remote addresses
The local address is removed dynamically from the socket if it is
already created. For remote addresses, it doesn't make any sense (and
there's no API to do so) because the remote address list passed to it is
only used at connect() time, when the socket is created. During the
initial hanshake, the remote provides its own list of remote addresses.
Related: OS#6077
Related: OS#4607
Depends: libosmocore.git Change-Id Ifc6e7d643c2a0c53f479bfd0d5c36d08c0c01953
Change-Id: I554aee92285bd72eb90c6daf47b37055cb3067aa
---
M TODO-RELEASE
M include/osmocom/sigtran/osmo_ss7.h
M src/osmo_ss7_asp.c
M src/osmo_ss7_asp_peer.c
M src/osmo_ss7_vty.c
M src/ss7_internal.h
M tests/vty/ss7_asp_test.vty
7 files changed, 162 insertions(+), 2 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
pespin: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
diff --git a/TODO-RELEASE b/TODO-RELEASE
index b1b533c..ae21a12 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -7,4 +7,4 @@
# If any interfaces have been added since the last public release: c:r:a + 1.
# If any interfaces have been removed or changed since the last public
release: c:r:0.
#library whatdescription / commit summary line
-libosmocore >1.9.0 osmo_sock_multiaddr_add_local_addr()
\ No newline at end of file
+libosmocore >1.9.0 osmo_sock_multiaddr_{add,del}_local_addr()
\ No newline at end of file
diff --git a/include/osmocom/sigtran/osmo_ss7.h
b/include/osmocom/sigtran/osmo_ss7.h
index 98e1187..841c12b 100644
--- a/include/osmocom/sigtran/osmo_ss7.h
+++ b/include/osmocom/sigtran/osmo_ss7.h
@@ -471,6 +471,8 @@
const char *const*hosts, size_t host_cnt, int
idx_primary);
int osmo_ss7_asp_peer_add_host(struct osmo_ss7_asp_peer *peer, void
*talloc_ctx, const char *host);
int osmo_ss7_asp_peer_add_host2(struct osmo_ss7_asp_peer *peer, void
*talloc_ctx, const char *host, bool is_primary_addr);
+int osmo_ss7_asp_peer_del_host(struct osmo_ss7_asp_peer *peer, const char
*host);
+
struct osmo_ss7_asp *
osmo_ss7_asp_find_by_name(struct osmo_ss7_instance *inst, const char *name);
diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c
index 68bd0ca..1ba0a43 100644
--- a/src/osmo_ss7_asp.c
+++ b/src/osmo_ss7_asp.c
@@ -187,6 +187,25 @@
return osmo_sock_multiaddr_add_local_addr(ofd->fd, _loc_addr, 1);
}
+int ss7_asp_apply_drop_local_address(const struct osmo_ss7_asp *asp, unsigned
int loc_idx)
+{
+ const char *new_loc_addr;
+ struct osmo_fd *ofd;
+
+ OSMO_ASSERT(loc_idx < asp->cfg.local.host_cnt);
+ new_loc_addr = asp->cfg.local.host[loc_idx];
+
+ LOGPASP(asp, DLSS7, LOGL_INFO, "Remove local address %s\n",
+ new_loc_addr);
+
+ if (asp->cfg.is_server)
+ ofd = osmo_stream_srv_get_ofd(asp->server);
+ else
+ ofd = osmo_stream_cli_get_ofd(asp->client);
+
+ return osmo_sock_multiaddr_del_local_addr(ofd->fd, _loc_addr, 1);
+}
+
int ss7_asp_apply_peer_primary_address(const struct osmo_ss7_asp *asp)
{
struct osmo_fd *ofd;
diff --git a/src/osmo_ss7_asp_peer.c b/src/osmo_ss7_asp_peer.c
index cf591d9..39a92b1 100644
--- a/src/osmo_ss7_asp_peer.c
+++ b/src/osmo_ss7_asp_peer.c
@@ -208,6 +208,50 @@
return 0;
}
+/*! \brief Remove address from a given ASP peer.
+ * \param[in] peer Application Server Process peer the address is removed
from.
+ * \param[in] host string containing an IP address.
+ * \returns 0 on success; negative otherwise */
+int osmo_ss7_asp_peer_del_host(struct osmo_ss7_asp_peer *peer, const char
*host)
+{
+ int i;
+ struct osmo_sockaddr_str addr_str;
+ bool found = false;
+
+ if (osmo_sockaddr_str_from_str(_str, host, 0) < 0)
+ return -EINVAL;
+
+ for (i = 0; i < peer->host_cnt; i++) {
+ if (strcmp(host, peer->host[i]) == 0) {
+ found = true;
+ break;
+ }
+ }
+
+ if (!found)
+ return -ENOENT;
+
+ /* If current primary points to addr being removed, unset it: */
+ if (peer->idx_primary == i)
+ peer->idx_primary = -1;
+ /* If it's after it, update it together with sliding done further
below: */
+ else if (peer->idx_primary > i)
+ peer->idx_primary--;
+
+ /* Free addr to remove: */
+ TALLOC_FREE(peer->host[i]);
+
+ /* Move the rest of the array: */
+ for (; i < peer->host_cnt - 1; i++)
+ peer->host[i] = peer->host[i + 1];
+ peer->host[i] = NULL;
+
+ /* Update array size: */
+
[S] Change in libosmo-sccp[master]: xua_server: asp: Support removing local addresses
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/34613?usp=email )
Change subject: xua_server: asp: Support removing local addresses
..
xua_server: asp: Support removing local addresses
The socket is reconfigured (and hence reopened) upon VTY node exit if
changes were stored in the address list of the xua_server
(osmo_stream_srv_link).
Related: OS#4607
Change-Id: I942edff7695efeea7753f22e31c2098c201290ff
---
M include/osmocom/sigtran/osmo_ss7.h
M src/osmo_ss7_vty.c
M src/osmo_ss7_xua_srv.c
3 files changed, 43 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
diff --git a/include/osmocom/sigtran/osmo_ss7.h
b/include/osmocom/sigtran/osmo_ss7.h
index 841c12b..a8a624f 100644
--- a/include/osmocom/sigtran/osmo_ss7.h
+++ b/include/osmocom/sigtran/osmo_ss7.h
@@ -562,6 +562,7 @@
int
osmo_ss7_xua_server_set_local_hosts(struct osmo_xua_server *xs, const char
**local_hosts, size_t local_host_cnt);
int osmo_ss7_xua_server_add_local_host(struct osmo_xua_server *xs, const char
*local_host);
+int osmo_ss7_xua_server_del_local_host(struct osmo_xua_server *xs, const char
*local_host);
void osmo_ss7_xua_server_destroy(struct osmo_xua_server *xs);
struct osmo_sccp_instance *
diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c
index 172893e..ff27cf3 100644
--- a/src/osmo_ss7_vty.c
+++ b/src/osmo_ss7_vty.c
@@ -511,6 +511,22 @@
return CMD_SUCCESS;
}
+DEFUN_ATTR(xua_no_local_ip, xua_no_local_ip_cmd,
+ "no local-ip " VTY_IPV46_CMD,
+ NO_STR "Configure the Local IP Address for xUA\n"
+ "IPv4 Address to use for XUA\n"
+ "IPv6 Address to use for XUA\n",
+ CMD_ATTR_NODE_EXIT)
+{
+ struct osmo_xua_server *xs = vty->index;
+
+ if (osmo_ss7_xua_server_del_local_host(xs, argv[0]) != 0) {
+ vty_out(vty, "%% Failed deleting local address '%s' from
set%s", argv[0], VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+ return CMD_SUCCESS;
+}
+
DEFUN_ATTR(xua_accept_dyn_asp, xua_accept_dyn_asp_cmd,
"accept-asp-connections (pre-configured|dynamic-permitted)",
"Define what kind of ASP connections to accept\n"
@@ -2476,6 +2492,7 @@
install_lib_element(L_CS7_NODE, _xua_cmd);
install_lib_element(L_CS7_NODE, _cs7_xua_cmd);
install_lib_element(L_CS7_XUA_NODE, _local_ip_cmd);
+ install_lib_element(L_CS7_XUA_NODE, _no_local_ip_cmd);
install_lib_element(L_CS7_XUA_NODE, _accept_dyn_asp_cmd);
install_lib_element(L_CS7_XUA_NODE, _sctp_param_init_cmd);
install_lib_element(L_CS7_XUA_NODE, _no_sctp_param_init_cmd);
diff --git a/src/osmo_ss7_xua_srv.c b/src/osmo_ss7_xua_srv.c
index dc27c83..32266ff 100644
--- a/src/osmo_ss7_xua_srv.c
+++ b/src/osmo_ss7_xua_srv.c
@@ -284,6 +284,17 @@
return osmo_stream_srv_link_set_addrs(xs->server, (const char
**)xs->cfg.local.host, xs->cfg.local.host_cnt);
}
+int
+osmo_ss7_xua_server_del_local_host(struct osmo_xua_server *xs, const char
*local_host)
+{
+ int rc;
+
+ rc = osmo_ss7_asp_peer_del_host(>cfg.local, local_host);
+ if (rc < 0)
+ return rc;
+ return osmo_stream_srv_link_set_addrs(xs->server, (const char
**)xs->cfg.local.host, xs->cfg.local.host_cnt);
+}
+
bool ss7_xua_server_set_default_local_hosts(struct osmo_xua_server *oxs)
{
/* If no local addr was set, or erased after _create(): */
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34613?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I942edff7695efeea7753f22e31c2098c201290ff
Gerrit-Change-Number: 34613
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in libosmo-sccp[master]: xua_server: asp: Support removing local addresses
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34613?usp=email ) Change subject: xua_server: asp: Support removing local addresses .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34613?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I942edff7695efeea7753f22e31c2098c201290ff Gerrit-Change-Number: 34613 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Oct 2023 11:21:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-sccp[master]: asp: Support removing local & remote addresses
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34612?usp=email ) Change subject: asp: Support removing local & remote addresses .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34612?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I554aee92285bd72eb90c6daf47b37055cb3067aa Gerrit-Change-Number: 34612 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 04 Oct 2023 11:21:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-sccp[master]: sccp: Drop unused local variable
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/34617?usp=email )
Change subject: sccp: Drop unused local variable
..
sccp: Drop unused local variable
Change-Id: I7f829f1c285d01faeaad317262ddd51f39e42886
---
M src/sccp.c
1 file changed, 9 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/src/sccp.c b/src/sccp.c
index ecab9ab..85bea6d 100644
--- a/src/sccp.c
+++ b/src/sccp.c
@@ -840,7 +840,6 @@
struct msgb *request;
struct sccp_connection_request *req;
uint8_t *data;
- uint8_t extra_size = 3 + 1;
int called_len;
if (l3_data) {
@@ -850,8 +849,6 @@
}
}
- if (l3_data)
- extra_size += 2 + l3_length;
request = msgb_alloc_headroom(SCCP_MSG_SIZE,
SCCP_MSG_HEADROOM, "sccp connection
request");
request->l2h = >data[0];
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34617?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I7f829f1c285d01faeaad317262ddd51f39e42886
Gerrit-Change-Number: 34617
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmocom-bb[master]: Correctly extract bits from SI2*/SI5*
Attention is currently required from: fixeria, jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34604?usp=email ) Change subject: Correctly extract bits from SI2*/SI5* .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34604?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie5349464fed0a4276955235c7c87b5bcb299f20d Gerrit-Change-Number: 34604 Gerrit-PatchSet: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 04 Oct 2023 11:20:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: ASCI: Add VTY command to display group call neighbor cells
Attention is currently required from: fixeria, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34615?usp=email ) Change subject: ASCI: Add VTY command to display group call neighbor cells .. Patch Set 3: (1 comment) File src/host/layer23/src/mobile/vty_interface.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34615/comment/81c3202a_e798ad25 PS1, Line 393: ASCI_STR > missing `SHOW_STR` in command description Replaced by SHOW_ASCI_STR to make clear that it already includes the SHOW_STR. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34615?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie84221507bdf247c1563b829d6cf0adb53ce161f Gerrit-Change-Number: 34615 Gerrit-PatchSet: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 04 Oct 2023 11:16:50 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: Fix potential NULL pointer dereferences, discovered by Coverity Scan
Attention is currently required from: jolly, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34608?usp=email ) Change subject: Fix potential NULL pointer dereferences, discovered by Coverity Scan .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34608?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I47aa506014d8bddb8c8ce9b506c1c5c7b8056d30 Gerrit-Change-Number: 34608 Gerrit-PatchSet: 4 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 04 Oct 2023 11:08:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmo-bsc[master]: ASCI: Add System Information 10 support
Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34626?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: ASCI: Add System Information 10 support .. ASCI: Add System Information 10 support A timer is used to wait some seconds before sending SI 10 to all BTS. This ensures that all channels are established by the MSC, before sending a complete list of VGCS/VBS neighbor cells for a call. For each BTS, an SI 10 is gerated with all other neighbor BTS. The SI 10 will only define neighbor cells within the same BSC, because it does not know about neighbor cells within other BSCs. Change-Id: Icd3101e6dd935a57f003253aaef400c2cf95a0c3 --- M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/system_information.h M src/osmo-bsc/system_information.c M src/osmo-bsc/vgcs_fsm.c 4 files changed, 313 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/26/34626/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34626?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icd3101e6dd935a57f003253aaef400c2cf95a0c3 Gerrit-Change-Number: 34626 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[M] Change in osmo-bsc[master]: ASCI: Make neigh_list_get_arfcn() available to other users
Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34625?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: ASCI: Make neigh_list_get_arfcn() available to other users .. ASCI: Make neigh_list_get_arfcn() available to other users The error logging message within this function is moved to the user neigh_list_get_arfcn(). Change-Id: Ia8a1dca4837536129d17e7784b892bcb75b9ca4b --- M include/osmocom/bsc/gsm_04_08_rr.h M src/osmo-bsc/gsm_04_08_rr.c 2 files changed, 43 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/25/34625/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34625?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia8a1dca4837536129d17e7784b892bcb75b9ca4b Gerrit-Change-Number: 34625 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[M] Change in osmo-ttcn3-hacks[master]: library: add System Information Type 10 Rest Octets codec
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34578?usp=email )
Change subject: library: add System Information Type 10 Rest Octets codec
..
library: add System Information Type 10 Rest Octets codec
The CSN.1 definition can be found in 3GPP TS 44.018, section 10.5.2.44.
Change-Id: Iab04a588e645abf9b3c99bddef293526ae6752e1
Related: OS#5782
---
M library/GSM_RestOctets.ttcn
1 file changed, 136 insertions(+), 0 deletions(-)
Approvals:
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
jolly: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/library/GSM_RestOctets.ttcn b/library/GSM_RestOctets.ttcn
index 6fa781c..eff9546 100644
--- a/library/GSM_RestOctets.ttcn
+++ b/library/GSM_RestOctets.ttcn
@@ -1241,6 +1241,125 @@
};
+/* 10.5.2.44 SI10 rest octets (ASCI) */
+type record SI10RestOctets {
+ BIT1ba_ind,
+ BIT1neigh_info_presence, // L/H
+ SI10NeighInfo neigh_info optional
+} with {
+ variant (neigh_info_presence) "CSN.1 L/H"
+ variant (neigh_info) "PRESENCE(neigh_info_presence = '1'B)"
+
+ /* The TITAN's RAW encoder generates an octet-aligned octetstring,
+* so we should make sure that unused bits contain proper padding. */
+ variant "PADDING(yes), PADDING_PATTERN('00101011'B)"
+};
+
+private type record SI10NeighInfo {
+ uint5_t first_freq,
+ SI10CellInfocell_info,
+ SI10InfoFieldList info_field optional,
+ BIT1info_field_term ('0'B) // L/H
+} with {
+ variant (info_field_term) "CSN.1 L/H"
+};
+
+private type record SI10CellInfo {
+ uint6_t bsic,
+ BIT1cell_params_presence, // L/H
+ SI10CellParams cell_params optional
+} with {
+ variant (cell_params_presence) "CSN.1 L/H"
+ variant (cell_params) "PRESENCE(cell_params_presence = '1'B)"
+};
+
+private type record SI10CellParams {
+ BIT1cell_barred, // L/H
+ SI10FurtherCellInfo further_cell_info optional
+} with {
+ variant (cell_barred) "CSN.1 L/H"
+ variant (further_cell_info) "PRESENCE(cell_barred = '0'B)"
+};
+
+private type record SI10FurtherCellInfo {
+ BIT1la_different, // L/H
+ uint3_t cell_resel_hyst optional,
+ uint5_t ms_txpwr_max_cch,
+ uint6_t rxlev_access_min,
+ uint6_t cell_resel_offset,
+ uint3_t temp_offset,
+ uint5_t penalty_time
+} with {
+ variant (la_different) "CSN.1 L/H"
+ variant (cell_resel_hyst) "PRESENCE(la_different = '1'B)"
+};
+
+private type record of SI10InfoField SI10InfoFieldList;
+private type record SI10InfoField {
+ BIT1item_ind ('1'B),
+ SI10NextFreqListnext_freq optional,
+ BIT1next_freq_term ('0'B), // L/H
+ SI10DiffCellInfodiff_cell_info
+} with {
+ variant (item_ind) "CSN.1 L/H"
+ variant "PRESENCE(item_ind = '1'B)"
+ variant (next_freq_term) "CSN.1 L/H"
+};
+
+private type record of SI10NextFreq SI10NextFreqList;
+private type BIT1 SI10NextFreq with { variant "CSN.1 L/H" };
+
+private type record SI10DiffCellInfo {
+ BIT1bcc_or_bsic, // L/H
+ uint3_t bcc optional,
+ uint6_t bsic optional,
+ BIT1diff_cell_params_presence, // L/H
+ SI10DiffCellParams diff_cell_params optional
+} with {
+ variant (bcc_or_bsic) "CSN.1 L/H"
+ variant (bcc) "PRESENCE(bcc_or_bsic = '1'B)"
+ variant (bsic) "PRESENCE(bcc_or_bsic = '0'B)"
+ variant (diff_cell_params_presence) "CSN.1 L/H"
+ variant (diff_cell_params) "PRESENCE(diff_cell_params_presence = '1'B)"
+};
+
+private type record SI10DiffCellParams {
+ BIT1cell_barred, // L/H
+ SI10FurtherDiffCellInfo further_diff_cell_info optional
+} with {
+ variant (cell_barred) "CSN.1 L/H"
+ variant (further_diff_cell_info) "PRESENCE(cell_barred = '0'B)"
+};
+
+private type record SI10FurtherDiffCellInfo {
+ BIT1la_different, // L/H
+ uint3_t cell_resel_hyst optional,
+ BIT1ms_txpwr_max_cch_presence, // L/H
+ uint5_t ms_txpwr_max_cch optional,
+ BIT1rxlev_access_min_presence, // L/H
+ uint6_t rxlev_access_min optional,
+ BIT1cell_resel_offset_presence, // L/H
+ uint6_t cell_resel_offset optional,
+ BIT1temp_offset_presence, //
[M] Change in osmo-ttcn3-hacks[master]: library: add System Information Type 10 Rest Octets codec
Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34578?usp=email ) Change subject: library: add System Information Type 10 Rest Octets codec .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34578?usp=email 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: Iab04a588e645abf9b3c99bddef293526ae6752e1 Gerrit-Change-Number: 34578 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 04 Oct 2023 10:56:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: Fix potential NULL pointer dereferences, discovered by Coverity Scan
Attention is currently required from: fixeria, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34608?usp=email ) Change subject: Fix potential NULL pointer dereferences, discovered by Coverity Scan .. Patch Set 4: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/34608/comment/c3aa2652_ac1523e9 PS3, Line 7: Fixed potential NULL pointer dereferences, discovered by Coverity Scan > we actually usually use imperative/infinitive in here. Done -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34608?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I47aa506014d8bddb8c8ce9b506c1c5c7b8056d30 Gerrit-Change-Number: 34608 Gerrit-PatchSet: 4 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 04 Oct 2023 10:56:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: Fix potential NULL pointer dereferences, discovered by Coverity Scan
Attention is currently required from: fixeria, jolly. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34608?usp=email to look at the new patch set (#4). Change subject: Fix potential NULL pointer dereferences, discovered by Coverity Scan .. Fix potential NULL pointer dereferences, discovered by Coverity Scan See: CID 323362 + CID 323363 Change-Id: I47aa506014d8bddb8c8ce9b506c1c5c7b8056d30 --- M src/host/layer23/src/mobile/gsm48_mm.c 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/08/34608/4 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34608?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I47aa506014d8bddb8c8ce9b506c1c5c7b8056d30 Gerrit-Change-Number: 34608 Gerrit-PatchSet: 4 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: Fix settings for VGCS/VBS
Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34644?usp=email ) Change subject: Fix settings for VGCS/VBS .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34644?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I81575dd3f2ade70101df32935a1c3d5469327577 Gerrit-Change-Number: 34644 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 04 Oct 2023 10:47:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmocom-bb[master]: Fixed potential NULL pointer dereferences, discovered by Coverity Scan
Attention is currently required from: fixeria, jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34608?usp=email ) Change subject: Fixed potential NULL pointer dereferences, discovered by Coverity Scan .. Patch Set 3: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/34608/comment/a645cf7e_908f2773 PS3, Line 7: Fixed potential NULL pointer dereferences, discovered by Coverity Scan we actually usually use imperative/infinitive in here. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34608?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I47aa506014d8bddb8c8ce9b506c1c5c7b8056d30 Gerrit-Change-Number: 34608 Gerrit-PatchSet: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 04 Oct 2023 10:47:29 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[L] Change in osmocom-bb[master]: ASCI: Add VTY commands to control voice group/broadcast calls
Attention is currently required from: fixeria, laforge, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34495?usp=email ) Change subject: ASCI: Add VTY commands to control voice group/broadcast calls .. Patch Set 16: (2 comments) File src/host/layer23/src/mobile/vty_interface.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34495/comment/c75d73d4_ca937e73 PS16, Line 379: ASCI_STR > You're missing `SHOW_STR` here, it should be: […] It is already added in the #define above. I renamed it to SHOW_ASCI_STR, to make this clearer. https://gerrit.osmocom.org/c/osmocom-bb/+/34495/comment/928e0c2b_e0cf94a9 PS16, Line 700: These commands perform VGCS on given MS without entering the VGCS node > So then is there really a need for having a dedicated VTY node for just one > command, which is also a […] You can switch between talk and listen without having a full command. Just enter "talk" or "listen" or other sub-commands. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34495?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id32253b4e10b8df48e819d8a92bbcda332dd11e6 Gerrit-Change-Number: 34495 Gerrit-PatchSet: 16 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 04 Oct 2023 10:47:15 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[L] Change in osmocom-bb[master]: ASCI: Add decoding of SYSTEM INFORMATION TYPE 10 $(ASCI)$
Attention is currently required from: fixeria, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34614?usp=email ) Change subject: ASCI: Add decoding of SYSTEM INFORMATION TYPE 10 $(ASCI)$ .. Patch Set 2: (9 comments) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/34614/comment/b91d95a1_9aa56e1d PS1, Line 7: ASCI: Add decoding of SYSTEM INFORMATION TYPE 10 $(ASCI)$ > what's this $(ASCI)$ here at the end? This is the full name of the message. See 9.1.50 in TS 44.018 File src/host/layer23/include/osmocom/bb/common/sysinfo.h: https://gerrit.osmocom.org/c/osmocom-bb/+/34614/comment/0da1c9c2_badec80b PS1, Line 179: uint8_t si10_cells; /* number neighbor cells found in SI 10 */ > having si10_cells vs si10_cell below is highly misleading and prone to error. > […] Done File src/host/layer23/src/common/sysinfo.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34614/comment/763773c1_947c4915 PS1, Line 613: Band indicator > `BA_IND` is actually BCCH allocation sequence number indication, and not a > band indicator? The loggi […] Done https://gerrit.osmocom.org/c/osmocom-bb/+/34614/comment/8ba02555_3007e56d PS1, Line 632: parameter > parameter(s) Done https://gerrit.osmocom.org/c/osmocom-bb/+/34614/comment/d6f90d90_1b0eb210 PS1, Line 651: bitvec_get_uint(bv, 6) - 110 > use `rxlev2dbm()` Done https://gerrit.osmocom.org/c/osmocom-bb/+/34614/comment/5698da68_d3410d58 PS1, Line 1040: static int16_t arfcn_from_freq(struct gsm48_sysinfo *s, uint16_t index) > according to the param looks mmore like arfcn_from_index ;) […] The specs calls it "frequency", but it is actually an index, relative to SI5(bis/ter). I will rename it to arfcn_from_freq_index https://gerrit.osmocom.org/c/osmocom-bb/+/34614/comment/e341b873_6dd49678 PS1, Line 1091: puts > debugging leftovers? Done File src/host/layer23/src/mobile/gsm48_rr.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34614/comment/62e9932a_17189645 PS1, Line 2900: /* receive "SYSTEM INFORMATION 10" message (9.1.50) */ > why turning the first char into a lowcase her? Done https://gerrit.osmocom.org/c/osmocom-bb/+/34614/comment/95655a3b_5b9513d1 PS1, Line 2909: LOGP(DRR, LOGL_INFO, "No cell selected, SYSTEM INFORMATION 10 " > all these can git in one line. Done -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34614?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I81c7929f6d951d8eef7d08624f0b72830370c448 Gerrit-Change-Number: 34614 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 04 Oct 2023 10:47:11 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: ASCI: Add VTY command to display group call neighbor cells
Attention is currently required from: jolly, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34615?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: ASCI: Add VTY command to display group call neighbor cells .. ASCI: Add VTY command to display group call neighbor cells Related: OS#5782 Change-Id: Ie84221507bdf247c1563b829d6cf0adb53ce161f --- M src/host/layer23/include/osmocom/bb/common/sysinfo.h M src/host/layer23/src/common/sysinfo.c M src/host/layer23/src/mobile/vty_interface.c 3 files changed, 70 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/15/34615/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34615?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie84221507bdf247c1563b829d6cf0adb53ce161f Gerrit-Change-Number: 34615 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: Fix settings for VGCS/VBS
jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34644?usp=email ) Change subject: Fix settings for VGCS/VBS .. Fix settings for VGCS/VBS The "support" flags must be copied to the settings, because they are enabled by default and may be omitted in the VTY config. Related: OS#5364 Change-Id: I81575dd3f2ade70101df32935a1c3d5469327577 --- M src/host/layer23/src/common/settings.c 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/44/34644/1 diff --git a/src/host/layer23/src/common/settings.c b/src/host/layer23/src/common/settings.c index 288b03e..395d239 100644 --- a/src/host/layer23/src/common/settings.c +++ b/src/host/layer23/src/common/settings.c @@ -100,6 +100,8 @@ set->ch_cap = sup->ch_cap; set->min_rxlev_dbm = sup->min_rxlev_dbm; set->dsc_max = sup->dsc_max; + set->vgcs = sup->vgcs; + set->vbs = sup->vbs; if (sup->half_v1 || sup->half_v3) set->half = 1; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34644?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I81575dd3f2ade70101df32935a1c3d5469327577 Gerrit-Change-Number: 34644 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-MessageType: newchange
[S] Change in osmocom-bb[master]: Fixed potential NULL pointer dereferences, discovered by Coverity Scan
Attention is currently required from: fixeria, jolly, pespin. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34608?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+2 by fixeria The change is no longer submittable: Code-Review is unsatisfied now. Change subject: Fixed potential NULL pointer dereferences, discovered by Coverity Scan .. Fixed potential NULL pointer dereferences, discovered by Coverity Scan See: CID 323362 + CID 323363 Change-Id: I47aa506014d8bddb8c8ce9b506c1c5c7b8056d30 --- M src/host/layer23/src/mobile/gsm48_mm.c 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/08/34608/3 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34608?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I47aa506014d8bddb8c8ce9b506c1c5c7b8056d30 Gerrit-Change-Number: 34608 Gerrit-PatchSet: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[L] Change in osmocom-bb[master]: ASCI: Add decoding of SYSTEM INFORMATION TYPE 10 $(ASCI)$
Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34614?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: ASCI: Add decoding of SYSTEM INFORMATION TYPE 10 $(ASCI)$ .. ASCI: Add decoding of SYSTEM INFORMATION TYPE 10 $(ASCI)$ Related: OS#5782 Change-Id: I81c7929f6d951d8eef7d08624f0b72830370c448 --- M src/host/layer23/include/osmocom/bb/common/sysinfo.h M src/host/layer23/src/common/sysinfo.c M src/host/layer23/src/mobile/gsm48_rr.c 3 files changed, 322 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/14/34614/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34614?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I81c7929f6d951d8eef7d08624f0b72830370c448 Gerrit-Change-Number: 34614 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[S] Change in osmocom-bb[master]: Correctly extract bits from SI2*/SI5*
Attention is currently required from: fixeria, jolly, pespin. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/34604?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by pespin, Code-Review+2 by fixeria The change is no longer submittable: Code-Review is unsatisfied now. Change subject: Correctly extract bits from SI2*/SI5* .. Correctly extract bits from SI2*/SI5* These bits are: * EXT-IND * BA-IND * Multiband reporting Change-Id: Ie5349464fed0a4276955235c7c87b5bcb299f20d --- M src/host/layer23/src/common/sysinfo.c 1 file changed, 26 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/04/34604/3 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34604?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie5349464fed0a4276955235c7c87b5bcb299f20d Gerrit-Change-Number: 34604 Gerrit-PatchSet: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in libosmo-sccp[master]: sccp: Drop unused local variable
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34617?usp=email ) Change subject: sccp: Drop unused local variable .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34617?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I7f829f1c285d01faeaad317262ddd51f39e42886 Gerrit-Change-Number: 34617 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 04 Oct 2023 10:16:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-gprs[master]: rlcmac: tbf_ul_ass_fsm: Fix state not reset after first UL-TBF re-ass...
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-gprs/+/34622?usp=email )
Change subject: rlcmac: tbf_ul_ass_fsm: Fix state not reset after first UL-TBF
re-assignment
..
rlcmac: tbf_ul_ass_fsm: Fix state not reset after first UL-TBF re-assignment
The FSM can be reused several times to assign a UL TBF over its
lifespan, eg. if a DL TBF DL ACK/NACK is reuse to request allocation of
a UL TBF several times.
Some state like ctx->tbf_starting_time_exists was being left as =true
during the initial run of the FSM, and as a result subsequent runs going
through the check delaying completing after sending the PKT CTRL ACK.
Change-Id: Iaddbd1e3924036be1cf6eed41367031d3e127f57
---
M src/rlcmac/tbf_ul_ass_fsm.c
1 file changed, 32 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve; Verified
pespin: Looks good to me, approved
diff --git a/src/rlcmac/tbf_ul_ass_fsm.c b/src/rlcmac/tbf_ul_ass_fsm.c
index b1be58c..df5b799 100644
--- a/src/rlcmac/tbf_ul_ass_fsm.c
+++ b/src/rlcmac/tbf_ul_ass_fsm.c
@@ -128,6 +128,12 @@
static int handle_imm_ass(struct gprs_rlcmac_tbf_ul_ass_fsm_ctx *ctx, const
struct tbf_ul_ass_ev_rx_ccch_imm_ass_ctx *d)
{
+ /* reset previous state: */
+ memset(>phase1_alloc, 0, sizeof(ctx->phase1_alloc));
+ ctx->sba = true;
+ ctx->tbf_starting_time_exists = false;
+ ctx->tbf_starting_time = 0;
+
/* TS 44.018 10.5.2.16 IA Rest Octets */
switch (d->iaro->UnionType) {
case 1: /* d->iaro->u.lh.* (IA_RestOctetsLH_t) */
@@ -195,6 +201,12 @@
const Timeslot_Allocation_t *ts_alloc;
const Timeslot_Allocation_Power_Ctrl_Param_t *ts_alloc_pwr_ctl;
+ /* reset previous state: */
+ memset(>phase2_alloc, 0, sizeof(ctx->phase2_alloc));
+ ctx->sba = false;
+ ctx->tbf_starting_time_exists = false;
+ ctx->tbf_starting_time = 0;
+
switch (ulass->UnionType) {
case 0: /* ulass->u.PUA_GPRS_Struct.* (PUA_GPRS_t) */
ctx->ul_tbf->tx_cs =
ulass->u.PUA_GPRS_Struct.CHANNEL_CODING_COMMAND + 1;
@@ -258,6 +270,9 @@
ctx->dl_tbf = NULL;
memset(>phase1_alloc, 0, sizeof(ctx->phase1_alloc));
memset(>phase2_alloc, 0, sizeof(ctx->phase2_alloc));
+ ctx->sba = false;
+ ctx->tbf_starting_time_exists = false;
+ ctx->tbf_starting_time = 0;
}
static void st_idle(struct osmo_fsm_inst *fi, uint32_t event, void *data)
@@ -368,7 +383,6 @@
data_ctx->msg = create_pkt_resource_req(ctx, data_ctx);
if (!data_ctx->msg)
return;
- ctx->sba = false; /* Reset state */
tbf_ul_ass_fsm_state_chg(fi,
GPRS_RLCMAC_TBF_UL_ASS_ST_WAIT_PKT_UL_ASS);
break;
default:
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34622?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: Iaddbd1e3924036be1cf6eed41367031d3e127f57
Gerrit-Change-Number: 34622
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Hoernchen
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in libosmo-gprs[master]: rlcmac: tbf_ul_ass_fsm: Fix state not reset after first UL-TBF re-ass...
Attention is currently required from: Hoernchen. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34622?usp=email ) Change subject: rlcmac: tbf_ul_ass_fsm: Fix state not reset after first UL-TBF re-assignment .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34622?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Iaddbd1e3924036be1cf6eed41367031d3e127f57 Gerrit-Change-Number: 34622 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: Hoernchen Gerrit-Comment-Date: Wed, 04 Oct 2023 10:15:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-sccp[master]: asp: Apply SCTP peer primary address changes after the ASP was started
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/34610?usp=email )
Change subject: asp: Apply SCTP peer primary address changes after the ASP was
started
..
asp: Apply SCTP peer primary address changes after the ASP was started
Related: OS#6077
Change-Id: I088b9a59ebfd85f3ce4a26f28bf41472d9b9da60
---
M src/osmo_ss7_vty.c
1 file changed, 27 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c
index 000b1cf..cdca10d 100644
--- a/src/osmo_ss7_vty.c
+++ b/src/osmo_ss7_vty.c
@@ -714,11 +714,28 @@
{
struct osmo_ss7_asp *asp = vty->index;
bool is_primary = argc > 1;
+ int old_idx_primary = asp->cfg.local.idx_primary;
+ int rc;
if (osmo_ss7_asp_peer_add_host2(>cfg.local, asp, argv[0],
is_primary) != 0) {
vty_out(vty, "%% Failed adding host '%s' to set%s", argv[0],
VTY_NEWLINE);
return CMD_WARNING;
}
+
+ if (!ss7_asp_is_started(asp))
+ return CMD_SUCCESS;
+ if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA)
+ return CMD_SUCCESS;
+
+ /* The SCTP socket is already created, dynamically apply the new
primary if it changed: */
+ if (is_primary && asp->cfg.local.idx_primary != old_idx_primary) {
+ if ((rc = ss7_asp_apply_peer_primary_address(asp)) < 0) {
+ /* Failed, rollback changes: */
+ asp->cfg.local.idx_primary = old_idx_primary;
+ vty_out(vty, "%% Failed announcing primary '%s' to
peer%s", argv[0], VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+ }
return CMD_SUCCESS;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34610?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I088b9a59ebfd85f3ce4a26f28bf41472d9b9da60
Gerrit-Change-Number: 34610
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in libosmo-sccp[master]: asp: Apply SCTP primary address changes after the ASP was started
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/34609?usp=email )
Change subject: asp: Apply SCTP primary address changes after the ASP was
started
..
asp: Apply SCTP primary address changes after the ASP was started
Related: OS#6077
Change-Id: I2beb597b2e98d8983177fb21882a461219b3aa58
---
M src/osmo_ss7_asp.c
M src/osmo_ss7_vty.c
M src/ss7_internal.h
3 files changed, 37 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c
index 6068a9d..f26e2e1 100644
--- a/src/osmo_ss7_asp.c
+++ b/src/osmo_ss7_asp.c
@@ -617,6 +617,14 @@
return asp->fi->state == XUA_ASP_S_ACTIVE;
}
+bool ss7_asp_is_started(const struct osmo_ss7_asp *asp)
+{
+ if (asp->cfg.is_server)
+ return !!asp->server;
+ else
+ return !!asp->client;
+}
+
/***
* libosmo-netif integration for SCTP stream server/client
***/
diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c
index 4e13522..000b1cf 100644
--- a/src/osmo_ss7_vty.c
+++ b/src/osmo_ss7_vty.c
@@ -732,11 +732,28 @@
{
struct osmo_ss7_asp *asp = vty->index;
bool is_primary = argc > 1;
+ int old_idx_primary = asp->cfg.remote.idx_primary;
+ int rc;
if (osmo_ss7_asp_peer_add_host2(>cfg.remote, asp, argv[0],
is_primary) != 0) {
vty_out(vty, "%% Failed adding host '%s' to set%s", argv[0],
VTY_NEWLINE);
return CMD_WARNING;
}
+
+ if (!ss7_asp_is_started(asp))
+ return CMD_SUCCESS;
+ if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA)
+ return CMD_SUCCESS;
+
+ /* The SCTP socket is already created, dynamically apply the new
primary if it changed: */
+ if (asp->cfg.proto != OSMO_SS7_ASP_PROT_IPA && ss7_asp_is_started(asp))
{
+ if ((rc = ss7_asp_apply_primary_address(asp)) < 0) {
+ /* Failed, rollback changes: */
+ asp->cfg.remote.idx_primary = old_idx_primary;
+ vty_out(vty, "%% Failed applying primary on host
'%s'%s", argv[0], VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+ }
return CMD_SUCCESS;
}
diff --git a/src/ss7_internal.h b/src/ss7_internal.h
index 6449c5b..ad71e83 100644
--- a/src/ss7_internal.h
+++ b/src/ss7_internal.h
@@ -18,7 +18,9 @@
uint16_t remote_port, uint16_t local_port,
enum osmo_ss7_asp_protocol proto);
bool ss7_asp_set_default_peer_hosts(struct osmo_ss7_asp *asp);
+bool ss7_asp_is_started(const struct osmo_ss7_asp *asp);
struct osmo_ss7_asp *ss7_asp_find_by_socket_addr(int fd);
+
int ss7_asp_proto_to_ip_proto(enum osmo_ss7_asp_protocol proto);
int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn);
int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34609?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I2beb597b2e98d8983177fb21882a461219b3aa58
Gerrit-Change-Number: 34609
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in libosmo-sccp[master]: asp: Support adding new local addresses after the ASP was started
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/34611?usp=email )
Change subject: asp: Support adding new local addresses after the ASP was
started
..
asp: Support adding new local addresses after the ASP was started
Related: OS#6077
Depends: libosmocore.git Change-Id Ifc6e7d643c2a0c53f479bfd0d5c36d08c0c01953
Change-Id: I8318d2693f3a9c479b18ab1d660431c1ec77c004
---
M TODO-RELEASE
M src/osmo_ss7_asp.c
M src/osmo_ss7_vty.c
M src/ss7_internal.h
4 files changed, 48 insertions(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
diff --git a/TODO-RELEASE b/TODO-RELEASE
index d0852fc..b1b533c 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -7,3 +7,4 @@
# If any interfaces have been added since the last public release: c:r:a + 1.
# If any interfaces have been removed or changed since the last public
release: c:r:0.
#library whatdescription / commit summary line
+libosmocore >1.9.0 osmo_sock_multiaddr_add_local_addr()
\ No newline at end of file
diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c
index f26e2e1..68bd0ca 100644
--- a/src/osmo_ss7_asp.c
+++ b/src/osmo_ss7_asp.c
@@ -168,6 +168,25 @@
};
static unsigned int g_ss7_asp_rcg_idx;
+int ss7_asp_apply_new_local_address(const struct osmo_ss7_asp *asp, unsigned
int loc_idx)
+{
+ const char *new_loc_addr;
+ struct osmo_fd *ofd;
+
+ OSMO_ASSERT(loc_idx < asp->cfg.local.host_cnt);
+ new_loc_addr = asp->cfg.local.host[loc_idx];
+
+ LOGPASP(asp, DLSS7, LOGL_INFO, "Add local address %s\n",
+ new_loc_addr);
+
+ if (asp->cfg.is_server)
+ ofd = osmo_stream_srv_get_ofd(asp->server);
+ else
+ ofd = osmo_stream_cli_get_ofd(asp->client);
+
+ return osmo_sock_multiaddr_add_local_addr(ofd->fd, _loc_addr, 1);
+}
+
int ss7_asp_apply_peer_primary_address(const struct osmo_ss7_asp *asp)
{
struct osmo_fd *ofd;
diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c
index cdca10d..f9c1ada 100644
--- a/src/osmo_ss7_vty.c
+++ b/src/osmo_ss7_vty.c
@@ -715,6 +715,7 @@
struct osmo_ss7_asp *asp = vty->index;
bool is_primary = argc > 1;
int old_idx_primary = asp->cfg.local.idx_primary;
+ int old_host_count = asp->cfg.local.host_cnt;
int rc;
if (osmo_ss7_asp_peer_add_host2(>cfg.local, asp, argv[0],
is_primary) != 0) {
@@ -726,8 +727,21 @@
return CMD_SUCCESS;
if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA)
return CMD_SUCCESS;
+ /* The SCTP socket is already created. */
- /* The SCTP socket is already created, dynamically apply the new
primary if it changed: */
+ /* dynamically apply the new address if it was added to the set: */
+ if (asp->cfg.local.host_cnt > old_host_count) {
+ if ((rc = ss7_asp_apply_new_local_address(asp,
asp->cfg.local.host_cnt - 1)) < 0) {
+ /* Failed, rollback changes: */
+ TALLOC_FREE(asp->cfg.local.host[asp->cfg.local.host_cnt
- 1]);
+ asp->cfg.local.host_cnt--;
+ vty_out(vty, "%% Failed adding new local address
'%s'%s", argv[0], VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+ vty_out(vty, "%% Local address '%s' added to the active socket
bind set%s", argv[0], VTY_NEWLINE);
+ }
+
+ /* dynamically apply the new primary if it changed: */
if (is_primary && asp->cfg.local.idx_primary != old_idx_primary) {
if ((rc = ss7_asp_apply_peer_primary_address(asp)) < 0) {
/* Failed, rollback changes: */
@@ -735,6 +749,7 @@
vty_out(vty, "%% Failed announcing primary '%s' to
peer%s", argv[0], VTY_NEWLINE);
return CMD_WARNING;
}
+ vty_out(vty, "%% Local address '%s' announced as primary to the
peer on the active socket%s", argv[0], VTY_NEWLINE);
}
return CMD_SUCCESS;
}
diff --git a/src/ss7_internal.h b/src/ss7_internal.h
index ad71e83..438fca9 100644
--- a/src/ss7_internal.h
+++ b/src/ss7_internal.h
@@ -27,6 +27,7 @@
int ss7_asp_xua_srv_conn_closed_cb(struct osmo_stream_srv *srv);
int ss7_asp_apply_peer_primary_address(const struct osmo_ss7_asp *asp);
int ss7_asp_apply_primary_address(const struct osmo_ss7_asp *asp);
+int ss7_asp_apply_new_local_address(const struct osmo_ss7_asp *asp, unsigned
int loc_idx);
bool ss7_asp_peer_match_host(const struct osmo_ss7_asp_peer *peer, const char
*host, bool host_is_v6);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34611?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
[S] Change in libosmo-sccp[master]: asp: Support adding new local addresses after the ASP was started
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34611?usp=email ) Change subject: asp: Support adding new local addresses after the ASP was started .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34611?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8318d2693f3a9c479b18ab1d660431c1ec77c004 Gerrit-Change-Number: 34611 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Oct 2023 10:15:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-sccp[master]: asp: Apply SCTP peer primary address changes after the ASP was started
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34610?usp=email ) Change subject: asp: Apply SCTP peer primary address changes after the ASP was started .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34610?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I088b9a59ebfd85f3ce4a26f28bf41472d9b9da60 Gerrit-Change-Number: 34610 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Oct 2023 10:15:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-sccp[master]: asp: Apply SCTP primary address changes after the ASP was started
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34609?usp=email ) Change subject: asp: Apply SCTP primary address changes after the ASP was started .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34609?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I2beb597b2e98d8983177fb21882a461219b3aa58 Gerrit-Change-Number: 34609 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 04 Oct 2023 10:15:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-sccp[master]: asp: Support removing local & remote addresses
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34612?usp=email ) Change subject: asp: Support removing local & remote addresses .. Patch Set 1: (1 comment) File src/osmo_ss7_vty.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/34612/comment/5d63fd37_41cd3a7e PS1, Line 760: of > remove "of" here and in the line below? I'm simply reusing same format of similar commands around it. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34612?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I554aee92285bd72eb90c6daf47b37055cb3067aa Gerrit-Change-Number: 34612 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 04 Oct 2023 10:14:59 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: library: add System Information Type 10 Rest Octets codec
Attention is currently required from: fixeria, laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34578?usp=email ) Change subject: library: add System Information Type 10 Rest Octets codec .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34578?usp=email 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: Iab04a588e645abf9b3c99bddef293526ae6752e1 Gerrit-Change-Number: 34578 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 04 Oct 2023 09:39:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: meas: ts45008_83_is_sub(): properly handle CSD modes
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/34595?usp=email )
Change subject: meas: ts45008_83_is_sub(): properly handle CSD modes
..
meas: ts45008_83_is_sub(): properly handle CSD modes
Change-Id: Ic3b1e27be2dece3605657fd91d7addebb1e554e8
Related: OS#6168
---
M src/common/measurement.c
1 file changed, 30 insertions(+), 13 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/src/common/measurement.c b/src/common/measurement.c
index db3cdc1..96598bf 100644
--- a/src/common/measurement.c
+++ b/src/common/measurement.c
@@ -19,7 +19,7 @@
/* Active TDMA frame subset for TCH/H in DTX mode (see 3GPP TS 45.008 Section
8.3).
* This mapping is used to determine if a L2 block starting at the given TDMA
FN
* belongs to the SUB set and thus shall always be transmitted in DTX mode. */
-static const uint8_t ts45008_dtx_tchh_fn_map[104] = {
+static const uint8_t ts45008_dtx_tchh_speech_fn_map[104] = {
/* TCH/H(0): 0, 2, 4, 6, 52, 54, 56, 58 */
[0] = 1, /* block { 0, 2, 4, 6} */
[52] = 1, /* block {52, 54, 56, 58} */
@@ -28,6 +28,15 @@
[66] = 1, /* block {66, 68, 70, 72} */
};
+static const uint8_t ts45008_dtx_tchh_data_fn_map[104] = {
+ /* UL TCH/H(0): 52, 54, 56, 58, 60, 62, 65, 67, 69, 71 */
+ [52] = 1, /* block {52, 54, 56, 58, 60, 62} */
+ [60] = 1, /* block {60, 62, 65, 67, 69, 71} */
+ /* UL TCH/H(1): 70, 72, 74, 76, 79, 81, 83, 85, 87, 89 */
+ [70] = 1, /* block {70, 72, 74, 76, 79, 81} */
+ [79] = 1, /* block {79, 81, 83, 85, 87, 89} */
+};
+
/* In cases where we less measurements than we expect we must assume that we
* just did not receive the block because it was lost due to bad channel
* conditions. We set up a dummy measurement result here that reflects the
@@ -50,7 +59,7 @@
uint32_t fn104 = fn % 104;
/* See TS 45.008 Sections 8.3 and 8.4 for a detailed descriptions of
the rules
-* implemented here. We only implement the logic for Voice, not CSD */
+* implemented here. We implement the logic for both speech and data
(CSD). */
/* AMR is special, SID frames may be scheduled dynamically at any time
*/
if (lchan->tch_mode == GSM48_CMODE_SPEECH_AMR)
@@ -73,13 +82,12 @@
break;
case GSM48_CMODE_DATA_12k0: /* TCH/F9.6 */
case GSM48_CMODE_DATA_6k0: /* TCH/F4.8 */
- /* FIXME: In case of data traffic channels TCH/F9.6 and
TCH/F4.8 the
-* RXQUAL_SUB report shall include measurements on the
TDMA frames given
-* in the table of subclause 8.3 only if L2 fill frames
have been received
-* as FACCH/F frames at the corresponding frame
positions. */
+ /* FIXME: The RXQUAL_SUB (not RXLEV!) report shall
include measurements on
+* the TDMA frames given in the table of subclause 8.3
only if L2 fill frames
+* have been received as FACCH/F frames at the
corresponding frame positions. */
default:
if (lchan->rsl_cmode == RSL_CMOD_SPD_DATA)
- return false;
+ return fn104 == 52;
LOGPLCFN(lchan, fn, DMEAS, LOGL_ERROR, "Unsupported
lchan->tch_mode %u\n", lchan->tch_mode);
break;
}
@@ -88,7 +96,7 @@
switch (lchan->tch_mode) {
case GSM48_CMODE_SPEECH_V1:
case GSM48_CMODE_SPEECH_V1_VAMOS:
- if (ts45008_dtx_tchh_fn_map[fn104])
+ if (ts45008_dtx_tchh_speech_fn_map[fn104])
return true;
break;
case GSM48_CMODE_SIGN:
@@ -97,13 +105,12 @@
return true;
case GSM48_CMODE_DATA_6k0: /* TCH/H4.8 */
case GSM48_CMODE_DATA_3k6: /* TCH/H2.4 */
- /* FIXME: In case of data traffic channels TCH/H4.8 and
TCH/H2.4 the
-* RXQUAL_SUB report shall include measurements on the
TDMA frames given
-* in the table of subclause 8.3 only if L2 fill frames
have been received
-* as FACCH/H frames at the corresponding frame
positions. */
+ /* FIXME: The RXQUAL_SUB (not RXLEV!) report shall
include measurements on
+* the TDMA frames given in the table of subclause 8.3
only if L2 fill frames
+* have been received as FACCH/H frames at the
corresponding frame positions. */
default:
[S] Change in osmo-bts[master]: meas: lchan_meas_sub_num_expected(): handle CSD modes
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/34596?usp=email )
Change subject: meas: lchan_meas_sub_num_expected(): handle CSD modes
..
meas: lchan_meas_sub_num_expected(): handle CSD modes
Change-Id: Iba5314dc89d65ab4a3706b6ef11994b6fa95162c
Related: OS#6168
---
M src/common/measurement.c
1 file changed, 16 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/src/common/measurement.c b/src/common/measurement.c
index 96598bf..19bff71 100644
--- a/src/common/measurement.c
+++ b/src/common/measurement.c
@@ -434,6 +434,9 @@
switch (pchan) {
case GSM_PCHAN_TCH_F:
+ if (lchan->rsl_cmode == RSL_CMOD_SPD_DATA)
+ return 1 + 1; /* 1 x SACCH + 1 x FACCH */
+ /* else: signalling or speech */
switch (lchan->tch_mode) {
case GSM48_CMODE_SIGN: /* TCH/F sign: DTX *is* permitted */
case GSM48_CMODE_SPEECH_V1: /* TCH/FS */
@@ -450,6 +453,9 @@
return -1; /* at least 1 x SACCH + M x TCH (variable) */
}
case GSM_PCHAN_TCH_H:
+ if (lchan->rsl_cmode == RSL_CMOD_SPD_DATA)
+ return 1 + 2; /* 1 x SACCH + 2 x FACCH */
+ /* else: signalling or speech */
switch (lchan->tch_mode) {
case GSM48_CMODE_SIGN: /* TCH/H sign: DTX *is not* permitted */
return 1 + 12; /* 1 x SACCH + 12 x TCH */
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34596?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Iba5314dc89d65ab4a3706b6ef11994b6fa95162c
Gerrit-Change-Number: 34596
Gerrit-PatchSet: 4
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-bts[master]: meas: fix ts45008_83_is_sub(): DTX is permitted on TCH/F sign
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/34594?usp=email )
Change subject: meas: fix ts45008_83_is_sub(): DTX is permitted on TCH/F sign
..
meas: fix ts45008_83_is_sub(): DTX is permitted on TCH/F sign
DTX is not allowed for TCH/H in signalling mode, but *is* allowed
for TCH/F in signalling mode.
Change-Id: I91cfd8f561eb47a5fc48c0682d56331a1d69aded
Related: OS#6168
---
M src/common/measurement.c
1 file changed, 14 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: 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
diff --git a/src/common/measurement.c b/src/common/measurement.c
index e02dbe6..db3cdc1 100644
--- a/src/common/measurement.c
+++ b/src/common/measurement.c
@@ -59,6 +59,7 @@
switch (lchan->type) {
case GSM_LCHAN_TCH_F:
switch (lchan->tch_mode) {
+ case GSM48_CMODE_SIGN: /* TCH/F sign: DTX *is* permitted */
case GSM48_CMODE_SPEECH_V1:
case GSM48_CMODE_SPEECH_V1_VAMOS:
case GSM48_CMODE_SPEECH_EFR:
@@ -70,10 +71,6 @@
if (fn104 == 52)
return true;
break;
- case GSM48_CMODE_SIGN:
- /* No DTX allowed; SUB=FULL, therefore measurements at
all frame numbers are
-* SUB */
- return true;
case GSM48_CMODE_DATA_12k0: /* TCH/F9.6 */
case GSM48_CMODE_DATA_6k0: /* TCH/F4.8 */
/* FIXME: In case of data traffic channels TCH/F9.6 and
TCH/F4.8 the
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34594?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I91cfd8f561eb47a5fc48c0682d56331a1d69aded
Gerrit-Change-Number: 34594
Gerrit-PatchSet: 4
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-bts[master]: meas: handle VAMOS specific chan modes
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/34593?usp=email )
Change subject: meas: handle VAMOS specific chan modes
..
meas: handle VAMOS specific chan modes
Treat the VAMOS channel modes same as their non-VAMOS counterparts.
Change-Id: I8ecaf87c7cda4c10dd411e7539382274715bce57
Related: OS#6168
---
M src/common/measurement.c
1 file changed, 21 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
diff --git a/src/common/measurement.c b/src/common/measurement.c
index 960e462..e02dbe6 100644
--- a/src/common/measurement.c
+++ b/src/common/measurement.c
@@ -60,7 +60,9 @@
case GSM_LCHAN_TCH_F:
switch (lchan->tch_mode) {
case GSM48_CMODE_SPEECH_V1:
+ case GSM48_CMODE_SPEECH_V1_VAMOS:
case GSM48_CMODE_SPEECH_EFR:
+ case GSM48_CMODE_SPEECH_V2_VAMOS:
/* Active TDMA frame subset for TCH/F: 52, 53, 54, 55,
56, 57, 58, 59.
* There is only one *complete* block in this subset
starting at FN=52.
* Incomplete blocks {... 52, 53, 54, 55} and {56, 57,
58, 59 ...}
@@ -88,6 +90,7 @@
case GSM_LCHAN_TCH_H:
switch (lchan->tch_mode) {
case GSM48_CMODE_SPEECH_V1:
+ case GSM48_CMODE_SPEECH_V1_VAMOS:
if (ts45008_dtx_tchh_fn_map[fn104])
return true;
break;
@@ -430,11 +433,15 @@
switch (lchan->tch_mode) {
case GSM48_CMODE_SIGN: /* TCH/F sign: DTX *is* permitted */
case GSM48_CMODE_SPEECH_V1: /* TCH/FS */
+ case GSM48_CMODE_SPEECH_V1_VAMOS:
case GSM48_CMODE_SPEECH_EFR: /* TCH/EFS */
+ case GSM48_CMODE_SPEECH_V2_VAMOS:
return 1 + 1; /* 1 x SACCH + 1 x TCH */
case GSM48_CMODE_SPEECH_AMR: /* TCH/AFS */
+ case GSM48_CMODE_SPEECH_V3_VAMOS:
case GSM48_CMODE_SPEECH_V4: /* O-TCH/WFS */
case GSM48_CMODE_SPEECH_V5: /* TCH/WFS */
+ case GSM48_CMODE_SPEECH_V5_VAMOS:
default:
return -1; /* at least 1 x SACCH + M x TCH (variable) */
}
@@ -443,8 +450,10 @@
case GSM48_CMODE_SIGN: /* TCH/H sign: DTX *is not* permitted */
return 1 + 12; /* 1 x SACCH + 12 x TCH */
case GSM48_CMODE_SPEECH_V1:
+ case GSM48_CMODE_SPEECH_V1_VAMOS:
return 1 + 2; /* 1 x SACCH + 2 x TCH */
case GSM48_CMODE_SPEECH_AMR: /* TCH/AHS */
+ case GSM48_CMODE_SPEECH_V3_VAMOS:
case GSM48_CMODE_SPEECH_V4: /* O-TCH/WHS */
case GSM48_CMODE_SPEECH_V6: /* O-TCH/AHS */
default:
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34593?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I8ecaf87c7cda4c10dd411e7539382274715bce57
Gerrit-Change-Number: 34593
Gerrit-PatchSet: 4
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[XL] Change in osmo-bts[master]: meas: lchan_meas_sub_num_expected(): proper cmode enforcement
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34592?usp=email ) Change subject: meas: lchan_meas_sub_num_expected(): proper cmode enforcement .. meas: lchan_meas_sub_num_expected(): proper cmode enforcement 3GPP TS 45.008, section 8.3 defines TDMA Fn subsets, which shall always be transmitted when DTX is employed, only for: * TCH/F in signalling mode (but not for TCH/H), * TCH/H and TCH/F in data mode (CSD) [*], * TCH/FS, TCH/EFS, and TCH/HS. For channel modes employing AMR codec, in particular: * TCH/AFS, TCH/WFS, O-TCH/WFS, * TCH/AHS, O-TCH/AHS, O-TCH/WHS, there exist no fixed TDMA Fn subsets, but DTX is still permitted. For those we expect at least one SACCH frame, plus a variable number of speech frames (0 or more). [*] Handling of data modes is fixed in a follow-up patch. Change-Id: Ied477528d77871dd7e3b5b7b433a4e33bca40011 Related: OS#6168 --- M src/common/measurement.c M tests/meas/meas_test.err 2 files changed, 764 insertions(+), 747 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34592?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ied477528d77871dd7e3b5b7b433a4e33bca40011 Gerrit-Change-Number: 34592 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[XL] Change in osmo-bts[master]: meas: also match stderr logging for meas_test
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34597?usp=email ) Change subject: meas: also match stderr logging for meas_test .. meas: also match stderr logging for meas_test Change-Id: Id1ce154a65b194ce5fd9257c9c1b26d62aad1e0d Related: OS#6168 --- M tests/meas/Makefile.am M tests/meas/meas_test.c A tests/meas/meas_test.err M tests/testsuite.at 4 files changed, 8,438 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34597?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id1ce154a65b194ce5fd9257c9c1b26d62aad1e0d Gerrit-Change-Number: 34597 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-bts[master]: meas: lchan_meas_sub_num_expected(): handle CSD modes
Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34596?usp=email ) Change subject: meas: lchan_meas_sub_num_expected(): handle CSD modes .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34596?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iba5314dc89d65ab4a3706b6ef11994b6fa95162c Gerrit-Change-Number: 34596 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 04 Oct 2023 09:18:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: meas: ts45008_83_is_sub(): properly handle CSD modes
Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34595?usp=email ) Change subject: meas: ts45008_83_is_sub(): properly handle CSD modes .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34595?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic3b1e27be2dece3605657fd91d7addebb1e554e8 Gerrit-Change-Number: 34595 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 04 Oct 2023 09:18:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: meas: fix ts45008_83_is_sub(): DTX is permitted on TCH/F sign
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34594?usp=email ) Change subject: meas: fix ts45008_83_is_sub(): DTX is permitted on TCH/F sign .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34594?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I91cfd8f561eb47a5fc48c0682d56331a1d69aded Gerrit-Change-Number: 34594 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Oct 2023 09:17:55 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: meas: handle VAMOS specific chan modes
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34593?usp=email ) Change subject: meas: handle VAMOS specific chan modes .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34593?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8ecaf87c7cda4c10dd411e7539382274715bce57 Gerrit-Change-Number: 34593 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Oct 2023 09:17:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-sccp[master]: xua_server: asp: Support removing local addresses
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34613?usp=email ) Change subject: xua_server: asp: Support removing local addresses .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34613?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I942edff7695efeea7753f22e31c2098c201290ff Gerrit-Change-Number: 34613 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 04 Oct 2023 08:39:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-sccp[master]: asp: Support removing local & remote addresses
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34612?usp=email ) Change subject: asp: Support removing local & remote addresses .. Patch Set 1: Code-Review+1 (1 comment) File src/osmo_ss7_vty.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/34612/comment/67e1a915_9ff667db PS1, Line 760: of remove "of" here and in the line below? -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34612?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I554aee92285bd72eb90c6daf47b37055cb3067aa Gerrit-Change-Number: 34612 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 04 Oct 2023 08:38:12 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: meas_feed: Use osmo_io instead of write queue
daniel has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/34526?usp=email )
Change subject: meas_feed: Use osmo_io instead of write queue
..
meas_feed: Use osmo_io instead of write queue
Related: OS#6170
Change-Id: Ib0570a3242e2846062e24c93cd31137acdee
---
M include/osmocom/bsc/meas_feed.h
M src/osmo-bsc/bsc_vty.c
M src/osmo-bsc/meas_feed.c
M src/osmo-bsc/osmo_bsc_main.c
4 files changed, 54 insertions(+), 54 deletions(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/include/osmocom/bsc/meas_feed.h b/include/osmocom/bsc/meas_feed.h
index f2bd4ba..447eab8 100644
--- a/include/osmocom/bsc/meas_feed.h
+++ b/include/osmocom/bsc/meas_feed.h
@@ -35,12 +35,12 @@
};
#define MEAS_FEED_VERSION 1
-#define MEAS_FEED_WQUEUE_MAX_LEN_DEFAULT 100
+#define MEAS_FEED_TXQUEUE_MAX_LEN_DEFAULT 100
int meas_feed_cfg_set(const char *dst_host, uint16_t dst_port);
void meas_feed_scenario_set(const char *name);
-void meas_feed_wqueue_max_length_set(unsigned int max_length);
+void meas_feed_txqueue_max_length_set(unsigned int max_length);
void meas_feed_cfg_get(char **host, uint16_t *port);
const char *meas_feed_scenario_get(void);
-unsigned int meas_feed_wqueue_max_length_get(void);
+unsigned int meas_feed_txqueue_max_length_get(void);
diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index d758832..bdc18b6 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -385,7 +385,7 @@
uint16_t meas_port;
char *meas_host;
const char *meas_scenario;
- unsigned int max_len = meas_feed_wqueue_max_length_get();
+ unsigned int max_len = meas_feed_txqueue_max_length_get();
meas_feed_cfg_get(_host, _port);
meas_scenario = meas_feed_scenario_get();
@@ -396,7 +396,7 @@
if (strlen(meas_scenario) > 0)
vty_out(vty, " meas-feed scenario %s%s",
meas_scenario, VTY_NEWLINE);
- if (max_len != MEAS_FEED_WQUEUE_MAX_LEN_DEFAULT)
+ if (max_len != MEAS_FEED_TXQUEUE_MAX_LEN_DEFAULT)
vty_out(vty, " meas-feed write-queue-max-length %u%s",
max_len, VTY_NEWLINE);
}
@@ -2424,7 +2424,7 @@
"Maximum number of messages to be queued waiting for transmission\n",
CMD_ATTR_IMMEDIATE)
{
- meas_feed_wqueue_max_length_set(atoi(argv[0]));
+ meas_feed_txqueue_max_length_set(atoi(argv[0]));
return CMD_SUCCESS;
}
diff --git a/src/osmo-bsc/meas_feed.c b/src/osmo-bsc/meas_feed.c
index 23b7d04..b18478f 100644
--- a/src/osmo-bsc/meas_feed.c
+++ b/src/osmo-bsc/meas_feed.c
@@ -6,7 +6,7 @@
#include
#include
-#include
+#include
#include
#include
@@ -23,17 +23,14 @@
#include
struct meas_feed_state {
- struct osmo_wqueue wqueue;
- unsigned int wqueue_max_len;
+ struct osmo_io_fd *io_fd;
char scenario[31+1];
char *dst_host;
uint16_t dst_port;
+ size_t txqueue_max;
};
-static struct meas_feed_state g_mfs = {
- .wqueue.bfd.fd = -1,
- .wqueue_max_len = MEAS_FEED_WQUEUE_MAX_LEN_DEFAULT,
-};
+static struct meas_feed_state g_mfs = { .txqueue_max =
MEAS_FEED_TXQUEUE_MAX_LEN_DEFAULT };
static int process_meas_rep(struct gsm_meas_rep *mr)
{
@@ -41,7 +38,7 @@
struct meas_feed_meas *mfm;
struct bsc_subscr *bsub;
- OSMO_ASSERT(g_mfs.wqueue.bfd.fd != -1);
+ OSMO_ASSERT(g_mfs.io_fd != NULL);
/* ignore measurements as long as we don't know who it is */
if (!mr->lchan) {
@@ -90,7 +87,7 @@
mfm->ss_nr = mr->lchan->nr;
/* and send it to the socket */
- if (osmo_wqueue_enqueue(_mfs.wqueue, msg) != 0) {
+ if (osmo_iofd_write_msgb(g_mfs.io_fd, msg)) {
LOGP(DMEAS, LOGL_ERROR, "meas_feed %s: sending measurement
report failed\n",
gsm_lchan_name(mr->lchan));
msgb_free(msg);
@@ -115,63 +112,54 @@
return 0;
}
-static int feed_write_cb(struct osmo_fd *ofd, struct msgb *msg)
-{
- return write(ofd->fd, msgb_data(msg), msgb_length(msg));
-}
-
-static int feed_read_cb(struct osmo_fd *ofd)
-{
- int rc;
- char buf[256];
-
- rc = read(ofd->fd, buf, sizeof(buf));
- osmo_fd_read_disable(ofd);
-
- return rc;
-}
-
static void meas_feed_close(void)
{
- if (g_mfs.wqueue.bfd.fd == -1)
+ if (g_mfs.io_fd == NULL)
return;
osmo_signal_unregister_handler(SS_LCHAN, meas_feed_sig_cb, NULL);
- osmo_wqueue_clear(_mfs.wqueue);
- osmo_fd_unregister(_mfs.wqueue.bfd);
- close(g_mfs.wqueue.bfd.fd);
- g_mfs.wqueue.bfd.fd = -1;
+
[S] Change in libosmo-sccp[master]: asp: Support adding new local addresses after the ASP was started
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34611?usp=email ) Change subject: asp: Support adding new local addresses after the ASP was started .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34611?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8318d2693f3a9c479b18ab1d660431c1ec77c004 Gerrit-Change-Number: 34611 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 04 Oct 2023 08:30:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-sccp[master]: asp: Apply SCTP peer primary address changes after the ASP was started
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34610?usp=email ) Change subject: asp: Apply SCTP peer primary address changes after the ASP was started .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34610?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I088b9a59ebfd85f3ce4a26f28bf41472d9b9da60 Gerrit-Change-Number: 34610 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 04 Oct 2023 08:25:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-sccp[master]: asp: Apply SCTP primary address changes after the ASP was started
Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34609?usp=email ) Change subject: asp: Apply SCTP primary address changes after the ASP was started .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34609?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I2beb597b2e98d8983177fb21882a461219b3aa58 Gerrit-Change-Number: 34609 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 04 Oct 2023 08:22:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-gprs[master]: rlcmac: migrate from fn_cmp() to gsm0502_fncmp()
Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34627?usp=email ) Change subject: rlcmac: migrate from fn_cmp() to gsm0502_fncmp() .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34627?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I3030d00c6881713a088b1739b2b5ba77bac84e46 Gerrit-Change-Number: 34627 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 04 Oct 2023 08:18:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: meas: lchan_meas_sub_num_expected(): handle CSD modes
Attention is currently required from: fixeria, laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34596?usp=email ) Change subject: meas: lchan_meas_sub_num_expected(): handle CSD modes .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34596?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iba5314dc89d65ab4a3706b6ef11994b6fa95162c Gerrit-Change-Number: 34596 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 04 Oct 2023 08:17:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: meas: ts45008_83_is_sub(): properly handle CSD modes
Attention is currently required from: fixeria, laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34595?usp=email ) Change subject: meas: ts45008_83_is_sub(): properly handle CSD modes .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34595?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic3b1e27be2dece3605657fd91d7addebb1e554e8 Gerrit-Change-Number: 34595 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 04 Oct 2023 08:15:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: meas: fix ts45008_83_is_sub(): DTX is permitted on TCH/F sign
Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34594?usp=email ) Change subject: meas: fix ts45008_83_is_sub(): DTX is permitted on TCH/F sign .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34594?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I91cfd8f561eb47a5fc48c0682d56331a1d69aded Gerrit-Change-Number: 34594 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 04 Oct 2023 08:13:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: meas: handle VAMOS specific chan modes
Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34593?usp=email ) Change subject: meas: handle VAMOS specific chan modes .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34593?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8ecaf87c7cda4c10dd411e7539382274715bce57 Gerrit-Change-Number: 34593 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 04 Oct 2023 08:12:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
