Change in osmo-ttcn3-hacks[master]: bsc CBSP: allow passing guard_timeout to BSC_Tests.f_init()
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19437 to look at the new patch set (#2). Change subject: bsc CBSP: allow passing guard_timeout to BSC_Tests.f_init() .. bsc CBSP: allow passing guard_timeout to BSC_Tests.f_init() An upcoming patch adds a test series (of various payload lengths) to TC_cbsp_write_bss(), which then needs a bit longer than 30 seconds to run through those. That test will pass a longer guard_timeout. Change-Id: I54e1b3994074f4d0caf5b201588fce0ec41dda89 --- M bsc/BSC_Tests_CBSP.ttcn 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/19437/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19437 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: I54e1b3994074f4d0caf5b201588fce0ec41dda89 Gerrit-Change-Number: 19437 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: bsc CBSP: TC_cbsp_write_bss: run a fixed series of payload lengths
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19439 to look at the new patch set (#2). Change subject: bsc CBSP: TC_cbsp_write_bss: run a fixed series of payload lengths .. bsc CBSP: TC_cbsp_write_bss: run a fixed series of payload lengths Recently fixed errors in the last_block counting as well as encoding ask for a proper test coverage of various lengths, which also verifies the expected blocks count explicitly. Implement this in TC_cbsp_write_bss(): Run f_tc_cbsp_write_bss() multiple times with differing fixed payload lengths, at all block count transitions, plus some arbitrary lengths in-between. Before this patch, TC_cbsp_write_bss() would pick a different random payload length for every test run, which, until recently, then sporadically hit last_block value errors. That's not good for reproducability. Change-Id: I3cace19f9e5adc8ebab13ef2328a36dc150b2b31 --- M bsc/BSC_Tests_CBSP.ttcn 1 file changed, 33 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/39/19439/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19439 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: I3cace19f9e5adc8ebab13ef2328a36dc150b2b31 Gerrit-Change-Number: 19439 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: bsc CBSP: f_gen_page(): allow passing explicit payload len
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19438 to look at the new patch set (#2). Change subject: bsc CBSP: f_gen_page(): allow passing explicit payload len .. bsc CBSP: f_gen_page(): allow passing explicit payload len Keep the default of using a random payload length, but also allow picking one specifically. TC_cbsp_write_bss() will use this in a subsequent patch. Change-Id: I259da42cbcbfdfe930aabb45c9de8a2b67c69629 --- M bsc/BSC_Tests_CBSP.ttcn 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/19438/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19438 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: I259da42cbcbfdfe930aabb45c9de8a2b67c69629 Gerrit-Change-Number: 19438 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: bsc CBSP: f_page2rsl: fix nr of blocks calculation
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19436 to look at the new patch set (#2). Change subject: bsc CBSP: f_page2rsl: fix nr of blocks calculation .. bsc CBSP: f_page2rsl: fix nr of blocks calculation When dividing the payload by 22, the initial 6 header octets must also be taken into account. And, the last_block value indicates 4 as 0, which is not encoded correctly before this patch. Add a separate f_cbsp_block_count_enc() to fix the calculation. Change-Id: I06cc144bd92e94d461dac3f56a738da8e055b73a --- M bsc/BSC_Tests_CBSP.ttcn 1 file changed, 31 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/36/19436/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19436 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: I06cc144bd92e94d461dac3f56a738da8e055b73a Gerrit-Change-Number: 19436 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: bsc CBSP: cosmetic: rename f_cbsp_init_tail() to f_expect_cbsp_restart()
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19440 to look at the new patch set (#2). Change subject: bsc CBSP: cosmetic: rename f_cbsp_init_tail() to f_expect_cbsp_restart() .. bsc CBSP: cosmetic: rename f_cbsp_init_tail() to f_expect_cbsp_restart() It might be part of initialization, but what this function does is expect to receive a CBSP RESTART, period. Change-Id: Ieffe70cf43eb79b798d93717bbce294ee809f0e2 --- M bsc/BSC_Tests_CBSP.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/40/19440/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19440 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: Ieffe70cf43eb79b798d93717bbce294ee809f0e2 Gerrit-Change-Number: 19440 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-bsc[master]: fix CBSP server: actually open the srv_link
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/19441 )
Change subject: fix CBSP server: actually open the srv_link
..
fix CBSP server: actually open the srv_link
Change-Id: Ic688573e179381f7798055b647200e508f1bc37f
---
M src/osmo-bsc/cbsp_link.c
1 file changed, 10 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/41/19441/1
diff --git a/src/osmo-bsc/cbsp_link.c b/src/osmo-bsc/cbsp_link.c
index 91217ad..d93bd1a 100644
--- a/src/osmo-bsc/cbsp_link.c
+++ b/src/osmo-bsc/cbsp_link.c
@@ -239,13 +239,20 @@
if (cbc->config.listen_port != -1) {
LOGP(DCBS, LOGL_NOTICE, "Starting CBSP Server (bound to
%s:%u)\n",
cbc->config.listen_hostname, cbc->config.listen_port);
- if (!cbc->server.srv) {
+ if (!cbc->server.link) {
+ LOGP(DCBS, LOGL_NOTICE, "Creating CBSP Server\n");
cbc->server.link = osmo_stream_srv_link_create(cbc);
osmo_stream_srv_link_set_data(cbc->server.link, cbc);
osmo_stream_srv_link_set_accept_cb(cbc->server.link,
cbsp_srv_link_accept_cb);
+
+ osmo_stream_srv_link_set_addr(cbc->server.link,
cbc->config.listen_hostname);
+ osmo_stream_srv_link_set_port(cbc->server.link,
cbc->config.listen_port);
+
+ if (osmo_stream_srv_link_open(cbc->server.link) < 0) {
+ LOGP(DCBS, LOGL_ERROR, "Cannot open CBSP Server
link on %s:%u\n",
+cbc->config.listen_hostname,
cbc->config.listen_port);
+ }
}
- osmo_stream_srv_link_set_addr(cbc->server.link,
cbc->config.listen_hostname);
- osmo_stream_srv_link_set_port(cbc->server.link,
cbc->config.listen_port);
}
return 0;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19441
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ic688573e179381f7798055b647200e508f1bc37f
Gerrit-Change-Number: 19441
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: bsc CBSP: f_gen_page(): allow passing explicit payload len
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19438 )
Change subject: bsc CBSP: f_gen_page(): allow passing explicit payload len
..
bsc CBSP: f_gen_page(): allow passing explicit payload len
Keep the default of using a random payload length, but also allow picking one
specifically. TC_cbsp_write_bss() will use this in a subsequent patch.
Change-Id: I259da42cbcbfdfe930aabb45c9de8a2b67c69629
---
M bsc/BSC_Tests_CBSP.ttcn
1 file changed, 8 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/38/19438/1
diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn
index dd57954..f1f0240 100644
--- a/bsc/BSC_Tests_CBSP.ttcn
+++ b/bsc/BSC_Tests_CBSP.ttcn
@@ -134,10 +134,14 @@
}
}
-function f_gen_page() return CBSP_IE {
- var integer len := f_rnd_int(82);
- var octetstring payload := f_rnd_octstring(len);
- return valueof(ts_CbspMsgContent(payload, len));
+function f_gen_page(integer payload_len := -1) return CBSP_IE {
+ if (payload_len < 1) {
+ /* No payload len of zero please */
+ payload_len := 1 + f_rnd_int(81);
+ }
+ log("Generating CBSP payload: ", payload_len, " octets");
+ var octetstring payload := f_rnd_octstring(payload_len);
+ return valueof(ts_CbspMsgContent(payload, payload_len));
}
function f_cbsp_reset_bss(integer idx) runs on CBSP_Adapter_CT {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19438
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: I259da42cbcbfdfe930aabb45c9de8a2b67c69629
Gerrit-Change-Number: 19438
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: bsc CBSP: log expected response in f_cbsp_write
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19433 )
Change subject: bsc CBSP: log expected response in f_cbsp_write
..
bsc CBSP: log expected response in f_cbsp_write
This helped to find message mismatches while solving the current CBSP test
failures.
Change-Id: I844717b0f665496a842764b3b915ba64249cd617
---
M bsc/BSC_Tests_CBSP.ttcn
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/33/19433/1
diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn
index acd0b99..d6a4b82 100644
--- a/bsc/BSC_Tests_CBSP.ttcn
+++ b/bsc/BSC_Tests_CBSP.ttcn
@@ -208,6 +208,7 @@
} else {
rx := tr_CBSP_WRITE_CBS_FAIL(msg_id, ser_no, fail_list, *,
success_list, channel_ind);
}
+ log("EXPECTING ", tr_CBSP_Recv(g_cbsp_conn_id[0], rx));
alt {
[] CBSP[0].receive(tr_CBSP_Recv(g_cbsp_conn_id[0], rx)) {
setverdict(pass);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19433
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: I844717b0f665496a842764b3b915ba64249cd617
Gerrit-Change-Number: 19433
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: bsc cbsp: f_page2rsl: fix nr of blocks calculation
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19436 )
Change subject: bsc cbsp: f_page2rsl: fix nr of blocks calculation
..
bsc cbsp: f_page2rsl: fix nr of blocks calculation
Change-Id: I06cc144bd92e94d461dac3f56a738da8e055b73a
---
M bsc/BSC_Tests_CBSP.ttcn
1 file changed, 31 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/36/19436/1
diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn
index 781bb8b..fd361bb 100644
--- a/bsc/BSC_Tests_CBSP.ttcn
+++ b/bsc/BSC_Tests_CBSP.ttcn
@@ -289,17 +289,43 @@
last_block := lblock
}
+/* translate blocks count to RSL_CB_CMD_LASTBLOCK_1..4 values */
+private function f_cbsp_block_count_enc(integer num_blocks) return integer
+{
+ if (num_blocks < 1 or num_blocks > 4) {
+ setverdict(fail, "Invalid num_blocks: ", num_blocks);
+ mtc.stop;
+ }
+ if (num_blocks == 4) {
+ return 0;
+ }
+ return num_blocks;
+}
+
+
/* build a RSL_Message receive template from a CBSP page */
-private function f_page2rsl(CBSP_IE page, uint16_t msg_id, uint16_t ser_no,
boolean ext_cbch := false)
+private function f_page2rsl(CBSP_IE page, uint16_t msg_id, uint16_t ser_no,
boolean ext_cbch := false, integer expect_blocks := -1)
return template (present) RSL_Message
{
var template RSL_Message tr;
- var integer lblock := page.body.msg_content.user_len / 22;
+ var integer len;
+ var integer num_blocks;
var octetstring payload;
- if (page.body.msg_content.user_len mod 22 > 0) {
- lblock := lblock + 1;
- }
+
payload := int2oct(ser_no, 2) & int2oct(msg_id, 2) & '0011'O &
page.body.msg_content.val;
+ len := lengthof(payload);
+ num_blocks := len / 22;
+ if (len mod 22 > 0) {
+ num_blocks := num_blocks + 1;
+ }
+
+ if (expect_blocks > 0 and expect_blocks != num_blocks) {
+ setverdict(fail, "test case claims to model ", expect_blocks, "
blocks, but generated ", num_blocks);
+ mtc.stop;
+ }
+
+ var integer lblock := f_cbsp_block_count_enc(num_blocks);
+
tr := tr_RSL_SMSCB_CMD(tr_RslCbCmdType(lblock), f_pad_oct(payload, 88,
'00'O));
if (ext_cbch) {
tr.ies[3] := tr_RSL_IE(RSL_IE_Body:{smscb_chan_ind := 1});
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19436
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: I06cc144bd92e94d461dac3f56a738da8e055b73a
Gerrit-Change-Number: 19436
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: bsc CBSP: quick-fix f_cbsp_init_client()
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19435 )
Change subject: bsc CBSP: quick-fix f_cbsp_init_client()
..
bsc CBSP: quick-fix f_cbsp_init_client()
Expecting a CBSP RESTART when connecting as CBSP client does not work. This
test should probably *send* a CBSP RESTART instead, but simply omitting that
for now helps to get the CBSP tests running at all first.
Change-Id: Ib93530691344c6dc4c0a8318bee2edf87e309a42
---
M bsc/BSC_Tests_CBSP.ttcn
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/35/19435/1
diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn
index d6a4b82..781bb8b 100644
--- a/bsc/BSC_Tests_CBSP.ttcn
+++ b/bsc/BSC_Tests_CBSP.ttcn
@@ -103,7 +103,8 @@
private function f_cbsp_init_client() runs on cbsp_test_CT {
f_init();
CBSP_Adapter.f_connect(mp_bsc_ip, mp_bsc_cbsp_port, "", -1);
- f_cbsp_init_tail();
+ /* TODO: should this send a CBSP RESTART? */
+ setverdict(pass);
}
private function f_cbsp_init_server() runs on cbsp_test_CT {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19435
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: Ib93530691344c6dc4c0a8318bee2edf87e309a42
Gerrit-Change-Number: 19435
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: bsc CBSP: cosmetic: rename f_cbsp_init_tail() to f_expect_cbsp_restart()
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19440 )
Change subject: bsc CBSP: cosmetic: rename f_cbsp_init_tail() to
f_expect_cbsp_restart()
..
bsc CBSP: cosmetic: rename f_cbsp_init_tail() to f_expect_cbsp_restart()
It might be part of initialization, but what this function does is expect to
receive a CBSP RESTART, period.
Change-Id: Ieffe70cf43eb79b798d93717bbce294ee809f0e2
---
M bsc/BSC_Tests_CBSP.ttcn
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/40/19440/1
diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn
index edbaddc..563e28f 100644
--- a/bsc/BSC_Tests_CBSP.ttcn
+++ b/bsc/BSC_Tests_CBSP.ttcn
@@ -124,9 +124,9 @@
mtc.stop;
}
}
- f_cbsp_init_tail();
+ f_expect_cbsp_restart();
}
-private function f_cbsp_init_tail() runs on cbsp_test_CT {
+private function f_expect_cbsp_restart() runs on cbsp_test_CT {
interleave {
[] CBSP[0].receive(tr_CBSP_Recv(?, tr_CBSP_RESTART(?, CBSP_BC_MSGT_CBS,
CBSP_RI_DATA_LOST)));
/* should we also expect a restart for emergency related messages? */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19440
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: Ieffe70cf43eb79b798d93717bbce294ee809f0e2
Gerrit-Change-Number: 19440
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: bsc CBSP: TC_cbsp_write_bss: run a fixed series of payload lengths
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19439 )
Change subject: bsc CBSP: TC_cbsp_write_bss: run a fixed series of payload
lengths
..
bsc CBSP: TC_cbsp_write_bss: run a fixed series of payload lengths
Recently fixed errors in the last_block counting as well as encoding ask for a
proper test coverage of various lengths, which also verifies the expected
blocks count explicitly.
Implement this in TC_cbsp_write_bss():
Run f_tc_cbsp_write_bss() multiple times with differing fixed payload lengths,
at all block count transitions, plus some arbitrary lengths in-between.
Before this patch, TC_cbsp_write_bss() would pick a different random payload
length for every test run, which, until recently, then sporadically hit
last_block value errors. That's not good for reproducability.
Change-Id: I3cace19f9e5adc8ebab13ef2328a36dc150b2b31
---
M bsc/BSC_Tests_CBSP.ttcn
1 file changed, 33 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/39/19439/1
diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn
index f1f0240..edbaddc 100644
--- a/bsc/BSC_Tests_CBSP.ttcn
+++ b/bsc/BSC_Tests_CBSP.ttcn
@@ -377,20 +377,46 @@
}
/* Write to entire BSS; three cells succeed; one fails (no CBCH) */
-testcase TC_cbsp_write_bss() runs on cbsp_test_CT {
- var CBSP_IEs pages := {f_gen_page()};
+function f_tc_cbsp_write_bss(integer payload_len := -1, integer expect_blocks
:= -1) runs on cbsp_test_CT {
+ var CBSP_IEs pages := {f_gen_page(payload_len := payload_len)};
var template (value) BSSMAP_FIELD_CellIdentificationList cell_list;
cell_list := ts_BSSMAP_CIL_BSS;
- f_cbsp_init_server();
f_cbsp_write(1, 1001, cell_list, content:=pages,
success_list:=tr_BSSMAP_CIL_CGI({?,?,?}), fail_list:={?});
- var template RSL_Message tr := f_page2rsl(pages[0], 1, 1001);
+ var template RSL_Message tr := f_page2rsl(pages[0], 1, 1001,
expect_blocks := expect_blocks);
+ log("RSL[0,1,2] EXPECTING ", tr_ASP_RSL_UD(tr));
interleave {
- [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr)) {}
- [] IPA_RSL[1].receive(tr_ASP_RSL_UD(tr)) {}
- [] IPA_RSL[2].receive(tr_ASP_RSL_UD(tr)) {}
+ [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr)) { log("Got SMSCB CMD on
RSL[0]"); }
+ [] IPA_RSL[1].receive(tr_ASP_RSL_UD(tr)) { log("Got SMSCB CMD on
RSL[1]"); }
+ [] IPA_RSL[2].receive(tr_ASP_RSL_UD(tr)) { log("Got SMSCB CMD on
RSL[2]"); }
}
+ setverdict(pass);
+}
+testcase TC_cbsp_write_bss() runs on cbsp_test_CT {
+ f_cbsp_init_server(guard_timeout := 60.0);
+ /* In the SMSCB message, there is a head followed by payload,
+* and the resulting data is segmented in blocks of 22 octets (<= 4
blocks).
+*
+*
[head][...payload]|[]|[]|[]
+* 0 |16|38
|60 |82
+* 05|22|44
|66 |88
+*
+* blocks count: 1 | 2 | 3 | 4
+* payload octets count: 1..16 | 17..38 | 39..60 | 61..82
+*/
+ f_tc_cbsp_write_bss(payload_len := 1, expect_blocks := 1);
+ f_tc_cbsp_write_bss(payload_len := 2, expect_blocks := 1);
+ f_tc_cbsp_write_bss(payload_len := 16, expect_blocks := 1);
+ f_tc_cbsp_write_bss(payload_len := 17, expect_blocks := 2);
+ f_tc_cbsp_write_bss(payload_len := 23, expect_blocks := 2);
+ f_tc_cbsp_write_bss(payload_len := 38, expect_blocks := 2);
+ f_tc_cbsp_write_bss(payload_len := 39, expect_blocks := 3);
+ f_tc_cbsp_write_bss(payload_len := 42, expect_blocks := 3);
+ f_tc_cbsp_write_bss(payload_len := 60, expect_blocks := 3);
+ f_tc_cbsp_write_bss(payload_len := 61, expect_blocks := 4);
+ f_tc_cbsp_write_bss(payload_len := 77, expect_blocks := 4);
+ f_tc_cbsp_write_bss(payload_len := 82, expect_blocks := 4);
}
/* Write to single BTS supporting CBCH: success */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19439
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: I3cace19f9e5adc8ebab13ef2328a36dc150b2b31
Gerrit-Change-Number: 19439
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: bsc CBSP: allow passing guard_timeout to BSC_Tests.f_init()
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19437 )
Change subject: bsc CBSP: allow passing guard_timeout to BSC_Tests.f_init()
..
bsc CBSP: allow passing guard_timeout to BSC_Tests.f_init()
An upcoming patch adds a test series (of various payload lengths) to
TC_cbsp_write_bss(), which then needs a bit longer than 30 seconds to run
through those. That test will pass a longer guard_timeout.
Change-Id: I54e1b3994074f4d0caf5b201588fce0ec41dda89
---
M bsc/BSC_Tests_CBSP.ttcn
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/37/19437/1
diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn
index fd361bb..dd57954 100644
--- a/bsc/BSC_Tests_CBSP.ttcn
+++ b/bsc/BSC_Tests_CBSP.ttcn
@@ -93,8 +93,8 @@
}
}
-private function f_init() runs on cbsp_test_CT {
- BSC_Tests.f_init();
+private function f_init(float guard_timeout := 30.0) runs on cbsp_test_CT {
+ BSC_Tests.f_init(guard_timeout := guard_timeout);
activate(as_IgnRSL((tr_RSL_BCCH_INFO, tr_RSL_SACCH_FILL,
tr_RSL_NO_BCCH_INFO, tr_RSL_NO_SACCH_FILL,
tr_RSL_MsgTypeD(?;
@@ -107,11 +107,11 @@
setverdict(pass);
}
-private function f_cbsp_init_server() runs on cbsp_test_CT {
+private function f_cbsp_init_server(float guard_timeout := 30.0) runs on
cbsp_test_CT {
var ASP_Event asp_evt;
timer T := 10.0;
- f_init();
+ f_init(guard_timeout := guard_timeout);
CBSP_Adapter.f_bind(mp_cbc_ip, mp_cbc_port);
T.start;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19437
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: I54e1b3994074f4d0caf5b201588fce0ec41dda89
Gerrit-Change-Number: 19437
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: bsc CBSP: drop unused vars 'pages'
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19430 )
Change subject: bsc CBSP: drop unused vars 'pages'
..
bsc CBSP: drop unused vars 'pages'
Change-Id: I252fed22cccfc77a4f9cfdd2a0e3070ceeefc547
---
M bsc/BSC_Tests_CBSP.ttcn
1 file changed, 0 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/30/19430/1
diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn
index 94167ce..56e522a 100644
--- a/bsc/BSC_Tests_CBSP.ttcn
+++ b/bsc/BSC_Tests_CBSP.ttcn
@@ -197,7 +197,6 @@
template CBSP_FailureListItems fail_list := omit) runs on
cbsp_test_CT {
var template (value) CBSP_PDU tx;
var template CBSP_PDU rx;
- var CBSP_IEs pages := {f_gen_page()};
tx := ts_CBSP_WRITE_CBS(msg_id, ser_no, cell_list, channel_ind,
category,
rep_period, num_bcast_req, dcs, content);
@@ -227,7 +226,6 @@
template CBSP_FailureListItems fail_list := omit) runs on
cbsp_test_CT {
var template (value) CBSP_PDU tx;
var template CBSP_PDU rx;
- var CBSP_IEs pages := {f_gen_page()};
tx := ts_CBSP_REPLACE_CBS(msg_id, new_ser_no, old_ser_no, cell_list,
channel_ind, category,
rep_period, num_bcast_req, dcs, content);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19430
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: I252fed22cccfc77a4f9cfdd2a0e3070ceeefc547
Gerrit-Change-Number: 19430
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: bsc CBSP: add log context for CBSP port errors
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19432 )
Change subject: bsc CBSP: add log context for CBSP port errors
..
bsc CBSP: add log context for CBSP port errors
Change-Id: Ifd90e84ee65d0cb03eefc7ae1da2605650daf7ac
---
M library/CBSP_Adapter.ttcn
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/32/19432/1
diff --git a/library/CBSP_Adapter.ttcn b/library/CBSP_Adapter.ttcn
index 8dbee6a..fe399aa 100644
--- a/library/CBSP_Adapter.ttcn
+++ b/library/CBSP_Adapter.ttcn
@@ -44,7 +44,8 @@
res := CBSP_CodecPort_CtrlFunct.f_IPL4_connect(CBSP[idx], remote_host,
remote_port,
local_host, local_port,
0, { tcp :={} });
if (not ispresent(res.connId)) {
- setverdict(fail, "Could not connect to CBSP port, check your
configuration");
+ setverdict(fail, "Could not connect to CBSP port, check your
configuration ",
+ "{remote ", remote_host, ":", remote_port, " local ",
local_host, ":", local_port, "}");
mtc.stop;
}
g_cbsp_conn_id[idx] := res.connId;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19432
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: Ifd90e84ee65d0cb03eefc7ae1da2605650daf7ac
Gerrit-Change-Number: 19432
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: bsc CBSP: add numerous mtc.stop after fail verdicts
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19431 )
Change subject: bsc CBSP: add numerous mtc.stop after fail verdicts
..
bsc CBSP: add numerous mtc.stop after fail verdicts
I found that I had to wait 30 seconds after a failure verdict.
Change-Id: I8314c53037948fae51028119c81ea247baed44ec
---
M bsc/BSC_Tests_CBSP.ttcn
1 file changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/31/19431/1
diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn
index 56e522a..acd0b99 100644
--- a/bsc/BSC_Tests_CBSP.ttcn
+++ b/bsc/BSC_Tests_CBSP.ttcn
@@ -120,6 +120,7 @@
}
[] T.timeout {
setverdict(fail, "Timeout waiting for incoming connection to
CBSP Port");
+ mtc.stop;
}
}
f_cbsp_init_tail();
@@ -183,6 +184,7 @@
}
[] CBSP[0].receive(tr_CBSP_Recv(g_cbsp_conn_id[0], ?)) {
setverdict(fail, "Received unexpected CBSP");
+ mtc.stop;
}
}
}
@@ -212,6 +214,7 @@
}
[] CBSP[0].receive(tr_CBSP_Recv(g_cbsp_conn_id[0], ?)) {
setverdict(fail, "Received unexpected CBSP");
+ mtc.stop;
}
}
}
@@ -243,6 +246,7 @@
}
[] CBSP[0].receive(tr_CBSP_Recv(g_cbsp_conn_id[0], ?)) {
setverdict(fail, "Received unexpected CBSP");
+ mtc.stop;
}
}
}
@@ -270,6 +274,7 @@
}
[] CBSP[0].receive(tr_CBSP_Recv(g_cbsp_conn_id[0], ?)) {
setverdict(fail, "Received unexpected CBSP");
+ mtc.stop;
}
}
}
@@ -573,10 +578,12 @@
}
[] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_OSMO_ETWS_CMD(?,?))) {
setverdict(fail, "Received unexpected OSMO_ETWS_CMD");
+ mtc.stop;
}
[] IPA_RSL[0].receive { repeat; }
[] T.timeout {
setverdict(fail, "Timeout waiting for RSL_OSMO_ETWS_CMD");
+ mtc.stop;
}
}
}
@@ -602,10 +609,12 @@
}
[] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_OSMO_ETWS_CMD(?,?))) {
setverdict(fail, "Received unexpected OSMO_ETWS_CMD");
+ mtc.stop;
}
[] IPA_RSL[0].receive { repeat; }
[] T.timeout {
setverdict(fail, "Timeout waiting for RSL_OSMO_ETWS_CMD
(enable)");
+ mtc.stop;
}
}
@@ -617,10 +626,12 @@
}
[] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_OSMO_ETWS_CMD(?,?))) {
setverdict(fail, "Received unexpected OSMO_ETWS_CMD");
+ mtc.stop;
}
[] IPA_RSL[0].receive { repeat; }
[] T.timeout {
setverdict(fail, "Timeout waiting for RSL_OSMO_ETWS_CMD
(disable)");
+ mtc.stop;
}
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19431
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: I8314c53037948fae51028119c81ea247baed44ec
Gerrit-Change-Number: 19431
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
Change in docker-playground[master]: jenkins-common.sh: exit early on full disk
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/19429 ) Change subject: jenkins-common.sh: exit early on full disk .. jenkins-common.sh: exit early on full disk When my disk runs full, jenkins-common.sh fails to create a VOL_BASEDIR right at the start, and hence no testsuite gets its external volumes mounted properly. However, the test suite still starts up with missing cfg files etc, and fails in non-obvious ways, until I find out the disk is full some minutes later. Instead, verify that the base dir really exists or bail out right there. Change-Id: I6540797c8e0ee3e7b09d4a80592d5e270e7d9adc --- M jenkins-common.sh 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/29/19429/1 diff --git a/jenkins-common.sh b/jenkins-common.sh index a29720c..64ec0bb 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -135,6 +135,11 @@ mkdir -p "$VOL_BASE_DIR" fi +if [ ! -d "$VOL_BASE_DIR" ]; then + echo "ERROR: \$VOL_BASE_DIR does not exist: '$VOL_BASE_DIR'" + exit 1 +fi + # non-jenkins execution: put logs in /tmp if [ "x$BUILD_TAG" = "x" ]; then BUILD_TAG=nonjenkins -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6540797c8e0ee3e7b09d4a80592d5e270e7d9adc Gerrit-Change-Number: 19429 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange
Change in docker-playground[master]: bsc CBSP: fix osmo-bsc.cfg to contain 3 BTS with a CBCH
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/19428 ) Change subject: bsc CBSP: fix osmo-bsc.cfg to contain 3 BTS with a CBCH .. bsc CBSP: fix osmo-bsc.cfg to contain 3 BTS with a CBCH The bsc/BSC_Tests_CBSP.ttcn rely on a configuration where the first three BTS carry out SMSCB messaging, and the fourth BTS does not. That requires a CBCH channel config on bts 0, 1, 2. Related: Iac46ee2cc5bc0978d5f5baa550baf493a7c56b1b (osmo-ttcn3-hacks) Change-Id: Idbcc703ace7012fb395f0eef3e445df28b368d74 --- M ttcn3-bsc-test/osmo-bsc.cfg 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/28/19428/1 diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg index d49e6f2..13e7f60 100644 --- a/ttcn3-bsc-test/osmo-bsc.cfg +++ b/ttcn3-bsc-test/osmo-bsc.cfg @@ -144,7 +144,7 @@ max_power_red 20 rsl e1 tei 0 timeslot 0 -phys_chan_config CCCH+SDCCH4 +phys_chan_config CCCH+SDCCH4+CBCH hopping enabled 0 timeslot 1 phys_chan_config TCH/F @@ -234,7 +234,7 @@ max_power_red 20 rsl e1 tei 0 timeslot 0 -phys_chan_config CCCH+SDCCH4 +phys_chan_config CCCH+SDCCH4+CBCH hopping enabled 0 timeslot 1 phys_chan_config TCH/F @@ -324,7 +324,7 @@ max_power_red 20 rsl e1 tei 0 timeslot 0 -phys_chan_config CCCH+SDCCH4 +phys_chan_config CCCH+SDCCH4+CBCH hopping enabled 0 timeslot 1 phys_chan_config TCH/F -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idbcc703ace7012fb395f0eef3e445df28b368d74 Gerrit-Change-Number: 19428 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange
Change in libosmocore[master]: Gb/BSSGP: replace hardcoded Tx into NS library by a callback
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19414 ) Change subject: Gb/BSSGP: replace hardcoded Tx into NS library by a callback .. Patch Set 4: > Patch Set 4: > > (2 comments) > > I'm not really sure if this is worth the effort. If we have a new NS > implementation, we don't need to support osage of that new implentation by > old applications. So we could simply introduce a new implementation (with > new API, ideally an SAP based on osmo_prim) in the library. After it's > added, we can convert the users to the new API. Old applications will use > the old codebase, while new applications will use the new. The new NS is also using this BSSGP. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3a498e6a0d68b87fed80c64199b22395796761b4 Gerrit-Change-Number: 19414 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 23:04:49 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-msc[master]: vty: fix vsub reference counting: call vlr_subscr_put()
fixeria has uploaded a new patch set (#2). (
https://gerrit.osmocom.org/c/osmo-msc/+/19427 )
Change subject: vty: fix vsub reference counting: call vlr_subscr_put()
..
vty: fix vsub reference counting: call vlr_subscr_put()
Otherwise, each time the 3GPP TS 44.014 MS test commands (TCH loop)
are invoked, both subscriber_mstest_{close,open} functions add +1
to the subscriber's reference count, but never revoke it.
Change-Id: I0cefa5b5a0cb712080ba2afd322db329f19608e3
---
M src/libmsc/msc_vty.c
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/27/19427/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19427
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I0cefa5b5a0cb712080ba2afd322db329f19608e3
Gerrit-Change-Number: 19427
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-CC: Jenkins Builder
Gerrit-MessageType: newpatchset
Change in osmo-msc[master]: vty: fix vsub reference counting: call vlr_subscr_put()
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-msc/+/19427 )
Change subject: vty: fix vsub reference counting: call vlr_subscr_put()
..
vty: fix vsub reference counting: call vlr_subscr_put()
Otherwise, each time the 3GPP TS 44.014 MS test commands (TCH loop)
are invoked, both subscriber_mstest_{close,open} functiona add +1
to the subscriber's reference count, but never revoke it.
Change-Id: I0cefa5b5a0cb712080ba2afd322db329f19608e3
---
M src/libmsc/msc_vty.c
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/27/19427/1
diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c
index c5e93aa..07a88c2 100644
--- a/src/libmsc/msc_vty.c
+++ b/src/libmsc/msc_vty.c
@@ -1704,6 +1704,7 @@
gsm0414_tx_close_tch_loop_cmd(msc_a, loop_mode);
+ vlr_subscr_put(vsub, VSUB_USE_VTY);
return CMD_SUCCESS;
}
@@ -1732,6 +1733,7 @@
gsm0414_tx_open_loop_cmd(msc_a);
+ vlr_subscr_put(vsub, VSUB_USE_VTY);
return CMD_SUCCESS;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19427
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I0cefa5b5a0cb712080ba2afd322db329f19608e3
Gerrit-Change-Number: 19427
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-msc[master]: gsm_04_14: fix off-by-one error in create_gsm0414_msg()
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-msc/+/19426 )
Change subject: gsm_04_14: fix off-by-one error in create_gsm0414_msg()
..
gsm_04_14: fix off-by-one error in create_gsm0414_msg()
This byte is redundant, and must not be allocated in this function.
A consequence of this error is that the MS alwats interprets the
"Sub-channel" IE as test loop A regardless of the specified type.
Here is an example of malformed Close TCH loop (type C) message:
0f 00 00 04
x. .. .. .. - Skip indicator (see 3GPP TS 24.007)
.x .. .. .. - Protocol discriminator (see 3GPP TS 24.007)
.. xx .. .. - Message type (CLOSE_TCH_LOOP_CMD)
.. .. !! .. - (!) Redundant byte from create_gsm0414_msg()
.. .. .. xx - (!) The actual "Sub-channel" IE (loop C, X=0)
Change-Id: Ia47225b884439dcd43be307e7351994e55fcd50d
---
M src/libmsc/gsm_04_14.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/26/19426/1
diff --git a/src/libmsc/gsm_04_14.c b/src/libmsc/gsm_04_14.c
index 8116558..03c06fd 100644
--- a/src/libmsc/gsm_04_14.c
+++ b/src/libmsc/gsm_04_14.c
@@ -43,7 +43,7 @@
struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.14");
struct gsm48_hdr *gh;
- gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh) + 1);
+ gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh));
gh->proto_discr = GSM48_PDISC_TEST;
gh->msg_type = msg_type;
return msg;
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19426
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Ia47225b884439dcd43be307e7351994e55fcd50d
Gerrit-Change-Number: 19426
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Build failure of network:osmocom:latest/ulfius in Debian_Testing/x86_64
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:latest/ulfius/Debian_Testing/x86_64
Package network:osmocom:latest/ulfius failed to build in Debian_Testing/x86_64
Check out the package for editing:
osc checkout network:osmocom:latest ulfius
Last lines of build log:
[ 136s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5
of 'MHD_start_daemon' from incompatible pointer type
[-Werror=incompatible-pointer-types]
[ 136s] 839 | mhd_flags, u_instance->port, NULL, NULL,
_webservice_dispatcher, (void *)u_instance,
[ 136s] |
^
[ 136s] ||
[ 136s] |int (*)(void *,
struct MHD_Connection *, const char *, const char *, const char *, const char
*, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char
*, const char *, const char *, const char *, long unsigned int *, void **)}
[ 136s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46,
[ 136s] from /usr/src/packages/BUILD/include/u_private.h:29,
[ 136s] from /usr/src/packages/BUILD/src/ulfius.c:29:
[ 136s] /usr/include/microhttpd.h:2425:1: note: expected
'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct
MHD_Connection *, const char *, const char *, const char *, const char *, long
unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct
MHD_Connection *, const char *, const char *, const char *, const char *,
size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char
*, const char *, const char *, const char *, long unsigned int *, void **)'}
[ 136s] 2425 | MHD_start_daemon (unsigned int flags,
[ 136s] | ^~~~
[ 136s] cc1: all warnings being treated as errors
[ 136s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144:
CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1
[ 136s] make[3]: *** Waiting for unfinished jobs
[ 136s] make[3]: Leaving directory '/usr/src/packages/BUILD/build'
[ 136s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all]
Error 2
[ 136s] make[2]: Leaving directory '/usr/src/packages/BUILD/build'
[ 136s] make[1]: *** [Makefile:166: all] Error 2
[ 136s] make[1]: Leaving directory '/usr/src/packages/BUILD/build'
[ 136s] dh_auto_build: error: cd build && make -j8 "INSTALL=install
--strip-program=true" returned exit code 2
[ 136s] make: *** [debian/rules:9: build] Error 25
[ 136s] dpkg-buildpackage: error: debian/rules build subprocess returned exit
status 2
[ 136s] ### VM INTERACTION START ###
[ 140s] [ 128.140119] sysrq: SysRq : Power Off
[ 140s] [ 128.145259] reboot: Power down
[ 140s] ### VM INTERACTION END ###
[ 140s]
[ 140s] lamb56 failed "build ulfius_2.5.2-4.1.dsc" at Tue Jul 28 22:04:24 UTC
2020.
[ 140s]
--
Configure notifications at https://build.opensuse.org/my/subscriptions
openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/ulfius in Debian_Testing/x86_64
Visit
https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/ulfius/Debian_Testing/x86_64
Package network:osmocom:nightly/ulfius failed to build in Debian_Testing/x86_64
Check out the package for editing:
osc checkout network:osmocom:nightly ulfius
Last lines of build log:
[ 116s] /usr/src/packages/BUILD/src/ulfius.c:839:48: error: passing argument 5
of 'MHD_start_daemon' from incompatible pointer type
[-Werror=incompatible-pointer-types]
[ 116s] 839 | mhd_flags, u_instance->port, NULL, NULL,
_webservice_dispatcher, (void *)u_instance,
[ 116s] |
^
[ 116s] ||
[ 116s] |int (*)(void *,
struct MHD_Connection *, const char *, const char *, const char *, const char
*, size_t *, void **) {aka int (*)(void *, struct MHD_Connection *, const char
*, const char *, const char *, const char *, long unsigned int *, void **)}
[ 116s] In file included from /usr/src/packages/BUILD/include/ulfius.h:46,
[ 116s] from /usr/src/packages/BUILD/include/u_private.h:29,
[ 116s] from /usr/src/packages/BUILD/src/ulfius.c:29:
[ 116s] /usr/include/microhttpd.h:2425:1: note: expected
'MHD_AccessHandlerCallback' {aka 'enum MHD_Result (*)(void *, struct
MHD_Connection *, const char *, const char *, const char *, const char *, long
unsigned int *, void **)'} but argument is of type 'int (*)(void *, struct
MHD_Connection *, const char *, const char *, const char *, const char *,
size_t *, void **)' {aka 'int (*)(void *, struct MHD_Connection *, const char
*, const char *, const char *, const char *, long unsigned int *, void **)'}
[ 116s] 2425 | MHD_start_daemon (unsigned int flags,
[ 116s] | ^~~~
[ 116s] cc1: all warnings being treated as errors
[ 116s] make[3]: *** [CMakeFiles/ulfius.dir/build.make:144:
CMakeFiles/ulfius.dir/src/ulfius.c.o] Error 1
[ 116s] make[3]: *** Waiting for unfinished jobs
[ 117s] make[3]: Leaving directory '/usr/src/packages/BUILD/build'
[ 117s] make[2]: *** [CMakeFiles/Makefile2:87: CMakeFiles/ulfius.dir/all]
Error 2
[ 117s] make[2]: Leaving directory '/usr/src/packages/BUILD/build'
[ 117s] make[1]: *** [Makefile:166: all] Error 2
[ 117s] make[1]: Leaving directory '/usr/src/packages/BUILD/build'
[ 117s] dh_auto_build: error: cd build && make -j8 "INSTALL=install
--strip-program=true" returned exit code 2
[ 117s] make: *** [debian/rules:9: build] Error 25
[ 117s] dpkg-buildpackage: error: debian/rules build subprocess returned exit
status 2
[ 117s] ### VM INTERACTION START ###
[ 120s] [ 108.399509] sysrq: SysRq : Power Off
[ 120s] [ 108.404101] reboot: Power down
[ 120s] ### VM INTERACTION END ###
[ 120s]
[ 120s] lamb70 failed "build ulfius_2.5.2-4.1.dsc" at Tue Jul 28 22:03:19 UTC
2020.
[ 120s]
--
Configure notifications at https://build.opensuse.org/my/subscriptions
openSUSE Build Service (https://build.opensuse.org/)
Change in osmocom-bb[master]: layer23/mobile: cosmetic: use GSM48_PDISC_TEST from gsm_04_08.h
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/19425 ) Change subject: layer23/mobile: cosmetic: use GSM48_PDISC_TEST from gsm_04_08.h .. layer23/mobile: cosmetic: use GSM48_PDISC_TEST from gsm_04_08.h Change-Id: Ie1f14b37f6138f5a019a25bdbc8a3531418df6c2 --- M src/host/layer23/src/mobile/gsm48_mm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/25/19425/1 diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index d3b042c..52c6fe9 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -4076,7 +4076,7 @@ msgb_free(msg); return rc; - case 0x0f: /* test TS 04.14 */ + case GSM48_PDISC_TEST: /* test TS 04.14 */ LOGP(DMM, LOGL_NOTICE, "Test protocol 0x%02x according to " "TS 04.14 is not supported.\n", pdisc); goto status; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie1f14b37f6138f5a019a25bdbc8a3531418df6c2 Gerrit-Change-Number: 19425 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: bsc: test RR Channel Release cause codes from Clear Command cause codes
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217 ) Change subject: bsc: test RR Channel Release cause codes from Clear Command cause codes .. Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217/3/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217/3/bsc/BSC_Tests.ttcn@1446 PS3, Line 1446: template RR_Cause expect_rr_cause := ? > See my comment to the preceding change. […] I don't share this concern. It doesn't say "RSL channel release" specifically, and it actually still just expects all aspects of a channel release. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19217 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: Ie6c99f28b610a67f2d59ec00b3541940e882251b Gerrit-Change-Number: 19217 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 20:32:01 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in osmo-bsc[master]: lchan_fsm: silently ignore LCHAN_EV_RLL_ERR_IND
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19389 ) Change subject: lchan_fsm: silently ignore LCHAN_EV_RLL_ERR_IND .. lchan_fsm: silently ignore LCHAN_EV_RLL_ERR_IND The RLL ERR IND is sent by the BTS in any number of casese that lead to a disconnect of a radio link layer, for example due to bad RF conditions. The lchan FSM currnently prints error messages about this event not being permitted, leading to confusion among users. Let's ignore this event, I don't think the lchan FSM should or could be doing anything as a result. We could also simply remove that event, but let's keep it in case we should need it in the future. Change-Id: I07aad62d25566d6068a95797915bb97fc3c66328 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index e879059..4ed95dd 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1336,6 +1336,13 @@ lchan_fail_to(LCHAN_ST_UNUSED, "LCHAN_EV_TS_ERROR"); return; + case LCHAN_EV_RLL_ERR_IND: + /* let's just ignore this. We are already logging the +* fact that this message was received inside +* abis_rsl.c. There can be any number of reasons why the +* radio link layer failed */ + return; + default: return; } @@ -1464,6 +1471,7 @@ .allstate_action = lchan_fsm_allstate_action, .allstate_event_mask = 0 | S(LCHAN_EV_TS_ERROR) + | S(LCHAN_EV_RLL_ERR_IND) , .timer_cb = lchan_fsm_timer_cb, .cleanup = lchan_fsm_cleanup, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I07aad62d25566d6068a95797915bb97fc3c66328 Gerrit-Change-Number: 19389 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-bts[master]: doc: configuration.adoc: Document ramping down feature
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19410 ) Change subject: doc: configuration.adoc: Document ramping down feature .. doc: configuration.adoc: Document ramping down feature Change-Id: I3c7df0d914587bdde2aef9919f75d507a0e5884b --- M doc/manuals/chapters/configuration.adoc 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/configuration.adoc b/doc/manuals/chapters/configuration.adoc index 2b78620..772d8da 100644 --- a/doc/manuals/chapters/configuration.adoc +++ b/doc/manuals/chapters/configuration.adoc @@ -158,6 +158,12 @@ OsmoBTS can ramp up the power of its trx over time. This helps reduce cell congestion in busy environments. +Some models of OsmoBTS (such as osmo-bts-trx) also support ramping down the +transmit power over time until finally ceasing broadcast, for instance due to a +trx becoming administratively locked or due to the whole BTS being gracefully +shut down. This allows for mobile stations camping on the cell to gradually move +to other cells in the area once the signal drop is detected. + In this example, the trx starts with 5dBm output power which increases by 1dB every two seconds until it reaches nominal power. Power ramping can use the power-ramp commands at the CONFIG TRX node of the -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3c7df0d914587bdde2aef9919f75d507a0e5884b Gerrit-Change-Number: 19410 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-bts[master]: tx_power: Take into account max-initial when ramping up bigger power ...
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/19408 )
Change subject: tx_power: Take into account max-initial when ramping up bigger
power lvl intervals
..
tx_power: Take into account max-initial when ramping up bigger power lvl
intervals
Until now, power-ramp max-initial was only taken into account in order
to skip ramping if the desired target level was below it, in order to
forbid growin too quickly or applying directly to much power given power
amplifier requirements.
However, in the event that a higher tx power level is desired,
max-initial was not taking into account and ramping simply started from
current tx power level, which could be a lot lower than max-initial.
Allow shortcutting the ramping in that case so that max-initial is
applied directly, and ramping continues from there, in order to have a
more expected behavior (max-initial applied the same).
Since max-initial can since a few commits before handle a negative
value, this means One can for instance set max-initial to -10 and still
keep the old behavior of ramping step by step from -10 (rf-locked in
osmo-bts-trx) to 0 or 7 or whatever is the nominal power
(max_power_red).
Change-Id: I4e5742ecdbf66d77ff9445999f6fff43bbf4856a
---
M src/common/tx_power.c
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
Hoernchen: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/common/tx_power.c b/src/common/tx_power.c
index 7f134ca..c5ea7ed 100644
--- a/src/common/tx_power.c
+++ b/src/common/tx_power.c
@@ -276,8 +276,10 @@
tpp->ramp.attenuation_mdB = 0;
power_ramp_timer_cb(trx);
} else {
- /* We need to step it up. Start from the current value
*/
+ /* We need to step it up. Start from the current value,
shortcutting to max-initial. */
/* Set attenuation to cause no power change right now */
+ if (tpp->p_total_cur_mdBm + tpp->ramp.step_size_mdB <
tpp->ramp.max_initial_pout_mdBm)
+ tpp->p_total_cur_mdBm =
tpp->ramp.max_initial_pout_mdBm - tpp->ramp.step_size_mdB;
tpp->ramp.attenuation_mdB = tpp->p_total_tgt_mdBm -
tpp->p_total_cur_mdBm;
/* start with the first step */
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19408
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I4e5742ecdbf66d77ff9445999f6fff43bbf4856a
Gerrit-Change-Number: 19408
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Hoernchen
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-bts[master]: vty: Allow setting power-ramp max-initial to negative values
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/19406 )
Change subject: vty: Allow setting power-ramp max-initial to negative values
..
vty: Allow setting power-ramp max-initial to negative values
This allows for instance ramping up from -10 dBm -> -4 dBm if NOMTXPOWER
of SDR is really low (below 0dBm) or because the max_power_red is >=
NOMTXPOWER.
Related: SYS#4920
Change-Id: I0f27fb7b86b58c5a80f5342b66ff4f5d1b775498
---
M src/common/tx_power.c
M src/common/vty.c
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
Hoernchen: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/common/tx_power.c b/src/common/tx_power.c
index 8f50b0f..7f134ca 100644
--- a/src/common/tx_power.c
+++ b/src/common/tx_power.c
@@ -268,8 +268,8 @@
if (we_are_ramping_up(trx)) {
if (tpp->p_total_tgt_mdBm <= tpp->ramp.max_initial_pout_mdBm) {
LOGPTRX(trx, DL1C, LOGL_INFO,
- "target_power(%d) is below max.initial power\n",
- tpp->p_total_tgt_mdBm);
+ "target_power (%d mdBm) is below or equal to
'power ramp max-initial' power (%d mdBm)\n",
+ tpp->p_total_tgt_mdBm,
tpp->ramp.max_initial_pout_mdBm);
/* new setting is below the maximum initial output
* power, so we can directly jump to this level */
tpp->p_total_cur_mdBm = tpp->p_total_tgt_mdBm;
diff --git a/src/common/vty.c b/src/common/vty.c
index 91f3706..3f24d66 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -723,7 +723,7 @@
#define PR_STR "Power-Ramp settings\n"
DEFUN(cfg_trx_pr_max_initial, cfg_trx_pr_max_initial_cmd,
- "power-ramp max-initial <0-10> (dBm|mdBm)",
+ "power-ramp max-initial <-1-10> (dBm|mdBm)",
PR_STR "Maximum initial power\n"
"Value\n" DB_MDB_STR)
{
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19406
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I0f27fb7b86b58c5a80f5342b66ff4f5d1b775498
Gerrit-Change-Number: 19406
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Hoernchen
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bts[master]: bts-trx: Fix assert hit when rf_locked in .cfg and TS TCH/F_PDCH
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/19407 )
Change subject: bts-trx: Fix assert hit when rf_locked in .cfg and TS TCH/F_PDCH
..
bts-trx: Fix assert hit when rf_locked in .cfg and TS TCH/F_PDCH
If TRX is administratively locked during startup, for TS conigured as
TCH/F_PDCH the BSC will send a ACT PDCH message, but osmo-bts-trx won't
apply it by signalling it as available to the PCU, since the TRX is
locked.
That means the ts->flags contains the pending action to activate
it until it is unlocked. As a result, calling trx_set_ts() on it was
hitting the assert inside which expects not to apply the TS until it has
been confirmed by the PCU.
Let's still skip setting the TS and let pcu_tx_info_ind() trigger the
activation confirmation from PCU, since the TRX has just been unlocked.
Fixes following assert:
Assert failed (ts->flags & TS_F_PDCH_PENDING_MASK) == 0
/osmo-bts/src/osmo-bts-trx/l1_if.c:34
Change-Id: Ie3cad15d31870346d03a6e2f6dd32a9d2dd3067e
---
M src/osmo-bts-trx/l1_if.c
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
Hoernchen: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c
index 48305b5..a2b3415 100644
--- a/src/osmo-bts-trx/l1_if.c
+++ b/src/osmo-bts-trx/l1_if.c
@@ -702,6 +702,13 @@
* internally restore the old status
here.
*/
ts->dyn.pchan_is = ts->dyn.pchan_want;
+ } else if (ts->pchan == GSM_PCHAN_TCH_F_PDCH &&
ts->flags & TS_F_PDCH_PENDING_MASK) {
+ /* TS configuration already in progress,
+* waiting for PCU response, let it be
+* de/activated later by PCU ACT CNF as
a
+* response to pcu_tx_info_ind()
+*/
+ continue;
}
trx_set_ts(ts);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19407
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ie3cad15d31870346d03a6e2f6dd32a9d2dd3067e
Gerrit-Change-Number: 19407
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Hoernchen
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-bts[master]: bts-trx: Fix handling ADM state change while previous one WIP
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/19405 )
Change subject: bts-trx: Fix handling ADM state change while previous one WIP
..
bts-trx: Fix handling ADM state change while previous one WIP
Fix power ramping if administrative state changes while previous
opposite change was already ACKED but power ramping was still ongoing.
With previous code, osmo-bts-trx would have sent a NACK and BSc would
drop the BTs link as a result.
Change-Id: I6c5240710ef6d223651dfb4a8db939b5d2f974ca
---
M src/osmo-bts-trx/l1_if.c
1 file changed, 24 insertions(+), 5 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c
index cd7ecc0..48305b5 100644
--- a/src/osmo-bts-trx/l1_if.c
+++ b/src/osmo-bts-trx/l1_if.c
@@ -662,11 +662,29 @@
break;
if (mo->procedure_pending) {
- LOGPTRX(trx, DL1C, LOGL_ERROR, "Discarding adm change
command: "
- "pending procedure on RC %d\n",
- ((struct gsm_bts_trx *)obj)->nr);
- rc = -1;
- break;
+ LOGPTRX(trx, DL1C, LOGL_INFO,
+ "ADM change received while previous one still
WIP\n");
+
+ if (mo->nm_state.administrative == NM_STATE_LOCKED &&
+ adm_state == NM_STATE_UNLOCKED) {
+ /* Previous change was UNLOCKED->LOCKED, so we
+* were ramping down and we didn't deactivate
+* yet, so now simply skip old ramp down compl
+* cb, skip TS activation and go for ramp up
+* directly. */
+ goto ramp_up;
+ } else if (mo->nm_state.administrative ==
NM_STATE_UNLOCKED &&
+ adm_state == NM_STATE_LOCKED) {
+ /* Previous change was LOCKED->UNLOCKED, which
+* means TS were also enabled during start of
+* ramping up. So we simply need to skip
+* ramping up and start ramping down instead,
+* disabling TS at the end as usual. Fall
+* through usual procedure below.
+*/
+ } else if (mo->nm_state.administrative == adm_state) {
+ OSMO_ASSERT(0);
+ }
}
switch (adm_state) {
case NM_STATE_LOCKED:
@@ -687,6 +705,7 @@
}
trx_set_ts(ts);
}
+ramp_up:
rc = l1if_trx_start_power_ramp(trx,
bts_model_chg_adm_state_ramp_compl_cb);
if (rc == 0) {
mo->nm_state.administrative = adm_state;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19405
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I6c5240710ef6d223651dfb4a8db939b5d2f974ca
Gerrit-Change-Number: 19405
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Hoernchen
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bts[master]: common: Avoid call to bts_model_chg_adm_state() if there's no ADM sta...
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/19404 )
Change subject: common: Avoid call to bts_model_chg_adm_state() if there's no
ADM state change
..
common: Avoid call to bts_model_chg_adm_state() if there's no ADM state change
Let's handle it in common code to simplify and avoid duplication in
model specific code.
Change-Id: Icea3ea1108d360193cac478f366be97ff38246d4
---
M src/common/oml.c
1 file changed, 6 insertions(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/common/oml.c b/src/common/oml.c
index 1be4f89..39304f1 100644
--- a/src/common/oml.c
+++ b/src/common/oml.c
@@ -1032,13 +1032,14 @@
return oml_fom_ack_nack(msg, NM_NACK_OBJINST_UNKN);
/* Step 2: Do some global dependency/consistency checking */
- if (mo->nm_state.administrative == adm_state)
+ if (mo->nm_state.administrative == adm_state) {
LOGPFOH(DOML, LOGL_NOTICE, foh, "ADM state already was %s\n",
get_value_string(abis_nm_adm_state_names, adm_state));
- else
- LOGPFOH(DOML, LOGL_NOTICE, foh, "ADM STATE %s -> %s\n",
- get_value_string(abis_nm_adm_state_names,
mo->nm_state.administrative),
- get_value_string(abis_nm_adm_state_names, adm_state));
+ return oml_mo_statechg_ack(mo);
+ }
+ LOGPFOH(DOML, LOGL_NOTICE, foh, "ADM STATE %s -> %s\n",
+ get_value_string(abis_nm_adm_state_names,
mo->nm_state.administrative),
+ get_value_string(abis_nm_adm_state_names, adm_state));
/* Step 3: Ask BTS driver to apply the state chg */
return bts_model_chg_adm_state(bts, mo, obj, adm_state);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19404
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Icea3ea1108d360193cac478f366be97ff38246d4
Gerrit-Change-Number: 19404
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Hoernchen
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bts[master]: doc: configuration.adoc: Document ramping down feature
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19410 ) Change subject: doc: configuration.adoc: Document ramping down feature .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3c7df0d914587bdde2aef9919f75d507a0e5884b Gerrit-Change-Number: 19410 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 20:28:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: common: Avoid call to bts_model_chg_adm_state() if there's no ADM sta...
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19404 ) Change subject: common: Avoid call to bts_model_chg_adm_state() if there's no ADM state change .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icea3ea1108d360193cac478f366be97ff38246d4 Gerrit-Change-Number: 19404 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 20:28:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: bts-trx: Fix handling ADM state change while previous one WIP
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19405 ) Change subject: bts-trx: Fix handling ADM state change while previous one WIP .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6c5240710ef6d223651dfb4a8db939b5d2f974ca Gerrit-Change-Number: 19405 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 20:28:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: tx_power: Take into account max-initial when ramping up bigger power ...
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19408 ) Change subject: tx_power: Take into account max-initial when ramping up bigger power lvl intervals .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4e5742ecdbf66d77ff9445999f6fff43bbf4856a Gerrit-Change-Number: 19408 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 20:28:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: bts-trx: Fix assert hit when rf_locked in .cfg and TS TCH/F_PDCH
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19407 ) Change subject: bts-trx: Fix assert hit when rf_locked in .cfg and TS TCH/F_PDCH .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie3cad15d31870346d03a6e2f6dd32a9d2dd3067e Gerrit-Change-Number: 19407 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 20:28:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: vty: Allow setting power-ramp max-initial to negative values
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19406 ) Change subject: vty: Allow setting power-ramp max-initial to negative values .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0f27fb7b86b58c5a80f5342b66ff4f5d1b775498 Gerrit-Change-Number: 19406 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 20:28:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_si_acc_rotate
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359 ) Change subject: bsc: Introduce test TC_si_acc_rotate .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359 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: I18d0243353fce547d126d62c34415628a21cb52b Gerrit-Change-Number: 19359 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 20:15:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: vty: Don't match negative values on purely positive ranges
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19424 ) Change subject: vty: Don't match negative values on purely positive ranges .. Patch Set 1: Code-Review+1 really nice catch. a unit test would be great to prevent these kind of things... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia95f6314a2dd3f94d21fc219cf69bb8d39b8e7f0 Gerrit-Change-Number: 19424 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 20:15:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: vty: Allow larger strlen parsing numerical range values
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19423 ) Change subject: vty: Allow larger strlen parsing numerical range values .. Patch Set 1: well, the 64bit mask would only work on a 64bit arch, right? Where do we need numeric values that large? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id053acd6bf5e8fb7c468959f0b78b778f8c5e6c2 Gerrit-Change-Number: 19423 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 20:14:35 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore[master]: vty: Allow using hex and octal representations in cmd numeric ranges
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19422 ) Change subject: vty: Allow using hex and octal representations in cmd numeric ranges .. Patch Set 1: is this really an advantage? As we don't store the 'base', any write/save would store something in decimal that the user specified in hex. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia2b7fbbf5502c28374c21dbff548232680da27d4 Gerrit-Change-Number: 19422 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 20:13:48 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore[master]: add osmo_sockaddr_local_ip() to determine the local address for a rem...
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19416 ) Change subject: add osmo_sockaddr_local_ip() to determine the local address for a remote. .. Patch Set 7: like in a previous patch: Doesn't it make sense to turn osmo_sock_local_ip() into a wrapper around the new osmo_sockaddr_local_ip? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9cd2c5ceb28183e2fd2d28f9c9088c3fcac643d2 Gerrit-Change-Number: 19416 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 20:12:18 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore[master]: socket.c: add osmo_sockaddr_cmp()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19415 ) Change subject: socket.c: add osmo_sockaddr_cmp() .. Patch Set 7: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19415/7/src/socket.c File src/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/19415/7/src/socket.c@1589 PS7, Line 1589: /* fallback to memcmp for remaing AF */ : return memcmp(a, b, sizeof(struct osmo_sockaddr)); might be worth moving this into a "default:" clause of the switch statement to clearly see it's three different exist paths, rather than some coommon code at the end of the function. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d12ebae2710ffd17cf071e6ada0804e73f87dd6 Gerrit-Change-Number: 19415 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 20:11:30 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: socket.c: fix osmo_sock_get_ip_and_port for IPv6
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19147 ) Change subject: socket.c: fix osmo_sock_get_ip_and_port for IPv6 .. Patch Set 8: would be great to have a unit test that goes along with this. We can then first show that it breaks without this fix, and that the fix makes the test working. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4e69d814367168c05f0da161ec9b705db36ad096 Gerrit-Change-Number: 19147 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 20:10:08 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore[master]: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19143 ) Change subject: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd .. Patch Set 9: doest it make sense to keep a completely separate implementation for osmo_sock_init2_ofd, rather than "redirecting" the old code to the new? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 20:09:16 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore[master]: sockaddr_str: add osmo_sockaddr_str_from_str2() which doesn't set the...
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19142 ) Change subject: sockaddr_str: add osmo_sockaddr_str_from_str2() which doesn't set the port .. Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifd4e282586b8bd40b912a9f1c25f9e8208420106 Gerrit-Change-Number: 19142 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 20:07:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: osmo_sock_init2: improve support for AF_UNSPEC
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19140 ) Change subject: osmo_sock_init2: improve support for AF_UNSPEC .. Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I397c633931fd00d4f083955a3c49a40fb002d766 Gerrit-Change-Number: 19140 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 20:07:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: vty: add a define VTY_IPV46_CMD to require a IPv4/6 address
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/19139 )
Change subject: vty: add a define VTY_IPV46_CMD to require a IPv4/6 address
..
vty: add a define VTY_IPV46_CMD to require a IPv4/6 address
Allow to use this define in vty definitions when a IPV4/6 address
is required as argument.
Change-Id: I86e399aea86b68b48e627f11e1de48fdfad16525
---
M include/osmocom/vty/command.h
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/include/osmocom/vty/command.h b/include/osmocom/vty/command.h
index 88490f7..29206ce 100644
--- a/include/osmocom/vty/command.h
+++ b/include/osmocom/vty/command.h
@@ -304,6 +304,10 @@
#define CMD_IPV6(S)((strcmp ((S), "X:X::X:X") == 0))
#define CMD_IPV6_PREFIX(S) ((strcmp ((S), "X:X::X:X/M") == 0))
+#define VTY_IPV4_CMD "A.B.C.D"
+#define VTY_IPV6_CMD "X:X::X:X"
+#define VTY_IPV46_CMD "(" VTY_IPV4_CMD "|" VTY_IPV6_CMD ")"
+
/* Common descriptions. */
#define SHOW_STR "Show running system information\n"
#define IP_STR "IP information\n"
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19139
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I86e399aea86b68b48e627f11e1de48fdfad16525
Gerrit-Change-Number: 19139
Gerrit-PatchSet: 3
Gerrit-Owner: lynxis lazus
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in libosmocore[master]: vty: add a define VTY_IPV46_CMD to require a IPv4/6 address
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19139 ) Change subject: vty: add a define VTY_IPV46_CMD to require a IPv4/6 address .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I86e399aea86b68b48e627f11e1de48fdfad16525 Gerrit-Change-Number: 19139 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 20:02:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: bts_features: add feature BTS_FEAT_IPV6_NSVC
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19145 ) Change subject: bts_features: add feature BTS_FEAT_IPV6_NSVC .. Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0 Gerrit-Change-Number: 19145 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 20:01:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns_frgre.h: add missing declaration of structs
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19412 ) Change subject: gprs_ns_frgre.h: add missing declaration of structs .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I47b3458ff7dc7ab1fcb7e4dd690142e2bc44ed46 Gerrit-Change-Number: 19412 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 20:01:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns_frgre.h: add missing declaration of structs
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19412 ) Change subject: gprs_ns_frgre.h: add missing declaration of structs .. gprs_ns_frgre.h: add missing declaration of structs Change-Id: I47b3458ff7dc7ab1fcb7e4dd690142e2bc44ed46 --- M include/osmocom/gprs/gprs_ns_frgre.h 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/gprs/gprs_ns_frgre.h b/include/osmocom/gprs/gprs_ns_frgre.h index d48ce08..8cf54c7 100644 --- a/include/osmocom/gprs/gprs_ns_frgre.h +++ b/include/osmocom/gprs/gprs_ns_frgre.h @@ -2,4 +2,7 @@ #pragma once +struct gprs_nsvc; +struct msgb; + int gprs_ns_frgre_sendmsg(struct gprs_nsvc *nsvc, struct msgb *msg); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I47b3458ff7dc7ab1fcb7e4dd690142e2bc44ed46 Gerrit-Change-Number: 19412 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in libosmocore[master]: bts_features: add feature BTS_FEAT_IPV6_NSVC
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/19145 )
Change subject: bts_features: add feature BTS_FEAT_IPV6_NSVC
..
bts_features: add feature BTS_FEAT_IPV6_NSVC
Previous both the IPA nanobts and the sysmobts has been using the IPv4 only OML
attribute NM_ATT_IPACC_NS_LINK_CFG.
A bts with BTS_FEAT_IPV6_NSVC supports IPv6 for NSVC (PCUSGSN) using
the new OML attribute NM_ATT_OSMO_NS_LINK_CFG.
Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0
---
M include/osmocom/gsm/bts_features.h
M src/gsm/bts_features.c
2 files changed, 2 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/include/osmocom/gsm/bts_features.h
b/include/osmocom/gsm/bts_features.h
index 22461a6..341ba40 100644
--- a/include/osmocom/gsm/bts_features.h
+++ b/include/osmocom/gsm/bts_features.h
@@ -25,6 +25,7 @@
BTS_FEAT_SPEECH_H_AMR,
BTS_FEAT_ETWS_PN,
BTS_FEAT_PAGING_COORDINATION, /* BTS hands CS paging to PCU/PACCH */
+ BTS_FEAT_IPV6_NSVC,
_NUM_BTS_FEAT
};
diff --git a/src/gsm/bts_features.c b/src/gsm/bts_features.c
index 5a4b7f6..9a5188b 100644
--- a/src/gsm/bts_features.c
+++ b/src/gsm/bts_features.c
@@ -40,6 +40,7 @@
{ BTS_FEAT_SPEECH_H_AMR,"Halfrate speech AMR" },
{ BTS_FEAT_ETWS_PN, "ETWS Primary Notification via PCH" },
{ BTS_FEAT_PAGING_COORDINATION, "BSS Paging Coordination" },
+ { BTS_FEAT_IPV6_NSVC, "NSVC IPv6" },
{ 0, NULL }
};
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19145
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0
Gerrit-Change-Number: 19145
Gerrit-PatchSet: 5
Gerrit-Owner: lynxis lazus
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in libosmocore[master]: socket: osmo_sock_local_ip: correct doxygen comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19413 ) Change subject: socket: osmo_sock_local_ip: correct doxygen comment .. socket: osmo_sock_local_ip: correct doxygen comment There is no parameter fd. Change-Id: I1e31fcbf40d8abf99214b87e70e867b5ab66bd75 --- M src/socket.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, approved diff --git a/src/socket.c b/src/socket.c index 503ceaf..7fa9ab3 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1286,7 +1286,6 @@ /*! Determine the matching local IP-address for a given remote IP-Address. * \param[out] local_ip caller provided memory for resulting local IP-address * \param[in] remote_ip remote IP-address - * \param[in] fd file descriptor of related scoket * \returns 0 on success; negative otherwise * * The function accepts IPv4 and IPv6 address strings. The caller must provide -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1e31fcbf40d8abf99214b87e70e867b5ab66bd75 Gerrit-Change-Number: 19413 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in libosmocore[master]: gsm 12.21: add osmocom specific NM_ATT_OSMO_NS_LINK_CFG
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19146 ) Change subject: gsm 12.21: add osmocom specific NM_ATT_OSMO_NS_LINK_CFG .. Patch Set 6: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19146/6/src/gsm/abis_nm.c File src/gsm/abis_nm.c: https://gerrit.osmocom.org/c/libosmocore/+/19146/6/src/gsm/abis_nm.c@515 PS6, Line 515: NM_ATT_OSMO_NS_LINK_CFG Shouldn't this be a part of abis_nm_osmo_att_tlvdef? At least NM_ATT_OSMO_REDUCEPOWER is defined there. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19146 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic261bc43a07fa741b97a9c6ec5a9ed6f5ecae588 Gerrit-Change-Number: 19146 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 28 Jul 2020 17:50:01 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-msc[master]: Clear Command: set cause value to "Call Control"
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-msc/+/19213 )
Change subject: Clear Command: set cause value to "Call Control"
..
Clear Command: set cause value to "Call Control"
So far, by failing to initialize the cause value, we always send a Clear
Command cause == 0, which actually means "Radio Interface Message Failure".
This is seen in all my logged network traces of osmo-msc lab testing.
"Call Control" seems to be the only cause value that remotely fits a normal
release procedure, even if it was not voice call related, see 3GPP TS 48.008
3.2.1.21.
Related: OS#4664
Change-Id: I1347ed72ae7d7ea73a557b866e764819c5ef8c42
---
M src/libmsc/msc_a.c
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c
index 76c0f01..0645c54 100644
--- a/src/libmsc/msc_a.c
+++ b/src/libmsc/msc_a.c
@@ -779,6 +779,9 @@
struct ran_msg msg = {
.msg_type = RAN_MSG_CLEAR_COMMAND,
.clear_command = {
+ /* "Call Control" is the only cause code listed
in 3GPP TS 48.008 3.2.1.21 CLEAR COMMAND
+* that qualifies for a normal release
situation. (OS#4664) */
+ .gsm0808_cause = GSM0808_CAUSE_CALL_CONTROL,
.csfb_ind = (vsub && vsub->sgs_fsm->state ==
SGS_UE_ST_ASSOCIATED),
},
};
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19213
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I1347ed72ae7d7ea73a557b866e764819c5ef8c42
Gerrit-Change-Number: 19213
Gerrit-PatchSet: 2
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-CC: fixeria
Gerrit-MessageType: merged
Change in osmo-msc[master]: Clear Command: set cause value to "Call Control"
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/19213 ) Change subject: Clear Command: set cause value to "Call Control" .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1347ed72ae7d7ea73a557b866e764819c5ef8c42 Gerrit-Change-Number: 19213 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 28 Jul 2020 16:33:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-msc[master]: Clear Command: set cause value to "Call Control"
Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/19213 to look at the new patch set (#2). Change subject: Clear Command: set cause value to "Call Control" .. Clear Command: set cause value to "Call Control" So far, by failing to initialize the cause value, we always send a Clear Command cause == 0, which actually means "Radio Interface Message Failure". This is seen in all my logged network traces of osmo-msc lab testing. "Call Control" seems to be the only cause value that remotely fits a normal release procedure, even if it was not voice call related, see 3GPP TS 48.008 3.2.1.21. Related: OS#4664 Change-Id: I1347ed72ae7d7ea73a557b866e764819c5ef8c42 --- M src/libmsc/msc_a.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/13/19213/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/19213 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1347ed72ae7d7ea73a557b866e764819c5ef8c42 Gerrit-Change-Number: 19213 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: fixeria Gerrit-MessageType: newpatchset
Change in libosmocore[master]: vty: add a define VTY_IPV46_CMD to require a IPv4/6 address
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19139 ) Change subject: vty: add a define VTY_IPV46_CMD to require a IPv4/6 address .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I86e399aea86b68b48e627f11e1de48fdfad16525 Gerrit-Change-Number: 19139 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 16:09:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: socket: osmo_sock_local_ip: correct doxygen comment
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19413 ) Change subject: socket: osmo_sock_local_ip: correct doxygen comment .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1e31fcbf40d8abf99214b87e70e867b5ab66bd75 Gerrit-Change-Number: 19413 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 16:08:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: bts_features: add feature BTS_FEAT_IPV6_NSVC
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19145 ) Change subject: bts_features: add feature BTS_FEAT_IPV6_NSVC .. Patch Set 5: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19145/5//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/19145/5//COMMIT_MSG@9 PS5, Line 9: has both ... have -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0 Gerrit-Change-Number: 19145 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 16:07:21 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns_frgre.h: add missing declaration of structs
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19412 ) Change subject: gprs_ns_frgre.h: add missing declaration of structs .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I47b3458ff7dc7ab1fcb7e4dd690142e2bc44ed46 Gerrit-Change-Number: 19412 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 16:04:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: vty: Allow using hex and octal representations in cmd numeric ranges
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/19422 )
Change subject: vty: Allow using hex and octal representations in cmd numeric
ranges
..
vty: Allow using hex and octal representations in cmd numeric ranges
Change-Id: Ia2b7fbbf5502c28374c21dbff548232680da27d4
---
M src/vty/command.c
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/22/19422/1
diff --git a/src/vty/command.c b/src/vty/command.c
index 9b32d22..256f1db 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -1276,7 +1276,7 @@
if (range[1] == '-') {
signed long min = 0, max = 0, val;
- val = strtol(str, , 10);
+ val = strtol(str, , 0);
if (*endptr != '\0')
return 0;
@@ -1288,7 +1288,7 @@
return 0;
strncpy(buf, range, p - range);
buf[p - range] = '\0';
- min = -strtol(buf, , 10);
+ min = -strtol(buf, , 0);
if (*endptr != '\0')
return 0;
@@ -1300,7 +1300,7 @@
return 0;
strncpy(buf, range, p - range);
buf[p - range] = '\0';
- max = strtol(buf, , 10);
+ max = strtol(buf, , 0);
if (*endptr != '\0')
return 0;
@@ -1309,7 +1309,7 @@
} else {
unsigned long min, max, val;
- val = strtoul(str, , 10);
+ val = strtoul(str, , 0);
if (*endptr != '\0')
return 0;
@@ -1321,7 +1321,7 @@
return 0;
strncpy(buf, range, p - range);
buf[p - range] = '\0';
- min = strtoul(buf, , 10);
+ min = strtoul(buf, , 0);
if (*endptr != '\0')
return 0;
@@ -1333,7 +1333,7 @@
return 0;
strncpy(buf, range, p - range);
buf[p - range] = '\0';
- max = strtoul(buf, , 10);
+ max = strtoul(buf, , 0);
if (*endptr != '\0')
return 0;
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19422
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ia2b7fbbf5502c28374c21dbff548232680da27d4
Gerrit-Change-Number: 19422
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in libosmocore[master]: vty: Allow larger strlen parsing numerical range values
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/19423 )
Change subject: vty: Allow larger strlen parsing numerical range values
..
vty: Allow larger strlen parsing numerical range values
This allows for instance accepting a range:
<0x00-0x>, which is a 64bit mask.
Change-Id: Id053acd6bf5e8fb7c468959f0b78b778f8c5e6c2
---
M src/vty/command.c
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/23/19423/1
diff --git a/src/vty/command.c b/src/vty/command.c
index 256f1db..cc52c14 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -1262,12 +1262,12 @@
#endif /* HAVE_IPV6 */
-#define DECIMAL_STRLEN_MAX 10
+#define NUMERIC_STRLEN_MAX 18
static int cmd_range_match(const char *range, const char *str)
{
char *p;
- char buf[DECIMAL_STRLEN_MAX + 1];
+ char buf[NUMERIC_STRLEN_MAX + 1];
char *endptr = NULL;
if (str == NULL)
@@ -1284,7 +1284,7 @@
p = strchr(range, '-');
if (p == NULL)
return 0;
- if (p - range > DECIMAL_STRLEN_MAX)
+ if (p - range > NUMERIC_STRLEN_MAX)
return 0;
strncpy(buf, range, p - range);
buf[p - range] = '\0';
@@ -1296,7 +1296,7 @@
p = strchr(range, '>');
if (p == NULL)
return 0;
- if (p - range > DECIMAL_STRLEN_MAX)
+ if (p - range > NUMERIC_STRLEN_MAX)
return 0;
strncpy(buf, range, p - range);
buf[p - range] = '\0';
@@ -1317,7 +1317,7 @@
p = strchr(range, '-');
if (p == NULL)
return 0;
- if (p - range > DECIMAL_STRLEN_MAX)
+ if (p - range > NUMERIC_STRLEN_MAX)
return 0;
strncpy(buf, range, p - range);
buf[p - range] = '\0';
@@ -1329,7 +1329,7 @@
p = strchr(range, '>');
if (p == NULL)
return 0;
- if (p - range > DECIMAL_STRLEN_MAX)
+ if (p - range > NUMERIC_STRLEN_MAX)
return 0;
strncpy(buf, range, p - range);
buf[p - range] = '\0';
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19423
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Id053acd6bf5e8fb7c468959f0b78b778f8c5e6c2
Gerrit-Change-Number: 19423
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in libosmocore[master]: vty: Don't match negative values on purely positive ranges
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/19424 )
Change subject: vty: Don't match negative values on purely positive ranges
..
vty: Don't match negative values on purely positive ranges
Without this patch, for instance having a range 0-ULONG_MAX would match
if someones types value -3, which would be converted to unsigned but
that's clearly what is expected here from user point of view.
Change-Id: Ia95f6314a2dd3f94d21fc219cf69bb8d39b8e7f0
---
M src/vty/command.c
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/19424/1
diff --git a/src/vty/command.c b/src/vty/command.c
index cc52c14..7522c1d 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -1309,6 +1309,9 @@
} else {
unsigned long min, max, val;
+ if (str[0] == '-')
+ return 0;
+
val = strtoul(str, , 0);
if (*endptr != '\0')
return 0;
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19424
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ia95f6314a2dd3f94d21fc219cf69bb8d39b8e7f0
Gerrit-Change-Number: 19424
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: Introduce test TC_si_acc_ramp_rotate
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378 ) Change subject: Introduce test TC_si_acc_ramp_rotate .. Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378/1/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378/1/bsc/BSC_Tests.ttcn@1869 PS1, Line 1869: f_si_recv_one_si Huh, this function looks pretty much like an altstep. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378/1/bsc/BSC_Tests.ttcn@1884 PS1, Line 1884: while While this could be an alt statement with the timer, calling 'repeat' while 'last_si.si1 == omit'. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19378 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: I29acf4f117ccea53028c780cc9feb1da1fc16739 Gerrit-Change-Number: 19378 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 28 Jul 2020 15:53:35 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: osmo_sock_init2: improve support for AF_UNSPEC
Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19140 to look at the new patch set (#7). Change subject: osmo_sock_init2: improve support for AF_UNSPEC .. osmo_sock_init2: improve support for AF_UNSPEC osmo_sock_init2 abstract two calls of getaddrinfo into one. While there aren't problems with AF_INET or AF_INET6. When using AF_UNSPEC there are corner cases when this fails. E.g. calling local_host with "" and remote_host with an IPv6 only address results in setting up a local socket with AF_INET while trying to connect from there towards AF_INET6 will most likely fail. To prevent such cases with AF_UNSPEC, search prio calling any syscalls if local and remote site supports AF_INET or AF_INET6. In case both supported, prefer AF_INET6 Change-Id: I397c633931fd00d4f083955a3c49a40fb002d766 --- M src/socket.c M tests/socket/socket_test.c M tests/socket/socket_test.err M tests/socket/socket_test.ok 4 files changed, 105 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/40/19140/7 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I397c633931fd00d4f083955a3c49a40fb002d766 Gerrit-Change-Number: 19140 Gerrit-PatchSet: 7 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_si_acc_rotate
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359 ) Change subject: bsc: Introduce test TC_si_acc_rotate .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19359 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: I18d0243353fce547d126d62c34415628a21cb52b Gerrit-Change-Number: 19359 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 15:42:02 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: Send a BVC-RESET to all persistent Gb interfaces at start-up
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 ) Change subject: Send a BVC-RESET to all persistent Gb interfaces at start-up .. Patch Set 4: The SGSN could react on S_NS_UNBLOCK signal and check if the NSVC is persistant. We should ensure we don't reset a running BSVC. The new NS code can react on NSE_AVAILABLE which matches the case more likely. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0b46035b40709c38bb9ab9493c11031a577e3ee0 Gerrit-Change-Number: 19027 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 14:28:00 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-sgsn[master]: Send a BVC-RESET to all persistent Gb interfaces at start-up
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 ) Change subject: Send a BVC-RESET to all persistent Gb interfaces at start-up .. Patch Set 4: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0b46035b40709c38bb9ab9493c11031a577e3ee0 Gerrit-Change-Number: 19027 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 14:28:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: socket.c add osmo_sockaddr_valid()
lynxis lazus has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19144 ) Change subject: socket.c add osmo_sockaddr_valid() .. Abandoned it's not used. let's drop it until someone want's to use it. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib6fb050e1bfe3f3a8d8bbe5e762351ce6b7cc48c Gerrit-Change-Number: 19144 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: abandon
Change in osmo-sgsn[master]: Send a BVC-RESET to all persistent Gb interfaces at start-up
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 ) Change subject: Send a BVC-RESET to all persistent Gb interfaces at start-up .. Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-sgsn/+/19027/4/src/sgsn/sgsn_main.c File src/sgsn/sgsn_main.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/19027/4/src/sgsn/sgsn_main.c@215 PS4, Line 215: nsvc->state |= NSE_S_ALIVE; we shouldn't sent messages over dead nsvc's -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0b46035b40709c38bb9ab9493c11031a577e3ee0 Gerrit-Change-Number: 19027 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 14:22:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-sgsn[master]: Send a BVC-RESET to all persistent Gb interfaces at start-up
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 ) Change subject: Send a BVC-RESET to all persistent Gb interfaces at start-up .. Patch Set 4: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0b46035b40709c38bb9ab9493c11031a577e3ee0 Gerrit-Change-Number: 19027 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 14:21:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: Send a BVC-RESET to all persistent Gb interfaces at start-up
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 ) Change subject: Send a BVC-RESET to all persistent Gb interfaces at start-up .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/19027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0b46035b40709c38bb9ab9493c11031a577e3ee0 Gerrit-Change-Number: 19027 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 14:20:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: NOT_FOR_MERGE: modify README to test gerrit comments
lynxis lazus has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19371 ) Change subject: NOT_FOR_MERGE: modify README to test gerrit comments .. Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I924ae3d13bd7b09042062a246a743a7f6c3832ba Gerrit-Change-Number: 19371 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: abandon
Change in libosmocore[master]: bts_features: add feature BTS_FEAT_IPV6_NSVC
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19145 ) Change subject: bts_features: add feature BTS_FEAT_IPV6_NSVC .. Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/19145/2/include/osmocom/gsm/bts_features.h File include/osmocom/gsm/bts_features.h: https://gerrit.osmocom.org/c/libosmocore/+/19145/2/include/osmocom/gsm/bts_features.h@28 PS2, Line 28: BTS_FEAT_IPV6_NSVC, > The NSVC remote IP address is specified in the BSC config file. […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0 Gerrit-Change-Number: 19145 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 14:14:12 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in libosmocore[master]: bts_features: add feature BTS_FEAT_IPV6_NSVC
lynxis lazus has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/19145 )
Change subject: bts_features: add feature BTS_FEAT_IPV6_NSVC
..
Patch Set 5:
(1 comment)
https://gerrit.osmocom.org/c/libosmocore/+/19145/4/src/gsm/bts_features.c
File src/gsm/bts_features.c:
https://gerrit.osmocom.org/c/libosmocore/+/19145/4/src/gsm/bts_features.c@43
PS4, Line 43: { BTS_FEAT_IPV6_NSVC, "NSVC IPV6" },
> IPv6
Done
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19145
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0
Gerrit-Change-Number: 19145
Gerrit-PatchSet: 5
Gerrit-Owner: lynxis lazus
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Tue, 28 Jul 2020 14:13:46 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
Change in osmo-bts[master]: pcuif_proto: version 0xa: add support for NSVC IPv6 support
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19418 ) Change subject: pcuif_proto: version 0xa: add support for NSVC IPv6 support .. Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/osmo-bts/+/19418/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/19418/1//COMMIT_MSG@11 PS1, Line 11: IPPROTO_IPIP is used for IPv4, IPPROTO_IPV6 for IPv6. 0 means unset or > This doesn't make sense to me, you are using something from the wrong layer > afaiu. […] Yes, it's for a different layer. But I didn't want to invent new enums etc if there are good known values. So I found the IPPROTO which suites the case. https://gerrit.osmocom.org/c/osmo-bts/+/19418/1/include/osmo-bts/pcuif_proto.h File include/osmo-bts/pcuif_proto.h: https://gerrit.osmocom.org/c/osmo-bts/+/19418/1/include/osmo-bts/pcuif_proto.h@160 PS1, Line 160: * OS dependent. IPIP => v4, IPV6 => v6, 0 => unused */ > So what? it goes over unix sockets, so same host/system on both sides... Maybe it still goes over an unix socket. But if we move further around I like to have well defined values. I looked for a more specified value and found the IPPROTO values. https://gerrit.osmocom.org/c/osmo-bts/+/19418/1/include/osmo-bts/pcuif_proto.h@163 PS1, Line 163: struct in_addr ipv4; > simply call the fields v4 and v6? So you have remote_ip.v6 ... Same as we do > in in46_addr in libgtp. Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd Gerrit-Change-Number: 19418 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 14:12:28 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: WIP: PCU socket: test NSVC IPv4/IPv6
lynxis lazus has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19421 )
Change subject: WIP: PCU socket: test NSVC IPv4/IPv6
..
WIP: PCU socket: test NSVC IPv4/IPv6
Change-Id: Iae854875a45dbc29cd46a267ccaf60f1f2ac2973
---
M bts/BTS_Tests.ttcn
1 file changed, 38 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/21/19421/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 1c8127b..9038924 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -35,6 +35,7 @@
import from L1CTL_Types all;
import from LAPDm_Types all;
import from LAPDm_RAW_PT all;
+import from Native_Functions all;
import from Osmocom_CTRL_Adapter all;
import from Osmocom_CTRL_Functions all;
@@ -5434,6 +5435,41 @@
setverdict(pass);
}
+testcase TC_pcu_socket_nsvc_ipv4() runs on test_CT {
+ f_init_vty_bsc();
+ f_vty_config2(BSCVTY, {"network", "bts 0"} , "gprs nsvc 0 remote ip
127.127.127.127");
+ f_vty_transceive(BSCVTY, "drop bts connection 0 oml");
+
+ f_init();
+
+ if (g_pcu_last_info.u.info_ind.remote_protocol[0] !=
PCU_IF_ADRESS_IPV4) {
+ setverdict(fail, "Expected address family = IPV4");
+ }
+
+ if (substr(g_pcu_last_info.u.info_ind.remote_ip[0], 0, 4) !=
f_inet_addr("127.127.127.127")) {
+ setverdict(fail, "Invalid remote_ip!");
+ }
+
+ setverdict(pass);
+}
+
+testcase TC_pcu_socket_nsvc_ipv6() runs on test_CT {
+ f_init_vty_bsc();
+ f_vty_config2(BSCVTY, {"network", "bts 0"} , "gprs nsvc 0 remote ip
fd00::ca:ff:ee");
+
+ f_init();
+
+ if (g_pcu_last_info.u.info_ind.remote_protocol[0] !=
PCU_IF_ADRESS_IPV6) {
+ setverdict(fail, "Expected address family = IPV6");
+ }
+
+ if (g_pcu_last_info.u.info_ind.remote_ip[0] !=
f_inet6_addr("fd00::ca:ff:ee")) {
+ setverdict(fail, "Invalid remote_ip!");
+ }
+
+ setverdict(pass);
+}
+
/***
* Osmocom Style Dynamic Timeslot Support
***/
@@ -6831,6 +6867,8 @@
execute( TC_pcu_socket_disconnect_nosi3gprs() );
execute( TC_pcu_socket_disconnect_nosi4gprs() );
execute( TC_pcu_socket_verify_info_ind() );
+ execute( TC_pcu_socket_nsvc_ipv4() );
+ execute( TC_pcu_socket_nsvc_ipv6() );
execute( TC_dyn_osmo_pdch_act_deact() );
execute( TC_dyn_osmo_pdch_double_act() );
execute( TC_dyn_ipa_pdch_act_deact() );
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19421
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: Iae854875a45dbc29cd46a267ccaf60f1f2ac2973
Gerrit-Change-Number: 19421
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: WIP: update PCUIF_Types
lynxis lazus has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19420 )
Change subject: WIP: update PCUIF_Types
..
WIP: update PCUIF_Types
Change-Id: I13b03c380edc2dc609c5e4053462a3cd6f78ce72
---
M library/PCUIF_Types.ttcn
1 file changed, 18 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/20/19420/1
diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn
index 089403c..674c6d4 100644
--- a/library/PCUIF_Types.ttcn
+++ b/library/PCUIF_Types.ttcn
@@ -20,7 +20,14 @@
};
const charstring PCU_SOCK_DEFAULT := "/tmp/pcu_bts";
-type integer PCUIF_Version (9); /* supported versions */
+
+type integer PCUIF_Version (10); /* supported versions */
+
+type enumerated PCUIF_RemoteProtocol {
+ PCU_IF_ADRESS_UNSPEC('00'O),
+ PCU_IF_ADRESS_IPV4 ('04'O),
+ PCU_IF_ADRESS_IPV6 ('2a'O)
+} with { variant "FIELDLENGTH(8)" };
type enumerated PCUIF_MsgType {
PCU_IF_MSG_DATA_REQ ('00'O),
@@ -186,8 +193,14 @@
record length(2) of uint16_tnsvci,
record length(2) of uint16_tlocal_pprt,
record length(2) of uint16_tremote_port,
- record length(2) of OCT4remote_ip
-} with { variant "" }
+ record length(2) of PCUIF_RemoteProtocolremote_protocol,
+ record length(2) of octetstring remote_ip length(16)
+};
+
+type union PCUIF_RemoteIPu {
+ OCT4 ipv4,
+ octetstring ipv6 length(16)
+};
type record PCUIF_act_req {
uint8_t is_activate,
@@ -258,7 +271,7 @@
time_ind, msg_type = PCU_IF_MSG_TIME_IND;
pag_req,msg_type = PCU_IF_MSG_PAG_REQ;
app_info_req, msg_type =
PCU_IF_MSG_APP_INFO_REQ)"
-variant "PADDING(1696)" /* 212 * 8 */
+variant "PADDING(1904)" /* 238 * 8 */
};
external function enc_PCUIF_Message(in PCUIF_Message pdu) return octetstring
@@ -741,6 +754,7 @@
nsvci := ?,
local_pprt := ?,
remote_port := ?,
+ remote_protocol := ?,
remote_ip := ?
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19420
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: I13b03c380edc2dc609c5e4053462a3cd6f78ce72
Gerrit-Change-Number: 19420
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus
Gerrit-MessageType: newchange
Change in libosmocore[master]: Gb/BSSGP: replace hardcoded Tx into NS library by a callback
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19414 ) Change subject: Gb/BSSGP: replace hardcoded Tx into NS library by a callback .. Patch Set 4: Code-Review-1 (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/19414/4/include/osmocom/gprs/gprs_bssgp.h File include/osmocom/gprs/gprs_bssgp.h: https://gerrit.osmocom.org/c/libosmocore/+/19414/4/include/osmocom/gprs/gprs_bssgp.h@15 PS4, Line 15: typedef int bssgp_bvc_send(void *ctx, struct msgb *msg); Usually one uses: typedef int (*bssgp_bvc_send)(void *ctx, struct msgb *msg); Then: void bssgp_set_bssgp_callback(bssgp_bvc_send ns_send, void *data); https://gerrit.osmocom.org/c/libosmocore/+/19414/4/src/gb/gprs_bssgp.c File src/gb/gprs_bssgp.c: https://gerrit.osmocom.org/c/libosmocore/+/19414/4/src/gb/gprs_bssgp.c@76 PS4, Line 76: /* callback to be compatible with users which do not set the bssgp_ns_send function */ to be backward-compatible with old users -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3a498e6a0d68b87fed80c64199b22395796761b4 Gerrit-Change-Number: 19414 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 13:16:46 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: bts_features: add feature BTS_FEAT_IPV6_NSVC
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19145 ) Change subject: bts_features: add feature BTS_FEAT_IPV6_NSVC .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0 Gerrit-Change-Number: 19145 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 13:11:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: pcuif_proto: version 0xa: add support for NSVC IPv6 support
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/19418 ) Change subject: pcuif_proto: version 0xa: add support for NSVC IPv6 support .. Patch Set 1: Code-Review-1 (3 comments) https://gerrit.osmocom.org/c/osmo-bts/+/19418/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/19418/1//COMMIT_MSG@11 PS1, Line 11: IPPROTO_IPIP is used for IPv4, IPPROTO_IPV6 for IPv6. 0 means unset or This doesn't make sense to me, you are using something from the wrong layer afaiu. That's for stuff on top of IP(v4 or v6), while in here we need to specify IPv4 or IPv6 themselves. https://gerrit.osmocom.org/c/osmo-bts/+/19418/1/include/osmo-bts/pcuif_proto.h File include/osmo-bts/pcuif_proto.h: https://gerrit.osmocom.org/c/osmo-bts/+/19418/1/include/osmo-bts/pcuif_proto.h@160 PS1, Line 160: * OS dependent. IPIP => v4, IPV6 => v6, 0 => unused */ So what? it goes over unix sockets, so same host/system on both sides... https://gerrit.osmocom.org/c/osmo-bts/+/19418/1/include/osmo-bts/pcuif_proto.h@163 PS1, Line 163: struct in_addr ipv4; simply call the fields v4 and v6? So you have remote_ip.v6 ... Same as we do in in46_addr in libgtp. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd Gerrit-Change-Number: 19418 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 13:10:15 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: pcuif_proto: version 0xa: add support for NSVC IPv6 support
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19419 ) Change subject: pcuif_proto: version 0xa: add support for NSVC IPv6 support .. Patch Set 1: Code-Review-1 See my comments in https://gerrit.osmocom.org/c/osmo-bts/+/19418 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If26958d5b584973dca79159cf9e7f3f266519ce9 Gerrit-Change-Number: 19419 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 13:11:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: Gb/BSSGP: replace hardcoded Tx into NS library by a callback
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19414 to look at the new patch set (#4). Change subject: Gb/BSSGP: replace hardcoded Tx into NS library by a callback .. Gb/BSSGP: replace hardcoded Tx into NS library by a callback Add bssgp_ns_send callback() to set the transmission path into the NS library. This allows to use the Gb implementation with the old NS and the new upcoming NS implementation. Users of the old NS implementation don't have to set the callback as the default is the old NS implementation. Only users of the new NS implementation need to set the callback and the callback data. Change-Id: I3a498e6a0d68b87fed80c64199b22395796761b4 --- M include/osmocom/gprs/gprs_bssgp.h M src/gb/Makefile.am M src/gb/gprs_bssgp.c M src/gb/gprs_bssgp_bss.c A src/gb/gprs_bssgp_internal.h M src/gb/gprs_bssgp_util.c M src/gb/libosmogb.map 7 files changed, 54 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/14/19414/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3a498e6a0d68b87fed80c64199b22395796761b4 Gerrit-Change-Number: 19414 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in libosmocore[master]: Gb/BSSGP: replace hardcoded Tx into NS library by a callback
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19414 to look at the new patch set (#3). Change subject: Gb/BSSGP: replace hardcoded Tx into NS library by a callback .. Gb/BSSGP: replace hardcoded Tx into NS library by a callback Add bssgp_ns_send callback() to set the transmission path into the NS library. This allows to use the Gb implementation with the old NS and the new upcoming NS implementation. Users of the old NS implementation don't have to set the callback as the default is the old NS implementation. Only users of the new NS implementation need to set the callback and the callback data. Change-Id: I3a498e6a0d68b87fed80c64199b22395796761b4 --- M include/osmocom/gprs/gprs_bssgp.h M src/gb/Makefile.am M src/gb/gprs_bssgp.c M src/gb/gprs_bssgp_bss.c A src/gb/gprs_bssgp_internal.h M src/gb/gprs_bssgp_util.c M src/gb/libosmogb.map 7 files changed, 54 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/14/19414/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3a498e6a0d68b87fed80c64199b22395796761b4 Gerrit-Change-Number: 19414 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in libosmocore[master]: gprs_ns: fix typo in comment
lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19411 ) Change subject: gprs_ns: fix typo in comment .. gprs_ns: fix typo in comment Change-Id: Ie9d8decea18542cb0e1641dcb5fca5e4850910eb --- M src/gb/gprs_ns.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index 14fe661..a6ef6d4 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -619,7 +619,7 @@ return gprs_ns_tx(nsvc, msg); } -/*! Transmit a NS-BLOCK on a tiven NS-VC +/*! Transmit a NS-BLOCK on a given NS-VC * \param[in] nsvc NS-VC on which the NS-BLOCK is to be transmitted * \param[in] cause Numeric NS Cause value * \returns 0 in case of success -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie9d8decea18542cb0e1641dcb5fca5e4850910eb Gerrit-Change-Number: 19411 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in libosmocore[master]: bts_features: add feature BTS_FEAT_IPV6_NSVC
Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19145 to look at the new patch set (#5). Change subject: bts_features: add feature BTS_FEAT_IPV6_NSVC .. bts_features: add feature BTS_FEAT_IPV6_NSVC Previous both the IPA nanobts and the sysmobts has been using the IPv4 only OML attribute NM_ATT_IPACC_NS_LINK_CFG. A bts with BTS_FEAT_IPV6_NSVC supports IPv6 for NSVC (PCUSGSN) using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG. Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0 --- M include/osmocom/gsm/bts_features.h M src/gsm/bts_features.c 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/19145/5 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9ef7949f66764b3c639e45eb440122e318da44a0 Gerrit-Change-Number: 19145 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: WIP add IPv6 support for the PCU SOCKET
lynxis lazus has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/19236 ) Change subject: WIP add IPv6 support for the PCU SOCKET .. Abandoned was only meant as example for fixeria. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iaa2113644fcb4e6ff38649ca7f3abb6469f33d48 Gerrit-Change-Number: 19236 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: abandon
Change in osmo-pcu[master]: pcuif_proto: version 0xa: add support for NSVC IPv6 support
lynxis lazus has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-pcu/+/19419 )
Change subject: pcuif_proto: version 0xa: add support for NSVC IPv6 support
..
pcuif_proto: version 0xa: add support for NSVC IPv6 support
Introduce a remote_proto to define the given protocol.
IPPROTO is more universal than address_family and is defined by an RFC.
IPPROTO_IPIP is used for IPv4, IPPROTO_IPV6 for IPv6. 0 means unset or
unused entry.
The remote_ip is network byte order, the default encoding for in_addr and
in6_addr.
Change-Id: If26958d5b584973dca79159cf9e7f3f266519ce9
---
M include/osmocom/pcu/pcuif_proto.h
M src/pcu_l1_if.cpp
2 files changed, 15 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/19/19419/1
diff --git a/include/osmocom/pcu/pcuif_proto.h
b/include/osmocom/pcu/pcuif_proto.h
index e88607e..c5ab8f6 100644
--- a/include/osmocom/pcu/pcuif_proto.h
+++ b/include/osmocom/pcu/pcuif_proto.h
@@ -2,10 +2,11 @@
#define _PCUIF_PROTO_H
#include
+#include
#define PCU_SOCK_DEFAULT "/tmp/pcu_bts"
-#define PCU_IF_VERSION 0x09
+#define PCU_IF_VERSION 0x0a
#define TXT_MAX_LEN128
/* msg_type */
@@ -155,7 +156,13 @@
uint16_tnsvci[2];
uint16_tlocal_port[2];
uint16_tremote_port[2];
- uint32_tremote_ip[2];
+ /* use IP PROTOCOL instead of address_family, because address_family is
+* OS dependent. IPIP => v4, IPV6 => v6, 0 => unused */
+ uint8_t remote_proto[2];
+ union {
+ struct in_addr ipv4;
+ struct in6_addr ipv6;
+ } remote_ip[2];
} __attribute__ ((packed));
struct gsm_pcu_if_act_req {
diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp
index 7fa82fb..8df9156 100644
--- a/src/pcu_l1_if.cpp
+++ b/src/pcu_l1_if.cpp
@@ -568,11 +568,15 @@
LOGP(DL1IF, LOGL_DEBUG, " nsvci=%d\n", info_ind->nsvci[0]);
LOGP(DL1IF, LOGL_DEBUG, " local_port=%d\n", info_ind->local_port[0]);
LOGP(DL1IF, LOGL_DEBUG, " remote_port=%d\n", info_ind->remote_port[0]);
- ia.s_addr = htonl(info_ind->remote_ip[0]);
+ ia.s_addr = info_ind->remote_ip[0].ipv4.s_addr;
LOGP(DL1IF, LOGL_DEBUG, " remote_ip=%s\n", inet_ntoa(ia));
+ if (info_ind->remote_proto[0] != IPPROTO_IPIP) {
+ goto bssgp_failed;
+ }
+
pcu = gprs_bssgp_create_and_connect(bts, info_ind->local_port[0],
- info_ind->remote_ip[0], info_ind->remote_port[0],
+ ntohl(info_ind->remote_ip[0].ipv4.s_addr),
info_ind->remote_port[0],
info_ind->nsei, info_ind->nsvci[0], info_ind->bvci,
info_ind->mcc, info_ind->mnc, info_ind->mnc_3_digits,
info_ind->lac, info_ind->rac,
info_ind->cell_id);
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/19419
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: If26958d5b584973dca79159cf9e7f3f266519ce9
Gerrit-Change-Number: 19419
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus
Gerrit-MessageType: newchange
Change in osmo-bts[master]: pcuif_proto: version 0xa: add support for NSVC IPv6 support
lynxis lazus has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/19418 )
Change subject: pcuif_proto: version 0xa: add support for NSVC IPv6 support
..
pcuif_proto: version 0xa: add support for NSVC IPv6 support
Introduce a remote_proto to define the given protocol.
IPPROTO is more universal than address_family and is defined by an RFC.
IPPROTO_IPIP is used for IPv4, IPPROTO_IPV6 for IPv6. 0 means unset or
unused entry.
The remote_ip is network byte order, the default encoding for in_addr and
in6_addr.
Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd
---
M include/osmo-bts/pcuif_proto.h
M src/common/pcu_sock.c
2 files changed, 11 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/19418/1
diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h
index e977914..9e3b801 100644
--- a/include/osmo-bts/pcuif_proto.h
+++ b/include/osmo-bts/pcuif_proto.h
@@ -2,10 +2,11 @@
#define _PCUIF_PROTO_H
#include
+#include
#define PCU_SOCK_DEFAULT "/tmp/pcu_bts"
-#define PCU_IF_VERSION 0x09
+#define PCU_IF_VERSION 0x0a
#define TXT_MAX_LEN128
/* msg_type */
@@ -155,7 +156,13 @@
uint16_tnsvci[2];
uint16_tlocal_port[2];
uint16_tremote_port[2];
- uint32_tremote_ip[2];
+ /* use IP PROTOCOL instead of address_family, because address_family is
+* OS dependent. IPIP => v4, IPV6 => v6, 0 => unused */
+ uint8_t remote_proto[2];
+ union {
+ struct in_addr ipv4;
+ struct in6_addr ipv6;
+ } remote_ip[2];
} __attribute__ ((packed));
struct gsm_pcu_if_act_req {
diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c
index 5fa0e19..a983d88 100644
--- a/src/common/pcu_sock.c
+++ b/src/common/pcu_sock.c
@@ -210,7 +210,8 @@
info_ind->nsvci[i] = nsvc->nsvci;
info_ind->local_port[i] = nsvc->local_port;
info_ind->remote_port[i] = nsvc->remote_port;
- info_ind->remote_ip[i] = nsvc->remote_ip;
+ info_ind->remote_ip[i].ipv4.s_addr = htonl(nsvc->remote_ip);
+ info_ind->remote_proto[i] = IPPROTO_IPIP;
}
for (i = 0; i < 8; i++) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/19418
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I4067b1af041b2cdad60d6fb16c9caee98bc218dd
Gerrit-Change-Number: 19418
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus
Gerrit-MessageType: newchange
Change in libosmocore[master]: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd
Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19143 to look at the new patch set (#5). Change subject: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd .. socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd osmo_sock_init3() takes osmo_sockaddr* as local and remote endpoints to setup a socket. Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 --- M include/osmocom/core/socket.h M src/socket.c M tests/socket/socket_test.c M tests/socket/socket_test.err M tests/socket/socket_test.ok 5 files changed, 309 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/19143/5 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in libosmocore[master]: osmo_sock_init2: improve support for AF_UNSPEC
Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19140 to look at the new patch set (#3). Change subject: osmo_sock_init2: improve support for AF_UNSPEC .. osmo_sock_init2: improve support for AF_UNSPEC osmo_sock_init2 abstract two calls of getaddrinfo into one. While there aren't problems with AF_INET or AF_INET6. When using AF_UNSPEC there are corner cases when this fails. E.g. calling local_host with "" and remote_host with an IPv6 only address results in setting up a local socket with AF_INET while trying to connect from there towards AF_INET6 will most likely fail. To prevent such cases with AF_UNSPEC, search prio calling any syscalls if local and remote site supports AF_INET or AF_INET6. In case both supported, prefer AF_INET6 Change-Id: I397c633931fd00d4f083955a3c49a40fb002d766 --- M src/socket.c M tests/socket/socket_test.c M tests/socket/socket_test.err M tests/socket/socket_test.ok 4 files changed, 101 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/40/19140/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19140 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I397c633931fd00d4f083955a3c49a40fb002d766 Gerrit-Change-Number: 19140 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in libosmocore[master]: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd
Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/19143 to look at the new patch set (#4). Change subject: socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd .. socket.c: introduce osmo_sock_init3 & osmo_sock_init3_ofd osmo_sock_init3() takes osmo_sockaddr* as local and remote endpoints to setup a socket. Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 --- M include/osmocom/core/socket.h M src/socket.c M tests/socket/socket_test.c M tests/socket/socket_test.ok 4 files changed, 305 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/19143/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1eece543e3241ef0e095eb63bb831f7c15a16794 Gerrit-Change-Number: 19143 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in libosmocore[master]: vty: add a define VTY_IPV46_CMD to require a IPv4/6 address
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19139 ) Change subject: vty: add a define VTY_IPV46_CMD to require a IPv4/6 address .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I86e399aea86b68b48e627f11e1de48fdfad16525 Gerrit-Change-Number: 19139 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 28 Jul 2020 10:54:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: socket: osmo_sock_local_ip: correct doxygen comment
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19413 ) Change subject: socket: osmo_sock_local_ip: correct doxygen comment .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1e31fcbf40d8abf99214b87e70e867b5ab66bd75 Gerrit-Change-Number: 19413 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 10:53:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns_frgre.h: add missing declaration of structs
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19412 ) Change subject: gprs_ns_frgre.h: add missing declaration of structs .. Patch Set 1: Code-Review+1 Preferrably use includes rather than redeclaring structs please. This way the relation chain between headers becomes clearer. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I47b3458ff7dc7ab1fcb7e4dd690142e2bc44ed46 Gerrit-Change-Number: 19412 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 10:53:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns_frgre.h: add missing declaration of structs
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/19412 ) Change subject: gprs_ns_frgre.h: add missing declaration of structs .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/19412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I47b3458ff7dc7ab1fcb7e4dd690142e2bc44ed46 Gerrit-Change-Number: 19412 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 28 Jul 2020 10:52:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
