Build failure of network:osmocom:nightly/libgtpnl in Raspbian_10/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libgtpnl/Raspbian_10/armv7l Package network:osmocom:nightly/libgtpnl failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libgtpnl Last lines of build log:
Change in osmo-bts[master]: [VAMOS] osmo-bts-omldummy: create shadow TRXes iff VAMOS is enabled
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/24155 )
Change subject: [VAMOS] osmo-bts-omldummy: create shadow TRXes iff VAMOS is
enabled
..
[VAMOS] osmo-bts-omldummy: create shadow TRXes iff VAMOS is enabled
Change-Id: I4aa9a8bb35bd828d6f25d5690297e727dace5974
Related: SYS#5315, OS#4940
---
M src/osmo-bts-omldummy/main.c
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/55/24155/1
diff --git a/src/osmo-bts-omldummy/main.c b/src/osmo-bts-omldummy/main.c
index 9ab23c5..dd6c47a 100644
--- a/src/osmo-bts-omldummy/main.c
+++ b/src/osmo-bts-omldummy/main.c
@@ -135,6 +135,12 @@
set_bts_features(bts->features, cmdline.features);
+ /* VAMOS: set up a shadow TRX for each primary TRX */
+ if (osmo_bts_has_feature(bts->features, BTS_FEAT_VAMOS)) {
+ llist_for_each_entry(trx, >trx_list, list)
+ gsm_bts_trx_alloc_shadow(trx);
+ }
+
//btsb = bts_role_bts(bts);
abis_init(bts);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24155
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I4aa9a8bb35bd828d6f25d5690297e727dace5974
Gerrit-Change-Number: 24155
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-bts[master]: [VAMOS] Implement the concept of 'shadow' transceiver
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/24153 )
Change subject: [VAMOS] Implement the concept of 'shadow' transceiver
..
[VAMOS] Implement the concept of 'shadow' transceiver
Change-Id: I48b44b4df9ffb1cca105aebbd868c29b21f3b1d6
Related: SYS#5315, OS#4940
---
M include/osmo-bts/bts_trx.h
M src/common/bts_trx.c
M src/common/oml.c
3 files changed, 86 insertions(+), 33 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/53/24153/1
diff --git a/include/osmo-bts/bts_trx.h b/include/osmo-bts/bts_trx.h
index 8513a12..86d5167 100644
--- a/include/osmo-bts/bts_trx.h
+++ b/include/osmo-bts/bts_trx.h
@@ -41,6 +41,11 @@
} role_bts;
struct gsm_bts_trx_ts ts[TRX_NR_TS];
+
+ /* If this is a primary TRX that has a shadow TRX, this points at the
shadow TRX.
+* NULL when this TRX is a shadow TRX itself, or when there is no
shadow TRX set up. */
+ struct gsm_bts_trx *shadow;
+ bool is_shadow;
};
static inline struct gsm_bts_trx *gsm_bts_bb_trx_get_trx(struct gsm_bts_bb_trx
*bb_transc) {
@@ -48,6 +53,7 @@
}
struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts);
+void gsm_bts_trx_alloc_shadow(struct gsm_bts_trx *trx);
int bts_trx_init(struct gsm_bts_trx *trx);
struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num);
char *gsm_trx_name(const struct gsm_bts_trx *trx);
diff --git a/src/common/bts_trx.c b/src/common/bts_trx.c
index 9fc18e4..5ee4e7f 100644
--- a/src/common/bts_trx.c
+++ b/src/common/bts_trx.c
@@ -52,10 +52,76 @@
return 0;
}
+static void gsm_bts_trx_init_ts_lchan(struct gsm_bts_trx *trx)
+{
+ unsigned int tn, ln;
+
+ for (tn = 0; tn < TRX_NR_TS; tn++) {
+ struct gsm_bts_trx_ts *ts = >ts[tn];
+
+ ts->trx = trx;
+ ts->nr = tn;
+ ts->pchan = GSM_PCHAN_NONE;
+ ts->dyn.pchan_is = GSM_PCHAN_NONE;
+ ts->dyn.pchan_want = GSM_PCHAN_NONE;
+ ts->tsc = -1;
+
+ ts->mo.fi = osmo_fsm_inst_alloc(_chan_fsm, trx, ts,
+ LOGL_INFO, NULL);
+ osmo_fsm_inst_update_id_f(ts->mo.fi, "%s-ts%u",
+ trx->bb_transc.mo.fi->id, ts->nr);
+ gsm_mo_init(>mo, trx->bts, NM_OC_CHANNEL,
+ trx->bts->nr, trx->nr, ts->nr);
+
+ for (ln = 0; ln < TS_MAX_LCHAN; ln++) {
+ struct gsm_lchan *lchan = >lchan[ln];
+ char *name;
+
+ lchan->ts = ts;
+ lchan->nr = ln;
+ lchan->type = GSM_LCHAN_NONE;
+
+ name = gsm_lchan_name_compute(lchan);
+ lchan->name = talloc_strdup(trx, name);
+ INIT_LLIST_HEAD(>sapi_cmds);
+ }
+ }
+}
+
+void gsm_bts_trx_alloc_shadow(struct gsm_bts_trx *prim)
+{
+ struct gsm_bts_trx *shadow;
+
+ /* The can be only one shadow TRX */
+ OSMO_ASSERT(prim->shadow == NULL);
+
+ shadow = talloc_zero(prim, struct gsm_bts_trx);
+ OSMO_ASSERT(shadow != NULL);
+ prim->shadow = shadow;
+
+ talloc_set_destructor(shadow, gsm_bts_trx_talloc_destructor);
+
+ shadow->is_shadow = true;
+ shadow->bts = prim->bts;
+ shadow->nr = prim->nr;
+
+ /* The shadow TRX has its own BASEBAND-TRANSCEIVER and CHANNEL MOs,
+* but due to its virtual nature has no dedicated RADIO-CARRIER MO. */
+ shadow->bb_transc.mo.fi = osmo_fsm_inst_alloc(_bb_transc_fsm,
+ shadow,
>bb_transc,
+ LOGL_INFO, NULL);
+ osmo_fsm_inst_update_id_f(shadow->bb_transc.mo.fi,
+ "bts%d-shadow-trx%d",
+ prim->bts->nr, shadow->nr);
+ gsm_mo_init(>bb_transc.mo, prim->bts, NM_OC_OSMO_SHADOW_TRANSC,
+ prim->bts->nr, shadow->nr, 0xff);
+
+ gsm_bts_trx_init_ts_lchan(shadow);
+}
+
struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts)
{
struct gsm_bts_trx *trx = talloc_zero(bts, struct gsm_bts_trx);
- int k;
if (!trx)
return NULL;
@@ -77,38 +143,7 @@
gsm_mo_init(>bb_transc.mo, bts, NM_OC_BASEB_TRANSC,
bts->nr, trx->nr, 0xff);
- for (k = 0; k < TRX_NR_TS; k++) {
- struct gsm_bts_trx_ts *ts = >ts[k];
- int l;
-
- ts->trx = trx;
- ts->nr = k;
- ts->pchan = GSM_PCHAN_NONE;
- ts->dyn.pchan_is = GSM_PCHAN_NONE;
- ts->dyn.pchan_want = GSM_PCHAN_NONE;
- ts->tsc = -1;
-
- ts->mo.fi = osmo_fsm_inst_alloc(_chan_fsm, trx, ts,
-
Change in osmo-bts[master]: [VAMOS] gsm_lchan_name_compute(): indicate if TRX is a shadow TRX
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/24154 )
Change subject: [VAMOS] gsm_lchan_name_compute(): indicate if TRX is a shadow
TRX
..
[VAMOS] gsm_lchan_name_compute(): indicate if TRX is a shadow TRX
Change-Id: I0e350fb067e0ff02d2f3cb54929ef152bb542636
Related: SYS#5315, OS#4940
---
M src/common/gsm_data.c
1 file changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/54/24154/1
diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c
index 7cf48bf..f8435c4 100644
--- a/src/common/gsm_data.c
+++ b/src/common/gsm_data.c
@@ -167,10 +167,12 @@
char *gsm_lchan_name_compute(const struct gsm_lchan *lchan)
{
- struct gsm_bts_trx_ts *ts = lchan->ts;
+ const struct gsm_bts_trx_ts *ts = lchan->ts;
+ const struct gsm_bts_trx *trx = ts->trx;
- snprintf(ts2str, sizeof(ts2str), "(bts=%d,trx=%d,ts=%d,ss=%d)",
-ts->trx->bts->nr, ts->trx->nr, ts->nr, lchan->nr);
+ snprintf(ts2str, sizeof(ts2str), "(bts=%d,%strx=%d,ts=%d,ss=%d)",
+trx->bts->nr, trx->is_shadow ? "shadow-" : "", trx->nr,
+ts->nr, lchan->nr);
return ts2str;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24154
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I0e350fb067e0ff02d2f3cb54929ef152bb542636
Gerrit-Change-Number: 24154
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-bts[master]: struct gsm_bts_trx: remove unused leftovers from openbsc
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/24152 )
Change subject: struct gsm_bts_trx: remove unused leftovers from openbsc
..
struct gsm_bts_trx: remove unused leftovers from openbsc
Change-Id: I667fc1d6a5eaccb69b45197da71d4a699f52fcfc
---
M include/osmo-bts/bts_trx.h
1 file changed, 0 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/52/24152/1
diff --git a/include/osmo-bts/bts_trx.h b/include/osmo-bts/bts_trx.h
index 4474903..8513a12 100644
--- a/include/osmo-bts/bts_trx.h
+++ b/include/osmo-bts/bts_trx.h
@@ -40,13 +40,6 @@
void *l1h;
} role_bts;
- union {
- struct {
- unsigned int test_state;
- uint8_t test_nr;
- struct rxlev_stats rxlev_stat;
- } ipaccess;
- };
struct gsm_bts_trx_ts ts[TRX_NR_TS];
};
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24152
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I667fc1d6a5eaccb69b45197da71d4a699f52fcfc
Gerrit-Change-Number: 24152
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in libosmocore[master]: gsm/abis_nm: add Osmocom specific OC for shadow transceiver
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/24151 )
Change subject: gsm/abis_nm: add Osmocom specific OC for shadow transceiver
..
gsm/abis_nm: add Osmocom specific OC for shadow transceiver
Change-Id: Idf3e917d7eb595e498514f1de50d4a5cb0333419
Related: SYS#5315, OS#4940
---
M include/osmocom/gsm/protocol/gsm_12_21.h
M src/gsm/abis_nm.c
2 files changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/51/24151/1
diff --git a/include/osmocom/gsm/protocol/gsm_12_21.h
b/include/osmocom/gsm/protocol/gsm_12_21.h
index 34622b3..82a40b8 100644
--- a/include/osmocom/gsm/protocol/gsm_12_21.h
+++ b/include/osmocom/gsm/protocol/gsm_12_21.h
@@ -298,6 +298,8 @@
NM_OC_IPAC_E1_CHAN = 0x10,
NM_OC_IPAC_CLK_MODULE = 0x22,
+ NM_OC_OSMO_SHADOW_TRANSC= 0x80,
+
NM_OC_BS11_ADJC = 0xa0,
NM_OC_BS11_HANDOVER = 0xa1,
NM_OC_BS11_PWR_CTRL = 0xa2,
diff --git a/src/gsm/abis_nm.c b/src/gsm/abis_nm.c
index f7793d7..5d384fa 100644
--- a/src/gsm/abis_nm.c
+++ b/src/gsm/abis_nm.c
@@ -609,6 +609,7 @@
{ NM_OC_BTS,"BTS" },
{ NM_OC_RADIO_CARRIER, "RADIO-CARRIER" },
{ NM_OC_BASEB_TRANSC, "BASEBAND-TRANSCEIVER" },
+ { NM_OC_OSMO_SHADOW_TRANSC, "SHADOW-TRANSCEIVER" },
{ NM_OC_CHANNEL,"CHANNEL" },
{ NM_OC_IPAC_E1_TRUNK, "IPAC-E1-TRUNK" },
{ NM_OC_IPAC_E1_PORT, "IPAC-E1-PORT" },
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/24151
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Idf3e917d7eb595e498514f1de50d4a5cb0333419
Gerrit-Change-Number: 24151
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in libosmocore[master]: gsm/abis_nm: add missing NM_OC_IPAC_* value-string entries
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/24150 )
Change subject: gsm/abis_nm: add missing NM_OC_IPAC_* value-string entries
..
gsm/abis_nm: add missing NM_OC_IPAC_* value-string entries
Change-Id: I2181af229e8e7da12d716c176ab9230f09e29eef
---
M src/gsm/abis_nm.c
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/50/24150/1
diff --git a/src/gsm/abis_nm.c b/src/gsm/abis_nm.c
index 13837d2..f7793d7 100644
--- a/src/gsm/abis_nm.c
+++ b/src/gsm/abis_nm.c
@@ -610,6 +610,10 @@
{ NM_OC_RADIO_CARRIER, "RADIO-CARRIER" },
{ NM_OC_BASEB_TRANSC, "BASEBAND-TRANSCEIVER" },
{ NM_OC_CHANNEL,"CHANNEL" },
+ { NM_OC_IPAC_E1_TRUNK, "IPAC-E1-TRUNK" },
+ { NM_OC_IPAC_E1_PORT, "IPAC-E1-PORT" },
+ { NM_OC_IPAC_E1_CHAN, "IPAC-E1-CHAN" },
+ { NM_OC_IPAC_CLK_MODULE,"IPAC-CLK-MODULE" },
{ NM_OC_BS11_ADJC, "ADJC" },
{ NM_OC_BS11_HANDOVER, "HANDOVER" },
{ NM_OC_BS11_PWR_CTRL, "POWER-CONTROL" },
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/24150
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2181af229e8e7da12d716c176ab9230f09e29eef
Gerrit-Change-Number: 24150
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in libosmo-abis[master]: Fix up vty 'show' commands for E1 line/timeslots
keith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/24133 ) Change subject: Fix up vty 'show' commands for E1 line/timeslots .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/24133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I6af92ae2808713c74afeecaa1f500443fb2b7795 Gerrit-Change-Number: 24133 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 05 May 2021 19:08:43 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-mgw[master]: Add vty command 'show mgcp active'
keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/24131 ) Change subject: Add vty command 'show mgcp active' .. Patch Set 3: (3 comments) > Patch Set 2: Verified+1 Code-Review+1 > > (3 comments) > > Looks good to me. I wonder if show mgcp active [stats] makes sense, but > apparently multiple optional non exclusive flags are not easy to model. I did have show mgcp active [stats], but decided to remove it, as I wondered if it would mean show stats for active connection or something, which doesn't really make sense. Maybe a "show mgcp stats" command that does not also iterate and dump all the endpoints would be better? thanks. https://gerrit.osmocom.org/c/osmo-mgw/+/24131/2/src/libosmo-mgcp/mgcp_vty.c File src/libosmo-mgcp/mgcp_vty.c: https://gerrit.osmocom.org/c/osmo-mgw/+/24131/2/src/libosmo-mgcp/mgcp_vty.c@324 PS2, Line 324: } > maybe print something when no calls are active, otherwise the user only sees: > […] Done https://gerrit.osmocom.org/c/osmo-mgw/+/24131/2/src/libosmo-mgcp/mgcp_vty.c@355 PS2, Line 355: "Include Statistics\n") > I think it should be "Include statistics" Done https://gerrit.osmocom.org/c/osmo-mgw/+/24131/2/src/libosmo-mgcp/mgcp_vty.c@365 PS2, Line 365: "Show only Endpoints with Active Connections\n") > I am not an expert in spelling, but I think "Show only endpoints with active > connections" is better. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/24131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I23a26b4fdc03d8b2469d293dd6c06ed83ce739e9 Gerrit-Change-Number: 24131 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 May 2021 19:02:47 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter Gerrit-MessageType: comment
Change in osmo-mgw[master]: Add vty command 'show mgcp active'
Hello Jenkins Builder, pespin, fixeria, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/24131 to look at the new patch set (#3). Change subject: Add vty command 'show mgcp active' .. Add vty command 'show mgcp active' With just one E1 line, the 'show mgcp' command outputs several hundred lines to the vty. Add a 'active' parameter to only show endpoints that are active. Change-Id: I23a26b4fdc03d8b2469d293dd6c06ed83ce739e9 --- M src/libosmo-mgcp/mgcp_vty.c 1 file changed, 38 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/31/24131/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/24131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I23a26b4fdc03d8b2469d293dd6c06ed83ce739e9 Gerrit-Change-Number: 24131 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Build failure of network:osmocom:nightly/osmo-e1d in Debian_10/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_10/armv7l Package network:osmocom:nightly/osmo-e1d failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log:
Change in osmo-bts[master]: rsl: fix wrong value printed in rsl_handle_chan_mod_ie()
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/24149 ) Change subject: rsl: fix wrong value printed in rsl_handle_chan_mod_ie() .. rsl: fix wrong value printed in rsl_handle_chan_mod_ie() Change-Id: I724504a39702393402fae20b0e9775c3486da966 --- M src/common/rsl.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/common/rsl.c b/src/common/rsl.c index cd3fda5..1cc7abb 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -137,7 +137,7 @@ default: LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "Channel Mode IE contains " "unknown 'Channel rate and type' value 0x%02x\n", - cm->chan_rate); + cm->chan_rt); *cause = RSL_ERR_IE_CONTENT; return -ENOTSUP; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I724504a39702393402fae20b0e9775c3486da966 Gerrit-Change-Number: 24149 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: merged
Change in osmo-bts[master]: osmo-bts-trx: refactor parse_rsp(), fix compilation warnings
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/23917 )
Change subject: osmo-bts-trx: refactor parse_rsp(), fix compilation warnings
..
osmo-bts-trx: refactor parse_rsp(), fix compilation warnings
For a long time, we see this annoying -Wstringop-truncation warning:
In function ‘parse_rsp’,
inlined from ‘trx_ctrl_read_cb’ at trx_if.c:647:6:
trx_if.c:416:2: warning: ‘strncat’ output may be truncated copying
between 0 and 45 bytes from a string of length 1495
416 | strncat(rsp->cmd, buf_in + 4, p - buf_in - 4);
| ^
There is no real need to use strncat() in parse_rsp(), because we
do not concatenate any strings but simply copy TRXC response parts
from the input buffer to the corresponding 'name' and 'parameters'
buffers. Let's use memcpy() instead. This also fixes the warning.
Change-Id: Ia10adf7d76abe9a423b07e828852fbfb53b95125
---
M src/osmo-bts-trx/trx_if.c
1 file changed, 20 insertions(+), 12 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved; Verified
Hoernchen: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c
index 18c5011..ff63187 100644
--- a/src/osmo-bts-trx/trx_if.c
+++ b/src/osmo-bts-trx/trx_if.c
@@ -397,6 +397,7 @@
static int parse_rsp(const char *buf_in, size_t len_in, struct trx_ctrl_rsp
*rsp)
{
+ size_t nlen, plen;
char *p, *k;
if (strncmp(buf_in, "RSP ", 4))
@@ -406,14 +407,17 @@
if (!(p = strchr(buf_in + 4, ' ')))
goto parse_err;
- if (p - buf_in >= sizeof(rsp->cmd)) {
- LOGP(DTRX, LOGL_ERROR, "cmd buffer too small %lu >= %zu\n",
-(long unsigned) (p - buf_in), sizeof(rsp->cmd));
+ /* Calculate length of the name part */
+ nlen = p - (buf_in + 4);
+
+ if (nlen >= sizeof(rsp->cmd)) {
+ LOGP(DTRX, LOGL_ERROR, "TRXC command name part is too long: "
+"%zu >= %zu\n", nlen, sizeof(rsp->cmd));
goto parse_err;
}
- rsp->cmd[0] = '\0';
- strncat(rsp->cmd, buf_in + 4, p - buf_in - 4);
+ memcpy(>cmd[0], buf_in + 4, nlen);
+ rsp->cmd[nlen] = '\0';
/* Now comes the status code of the response */
p++;
@@ -427,18 +431,22 @@
else
k = p + strlen(p);
- if (strlen(k) >= sizeof(rsp->params)) {
- LOGP(DTRX, LOGL_ERROR, "params buffer too small %zu >= %zu\n",
- strlen(k), sizeof(rsp->params));
+ /* Calculate length of the parameters part */
+ plen = strlen(k);
+
+ if (plen >= sizeof(rsp->params)) {
+ LOGP(DTRX, LOGL_ERROR, "TRXC command parameters part is too
long: "
+"%zu >= %zu\n", plen, sizeof(rsp->params));
goto parse_err;
}
- rsp->params[0] = '\0';
- strcat(rsp->params, k);
+
+ memcpy(>params[0], k, plen);
+ rsp->params[plen] = '\0';
+
return 0;
parse_err:
- LOGP(DTRX, LOGL_NOTICE, "Unknown message on ctrl port: %s\n",
- buf_in);
+ LOGP(DTRX, LOGL_NOTICE, "Unknown TRXC message: %s\n", buf_in);
return -1;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23917
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ia10adf7d76abe9a423b07e828852fbfb53b95125
Gerrit-Change-Number: 23917
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria
Gerrit-Reviewer: Hoernchen
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bts[master]: rsl: fix wrong value printed in rsl_handle_chan_mod_ie()
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/24149 ) Change subject: rsl: fix wrong value printed in rsl_handle_chan_mod_ie() .. Patch Set 1: Code-Review+2 Trivial change, fixing my own fault. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I724504a39702393402fae20b0e9775c3486da966 Gerrit-Change-Number: 24149 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 05 May 2021 18:15:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: osmo-bts-trx: refactor parse_rsp(), fix compilation warnings
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23917 ) Change subject: osmo-bts-trx: refactor parse_rsp(), fix compilation warnings .. Patch Set 3: Verified+1 Code-Review+2 FYI: I tested this change by running ttcn3-bts-test, no regressions observed. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23917 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia10adf7d76abe9a423b07e828852fbfb53b95125 Gerrit-Change-Number: 23917 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 May 2021 18:15:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: vty: fix the use of deprecated osmo_bts_feature_name()
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/23916 )
Change subject: vty: fix the use of deprecated osmo_bts_feature_name()
..
vty: fix the use of deprecated osmo_bts_feature_name()
Change-Id: I67863da286b0fd1ec42088bce12d3c76e4be30ba
Depends: I9dfdb5e81037b6000effbd340af4e5db0dcfd69c
---
M TODO-RELEASE
M src/common/vty.c
2 files changed, 4 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/TODO-RELEASE b/TODO-RELEASE
index 1546ec7..82f25d6 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -1,2 +1,5 @@
+# When cleaning up this file: bump API version(s) in the following files:
+# configure.ac, debian/control, and contrib/osmo-bts.spec.in.
update libosmo-abis dependency to > 1.1.1 for osmo_rtp_socket_set_priority()
update libosmo-abis dependency to > 1.1.1 for new e1_input vty commands for
DSCP + priority
+update libosmocore dependency to > 1.5.1-73-g524b4f80 for
osmo_bts_features_desc()
diff --git a/src/common/vty.c b/src/common/vty.c
index 626cd60..9e428e7 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -1015,7 +1015,7 @@
for (i = 0, no_features = true; i < _NUM_BTS_FEAT; i++) {
if (osmo_bts_has_feature(bts->features, i)) {
vty_out(vty, "%03u ", i);
- vty_out(vty, "%-40s%s", osmo_bts_feature_name(i),
VTY_NEWLINE);
+ vty_out(vty, "%-40s%s", osmo_bts_features_desc(i),
VTY_NEWLINE);
no_features = false;
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23916
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I67863da286b0fd1ec42088bce12d3c76e4be30ba
Gerrit-Change-Number: 23916
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bts[master]: common/abis: fix the use of deprecated e1inp_line_get() API
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/23919 )
Change subject: common/abis: fix the use of deprecated e1inp_line_get() API
..
common/abis: fix the use of deprecated e1inp_line_get() API
We need curly braces becausee1inp_line_get2() is basically a macro
that calls OSMO_ASSERT(), which in its turn contains an 'if' stmt.
Change-Id: I41a5fd13a7fa40e16bcf1a8099624b654274cee3
---
M src/common/abis.c
1 file changed, 3 insertions(+), 3 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/common/abis.c b/src/common/abis.c
index 5b914c7..be7e906 100644
--- a/src/common/abis.c
+++ b/src/common/abis.c
@@ -281,9 +281,9 @@
bts_dev_info.location2 = model_name;
line = e1inp_line_find(0);
- if (line)
- e1inp_line_get(line); /* We want a new reference for returned
line */
- else
+ if (line) {
+ e1inp_line_get2(line, __FILE__); /* We want a new reference for
returned line */
+ } else
line = e1inp_line_create(0, "ipa"); /* already comes with a
reference */
if (!line)
return NULL;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23919
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I41a5fd13a7fa40e16bcf1a8099624b654274cee3
Gerrit-Change-Number: 23919
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-trx[master]: add hidden fn adjustment command
Hoernchen has submitted this change. (
https://gerrit.osmocom.org/c/osmo-trx/+/24147 )
Change subject: add hidden fn adjustment command
..
add hidden fn adjustment command
This is only useful if the rf path delays the signal by at least one
frame, and therefore a fairly experimental command that might be removed
or reworked in the future and should not be relied upon.
Change-Id: I29964acffad5bad4f5bcad7f631e435a72979c46
---
M CommonLibs/config_defs.h
M CommonLibs/trx_vty.c
M Transceiver52M/Transceiver.cpp
3 files changed, 19 insertions(+), 1 deletion(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
Hoernchen: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/CommonLibs/config_defs.h b/CommonLibs/config_defs.h
index 17352c3..33be73f 100644
--- a/CommonLibs/config_defs.h
+++ b/CommonLibs/config_defs.h
@@ -48,6 +48,7 @@
double offset;
double freq_offset_khz;
double rssi_offset;
+ int ul_fn_offset;
bool force_rssi_offset; /* Force value set in VTY? */
bool swap_channels;
bool ext_rach;
diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c
index d1da450..30f55c8 100644
--- a/CommonLibs/trx_vty.c
+++ b/CommonLibs/trx_vty.c
@@ -271,6 +271,20 @@
return CMD_SUCCESS;
}
+
+DEFUN_ATTR(cfg_ul_fn_offset, cfg_ul_fn_offset_cmd,
+ "ul-fn-offset <-10-10>",
+ "Adjusts the uplink frame FN by the specified amount\n"
+ "Frame Number offset\n",
+ CMD_ATTR_HIDDEN)
+{
+ struct trx_ctx *trx = trx_from_vty(vty);
+
+ trx->cfg.ul_fn_offset = atoi(argv[0]);
+
+ return CMD_SUCCESS;
+}
+
DEFUN(cfg_swap_channels, cfg_swap_channels_cmd,
"swap-channels (disable|enable)",
"Swap primary and secondary channels of the PHY (if any)\n"
@@ -624,6 +638,8 @@
vty_out(vty, " filler access-burst-delay %u%s",
trx->cfg.rach_delay, VTY_NEWLINE);
if (trx->cfg.stack_size != 0)
vty_out(vty, " stack-size %u%s", trx->cfg.stack_size,
VTY_NEWLINE);
+ if (trx->cfg.ul_fn_offset != 0)
+ vty_out(vty, " ul-fn-offset %u%s", trx->cfg.ul_fn_offset,
VTY_NEWLINE);
trx_rate_ctr_threshold_write_config(vty, " ");
for (i = 0; i < trx->cfg.num_chans; i++) {
@@ -787,6 +803,7 @@
install_element(TRX_NODE, _stack_size_cmd);
install_element(TRX_NODE, _chan_cmd);
+ install_element(TRX_NODE, _ul_fn_offset_cmd);
install_node(_node, dummy_config_write);
install_element(CHAN_NODE, _chan_rx_path_cmd);
install_element(CHAN_NODE, _chan_tx_path_cmd);
diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp
index 91f06ec..9e7bd5a 100644
--- a/Transceiver52M/Transceiver.cpp
+++ b/Transceiver52M/Transceiver.cpp
@@ -649,7 +649,7 @@
}
/* Set time and determine correlation type */
- burstTime = radio_burst->getTime();
+ burstTime = radio_burst->getTime() + cfg->ul_fn_offset;
CorrType type = expectedCorrType(burstTime, chan);
/* Initialize struct bi */
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/24147
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I29964acffad5bad4f5bcad7f631e435a72979c46
Gerrit-Change-Number: 24147
Gerrit-PatchSet: 1
Gerrit-Owner: Hoernchen
Gerrit-Reviewer: Hoernchen
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-trx[master]: add hidden fn adjustment command
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/24147 ) Change subject: add hidden fn adjustment command .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/24147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I29964acffad5bad4f5bcad7f631e435a72979c46 Gerrit-Change-Number: 24147 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 May 2021 18:09:55 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: osmo-bts-trx: refactor parse_rsp(), fix compilation warnings
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23917 ) Change subject: osmo-bts-trx: refactor parse_rsp(), fix compilation warnings .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23917 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia10adf7d76abe9a423b07e828852fbfb53b95125 Gerrit-Change-Number: 23917 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 May 2021 18:08:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: common/abis: fix the use of deprecated e1inp_line_get() API
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23919 ) Change subject: common/abis: fix the use of deprecated e1inp_line_get() API .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23919 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I41a5fd13a7fa40e16bcf1a8099624b654274cee3 Gerrit-Change-Number: 23919 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 May 2021 18:07:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: osmo-bts-trx: implement TRXDv2 protocol support
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23833 ) Change subject: osmo-bts-trx: implement TRXDv2 protocol support .. Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3532a6693bb335043ec390049138308991083e66 Gerrit-Change-Number: 23833 Gerrit-PatchSet: 8 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 May 2021 18:07:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: amarisoftue: solve conflict of sample rate param in rf_driver
Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24140 to look at the new patch set (#2). Change subject: amarisoftue: solve conflict of sample rate param in rf_driver .. amarisoftue: solve conflict of sample rate param in rf_driver move sample_rate setting into rf_driver template that is shared between enb and ue Change-Id: Icc8042c3eec2a1e8bfc6823c06430c1cb18355b7 --- M src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl M src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl 2 files changed, 22 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/40/24140/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Icc8042c3eec2a1e8bfc6823c06430c1cb18355b7 Gerrit-Change-Number: 24140 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: vty: fix the use of deprecated osmo_bts_feature_name()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23916 ) Change subject: vty: fix the use of deprecated osmo_bts_feature_name() .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I67863da286b0fd1ec42088bce12d3c76e4be30ba Gerrit-Change-Number: 23916 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 May 2021 18:06:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-trx[master]: add hidden fn adjustment command
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/24147 ) Change subject: add hidden fn adjustment command .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/24147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I29964acffad5bad4f5bcad7f631e435a72979c46 Gerrit-Change-Number: 24147 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 May 2021 17:50:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: rsl: fix wrong value printed in rsl_handle_chan_mod_ie()
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/24149 ) Change subject: rsl: fix wrong value printed in rsl_handle_chan_mod_ie() .. rsl: fix wrong value printed in rsl_handle_chan_mod_ie() Change-Id: I724504a39702393402fae20b0e9775c3486da966 --- M src/common/rsl.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/49/24149/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index cd3fda5..1cc7abb 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -137,7 +137,7 @@ default: LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "Channel Mode IE contains " "unknown 'Channel rate and type' value 0x%02x\n", - cm->chan_rate); + cm->chan_rt); *cause = RSL_ERR_IE_CONTENT; return -ENOTSUP; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/24149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I724504a39702393402fae20b0e9775c3486da966 Gerrit-Change-Number: 24149 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in osmo-mgw[master]: send DLCX only once
Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/24143 to look at the new patch set (#2). Change subject: send DLCX only once .. send DLCX only once If the mgcp_client_fsm gets terminated in ST_DLCX_RESP, it has already sent a DLCX to the MGW. So do not send a second one. I noticed the duplicate DLCX for the same endpoint conn identifier while running TTCN3 tests and watching the network trace of test teardown. Change-Id: I35e415f67946b73c74408afe265618cfe4f72b0b --- M src/libosmo-mgcp-client/mgcp_client_fsm.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/43/24143/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/24143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I35e415f67946b73c74408afe265618cfe4f72b0b Gerrit-Change-Number: 24143 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-mgw[master]: add osmo_mgcpc_ep_ci_get_remote_rtp_info()
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/24145 ) Change subject: add osmo_mgcpc_ep_ci_get_remote_rtp_info() .. Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-mgw/+/24145/1/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c File src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c: https://gerrit.osmocom.org/c/osmo-mgw/+/24145/1/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c@511 PS1, Line 511: /*! Return the RTP port information that MGW is receiving on for this connection, as returned by the last CRCX-OK / > What about "Return the RTP local port information". "the RTP port where MGW is receiving on" is IMHO the clearest description... "local" is not clear at all: >From the perspective of the MGCP client, 'local' would mean e.g. osmo-bsc, >'remote' would mean MGW. >From the MGW perspective, 'local' would be MGW and 'remote' would be >BTS/SIP/other MGW... "MGW's local RTP port" would work. should I change that? https://gerrit.osmocom.org/c/osmo-mgw/+/24145/1/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c@523 PS1, Line 523: /*! Return the RTP port information that the MGW is sending to for this connection, as sent to the MGW by the last > RTP remote port hmm "MGW's remote RTP port" is again a bit weird, because it is the port of the MGW's peer, not belonging to the MGW at all. "MGW's remote port" may sound a bit like it is the port where the peer is sending RTP to. Are you sure that changing the wording improves the doc? -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/24145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibb488925827d9dc0ccb1f8d6d84728745d086793 Gerrit-Change-Number: 24145 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 May 2021 16:40:38 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-mgw[master]: add osmo_mgcpc_ep_ci_get_remote_rtp_info()
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/24145 ) Change subject: add osmo_mgcpc_ep_ci_get_remote_rtp_info() .. Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-mgw/+/24145/1/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c File src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c: https://gerrit.osmocom.org/c/osmo-mgw/+/24145/1/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c@511 PS1, Line 511: /*! Return the RTP port information that MGW is receiving on for this connection, as returned by the last CRCX-OK / What about "Return the RTP local port information". https://gerrit.osmocom.org/c/osmo-mgw/+/24145/1/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c@523 PS1, Line 523: /*! Return the RTP port information that the MGW is sending to for this connection, as sent to the MGW by the last RTP remote port -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/24145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibb488925827d9dc0ccb1f8d6d84728745d086793 Gerrit-Change-Number: 24145 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 May 2021 16:02:02 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: send DLCX only once
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/24143 ) Change subject: send DLCX only once .. Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/24143/1/src/libosmo-mgcp-client/mgcp_client_fsm.c File src/libosmo-mgcp-client/mgcp_client_fsm.c: https://gerrit.osmocom.org/c/osmo-mgw/+/24143/1/src/libosmo-mgcp-client/mgcp_client_fsm.c@525 PS1, Line 525: * If in ST_DLCX_RESP, a DLCX was already sent and we did not get a response. No point in sending another one. */ Probably deserves to be splitted in two lines. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/24143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I35e415f67946b73c74408afe265618cfe4f72b0b Gerrit-Change-Number: 24143 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 May 2021 15:57:27 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: tweak termination DLCX log msg
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/24144 ) Change subject: tweak termination DLCX log msg .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/24144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id723d949f101b66fb75296d01489d9dac350c7c8 Gerrit-Change-Number: 24144 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 May 2021 15:55:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ggsn[master]: gtp: constify pointer arg
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/24148 )
Change subject: gtp: constify pointer arg
..
gtp: constify pointer arg
Change-Id: Ib5b5a8b64247202a2538c2ff8f8601981ccda822
---
M gtp/gtp.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/48/24148/1
diff --git a/gtp/gtp.c b/gtp/gtp.c
index 547241d..caee5a6 100644
--- a/gtp/gtp.c
+++ b/gtp/gtp.c
@@ -773,7 +773,7 @@
static int gtp_notification(struct gsn_t *gsn, uint8_t version,
union gtp_packet *packet, int len,
-struct sockaddr_in *peer, int fd, uint16_t seq)
+const struct sockaddr_in *peer, int fd, uint16_t seq)
{
uint8_t ver = GTPHDR_F_GET_VER(packet->flags);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/24148
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: Ib5b5a8b64247202a2538c2ff8f8601981ccda822
Gerrit-Change-Number: 24148
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-trx[master]: add hidden fn adjustment command
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/24147 ) Change subject: add hidden fn adjustment command .. Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/24147/1/CommonLibs/trx_vty.c File CommonLibs/trx_vty.c: https://gerrit.osmocom.org/c/osmo-trx/+/24147/1/CommonLibs/trx_vty.c@806 PS1, Line 806: install_element(TRX_NODE, _ul_fn_offset_cmd); Better move it above, closer to _rssi_offset_cmd. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/24147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I29964acffad5bad4f5bcad7f631e435a72979c46 Gerrit-Change-Number: 24147 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: fixeria Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 05 May 2021 15:46:51 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-trx[master]: add hidden fn adjustment command
Hoernchen has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-trx/+/24147 )
Change subject: add hidden fn adjustment command
..
add hidden fn adjustment command
This is only useful if the rf path delays the signal by at least one
frame, and therefore a fairly experimental command that might be removed
or reworked in the future and should not be relied upon.
Change-Id: I29964acffad5bad4f5bcad7f631e435a72979c46
---
M CommonLibs/config_defs.h
M CommonLibs/trx_vty.c
M Transceiver52M/Transceiver.cpp
3 files changed, 19 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/47/24147/1
diff --git a/CommonLibs/config_defs.h b/CommonLibs/config_defs.h
index 17352c3..33be73f 100644
--- a/CommonLibs/config_defs.h
+++ b/CommonLibs/config_defs.h
@@ -48,6 +48,7 @@
double offset;
double freq_offset_khz;
double rssi_offset;
+ int ul_fn_offset;
bool force_rssi_offset; /* Force value set in VTY? */
bool swap_channels;
bool ext_rach;
diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c
index d1da450..30f55c8 100644
--- a/CommonLibs/trx_vty.c
+++ b/CommonLibs/trx_vty.c
@@ -271,6 +271,20 @@
return CMD_SUCCESS;
}
+
+DEFUN_ATTR(cfg_ul_fn_offset, cfg_ul_fn_offset_cmd,
+ "ul-fn-offset <-10-10>",
+ "Adjusts the uplink frame FN by the specified amount\n"
+ "Frame Number offset\n",
+ CMD_ATTR_HIDDEN)
+{
+ struct trx_ctx *trx = trx_from_vty(vty);
+
+ trx->cfg.ul_fn_offset = atoi(argv[0]);
+
+ return CMD_SUCCESS;
+}
+
DEFUN(cfg_swap_channels, cfg_swap_channels_cmd,
"swap-channels (disable|enable)",
"Swap primary and secondary channels of the PHY (if any)\n"
@@ -624,6 +638,8 @@
vty_out(vty, " filler access-burst-delay %u%s",
trx->cfg.rach_delay, VTY_NEWLINE);
if (trx->cfg.stack_size != 0)
vty_out(vty, " stack-size %u%s", trx->cfg.stack_size,
VTY_NEWLINE);
+ if (trx->cfg.ul_fn_offset != 0)
+ vty_out(vty, " ul-fn-offset %u%s", trx->cfg.ul_fn_offset,
VTY_NEWLINE);
trx_rate_ctr_threshold_write_config(vty, " ");
for (i = 0; i < trx->cfg.num_chans; i++) {
@@ -787,6 +803,7 @@
install_element(TRX_NODE, _stack_size_cmd);
install_element(TRX_NODE, _chan_cmd);
+ install_element(TRX_NODE, _ul_fn_offset_cmd);
install_node(_node, dummy_config_write);
install_element(CHAN_NODE, _chan_rx_path_cmd);
install_element(CHAN_NODE, _chan_tx_path_cmd);
diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp
index 91f06ec..9e7bd5a 100644
--- a/Transceiver52M/Transceiver.cpp
+++ b/Transceiver52M/Transceiver.cpp
@@ -649,7 +649,7 @@
}
/* Set time and determine correlation type */
- burstTime = radio_burst->getTime();
+ burstTime = radio_burst->getTime() + cfg->ul_fn_offset;
CorrType type = expectedCorrType(burstTime, chan);
/* Initialize struct bi */
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/24147
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I29964acffad5bad4f5bcad7f631e435a72979c46
Gerrit-Change-Number: 24147
Gerrit-PatchSet: 1
Gerrit-Owner: Hoernchen
Gerrit-MessageType: newchange
Change in pysim[master]: cards: move methods read_aids and select_adf_by_aid to class UsimCard
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/24146 )
Change subject: cards: move methods read_aids and select_adf_by_aid to class
UsimCard
..
cards: move methods read_aids and select_adf_by_aid to class UsimCard
A SimCard does not have ISIM or USIM applications, nor does it have an
EF.DIR to look at. It is not logical to implement them in the SimCard
class. Lets move those methods to the UsimCard, which makes more sense.
Change-Id: I71667b7b38c930b4e0409fe2ba2786e1db9cf9a3
---
M pySim/cards.py
1 file changed, 35 insertions(+), 35 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/46/24146/1
diff --git a/pySim/cards.py b/pySim/cards.py
index 0fb7357..6e8b52a 100644
--- a/pySim/cards.py
+++ b/pySim/cards.py
@@ -238,41 +238,6 @@
else:
return (None, sw)
- # Fetch all the AIDs present on UICC
- def read_aids(self):
- self._aids = []
- try:
- # Find out how many records the EF.DIR has
- # and store all the AIDs in the UICC
- rec_cnt = self._scc.record_count(EF['DIR'])
- for i in range(0, rec_cnt):
- rec = self._scc.read_record(EF['DIR'], i + 1)
- if (rec[0][0:2], rec[0][4:6]) == ('61', '4f')
and len(rec[0]) > 12 \
- and rec[0][8:8 + int(rec[0][6:8], 16) * 2] not
in self._aids:
- self._aids.append(rec[0][8:8 +
int(rec[0][6:8], 16) * 2])
- except Exception as e:
- print("Can't read AIDs from SIM -- %s" % (str(e),))
- self._aids = []
- return self._aids
-
- # Select ADF.U/ISIM in the Card using its full AID
- def select_adf_by_aid(self, adf="usim"):
- # Find full AID by partial AID:
- if is_hex(adf):
- for aid in self._aids:
- if len(aid) >= len(adf) and adf ==
aid[0:len(adf)]:
- return self._scc.select_adf(aid)
- # Find full AID by application name:
- elif adf in ["usim", "isim"]:
- # First (known) halves of the U/ISIM AID
- aid_map = {}
- aid_map["usim"] = "a000871002"
- aid_map["isim"] = "a000871004"
- for aid in self._aids:
- if aid_map[adf] in aid:
- return self._scc.select_adf(aid)
- return (None, None)
-
# Erase the contents of a file
def erase_binary(self, ef):
len = self._scc.binary_size(ef)
@@ -356,6 +321,41 @@
(res, sw) =
self._scc.update_binary(EF_USIM_ADF_map['UST'], content)
return sw
+ # Fetch all the AIDs present on UICC
+ def read_aids(self):
+ self._aids = []
+ try:
+ # Find out how many records the EF.DIR has
+ # and store all the AIDs in the UICC
+ rec_cnt = self._scc.record_count(EF['DIR'])
+ for i in range(0, rec_cnt):
+ rec = self._scc.read_record(EF['DIR'], i + 1)
+ if (rec[0][0:2], rec[0][4:6]) == ('61', '4f')
and len(rec[0]) > 12 \
+ and rec[0][8:8 + int(rec[0][6:8], 16) * 2] not
in self._aids:
+ self._aids.append(rec[0][8:8 +
int(rec[0][6:8], 16) * 2])
+ except Exception as e:
+ print("Can't read AIDs from SIM -- %s" % (str(e),))
+ self._aids = []
+ return self._aids
+
+ # Select ADF.U/ISIM in the Card using its full AID
+ def select_adf_by_aid(self, adf="usim"):
+ # Find full AID by partial AID:
+ if is_hex(adf):
+ for aid in self._aids:
+ if len(aid) >= len(adf) and adf ==
aid[0:len(adf)]:
+ return self._scc.select_adf(aid)
+ # Find full AID by application name:
+ elif adf in ["usim", "isim"]:
+ # First (known) halves of the U/ISIM AID
+ aid_map = {}
+ aid_map["usim"] = "a000871002"
+ aid_map["isim"] = "a000871004"
+ for aid in self._aids:
+ if aid_map[adf] in aid:
+ return self._scc.select_adf(aid)
+ return (None, None)
+
class IsimCard(UsimCard):
name = 'ISIM'
--
To
Change in osmo-mgw[master]: add osmo_mgcpc_ep_ci_get_remote_rtp_info()
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/24145 )
Change subject: add osmo_mgcpc_ep_ci_get_remote_rtp_info()
..
add osmo_mgcpc_ep_ci_get_remote_rtp_info()
So far an mgcp_client user can get the RTP address+port information that
the MGW has returned upon a CRCX. Add this function to return the other
RTP end, i.e. address+port that the MGW was told to send RTP to.
This will be used to fix the MGCP in osmo-bsc, which so far mixes up the
two RTP ends and compares the MSC's RTP address+port with the MGW's one
and hence fails to skip unnecessary MDCX.
Change-Id: Ibb488925827d9dc0ccb1f8d6d84728745d086793
---
M include/osmocom/mgcp_client/mgcp_client_endpoint_fsm.h
M src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c
2 files changed, 14 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/45/24145/1
diff --git a/include/osmocom/mgcp_client/mgcp_client_endpoint_fsm.h
b/include/osmocom/mgcp_client/mgcp_client_endpoint_fsm.h
index 736da22..78e3a41 100644
--- a/include/osmocom/mgcp_client/mgcp_client_endpoint_fsm.h
+++ b/include/osmocom/mgcp_client/mgcp_client_endpoint_fsm.h
@@ -23,6 +23,8 @@
bool osmo_mgcpc_ep_ci_get_crcx_info_to_sockaddr(const struct osmo_mgcpc_ep_ci
*ci, struct sockaddr_storage *dest);
bool osmo_mgcpc_ep_ci_get_crcx_info_to_osmux_cid(const struct osmo_mgcpc_ep_ci
*ci, uint8_t* cid);
+const struct mgcp_conn_peer *osmo_mgcpc_ep_ci_get_remote_rtp_info(const struct
osmo_mgcpc_ep_ci *ci);
+
void osmo_mgcpc_ep_ci_request(struct osmo_mgcpc_ep_ci *ci,
enum mgcp_verb verb, const struct mgcp_conn_peer
*verb_info,
struct osmo_fsm_inst *notify,
diff --git a/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c
b/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c
index 2b94840..8ab5961 100644
--- a/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c
+++ b/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c
@@ -508,7 +508,8 @@
osmo_mgcpc_ep_fsm_check_state_chg_after_response(ci->ep->fi);
}
-/*! Return the MGW's RTP port information for this connection, as returned by
the last CRCX/MDCX OK message. */
+/*! Return the RTP port information that MGW is receiving on for this
connection, as returned by the last CRCX-OK /
+ * MDCX-OK message. */
const struct mgcp_conn_peer *osmo_mgcpc_ep_ci_get_rtp_info(const struct
osmo_mgcpc_ep_ci *ci)
{
ci = osmo_mgcpc_ep_check_ci((struct osmo_mgcpc_ep_ci*)ci);
@@ -519,6 +520,16 @@
return >rtp_info;
}
+/*! Return the RTP port information that the MGW is sending to for this
connection, as sent to the MGW by the last
+ * CRCX / MDCX message. */
+const struct mgcp_conn_peer *osmo_mgcpc_ep_ci_get_remote_rtp_info(const struct
osmo_mgcpc_ep_ci *ci)
+{
+ ci = osmo_mgcpc_ep_check_ci((struct osmo_mgcpc_ep_ci*)ci);
+ if (!ci)
+ return NULL;
+ return >verb_info;
+}
+
/*! Return the MGW's RTP port information for this connection, as returned by
the last CRCX/MDCX OK message. */
bool osmo_mgcpc_ep_ci_get_crcx_info_to_sockaddr(const struct osmo_mgcpc_ep_ci
*ci, struct sockaddr_storage *dest)
{
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/24145
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: Ibb488925827d9dc0ccb1f8d6d84728745d086793
Gerrit-Change-Number: 24145
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in osmo-mgw[master]: send DLCX only once
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/24143 )
Change subject: send DLCX only once
..
send DLCX only once
If the mgcp_client_fsm gets terminated in ST_DLCX_RESP, it has already
sent a DLCX to the MGW. So do not send a second one.
I noticed the duplicate DLCX for the same endpoint conn identifier while
running TTCN3 tests and watching the network trace of test teardown.
Change-Id: I35e415f67946b73c74408afe265618cfe4f72b0b
---
M src/libosmo-mgcp-client/mgcp_client_fsm.c
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/43/24143/1
diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c
b/src/libosmo-mgcp-client/mgcp_client_fsm.c
index 83dd2f1..73a4e70 100644
--- a/src/libosmo-mgcp-client/mgcp_client_fsm.c
+++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c
@@ -521,8 +521,9 @@
/* Should the FSM be terminated while there are still open connections
* on the MGW, we send an unconditional DLCX to terminate the
* connection. This is not the normal case. The user should always use
-* mgcp_conn_delete() to instruct the FSM to perform a graceful exit */
- if (strlen(mgcp_ctx->conn_id)) {
+* mgcp_conn_delete() to instruct the FSM to perform a graceful exit.
+* If in ST_DLCX_RESP, a DLCX was already sent and we did not get a
response. No point in sending another one. */
+ if (fi->state != ST_DLCX_RESP && strlen(mgcp_ctx->conn_id)) {
LOGPFSML(fi, LOGL_NOTICE,
"MGW/DLCX: FSM termination with connections still
present, sending unconditional DLCX...\n");
msg = make_dlcx_msg(mgcp_ctx);
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/24143
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I35e415f67946b73c74408afe265618cfe4f72b0b
Gerrit-Change-Number: 24143
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in osmo-mgw[master]: tweak termination DLCX log msg
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/24144 )
Change subject: tweak termination DLCX log msg
..
tweak termination DLCX log msg
Sending a DLCX upon FSM cleanup is not unusual. Move the log about that
DLCX to INFO, and also print the endpoint and conn identifier.
Change-Id: Id723d949f101b66fb75296d01489d9dac350c7c8
---
M src/libosmo-mgcp-client/mgcp_client_fsm.c
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/44/24144/1
diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c
b/src/libosmo-mgcp-client/mgcp_client_fsm.c
index 73a4e70..9ed11a4 100644
--- a/src/libosmo-mgcp-client/mgcp_client_fsm.c
+++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c
@@ -524,8 +524,8 @@
* mgcp_conn_delete() to instruct the FSM to perform a graceful exit.
* If in ST_DLCX_RESP, a DLCX was already sent and we did not get a
response. No point in sending another one. */
if (fi->state != ST_DLCX_RESP && strlen(mgcp_ctx->conn_id)) {
- LOGPFSML(fi, LOGL_NOTICE,
-"MGW/DLCX: FSM termination with connections still
present, sending unconditional DLCX...\n");
+ LOGPFSML(fi, LOGL_INFO, "Conn cleanup, sending DLCX for %s
%s\n", mgcp_ctx->conn_peer_remote.endpoint,
+mgcp_ctx->conn_id);
msg = make_dlcx_msg(mgcp_ctx);
if (!msg)
LOGPFSML(fi, LOGL_ERROR, "MGW/DLCX: Error composing
DLCX message\n");
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/24144
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: Id723d949f101b66fb75296d01489d9dac350c7c8
Gerrit-Change-Number: 24144
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in pysim[master]: cards: rename class "Card" to "SimCard"
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/24142 )
Change subject: cards: rename class "Card" to "SimCard"
..
cards: rename class "Card" to "SimCard"
There are the classes IsimCard and UsimCard, which inheret from Card,
which is the base class for a normal non ISIM/USIM simcard. Card also
has methods in it that are related to simcards, so it is not just any
"Card", it is a SimCard and should be called that way.
Change-Id: I2077ded44bc2297b8d478c5bd1895951b494efcc
---
M pySim-read.py
M pySim-shell.py
M pySim/cards.py
3 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/42/24142/1
diff --git a/pySim-read.py b/pySim-read.py
index ebe0e29..a138698 100755
--- a/pySim-read.py
+++ b/pySim-read.py
@@ -34,7 +34,7 @@
from pySim.commands import SimCardCommands
from pySim.transport import init_reader, argparse_add_reader_args
-from pySim.cards import card_detect, Card, UsimCard, IsimCard
+from pySim.cards import card_detect, SimCard, UsimCard, IsimCard
from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid,
dec_msisdn
from pySim.utils import format_xplmn_w_act, dec_spn, dec_st, dec_addr_tlv
from pySim.utils import h2s, format_ePDGSelection
@@ -75,7 +75,7 @@
print("Reading ...")
# Initialize Card object by auto detecting the card
- card = card_detect("auto", scc) or Card(scc)
+ card = card_detect("auto", scc) or SimCard(scc)
# Read all AIDs on the UICC
card.read_aids()
diff --git a/pySim-shell.py b/pySim-shell.py
index bbfe7e9..8efbf14 100755
--- a/pySim-shell.py
+++ b/pySim-shell.py
@@ -37,7 +37,7 @@
from pySim.exceptions import *
from pySim.commands import SimCardCommands
from pySim.transport import init_reader, ApduTracer, argparse_add_reader_args
-from pySim.cards import card_detect, Card
+from pySim.cards import card_detect, SimCard
from pySim.utils import h2b, swap_nibbles, rpad, b2h, h2s, JsonEncoder,
bertlv_parse_one
from pySim.utils import dec_st, sanitize_pin_adm, tabulate_str_list, is_hex,
boxed_heading_str
from pySim.card_handler import card_handler
diff --git a/pySim/cards.py b/pySim/cards.py
index ac2545e..0fb7357 100644
--- a/pySim/cards.py
+++ b/pySim/cards.py
@@ -32,7 +32,7 @@
from smartcard.util import toBytes
from pytlv.TLV import *
-class Card(object):
+class SimCard(object):
name = 'SIM'
@@ -283,7 +283,7 @@
len = self._scc.record_size(ef)
self._scc.update_record(ef, rec_no, "ff" * len,
force_len=False, verify=True)
-class UsimCard(Card):
+class UsimCard(SimCard):
name = 'USIM'
@@ -479,7 +479,7 @@
uiari_recs += "UICC IARI: Can't read, response
code = %s\n" % (sw)
return uiari_recs
-class MagicSimBase(abc.ABC, Card):
+class MagicSimBase(abc.ABC, SimCard):
"""
Theses cards uses several record based EFs to store the provider infos,
each possible provider uses a specific record number in each EF. The
@@ -627,7 +627,7 @@
_ki_file = '6f1b'
-class FakeMagicSim(Card):
+class FakeMagicSim(SimCard):
"""
Theses cards have a record based EF 3f00/000c that contains the provider
information. See the program method for its format. The records go from
@@ -694,7 +694,7 @@
self._scc.update_record('000c', 1+i, entry)
-class GrcardSim(Card):
+class GrcardSim(SimCard):
"""
Greencard (grcard.cn) HZCOS GSM SIM
These cards have a much more regular ISO 7816-4 / TS 11.11 structure,
@@ -797,7 +797,7 @@
data, sw = self._scc._tp.send_apdu_checksw("009933" + par)
-class SysmoSIMgr2(Card):
+class SysmoSIMgr2(SimCard):
"""
sysmocom sysmoSIM-GR2
"""
@@ -1134,7 +1134,7 @@
self._scc.cla_byte = cla_byte_orig
self._scc.sel_ctrl = sel_ctrl_orig
-class OpenCellsSim(Card):
+class OpenCellsSim(SimCard):
"""
OpenCellsSim
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/24142
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I2077ded44bc2297b8d478c5bd1895951b494efcc
Gerrit-Change-Number: 24142
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-MessageType: newchange
Change in pysim[master]: cards: get rid of "kls" parameter in autodetect methods
dexter has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/pysim/+/24141 ) Change subject: cards: get rid of "kls" parameter in autodetect methods .. cards: get rid of "kls" parameter in autodetect methods The autodetect methods have a "kls" parameter as first parameter that somehow replaces the "self" parameter for unknown reason. Change-Id: I3e5defee394e1301bad8f04853fab8e9ded84335 --- M pySim/cards.py 1 file changed, 23 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/41/24141/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/24141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3e5defee394e1301bad8f04853fab8e9ded84335 Gerrit-Change-Number: 24141 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset
Change in pysim[master]: cards: get rid of "kls" parameter in autodetect methos
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/24141 )
Change subject: cards: get rid of "kls" parameter in autodetect methos
..
cards: get rid of "kls" parameter in autodetect methos
The autodetect methods have a "kls" parameter as first parameter that
somehow replaces the "self" parameter for unknown reason.
Change-Id: I3e5defee394e1301bad8f04853fab8e9ded84335
---
M pySim/cards.py
1 file changed, 22 insertions(+), 22 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/41/24141/1
diff --git a/pySim/cards.py b/pySim/cards.py
index f06aa02..9bbf385 100644
--- a/pySim/cards.py
+++ b/pySim/cards.py
@@ -503,9 +503,9 @@
_ki_file = None # type: Optional[str]
@classmethod
- def autodetect(kls, scc):
+ def autodetect(self, scc):
try:
- for p, l, t in kls._files.values():
+ for p, l, t in self._files.values():
if not t:
continue
if scc.record_size(['3f00', '7f4d', p]) != l:
@@ -637,14 +637,14 @@
name = 'fakemagicsim'
@classmethod
- def autodetect(kls, scc):
+ def autodetect(self, scc):
try:
if scc.record_size(['3f00', '000c']) != 0x5a:
return None
except:
return None
- return kls(scc)
+ return self(scc)
def _get_infos(self):
"""
@@ -704,7 +704,7 @@
name = 'grcardsim'
@classmethod
- def autodetect(kls, scc):
+ def autodetect(self, scc):
return None
def program(self, p):
@@ -762,11 +762,11 @@
name = 'sysmosim-gr1'
@classmethod
- def autodetect(kls, scc):
+ def autodetect(self, scc):
try:
# Look for ATR
if scc.get_atr() == toBytes("3B 99 18 00 11 88 22 33 44
55 66 77 60"):
- return kls(scc)
+ return self(scc)
except:
return None
return None
@@ -778,7 +778,7 @@
name = 'sysmoUSIM-GR1'
@classmethod
- def autodetect(kls, scc):
+ def autodetect(self, scc):
# TODO: Access the ATR
return None
@@ -805,11 +805,11 @@
name = 'sysmoSIM-GR2'
@classmethod
- def autodetect(kls, scc):
+ def autodetect(self, scc):
try:
# Look for ATR
if scc.get_atr() == toBytes("3B 7D 94 00 00 55 55 53 0A
74 86 93 0B 24 7C 4D 54 68"):
- return kls(scc)
+ return self(scc)
except:
return None
return None
@@ -885,11 +885,11 @@
self._scc.sel_ctrl = "0004" #request an FCP
@classmethod
- def autodetect(kls, scc):
+ def autodetect(self, scc):
try:
# Look for ATR
if scc.get_atr() == toBytes("3B 9F 96 80 1F C7 80 31 A0
73 BE 21 13 67 43 20 07 18 00 00 01 A5"):
- return kls(scc)
+ return self(scc)
except:
return None
return None
@@ -1012,11 +1012,11 @@
self._adm2_chv_num = 0x12
@classmethod
- def autodetect(kls, scc):
+ def autodetect(self, scc):
try:
# Look for ATR
if scc.get_atr() == toBytes("3B 9F 96 80 1F C7 80 31 A0
73 BE 21 13 67 44 22 06 10 00 00 01 A9"):
- return kls(scc)
+ return self(scc)
except:
return None
return None
@@ -1148,11 +1148,11 @@
@classmethod
- def autodetect(kls, scc):
+ def autodetect(self, scc):
try:
# Look for ATR
if scc.get_atr() == toBytes("3B 9F 95 80 1F C3 80 31 E0
73 FE 21 13 57 86 81 02 86 98 44 18 A8"):
- return kls(scc)
+ return self(scc)
except:
return None
return None
@@ -1198,11 +1198,11 @@
self._scc.sel_ctrl = "0004" #request an FCP
@classmethod
- def autodetect(kls, scc):
+ def autodetect(self, scc):
try:
# Look for ATR
if scc.get_atr() == toBytes("3B 9F 95 80 1F C7 80 31 E0
73 F6 21 13 67 4D 45 16 00 43 01 00 8F"):
- return
Change in pysim[master]: pySim-read: fix wrong comment
dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/24138 )
Change subject: pySim-read: fix wrong comment
..
pySim-read: fix wrong comment
Change-Id: Idcbbc6e964f7932a10d55f7f28646f278c994129
---
M pySim-read.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
dexter: Looks good to me, approved
diff --git a/pySim-read.py b/pySim-read.py
index ae10c1a..ebe0e29 100755
--- a/pySim-read.py
+++ b/pySim-read.py
@@ -71,7 +71,7 @@
scc.cla_byte = "a0"
scc.sel_ctrl = ""
- # Program the card
+ # Read the card
print("Reading ...")
# Initialize Card object by auto detecting the card
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/24138
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Idcbbc6e964f7932a10d55f7f28646f278c994129
Gerrit-Change-Number: 24138
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-MessageType: merged
Change in pysim[master]: pySim-read: fix wrong comment
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/24138 ) Change subject: pySim-read: fix wrong comment .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/24138 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Idcbbc6e964f7932a10d55f7f28646f278c994129 Gerrit-Change-Number: 24138 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 05 May 2021 13:02:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: amarisoftue: solve conflict of sample rate param in rf_driver
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24140 ) Change subject: amarisoftue: solve conflict of sample rate param in rf_driver .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Icc8042c3eec2a1e8bfc6823c06430c1cb18355b7 Gerrit-Change-Number: 24140 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 May 2021 12:45:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: amarisoft_enb: add NR support
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24126 ) Change subject: amarisoft_enb: add NR support .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ia27bbc6db5920ce14bacabe8043601aa2adaa5fe Gerrit-Change-Number: 24126 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 May 2021 12:44:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Build failure of network:osmocom:nightly/osmo-python-tests in Debian_9.0/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-python-tests/Debian_9.0/armv7l Package network:osmocom:nightly/osmo-python-tests failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-python-tests Last lines of build log:
Change in osmo-gsm-tester[master]: amarisoftue: solve conflict of sample rate param in rf_driver
srs_andre has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24140 )
Change subject: amarisoftue: solve conflict of sample rate param in rf_driver
..
amarisoftue: solve conflict of sample rate param in rf_driver
move sample_rate setting into rf_driver template that is shared
between enb and ue
Change-Id: Icc8042c3eec2a1e8bfc6823c06430c1cb18355b7
---
M src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl
M src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl
2 files changed, 22 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester
refs/changes/40/24140/1
diff --git a/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl
b/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl
index f9b2933..448c23c 100644
--- a/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/amarisoft_lteue.cfg.tmpl
@@ -10,12 +10,7 @@
},
%endif
-% if ue.rf_dev_type == 'zmq':
- /* Force sampling rate (if uncommented) */
- sample_rate: ${ue.sample_rate},
-% else:
bandwidth: ${ue.bandwidth},
-%endif
// log_options: "all.level=debug,all.max_size=32",
log_options:
"all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1",
diff --git a/src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl
b/src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl
index f2942d7..fbf90c2 100644
--- a/src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl
@@ -15,8 +15,12 @@
tx_gain: ${trx.tx_gain}, /* TX gain (in dB) B2x0: 0 to 89.8 dB */
rx_gain: ${trx.rx_gain}, /* RX gain (in dB) B2x0: 0 to 73 dB */
+// Only SDR and ZMQ devices require dedicated rf_port parameters
+% if trx.rf_dev_type != 'uhd':
+
rf_ports: [
% if trx.rf_dev_type == 'sdr':
+// NSA specific configuration
{
sample_rate: 23.04,
},
@@ -26,15 +30,28 @@
ul_freq: 3502.8, // Moves NR UL LO frequency -5.76 MHz
}
% else:
+// default case for UHD and ZMQ usage
+<%
+ # determine ports and sample rate from either eNB or UE object
+ num_ports = 1
+ try:
+ obj_sample_rate = enb.sample_rate
+ num_ports = int(enb.num_cells)
+ except AttributeError:
+ obj_sample_rate = ue.sample_rate
+%>
+
+%for port in range(num_ports):
{
- sample_rate: ${enb.sample_rate},
+ sample_rate: ${obj_sample_rate},
},
-{
- sample_rate: ${enb.sample_rate},
-}
- % endif
+%endfor
+
+ % endif
],
+% endif
+
// only the B210 requires a sample offset
% if "b200" in trx.rf_dev_args:
tx_time_offset: -150,
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24140
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: Icc8042c3eec2a1e8bfc6823c06430c1cb18355b7
Gerrit-Change-Number: 24140
Gerrit-PatchSet: 1
Gerrit-Owner: srs_andre
Gerrit-MessageType: newchange
Change in osmo-gsm-tester[master]: amarisoft_enb: add NR support
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24126 to look at the new patch set (#3). Change subject: amarisoft_enb: add NR support .. amarisoft_enb: add NR support this patch adds the ability to configure NR cells with Amarisoft eNB. It adds the new DRB-NR template and updates the normal enb.cfg template to allow using it as LTE only or with NR cells (5G NSA). Change-Id: Ia27bbc6db5920ce14bacabe8043601aa2adaa5fe --- M doc/examples/4g_srsLTE/defaults.conf M src/osmo_gsm_tester/obj/enb.py M src/osmo_gsm_tester/obj/enb_amarisoft.py A src/osmo_gsm_tester/templates/amarisoft_drb_nr.cfg.tmpl M src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl M src/osmo_gsm_tester/templates/amarisoft_rf_driver.cfg.tmpl M sysmocom/defaults.conf 7 files changed, 943 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/26/24126/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ia27bbc6db5920ce14bacabe8043601aa2adaa5fe Gerrit-Change-Number: 24126 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in osmo-gsm-tester[master]: amarisoft_enb: add NR support
srs_andre has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24126 ) Change subject: amarisoft_enb: add NR support .. Patch Set 2: > Patch Set 2: > > Wouldn't it make a lot more sense to have a new type of object "gnb" and have > a srsgnb implementation of it? > Or can you run both 4g and 5g cells using the same srsenb process? Well, right now it's only Amarisoft with 5G support. But yes, the same process can have both cells. We follow the same approach with srsENB. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ia27bbc6db5920ce14bacabe8043601aa2adaa5fe Gerrit-Change-Number: 24126 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 05 May 2021 12:24:22 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in pysim[master]: cards:FairwavesSIM: force SIM APDUs during programming
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/24139 )
Change subject: cards:FairwavesSIM: force SIM APDUs during programming
..
cards:FairwavesSIM: force SIM APDUs during programming
The FairwavesSIM programming fails when the card is accessed with USIM
APDUs. To keep it working temporarly switch to SIM APDUs during
programming.
Change-Id: I8f02625d2b620ecdf4b2afc27a8750119b707152
---
M pySim/cards.py
1 file changed, 14 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/39/24139/1
diff --git a/pySim/cards.py b/pySim/cards.py
index fa22d4c..f06aa02 100644
--- a/pySim/cards.py
+++ b/pySim/cards.py
@@ -1011,7 +1011,6 @@
self._adm_chv_num = 0x11
self._adm2_chv_num = 0x12
-
@classmethod
def autodetect(kls, scc):
try:
@@ -1089,6 +1088,16 @@
def program(self, p):
+ # For some reason the card programming only works when the card
+ # is handled as a classic SIM, even though it is an USIM, so we
+ # reconfigure the class byte and the select control field on
+ # the fly. When the programming is done the original values are
+ # restored.
+ cla_byte_orig = self._scc.cla_byte
+ sel_ctrl_orig = self._scc.sel_ctrl
+ self._scc.cla_byte = "a0"
+ self._scc.sel_ctrl = ""
+
# authenticate as ADM1
if not p['pin_adm']:
raise ValueError("Please provide a PIN-ADM as there is
no default one")
@@ -1121,6 +1130,10 @@
if sw != '9000':
print("Programming ACC failed with code %s"%sw)
+ # restore original cla byte and sel ctrl
+ self._scc.cla_byte = cla_byte_orig
+ self._scc.sel_ctrl = sel_ctrl_orig
+
class OpenCellsSim(Card):
"""
OpenCellsSim
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/24139
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I8f02625d2b620ecdf4b2afc27a8750119b707152
Gerrit-Change-Number: 24139
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-MessageType: newchange
Change in pysim[master]: pySim-read: fix wrong comment
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/24138 )
Change subject: pySim-read: fix wrong comment
..
pySim-read: fix wrong comment
Change-Id: Idcbbc6e964f7932a10d55f7f28646f278c994129
---
M pySim-read.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/38/24138/1
diff --git a/pySim-read.py b/pySim-read.py
index ae10c1a..ebe0e29 100755
--- a/pySim-read.py
+++ b/pySim-read.py
@@ -71,7 +71,7 @@
scc.cla_byte = "a0"
scc.sel_ctrl = ""
- # Program the card
+ # Read the card
print("Reading ...")
# Initialize Card object by auto detecting the card
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/24138
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Idcbbc6e964f7932a10d55f7f28646f278c994129
Gerrit-Change-Number: 24138
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-MessageType: newchange
Change in gr-gsm[master]: dists: add PKGBUILD script for Arch Linux
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/gr-gsm/+/24137 )
Change subject: dists: add PKGBUILD script for Arch Linux
..
dists: add PKGBUILD script for Arch Linux
Change-Id: Iabf6db281e95e72cdf0bd744bb7fd00c09360a38
---
A dists/arch/PKGBUILD
1 file changed, 38 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/37/24137/1
diff --git a/dists/arch/PKGBUILD b/dists/arch/PKGBUILD
new file mode 100644
index 000..f62b627
--- /dev/null
+++ b/dists/arch/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Vadim Yanitskiy
+
+pkgname=gr-gsm
+pkgver=v1165.13e42c4
+pkgrel=1
+pkgdesc="GNU Radio blocks and tools for receiving GSM transmissions"
+arch=('any')
+url="https://github.com/ptrkrysik/gr-gsm;
+license=('GPL2')
+# TODO: libosmocore?
+depends=('gnuradio' 'gnuradio-osmosdr' 'boost' 'swig')
+makedepends=('cmake')
+provides=('gr-gsm')
+source=(git://git.osmocom.org/${pkgname})
+sha1sums=('SKIP')
+
+pkgver() {
+ cd "$srcdir/$pkgname"
+ printf "v%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short
HEAD)"
+}
+
+build() {
+ cd "$srcdir/$pkgname"
+ mkdir build && cd build
+ cmake \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DENABLE_DOXYGEN=OFF \
+-Wno-dev \
+..
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname/build"
+ make DESTDIR=${pkgdir} install
+}
+
+# vim:set ts=2 sw=2 et:
--
To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/24137
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-Change-Id: Iabf6db281e95e72cdf0bd744bb7fd00c09360a38
Gerrit-Change-Number: 24137
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: sgsn: Fix default value for mp_ggsn_ip
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24124 )
Change subject: sgsn: Fix default value for mp_ggsn_ip
..
sgsn: Fix default value for mp_ggsn_ip
Make it match the osmo-sgsn.cfg files present in the same directory.
Change-Id: I798b3c8b6e4a4787b8a9d5ecd9d2b1aad2b931ee
---
M sgsn/SGSN_Tests.ttcn
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index 6c8ea61..e7abc9b 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -64,7 +64,7 @@
/* IP/port on which we run our internal GSUP/HLR emulation */
charstring mp_hlr_ip := "127.0.0.1";
integer mp_hlr_port := 4222;
- charstring mp_ggsn_ip := "127.0.0.2";
+ charstring mp_ggsn_ip := "127.0.0.103";
integer mp_echo_interval := 5; /* in seconds. Only used in test
enabling g_use_echo */
NSConfigurations mp_nsconfig := {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24124
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: I798b3c8b6e4a4787b8a9d5ecd9d2b1aad2b931ee
Gerrit-Change-Number: 24124
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: sgsn: TC_bssgp_rim_single_report: Avoid useless component start
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24125 )
Change subject: sgsn: TC_bssgp_rim_single_report: Avoid useless component start
..
sgsn: TC_bssgp_rim_single_report: Avoid useless component start
The componenet is not needed/used at all, so there's no need to start
it.
Change-Id: I63baadbb8b09843a653d3f5c11df204f5a1a761e
---
M sgsn/SGSN_Tests.ttcn
1 file changed, 0 insertions(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index e7abc9b..dded390 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -3156,17 +3156,12 @@
f_cleanup();
}
-private function f_TC_bssgp_rim_dummy(charstring id) runs on BSSGP_ConnHdlr {
-}
-
/* Run a RIM single report procedure over the sgsn. Since the SGSN will only
do a transparent routing of the
* RIM messages this basically tests if the message is correctly transfered
from one GB interface to the
* other and vice versa. */
testcase TC_bssgp_rim_single_report() runs on test_CT {
var BSSGP_ConnHdlr vc_conn;
f_init();
- vc_conn := f_start_handler(refers(f_TC_bssgp_rim_dummy),
testcasename(), g_gb, 17);
- vc_conn.done;
timer T := 2.0;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24125
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: I63baadbb8b09843a653d3f5c11df204f5a1a761e
Gerrit-Change-Number: 24125
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: sgsn: TC_bssgp_rim_single_report: Avoid useless component start
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24125 ) Change subject: sgsn: TC_bssgp_rim_single_report: Avoid useless component start .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24125 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: I63baadbb8b09843a653d3f5c11df204f5a1a761e Gerrit-Change-Number: 24125 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 05 May 2021 11:22:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: sgsn: Fix default value for mp_ggsn_ip
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24124 ) Change subject: sgsn: Fix default value for mp_ggsn_ip .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24124 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: I798b3c8b6e4a4787b8a9d5ecd9d2b1aad2b931ee Gerrit-Change-Number: 24124 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 05 May 2021 11:22:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: WIP
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/24136 ) Change subject: WIP .. WIP Change-Id: Id6527254a7305516f2d00876815e46a3c71a81b6 --- M pySim/cards.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/36/24136/1 diff --git a/pySim/cards.py b/pySim/cards.py index fa22d4c..6e82728 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -289,6 +289,8 @@ def __init__(self, ssc): super(UsimCard, self).__init__(ssc) + self._scc.cla_byte = "00" + self._scc.sel_ctrl = "0004" #request an FCP def read_ehplmn(self): (res, sw) = self._scc.read_binary(EF_USIM_ADF_map['EHPLMN']) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/24136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id6527254a7305516f2d00876815e46a3c71a81b6 Gerrit-Change-Number: 24136 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
Change in pysim[master]: cards: populate name property in Card, UsimCard and IsimCard
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/24135 ) Change subject: cards: populate name property in Card, UsimCard and IsimCard .. cards: populate name property in Card, UsimCard and IsimCard Even though Card, UsimCard and IsimCard are abstract classes which are normally only used to inheret from mit may make sense to pre-populate the name property with some meaningful value. Change-Id: Id643e1f83718aea073e7200aecbf2db2def8652f --- M pySim/cards.py 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/35/24135/1 diff --git a/pySim/cards.py b/pySim/cards.py index e900a7a..fa22d4c 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -34,6 +34,8 @@ class Card(object): + name = 'SIM' + def __init__(self, scc): self._scc = scc self._adm_chv_num = 4 @@ -282,6 +284,9 @@ self._scc.update_record(ef, rec_no, "ff" * len, force_len=False, verify=True) class UsimCard(Card): + + name = 'USIM' + def __init__(self, ssc): super(UsimCard, self).__init__(ssc) @@ -352,6 +357,9 @@ return sw class IsimCard(UsimCard): + + name = 'ISIM' + def __init__(self, ssc): super(IsimCard, self).__init__(ssc) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/24135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id643e1f83718aea073e7200aecbf2db2def8652f Gerrit-Change-Number: 24135 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
Change in pysim[master]: cards: IsimCard inherits UsimCard
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/24134 to look at the new patch set (#2). Change subject: cards: IsimCard inherits UsimCard .. cards: IsimCard inherits UsimCard Since an ISIM is always an USIM the class modell in cards.py should reflect this as well. Change-Id: I2de36a488840ec2bad94fa1830f9a2ac369bad80 --- M pySim/cards.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/34/24134/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/24134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2de36a488840ec2bad94fa1830f9a2ac369bad80 Gerrit-Change-Number: 24134 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in pysim[master]: WIP-TEST
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/24134 ) Change subject: WIP-TEST .. WIP-TEST Change-Id: I2de36a488840ec2bad94fa1830f9a2ac369bad80 --- M pySim/cards.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/34/24134/1 diff --git a/pySim/cards.py b/pySim/cards.py index 30857b3..e900a7a 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -351,7 +351,7 @@ (res, sw) = self._scc.update_binary(EF_USIM_ADF_map['UST'], content) return sw -class IsimCard(Card): +class IsimCard(UsimCard): def __init__(self, ssc): super(IsimCard, self).__init__(ssc) @@ -1255,7 +1255,7 @@ return None -class SysmoISIMSJA2(UsimCard, IsimCard): +class SysmoISIMSJA2(IsimCard): """ sysmocom sysmoISIM-SJA2 """ -- To view, visit https://gerrit.osmocom.org/c/pysim/+/24134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2de36a488840ec2bad94fa1830f9a2ac369bad80 Gerrit-Change-Number: 24134 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
Change in libosmo-abis[master]: Log TRAU FSM at INFO not NOTICE
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/24132 ) Change subject: Log TRAU FSM at INFO not NOTICE .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/24132 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ib4c5ac130e766906361c63090b30111970343075 Gerrit-Change-Number: 24132 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 May 2021 09:37:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: Log messages about RTP timestamps at level INFO
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/24130 ) Change subject: Log messages about RTP timestamps at level INFO .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/24130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id76dc6345e1b1875240c87c609b5224ea9a6643f Gerrit-Change-Number: 24130 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 May 2021 09:36:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: amarisoft_ltemme.cfg.tmpl: enable ENDC support in config template
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24128 ) Change subject: amarisoft_ltemme.cfg.tmpl: enable ENDC support in config template .. Patch Set 2: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24128/2/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl File src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24128/2/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl@a151 PS2, Line 151: /* If true, inter-UE routing is done inside the MME (hence no IP In the future please do this kind of stuff in separate patches. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ia1628e6674b124806e3cd59c5b190d27f6ba4403 Gerrit-Change-Number: 24128 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 May 2021 09:35:44 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: amarisoft_enb: add NR support
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24126 ) Change subject: amarisoft_enb: add NR support .. Patch Set 2: Wouldn't it make a lot more sense to have a new type of object "gnb" and have a srsgnb implementation of it? Or can you run both 4g and 5g cells using the same srsenb process? -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ia27bbc6db5920ce14bacabe8043601aa2adaa5fe Gerrit-Change-Number: 24126 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 05 May 2021 09:34:53 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: ms_srs: add 5G NSA support
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24127 ) Change subject: ms_srs: add 5G NSA support .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/24127 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I7de9f867e7e32d0ab4f74eb7661928175f6c1a16 Gerrit-Change-Number: 24127 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 May 2021 09:30:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2_sns: move selection of the next bind into own function
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/24122 )
Change subject: gprs_ns2_sns: move selection of the next bind into own function
..
Patch Set 2: Code-Review+2
(1 comment)
https://gerrit.osmocom.org/c/libosmocore/+/24122/2/src/gb/gprs_ns2_sns.c
File src/gb/gprs_ns2_sns.c:
https://gerrit.osmocom.org/c/libosmocore/+/24122/2/src/gb/gprs_ns2_sns.c@889
PS2, Line 889: if (!gss->initial_bind) {
this can be furhter simplified to:
if (!gss->initial_bind || ss->initial_bind->list.next == >binds) {
gss->initial_bind = llist_first_entry(>binds, struct ns2_sns_bind, list);
} else {
gss->initial_bind = llist_entry(gss->initial_bind->list.next, struct
ns2_sns_bind, list);
}
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/24122
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ic39f0e5474ecc055d9a1b6a7b30777574d8b741d
Gerrit-Change-Number: 24122
Gerrit-PatchSet: 2
Gerrit-Owner: lynxis lazus
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Wed, 05 May 2021 09:26:36 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2: vty: fix removing a bind from a SNS
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/24121 )
Change subject: gprs_ns2: vty: fix removing a bind from a SNS
..
Patch Set 2:
(1 comment)
https://gerrit.osmocom.org/c/libosmocore/+/24121/2/src/gb/gprs_ns2_vty.c
File src/gb/gprs_ns2_vty.c:
https://gerrit.osmocom.org/c/libosmocore/+/24121/2/src/gb/gprs_ns2_vty.c@215
PS2, Line 215: llist_for_each_entry_safe(vnse_bind, tmp, >binds, list) {
there's no need to use _safe variant here since list is not used anymore after
llist_del.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/24121
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I088c18abafc82ae7bd7b8c487ad9e9b448c42ba9
Gerrit-Change-Number: 24121
Gerrit-PatchSet: 2
Gerrit-Owner: lynxis lazus
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Wed, 05 May 2021 09:23:18 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2: vty: fix removing a bind from a SNS
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/24121 ) Change subject: gprs_ns2: vty: fix removing a bind from a SNS .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/24121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I088c18abafc82ae7bd7b8c487ad9e9b448c42ba9 Gerrit-Change-Number: 24121 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 May 2021 09:22:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2: sns: fix del bind()
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/24120 ) Change subject: gprs_ns2: sns: fix del bind() .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/24120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I79062d404ebba9d5c8f7f209bebde146fa08c71f Gerrit-Change-Number: 24120 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 May 2021 09:22:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: Add vty command 'show mgcp active'
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/24131 ) Change subject: Add vty command 'show mgcp active' .. Patch Set 2: Verified+1 Code-Review+1 (3 comments) Looks good to me. I wonder if show mgcp active [stats] makes sense, but apparently multiple optional non exclusive flags are not easy to model. https://gerrit.osmocom.org/c/osmo-mgw/+/24131/2/src/libosmo-mgcp/mgcp_vty.c File src/libosmo-mgcp/mgcp_vty.c: https://gerrit.osmocom.org/c/osmo-mgw/+/24131/2/src/libosmo-mgcp/mgcp_vty.c@324 PS2, Line 324: } maybe print something when no calls are active, otherwise the user only sees: Virtual trunk 0 with 30 endpoints: Virtual trunk 0 with 30 endpoints: No endpoints in use would look better. https://gerrit.osmocom.org/c/osmo-mgw/+/24131/2/src/libosmo-mgcp/mgcp_vty.c@355 PS2, Line 355: "Include Statistics\n") I think it should be "Include statistics" https://gerrit.osmocom.org/c/osmo-mgw/+/24131/2/src/libosmo-mgcp/mgcp_vty.c@365 PS2, Line 365: "Show only Endpoints with Active Connections\n") I am not an expert in spelling, but I think "Show only endpoints with active connections" is better. Just have a look at the style of the other help-strings in this file. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/24131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I23a26b4fdc03d8b2469d293dd6c06ed83ce739e9 Gerrit-Change-Number: 24131 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 05 May 2021 09:08:59 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
