Change in ...libosmocore[master]: vty_transcript_test.vty: add choice auto-complete tests
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/14307 ) Change subject: vty_transcript_test.vty: add choice auto-complete tests .. vty_transcript_test.vty: add choice auto-complete tests This patch is a result of discussion we had in [1]. The key idea is that libosmovty should properly auto-complete the commands containing choice, such as the following one: multi0 (one|two|three) [1] If9b0c0d031477ca87786aab5c269d00748e896c8 Right now, sending the following command: (osmo-foo-bar)# multi0 th would basically match the following vector: multi0 three however the resulting argv would be: ["multi0", "th"] Moreover, sending the following command: (osmo-foo-bar)# multi0 t would basically match the following vectors: multi0 two multi0 three because both start from 't', so the resulting argv would be: ["multi0", "t"] which is ambiguous! The expected output is: (osmo-foo-bar)# multi0 th ok argc=1 three (osmo-foo-bar)# multi0 t % Ambiguous command. This is going to be fixed in the follow up patches. Change-Id: I83c3aef813173952641035862c534ef16384780e --- M tests/vty/vty_transcript_test.vty 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/vty/vty_transcript_test.vty b/tests/vty/vty_transcript_test.vty index 57920a8..27dacdc 100644 --- a/tests/vty/vty_transcript_test.vty +++ b/tests/vty/vty_transcript_test.vty @@ -66,3 +66,12 @@ vty_transcript_test> multi2 ok argc=0 + +vty_transcript_test> multi0 thr +ok argc=1 thr + +vty_transcript_test> multi1 on +ok argc=1 on + +vty_transcript_test> multi2 t +ok argc=1 t -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I83c3aef813173952641035862c534ef16384780e Gerrit-Change-Number: 14307 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-ttcn3-hacks[master]: bsc: Only append Osmux IEs in BSSAP AoIP
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14387 ) Change subject: bsc: Only append Osmux IEs in BSSAP AoIP .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14387 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: If6cc0f65a0f273297a4523e5d6a7564d966f0aa6 Gerrit-Change-Number: 14387 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 06 Jun 2019 15:28:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: bsc: Avoid appending Osmux CID IE in AssignReq/Compl with SCCPLite
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14385 ) Change subject: bsc: Avoid appending Osmux CID IE in AssignReq/Compl with SCCPLite .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14385 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: Iff939e431fa3da9fef648242140fdb8d0dc92e52 Gerrit-Change-Number: 14385 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 06 Jun 2019 15:29:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: Add and set transport field for RanOps structure
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14386 ) Change subject: Add and set transport field for RanOps structure .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14386 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: Ife62e328af2d3f2475ff93249f2138820c7ddabb Gerrit-Change-Number: 14386 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 06 Jun 2019 15:29:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: bsc: Avoid appending Osmux CID IE in AssignReq/Compl with SCCPLite
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14385 )
Change subject: bsc: Avoid appending Osmux CID IE in AssignReq/Compl with
SCCPLite
..
bsc: Avoid appending Osmux CID IE in AssignReq/Compl with SCCPLite
That IE is not required when on SCCPlite, only for AoIP.
Change-Id: Iff939e431fa3da9fef648242140fdb8d0dc92e52
---
M bsc/BSC_Tests.ttcn
1 file changed, 2 insertions(+), 10 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index a84277f..518f9e1 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -650,11 +650,7 @@
}
} else {
var BSSMAP_IE_CircuitIdentityCode cic :=
valueof(ts_BSSMAP_IE_CIC(0,1));
- if (osmux_enabled) {
- ass_cmd := valueof(ts_BSSMAP_AssignmentReq(cic, omit,
osmux_cid));
- } else {
- ass_cmd := valueof(ts_BSSMAP_AssignmentReq(cic, omit));
- }
+ ass_cmd := valueof(ts_BSSMAP_AssignmentReq(cic, omit));
}
return ass_cmd;
}
@@ -684,11 +680,7 @@
}
} else {
/* CIC is optional "*" as the MSC allocated it */
- if (expect_osmux) {
- exp_compl := tr_BSSMAP_AssignmentComplete(*, omit,
osmux_cid);
- } else {
- exp_compl := tr_BSSMAP_AssignmentComplete(*, omit);
- }
+ exp_compl := tr_BSSMAP_AssignmentComplete(*, omit);
}
return exp_compl;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14385
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: Iff939e431fa3da9fef648242140fdb8d0dc92e52
Gerrit-Change-Number: 14385
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in ...osmo-ttcn3-hacks[master]: bsc: Only append Osmux IEs in BSSAP AoIP
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14387 )
Change subject: bsc: Only append Osmux IEs in BSSAP AoIP
..
bsc: Only append Osmux IEs in BSSAP AoIP
Previous to this commit, BSSAP Reset (Ack) messages contained Osmux
Support IE even if transport was SCCPLite, where those IEs are actually
meaningless.
Change-Id: If6cc0f65a0f273297a4523e5d6a7564d966f0aa6
---
M bsc/MSC_ConnectionHandler.ttcn
M library/RAN_Emulation.ttcnpp
2 files changed, 20 insertions(+), 11 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index 3cc8f8a..c7f6495 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -379,10 +379,12 @@
private function UnitdataCallback(PDU_BSSAP bssap)
runs on RAN_Emulation_CT return template PDU_BSSAP {
var template PDU_BSSAP resp := omit;
+ var boolean append_osmux_support := g_ran_ops.use_osmux and
+ (g_ran_ops.transport ==
BSSAP_TRANSPORT_AoIP);
/* answer all RESET with a RESET ACK */
- if (match(bssap, tr_BSSMAP_Reset(g_ran_ops.use_osmux))) {
- resp := ts_BSSMAP_ResetAck(g_ran_ops.use_osmux);
+ if (match(bssap, tr_BSSMAP_Reset(append_osmux_support))) {
+ resp := ts_BSSMAP_ResetAck(append_osmux_support);
}
return resp;
diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp
index 85ae084..ba018b4 100644
--- a/library/RAN_Emulation.ttcnpp
+++ b/library/RAN_Emulation.ttcnpp
@@ -445,6 +445,11 @@
type function BssmapUnitdataCallback(PDU_BSSAP bssap)
runs on RAN_Emulation_CT return template PDU_BSSAP;
+private function append_osmux_ie()
+runs on RAN_Emulation_CT return boolean {
+ return g_ran_ops.use_osmux and (g_ran_ops.transport ==
BSSAP_TRANSPORT_AoIP);
+}
+
/* handle common Unitdata such as Paging */
private function CommonBssmapUnitdataCallback(PDU_BSSAP bssap)
runs on RAN_Emulation_CT return template PDU_BSSAP {
@@ -469,14 +474,15 @@
private function f_bssap_wait_for_reset() runs on RAN_Emulation_CT {
var BSSAP_N_UNITDATA_ind ud_ind;
timer T := 20.0;
+ var boolean append_osmux_support := append_osmux_ie();
T.start;
alt {
- [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?,
tr_BSSMAP_Reset(g_ran_ops.use_osmux))) -> value ud_ind {
+ [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?,
tr_BSSMAP_Reset(append_osmux_support))) -> value ud_ind {
BSSAP.send(ts_BSSAP_UNITDATA_req(ud_ind.callingAddress,
ud_ind.calledAddress,
- ts_BSSMAP_ResetAck(g_ran_ops.use_osmux)));
+ ts_BSSMAP_ResetAck(append_osmux_support)));
}
- [] as_reset_ack();
+ [] as_reset_ack(append_osmux_support);
[] BSSAP.receive {
repeat;
}
@@ -489,14 +495,15 @@
function f_bssap_reset(SCCP_PAR_Address peer, SCCP_PAR_Address own) runs on
RAN_Emulation_CT {
timer T := 5.0;
+ var boolean append_osmux_support := append_osmux_ie();
- BSSAP.send(ts_BSSAP_UNITDATA_req(peer, own, ts_BSSMAP_Reset(0,
g_ran_ops.use_osmux)));
+ BSSAP.send(ts_BSSAP_UNITDATA_req(peer, own, ts_BSSMAP_Reset(0,
append_osmux_support)));
T.start;
alt {
- [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(own, peer,
tr_BSSMAP_ResetAck(g_ran_ops.use_osmux))) {
+ [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(own, peer,
tr_BSSMAP_ResetAck(append_osmux_support))) {
log("Received RESET-ACK in response to RESET, we're ready to
go!");
}
- [] as_reset_ack();
+ [] as_reset_ack(append_osmux_support);
[] BSSAP.receive { repeat };
[] T.timeout {
setverdict(fail, "Timeout waiting for RESET-ACK after sending
RESET");
@@ -728,7 +735,7 @@
f_ML3_patch_seq_nr(seq_nr, enc_l3);
}
-private altstep as_reset_ack() runs on RAN_Emulation_CT {
+private altstep as_reset_ack(boolean append_osmux_support := false) runs on
RAN_Emulation_CT {
#ifdef RAN_EMULATION_BSSAP
var BSSAP_N_UNITDATA_ind ud_ind;
#endif
@@ -736,10 +743,10 @@
var RANAP_N_UNITDATA_ind rud_ind;
#endif
#ifdef RAN_EMULATION_BSSAP
- [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?,
tr_BSSMAP_Reset(g_ran_ops.use_osmux))) -> value ud_ind {
+ [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?,
tr_BSSMAP_Reset(append_osmux_support))) -> value ud_ind {
log("Respoding to inbound RESET with RESET-ACK");
BSSAP.send(ts_BSSAP_UNITDATA_req(ud_ind.callingAddress,
ud_ind.calledAddress,
- ts_BSSMAP_ResetAck(g_ran_ops.use_osmux)));
+ ts_BSSMAP_ResetAck(append_osmux_support)));
Change in ...osmo-ttcn3-hacks[master]: Add and set transport field for RanOps structure
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14386 )
Change subject: Add and set transport field for RanOps structure
..
Add and set transport field for RanOps structure
This will allow RAN_Emulation to have better knowledge on the protocol
stack in use, and behave differently based on that information.
For intance, forthcoming commit will append OsmuxSupport IE only if
transport is BSSAP AoIP.
Change-Id: Ife62e328af2d3f2475ff93249f2138820c7ddabb
---
M bsc-nat/BSC_MS_ConnectionHandler.ttcn
M bsc-nat/MSC_ConnectionHandler.ttcn
M bsc/MSC_ConnectionHandler.ttcn
M library/RAN_Adapter.ttcnpp
M library/RAN_Emulation.ttcnpp
M msc/BSC_ConnectionHandler.ttcn
6 files changed, 13 insertions(+), 8 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/bsc-nat/BSC_MS_ConnectionHandler.ttcn
b/bsc-nat/BSC_MS_ConnectionHandler.ttcn
index f9f4db0..7f2ebcd 100644
--- a/bsc-nat/BSC_MS_ConnectionHandler.ttcn
+++ b/bsc-nat/BSC_MS_ConnectionHandler.ttcn
@@ -63,7 +63,7 @@
decode_dtap := false,
role_ms := true,
protocol := RAN_PROTOCOL_BSSAP,
- /* Always false. We don't want to enable Osmux signalling in SCCPLite
messages: */
+ transport := BSSAP_TRANSPORT_AoIP,
use_osmux := false,
sccp_addr_local := omit,
sccp_addr_peer := omit
diff --git a/bsc-nat/MSC_ConnectionHandler.ttcn
b/bsc-nat/MSC_ConnectionHandler.ttcn
index 89728b4..c8cb005 100644
--- a/bsc-nat/MSC_ConnectionHandler.ttcn
+++ b/bsc-nat/MSC_ConnectionHandler.ttcn
@@ -69,6 +69,7 @@
decode_dtap := false,
role_ms := false,
protocol := RAN_PROTOCOL_BSSAP,
+ transport := BSSAP_TRANSPORT_AoIP,
use_osmux := false,
sccp_addr_local := omit,
sccp_addr_peer := omit
diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index dbba135..3cc8f8a 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -394,6 +394,7 @@
decode_dtap := false,
role_ms := false,
protocol := RAN_PROTOCOL_BSSAP,
+ transport := BSSAP_TRANSPORT_AoIP,
use_osmux := false,
sccp_addr_local := omit,
sccp_addr_peer := omit
diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp
index 30a1a9e..862921e 100644
--- a/library/RAN_Adapter.ttcnpp
+++ b/library/RAN_Adapter.ttcnpp
@@ -52,13 +52,6 @@
RAN_Emulation_CT vc_RAN
}
-type enumerated RAN_Transport {
- BSSAP_TRANSPORT_AoIP, /* 3GPP AoIP: SCCP over M3UA over SCTP */
- BSSAP_TRANSPORT_SCCPlite_SERVER, /* SCCPlite: SCCP over IPA over TCP */
- BSSAP_TRANSPORT_SCCPlite_CLIENT, /* SCCPlite: SCCP over IPA over TCP */
- RANAP_TRANSPORT_IuCS/* 3GPP IuCS: SCCP over M3UA over SCTP */
-};
-
type record RAN_Configuration {
RAN_Transport transport,
charstring sccp_service_type,
@@ -153,6 +146,7 @@
timer T := 5.0;
T.start;
//T.timeout;
+ ops.transport := cfg.transport;
/* connect BSSNAP component to upper side of SCCP */
if (cfg.transport == RANAP_TRANSPORT_IuCS) {
#ifdef RAN_EMULATION_RANAP
diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp
index 41aec47..85ae084 100644
--- a/library/RAN_Emulation.ttcnpp
+++ b/library/RAN_Emulation.ttcnpp
@@ -75,6 +75,13 @@
MSC_CONN_PRIM_CONF_IND
}
+type enumerated RAN_Transport {
+ BSSAP_TRANSPORT_AoIP, /* 3GPP AoIP: SCCP over M3UA over SCTP */
+ BSSAP_TRANSPORT_SCCPlite_SERVER, /* SCCPlite: SCCP over IPA over TCP */
+ BSSAP_TRANSPORT_SCCPlite_CLIENT, /* SCCPlite: SCCP over IPA over TCP */
+ RANAP_TRANSPORT_IuCS/* 3GPP IuCS: SCCP over M3UA over SCTP */
+};
+
/* similar to PDU_BSSAP with DTAP, but DTAP is already decoded! */
type record PDU_DTAP_MO {
OCT1dlci optional,
@@ -650,6 +657,7 @@
boolean decode_dtap,
boolean role_ms,
RanProtocol protocol,
+ RAN_Transport transport,
boolean use_osmux,
/* needed for performing BSSMAP RESET */
SCCP_PAR_Address sccp_addr_local optional,
diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index b5dbb87..1dd4d05 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -222,6 +222,7 @@
decode_dtap := true,
role_ms := true,
protocol := RAN_PROTOCOL_BSSAP,
+ transport := BSSAP_TRANSPORT_AoIP,
use_osmux := false,
sccp_addr_local := omit,
sccp_addr_peer := omit
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14386
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Chan
Change in ...osmo-sgsn[master]: sgsn_libgtp: Use new per-GSN libgtp API instead of deprecated API
laforge has uploaded a new patch set (#2) to the change originally created by pespin. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/14292 ) Change subject: sgsn_libgtp: Use new per-GSN libgtp API instead of deprecated API .. sgsn_libgtp: Use new per-GSN libgtp API instead of deprecated API Depends: osmo-ggsn.git I653cbdc185165592d985e3efab6e3f1add97877b Related: OS#2873 Change-Id: Iaaffe0ec4d9590309c62b62c446677c6f6732f2a --- M src/gprs/sgsn_libgtp.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/92/14292/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/14292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iaaffe0ec4d9590309c62b62c446677c6f6732f2a Gerrit-Change-Number: 14292 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-sgsn[master]: sgsn_libgtp: Use new per-GSN libgtp API instead of deprecated API
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/14292 ) Change subject: sgsn_libgtp: Use new per-GSN libgtp API instead of deprecated API .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/14292 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iaaffe0ec4d9590309c62b62c446677c6f6732f2a Gerrit-Change-Number: 14292 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 06 Jun 2019 15:30:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: sgsn_libgtp: Use new per-GSN libgtp API instead of deprecated API
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/14292 )
Change subject: sgsn_libgtp: Use new per-GSN libgtp API instead of deprecated
API
..
sgsn_libgtp: Use new per-GSN libgtp API instead of deprecated API
Depends: osmo-ggsn.git I653cbdc185165592d985e3efab6e3f1add97877b
Related: OS#2873
Change-Id: Iaaffe0ec4d9590309c62b62c446677c6f6732f2a
---
M src/gprs/sgsn_libgtp.c
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/gprs/sgsn_libgtp.c b/src/gprs/sgsn_libgtp.c
index a8a1502..e9fffd8 100644
--- a/src/gprs/sgsn_libgtp.c
+++ b/src/gprs/sgsn_libgtp.c
@@ -153,7 +153,7 @@
imsi_ui64 = imsi_str2gtp(mmctx->imsi);
- rc = pdp_newpdp(&pdp, imsi_ui64, nsapi, NULL);
+ rc = gtp_pdp_newpdp(ggsn->gsn, &pdp, imsi_ui64, nsapi, NULL);
if (rc) {
LOGP(DGPRS, LOGL_ERROR, "Out of libgtp PDP Contexts\n");
return NULL;
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/14292
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: Iaaffe0ec4d9590309c62b62c446677c6f6732f2a
Gerrit-Change-Number: 14292
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in ...osmo-ccid-firmware[master]: Makefile: add missing hpl/rtc directory
laforge has removed a vote on this change. Change subject: Makefile: add missing hpl/rtc directory .. Removed Verified-1 by Jenkins Builder (102) -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/14389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I3fed159173467d1da091758fe2a87bef2cd2e3c7 Gerrit-Change-Number: 14389 Gerrit-PatchSet: 1 Gerrit-Owner: Kévin Redon Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: deleteVote
Change in ...osmo-ccid-firmware[master]: Makefile: add missing hpl/rtc directory
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/14389 ) Change subject: Makefile: add missing hpl/rtc directory .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/14389 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I3fed159173467d1da091758fe2a87bef2cd2e3c7 Gerrit-Change-Number: 14389 Gerrit-PatchSet: 1 Gerrit-Owner: Kévin Redon Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 06 Jun 2019 19:40:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: ASF: add related RTC files
laforge has removed a vote on this change. Change subject: ASF: add related RTC files .. Removed Verified-1 by Jenkins Builder (102) -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/14390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: If3e24ede24b4e8cc2724a796756a5a2aa81119de Gerrit-Change-Number: 14390 Gerrit-PatchSet: 1 Gerrit-Owner: Kévin Redon Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: deleteVote
Change in ...osmo-ccid-firmware[master]: ASF: add related RTC files
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/14390 ) Change subject: ASF: add related RTC files .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/14390 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: If3e24ede24b4e8cc2724a796756a5a2aa81119de Gerrit-Change-Number: 14390 Gerrit-PatchSet: 1 Gerrit-Owner: Kévin Redon Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 06 Jun 2019 19:40:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: Makefile: automatically get output directory list
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/14395 ) Change subject: Makefile: automatically get output directory list .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/14395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I8a18a5f04b03f9fa95a1b4f5ee77945e4fa8db07 Gerrit-Change-Number: 14395 Gerrit-PatchSet: 1 Gerrit-Owner: Kévin Redon Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 06 Jun 2019 19:42:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ccid-firmware[master]: ASF: add new utils
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/14394 ) Change subject: ASF: add new utils .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/14394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Icf6fb641050a1e7132ff2b14c1ce537ec9403b9f Gerrit-Change-Number: 14394 Gerrit-PatchSet: 1 Gerrit-Owner: Kévin Redon Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 06 Jun 2019 19:42:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bsc[master]: manuals: Update generated VTY reference and counters
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/14388 ) Change subject: manuals: Update generated VTY reference and counters .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9f75edf2e5b88ef8f4592fa89548f32e0a7df8d8 Gerrit-Change-Number: 14388 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 06 Jun 2019 19:42:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bsc[master]: manuals: Update generated VTY reference and counters
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-bsc/+/14388 ) Change subject: manuals: Update generated VTY reference and counters .. manuals: Update generated VTY reference and counters Change-Id: I9f75edf2e5b88ef8f4592fa89548f32e0a7df8d8 Related: OS#1700 --- M doc/manuals/chapters/counters_generated.adoc M doc/manuals/osmobsc-vty-reference.xml M doc/manuals/vty/bsc_vty_reference.xml 3 files changed, 286 insertions(+), 97 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, approved diff --git a/doc/manuals/chapters/counters_generated.adoc b/doc/manuals/chapters/counters_generated.adoc index d55df07..65f4ca4 100644 --- a/doc/manuals/chapters/counters_generated.adoc +++ b/doc/manuals/chapters/counters_generated.adoc @@ -1,7 +1,88 @@ + // autogenerated by show asciidoc counters -These counters and their description based on OsmoBSC (OsmoBSC). +These counters and their description based on OsmoBSC 1.4.0.84-3f1f8 (OsmoBSC). + +=== Rate Counters // generating tables for rate_ctr_group +// rate_ctr_group table base transceiver station +.bts - base transceiver station +[options="header"] +|=== +| Name | Reference | Description +| chreq:total | <> | Received channel requests. +| chreq:no_channel | <> | Sent to MS no channel available. +| chan:rf_fail | <> | Received a RF failure indication from BTS. +| chan:rll_err | <> | Received a RLL failure with T200 cause from BTS. +| oml_fail | <> | Received a TEI down on a OML link. +| rsl_fail | <> | Received a TEI down on a OML link. +| codec:amr_f | <> | Count the usage of AMR/F codec by channel mode requested. +| codec:amr_h | <> | Count the usage of AMR/H codec by channel mode requested. +| codec:efr | <> | Count the usage of EFR codec by channel mode requested. +| codec:fr | <> | Count the usage of FR codec by channel mode requested. +| codec:hr | <> | Count the usage of HR codec by channel mode requested. +| paging:attempted | <> | Paging attempts for a subscriber. +| paging:already | <> | Paging attempts ignored as subsciber was already being paged. +| paging:responded | <> | Paging attempts with successful paging response. +| paging:expired | <> | Paging Request expired because of timeout T3113. +| chan_act:total | <> | Total number of Channel Activations. +| chan_act:nack | <> | Number of Channel Activations that the BTS NACKed +| rsl:unknown | <> | Number of unknown/unsupported RSL messages received from BTS +| rsl:ipa_nack | <> | Number of IPA (RTP/dyn-PDCH) related NACKs received from BTS +| chan:mode_modify_nack | <> | Number of Channel Mode Modify NACKs received from BTS +|=== +// rate_ctr_group table base transceiver station +.bts - base transceiver station +[options="header"] +|=== +| Name | Reference | Description +| chreq:total | <> | Received channel requests. +| chreq:no_channel | <> | Sent to MS no channel available. +| chan:rf_fail | <> | Received a RF failure indication from BTS. +| chan:rll_err | <> | Received a RLL failure with T200 cause from BTS. +| oml_fail | <> | Received a TEI down on a OML link. +| rsl_fail | <> | Received a TEI down on a OML link. +| codec:amr_f | <> | Count the usage of AMR/F codec by channel mode requested. +| codec:amr_h | <> | Count the usage of AMR/H codec by channel mode requested. +| codec:efr | <> | Count the usage of EFR codec by channel mode requested. +| codec:fr | <> | Count the usage of FR codec by channel mode requested. +| codec:hr | <> | Count the usage of HR codec by channel mode requested. +| paging:attempted | <> | Paging attempts for a subscriber. +| paging:already | <> | Paging attempts ignored as subsciber was already being paged. +| paging:responded | <> | Paging attempts with successful paging response. +| paging:expired | <> | Paging Request expired because of timeout T3113. +| chan_act:total | <> | Total number of Channel Activations. +| chan_act:nack | <> | Number of Channel Activations that the BTS NACKed +| rsl:unknown | <> | Number of unknown/unsupported RSL messages received from BTS +| rsl:ipa_nack | <> | Number of IPA (RTP/dyn-PDCH) related NACKs received from BTS +| chan:mode_modify_nack | <> | Number of Channel Mode Modify NACKs received from BTS +|=== +// rate_ctr_group table base transceiver station +.bts - base transceiver station +[options="header"] +|=== +| Name | Reference | Description +| chreq:total | <> | Received channel requests. +| chreq:no_channel | <> | Sent to MS no channel available. +| chan:rf_fail | <> | Received a RF failure indication from BTS. +| chan:rll_err | &l
Change in ...osmo-bsc[master]: Introduce msc_is_{sccplite, aoip}() helpers
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/14383 )
Change subject: Introduce msc_is_{sccplite,aoip}() helpers
..
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14383
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ic0ee4c472e29ec3092049e5e23b744395613616d
Gerrit-Change-Number: 14383
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Comment-Date: Thu, 06 Jun 2019 19:42:51 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in ...osmo-bsc[master]: bsc: Append Osmux Support IE only on AoIP
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-bsc/+/14384 ) Change subject: bsc: Append Osmux Support IE only on AoIP .. bsc: Append Osmux Support IE only on AoIP Since in SCCPlite the BSC-attached MGW is controlled by the MSC, we don't need this kind of signalling. It's only needed for AoIP. Related: OS#2551 Change-Id: I802fc65c593e42aaa7a15cecab7a2f2b77ade3ea --- M src/osmo-bsc/osmo_bsc_sigtran.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index 8303c4f..18f269d 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -101,7 +101,7 @@ LOGP(DMSC, LOGL_NOTICE, "Sending RESET to MSC: %s\n", osmo_sccp_addr_name(ss7, &msc->a.msc_addr)); msg = gsm0808_create_reset(); - if (msc->use_osmux != OSMUX_USAGE_OFF) + if (msc_is_aoip(msc) && msc->use_osmux != OSMUX_USAGE_OFF) _gsm0808_extend_announce_osmux(msg); osmo_sccp_tx_unitdata_msg(msc->a.sccp_user, &msc->a.bsc_addr, @@ -120,7 +120,7 @@ LOGP(DMSC, LOGL_NOTICE, "Sending RESET ACK to MSC: %s\n", osmo_sccp_addr_name(ss7, &msc->a.msc_addr)); msg = gsm0808_create_reset_ack(); - if (msc->use_osmux != OSMUX_USAGE_OFF) + if (msc_is_aoip(msc) && msc->use_osmux != OSMUX_USAGE_OFF) _gsm0808_extend_announce_osmux(msg); osmo_sccp_tx_unitdata_msg(msc->a.sccp_user, &msc->a.bsc_addr, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I802fc65c593e42aaa7a15cecab7a2f2b77ade3ea Gerrit-Change-Number: 14384 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in ...osmo-bsc[master]: bsc: Append Osmux Support IE only on AoIP
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/14384 ) Change subject: bsc: Append Osmux Support IE only on AoIP .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I802fc65c593e42aaa7a15cecab7a2f2b77ade3ea Gerrit-Change-Number: 14384 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 06 Jun 2019 19:43:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: Add rate_ctr support to store/retrieve SDR errors through VTY
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14167 ) Change subject: Add rate_ctr support to store/retrieve SDR errors through VTY .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I78b158141697e5714d04db8b9ccc96f31f34f439 Gerrit-Change-Number: 14167 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 06 Jun 2019 19:43:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bsc[master]: Introduce msc_is_{sccplite, aoip}() helpers
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-bsc/+/14383 )
Change subject: Introduce msc_is_{sccplite,aoip}() helpers
..
Introduce msc_is_{sccplite,aoip}() helpers
Having the helper makes it easier to read/find for transport type checks. It
will be ifurther re-used in forthcoming commits.
Change-Id: Ic0ee4c472e29ec3092049e5e23b744395613616d
---
M include/osmocom/bsc/bsc_msc_data.h
M src/osmo-bsc/bsc_subscr_conn_fsm.c
M src/osmo-bsc/osmo_bsc_sigtran.c
3 files changed, 23 insertions(+), 17 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/include/osmocom/bsc/bsc_msc_data.h
b/include/osmocom/bsc/bsc_msc_data.h
index 4720845..1f9872a 100644
--- a/include/osmocom/bsc/bsc_msc_data.h
+++ b/include/osmocom/bsc/bsc_msc_data.h
@@ -191,5 +191,25 @@
return (port - base) / 2;
}
+static inline bool msc_is_aoip(const struct bsc_msc_data *msc)
+{
+ switch (msc->a.asp_proto) {
+ case OSMO_SS7_ASP_PROT_SUA:
+ case OSMO_SS7_ASP_PROT_M3UA:
+ return true;
+ default:
+ return false;
+ }
+}
+
+static inline bool msc_is_sccplite(const struct bsc_msc_data *msc)
+{
+ switch (msc->a.asp_proto) {
+ case OSMO_SS7_ASP_PROT_IPA:
+ return true;
+ default:
+ return false;
+ }
+}
#endif
diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c
b/src/osmo-bsc/bsc_subscr_conn_fsm.c
index 87ad567..7b9f912 100644
--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c
+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c
@@ -1058,14 +1058,7 @@
if (!conn || !conn->sccp.msc)
return false;
- switch (conn->sccp.msc->a.asp_proto) {
- case OSMO_SS7_ASP_PROT_SUA:
- case OSMO_SS7_ASP_PROT_M3UA:
- return true;
-
- default:
- return false;
- }
+ return msc_is_aoip(conn->sccp.msc);
}
bool gscon_is_sccplite(struct gsm_subscriber_connection *conn)
@@ -1073,11 +1066,5 @@
if (!conn || !conn->sccp.msc)
return false;
- switch (conn->sccp.msc->a.asp_proto) {
- case OSMO_SS7_ASP_PROT_IPA:
- return true;
-
- default:
- return false;
- }
+ return msc_is_sccplite(conn->sccp.msc);
}
diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c
index 5d61c32..8303c4f 100644
--- a/src/osmo-bsc/osmo_bsc_sigtran.c
+++ b/src/osmo-bsc/osmo_bsc_sigtran.c
@@ -523,8 +523,7 @@
* an X-Osmo-IGN flag telling osmo-mgw to ignore CallID
mismatches for this endpoint.
* If an explicit VTY command has already indicated whether or
not to send X-Osmo-IGN, do
* not overwrite that setting. */
- if (msc->a.asp_proto == OSMO_SS7_ASP_PROT_IPA
- && !msc->x_osmo_ign_configured)
+ if (msc_is_sccplite(msc) && !msc->x_osmo_ign_configured)
msc->x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID;
/* If unset, use default local SCCP address */
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14383
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ic0ee4c472e29ec3092049e5e23b744395613616d
Gerrit-Change-Number: 14383
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in ...osmo-trx[master]: Rename and move STOP signal from Transceiver to main
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-trx/+/14366 )
Change subject: Rename and move STOP signal from Transceiver to main
..
Rename and move STOP signal from Transceiver to main
The callback actually belongs there, since it's the code/thread in main the one
actually in charge of stopping everything. It simplifies current code,
and more important, allows for new clients of this signal to use it.
This callback will also be used in forthcoming commits by code
controlling rate_ctr thresholds to stop the process if the VTY
configured threshold is used.
Change-Id: Id4159e64225c6606fef34a74b24f37c3a071aceb
---
M CommonLibs/osmo_signal.h
M Transceiver52M/Transceiver.cpp
M Transceiver52M/Transceiver.h
M Transceiver52M/osmo-trx.cpp
4 files changed, 9 insertions(+), 24 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/CommonLibs/osmo_signal.h b/CommonLibs/osmo_signal.h
index 7299171..6ee1bf9 100644
--- a/CommonLibs/osmo_signal.h
+++ b/CommonLibs/osmo_signal.h
@@ -26,13 +26,13 @@
/* Signalling subsystems */
enum signal_subsystems {
- SS_TRANSC,
+ SS_MAIN,
SS_DEVICE,
};
-/* SS_TRANSC signals */
-enum SS_TRANSC {
- S_TRANSC_STOP_REQUIRED, /* Transceiver fatal error, it should be
stopped */
+/* SS_MAIN signals */
+enum SS_MAIN {
+ S_MAIN_STOP_REQUIRED, /* TRX fatal error, it should be stopped */
};
/* SS_DEVICE signals */
diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp
index 54b9ddd..9c55d02 100644
--- a/Transceiver52M/Transceiver.cpp
+++ b/Transceiver52M/Transceiver.cpp
@@ -119,7 +119,7 @@
: mBasePort(wBasePort), mLocalAddr(TRXAddress), mRemoteAddr(GSMcoreAddress),
mClockSocket(TRXAddress, wBasePort, GSMcoreAddress, wBasePort + 100),
mTransmitLatency(wTransmitLatency), mRadioInterface(wRadioInterface),
-rssiOffset(wRssiOffset), sig_cbfn(NULL),
+rssiOffset(wRssiOffset),
mSPSTx(tx_sps), mSPSRx(rx_sps), mChans(chans), mEdge(false), mOn(false),
mForceClockInterface(false),
mTxFreq(0.0), mRxFreq(0.0), mTSC(0), mMaxExpectedDelayAB(0),
mMaxExpectedDelayNB(0),
mWriteBurstToDiskMask(0)
@@ -225,17 +225,6 @@
return true;
}
-void Transceiver::setSignalHandler(osmo_signal_cbfn cbfn)
-{
- if (this->sig_cbfn)
-osmo_signal_unregister_handler(SS_TRANSC, this->sig_cbfn, NULL);
-
- if (cbfn) {
-this->sig_cbfn = cbfn;
-osmo_signal_register_handler(SS_TRANSC, this->sig_cbfn, NULL);
- }
-}
-
/*
* Start the transceiver
*
@@ -910,7 +899,7 @@
usleep(10);
} else if (rc < 0) {
LOG(FATAL) << "radio Interface receive failed, requesting stop.";
-osmo_signal_dispatch(SS_TRANSC, S_TRANSC_STOP_REQUIRED, this);
+osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL);
} else if (mForceClockInterface || mTransmitDeadlineClock >
mLastClockUpdateTime + GSM::Time(216,0)) {
mForceClockInterface = false;
writeClockInterface();
diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h
index 432e3b4..4614efe 100644
--- a/Transceiver52M/Transceiver.h
+++ b/Transceiver52M/Transceiver.h
@@ -130,8 +130,6 @@
/** accessor for number of channels */
size_t numChans() const { return mChans; };
- void setSignalHandler(osmo_signal_cbfn cbfn);
-
/** Codes for channel combinations */
typedef enum {
FILL, ///< Channel is transmitted, but unused
@@ -181,8 +179,6 @@
double rssiOffset; ///< RSSI to dBm conversion offset
- osmo_signal_cbfn *sig_cbfn; ///< Registered Signal Handler to
announce events.
-
/** modulate and add a burst to the transmit queue */
void addRadioVector(size_t chan, BitVector &bits,
int RSSI, GSM::Time &wTime);
diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp
index a79c26e..05489bd 100644
--- a/Transceiver52M/osmo-trx.cpp
+++ b/Transceiver52M/osmo-trx.cpp
@@ -123,7 +123,7 @@
void *handler_data, void *signal_data)
{
switch (signal) {
- case S_TRANSC_STOP_REQUIRED:
+ case S_MAIN_STOP_REQUIRED:
gshutdown = true;
break;
default:
@@ -152,8 +152,6 @@
return -1;
}
-transceiver->setSignalHandler(transc_sig_cb);
-
for (size_t i = 0; i < trx->cfg.num_chans; i++) {
fifo = radio->receiveFIFO(i);
if (fifo && transceiver->receiveFIFO(fifo, i))
@@ -627,6 +625,7 @@
return EXIT_FAILURE;
}
+ osmo_signal_register_handler(SS_MAIN, transc_sig_cb, NULL);
trx_rate_ctr_init(tall_trx_ctx, g_trx_ctx);
srandom(time(NULL));
@@ -641,5 +640,6 @@
osmo_fd_unregister(&signal_ofd);
osmo_fd_clos
Change in ...osmo-trx[master]: doc: vty: Update trx_vty_reference.xml
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14382 ) Change subject: doc: vty: Update trx_vty_reference.xml .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2587cd47ee48e979de447f7a0f4d79bb5fac0592 Gerrit-Change-Number: 14382 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 06 Jun 2019 19:43:37 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: doc: vty: Update trx_vty_reference.xml
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/14382 ) Change subject: doc: vty: Update trx_vty_reference.xml .. doc: vty: Update trx_vty_reference.xml Change-Id: I2587cd47ee48e979de447f7a0f4d79bb5fac0592 --- M doc/manuals/vty/trx_vty_reference.xml 1 file changed, 138 insertions(+), 43 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/vty/trx_vty_reference.xml b/doc/manuals/vty/trx_vty_reference.xml index ffc642a..d6cd15d 100644 --- a/doc/manuals/vty/trx_vty_reference.xml +++ b/doc/manuals/vty/trx_vty_reference.xml @@ -85,12 +85,6 @@ - - - - - - @@ -181,7 +175,7 @@ - + @@ -189,6 +183,7 @@ + @@ -198,21 +193,14 @@ - - - - - - - - - - + - + + + @@ -231,7 +219,7 @@ - + @@ -239,6 +227,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -312,6 +332,12 @@ + + + + + + enable @@ -365,12 +391,6 @@ - - - - - - @@ -474,7 +494,7 @@ - + @@ -482,6 +502,7 @@ + @@ -491,21 +512,14 @@ - - - - - - - - - - + - + + + @@ -524,7 +538,7 @@ - + @@ -532,6 +546,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -605,6 +651,12 @@ + + + + + + config @@ -910,7 +962,7 @@ - + @@ -918,14 +970,17 @@ + - + - + + + @@ -944,7 +999,7 @@ - + @@ -952,6 +1007,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-stats @@ -1035,10 +1122,11 @@ - + + @@ -1146,6 +1234,13 @@ + + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2587cd47ee48e979de447f7a0f4d79bb5fac0592 Gerrit-Change-Number: 14382 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in ...osmo-trx[master]: Add rate_ctr support to store/retrieve SDR errors through VTY
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-trx/+/14167 )
Change subject: Add rate_ctr support to store/retrieve SDR errors through VTY
..
Add rate_ctr support to store/retrieve SDR errors through VTY
Introduce a unified implementation-agnostic interface for radioDevice to
signal SDR error counters to upper layers and manage them.
This patch only implements counters for osmo-trx-lms (other devices will
show all counters unchanged during time).
Sample use through VTY:
"""
OsmoTRX> show rate-counters
osmo-trx statistics 0:
device:rx_underruns: 0 (0/s 0/m 0/h 0/d) Number of Rx underruns
device:rx_overruns: 0 (0/s 0/m 0/h 0/d) Number of Rx overruns
device:tx_underruns: 0 (0/s 0/m 0/h 0/d) Number of Tx underruns
device:rx_drop_events: 4 (0/s 2/m 3/h 0/d) Number of times Rx samples
were dropped by HW
device:rx_drop_samples:513 (0/s 196/m 425/h 0/d) Number of Rx samples
dropped by HW
"""
Change-Id: I78b158141697e5714d04db8b9ccc96f31f34f439
---
M CommonLibs/Makefile.am
M CommonLibs/osmo_signal.h
A CommonLibs/trx_rate_ctr.cpp
A CommonLibs/trx_rate_ctr.h
M Transceiver52M/device/common/radioDevice.h
M Transceiver52M/device/lms/LMSDevice.cpp
M Transceiver52M/device/lms/LMSDevice.h
M Transceiver52M/osmo-trx.cpp
8 files changed, 262 insertions(+), 37 deletions(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/CommonLibs/Makefile.am b/CommonLibs/Makefile.am
index 83bd0c0..22572e1 100644
--- a/CommonLibs/Makefile.am
+++ b/CommonLibs/Makefile.am
@@ -35,6 +35,7 @@
Timeval.cpp \
Logger.cpp \
Utils.cpp \
+ trx_rate_ctr.cpp \
trx_vty.c \
debug.c
libcommon_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS)
$(LIBOSMOVTY_LIBS)
@@ -50,6 +51,7 @@
Vector.h \
Logger.h \
Utils.h \
+ trx_rate_ctr.h \
trx_vty.h \
debug.h \
osmo_signal.h \
diff --git a/CommonLibs/osmo_signal.h b/CommonLibs/osmo_signal.h
index 00b8097..7299171 100644
--- a/CommonLibs/osmo_signal.h
+++ b/CommonLibs/osmo_signal.h
@@ -27,9 +27,28 @@
/* Signalling subsystems */
enum signal_subsystems {
SS_TRANSC,
+ SS_DEVICE,
};
/* SS_TRANSC signals */
enum SS_TRANSC {
S_TRANSC_STOP_REQUIRED, /* Transceiver fatal error, it should be
stopped */
};
+
+/* SS_DEVICE signals */
+enum SS_DEVICE {
+ /* Device internal counters changed. Counters are provided as cb data
+ (struct device_counters). Must be sent with PTHREAD_CANCEL_DISABLE
+ to avoid deadlocks in case osmo-trx process is asked to exit. */
+ S_DEVICE_COUNTER_CHANGE,
+};
+
+/* signal cb for signal */
+struct device_counters {
+ size_t chan;
+ unsigned int rx_underruns;
+ unsigned int rx_overruns;
+ unsigned int tx_underruns;
+ unsigned int rx_dropped_events;
+ unsigned int rx_dropped_samples;
+};
diff --git a/CommonLibs/trx_rate_ctr.cpp b/CommonLibs/trx_rate_ctr.cpp
new file mode 100644
index 000..711b904
--- /dev/null
+++ b/CommonLibs/trx_rate_ctr.cpp
@@ -0,0 +1,180 @@
+/*
+ * Copyright (C) 2019 sysmocom - s.f.m.c. GmbH
+ * All Rights Reserved
+ *
+ * Author: Pau Espin Pedrol
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/*
+ * rate_ctr API uses several osmocom select loop features, and as a result,
+ * calls to it must be done through the main thread (the one running the
osmocom
+ * loop in osmo-trx).
+ * Since read/write from/to SDR is done in separate threads (even read and
write
+ * each use a different thread), we must use some sort of message passing
system
+ * between main thread feeding rate_ctr structures and the Rx/Tx threads
+ * generating the events.
+ * The idea is that upon read/write issues, lower layers (SDR APIs) provide us
with
+ * underrun/overrun/droppedPackets information, and in that case we pass that
up
+ * the stack through signal with signal_cb
+ * being a pointer to a "struct device_counters" structure, which contains
+ * device (implementation agnostic) statful counters for different kind of
+ * statistics.
+ * That signal is processed h
Change in ...osmo-trx[master]: Add VTY commands to set error ctr thresholds
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14168 ) Change subject: Add VTY commands to set error ctr thresholds .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4bcf44dbf064e2e86dfc3b8a2ad18fea76fbd51a Gerrit-Change-Number: 14168 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 06 Jun 2019 19:44:02 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-msc[master]: libmsc/db.c: introduce and use parse_sm_ud_from_result()
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-msc/+/13488 )
Change subject: libmsc/db.c: introduce and use parse_sm_ud_from_result()
..
libmsc/db.c: introduce and use parse_sm_ud_from_result()
The following functions:
- sms_from_result(),
- sms_from_result_v3(),
- sms_from_result_v4(),
do retrieve the TP-UD, TP-UDL and text in the same way.
A consequence of such duplication is [1], which fixed potential
NULL-pointer dereference for sms_from_result(), but not for two
other functions: sms_from_result_v3() and sms_from_result_v4().
[1] I545967464c406348b8505d1729213cfb4afcd3e2
Change-Id: If67dfb9f7d2a55fa3d45dc4689a2acff9909faf6
---
M src/libmsc/db.c
1 file changed, 37 insertions(+), 49 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/libmsc/db.c b/src/libmsc/db.c
index 1fe8e6b..a12889b 100644
--- a/src/libmsc/db.c
+++ b/src/libmsc/db.c
@@ -225,6 +225,34 @@
return 0;
}
+static void parse_tp_ud_from_result(struct gsm_sms *sms, dbi_result result)
+{
+ const unsigned char *user_data;
+ unsigned int user_data_len;
+ const char *text;
+
+ /* Retrieve TP-UDL (User-Data-Length) in octets (regardless of DCS) */
+ user_data_len = dbi_result_get_field_length(result, "user_data");
+ if (user_data_len > sizeof(sms->user_data)) {
+ LOGP(DDB, LOGL_ERROR,
+"SMS TP-UD length %u is too big, truncating to %zu\n",
+user_data_len, sizeof(sms->user_data));
+ user_data_len = (uint8_t) sizeof(sms->user_data);
+ }
+ sms->user_data_len = user_data_len;
+
+ /* Retrieve the TP-UD (User-Data) itself */
+ if (user_data_len > 0) {
+ user_data = dbi_result_get_binary(result, "user_data");
+ memcpy(sms->user_data, user_data, user_data_len);
+ }
+
+ /* Retrieve the text parsed from TP-UD (User-Data) */
+ text = dbi_result_get_string(result, "text");
+ if (text)
+ OSMO_STRLCPY_ARRAY(sms->text, text);
+}
+
/**
* Copied from the normal sms_from_result_v3 to avoid having
* to make sure that the real routine will remain backward
@@ -234,9 +262,7 @@
{
struct gsm_sms *sms = sms_alloc();
long long unsigned int sender_id;
- const char *text, *daddr;
- const unsigned char *user_data;
- unsigned int user_data_len;
+ const char *daddr;
char buf[32];
char *quoted;
dbi_result result2;
@@ -274,20 +300,9 @@
if (daddr)
OSMO_STRLCPY_ARRAY(sms->dst.addr, daddr);
- user_data_len = dbi_result_get_field_length(result, "user_data");
- user_data = dbi_result_get_binary(result, "user_data");
- if (user_data_len > sizeof(sms->user_data)) {
- LOGP(DDB, LOGL_ERROR,
-"SMS TP-UD length %u is too big, truncating to %zu\n",
-user_data_len, sizeof(sms->user_data));
- user_data_len = (uint8_t) sizeof(sms->user_data);
- }
- sms->user_data_len = user_data_len;
- memcpy(sms->user_data, user_data, sms->user_data_len);
+ /* Parse TP-UD, TP-UDL and decoded text */
+ parse_tp_ud_from_result(sms, result);
- text = dbi_result_get_string(result, "text");
- if (text)
- OSMO_STRLCPY_ARRAY(sms->text, text);
return sms;
}
@@ -400,9 +415,7 @@
static struct gsm_sms *sms_from_result_v4(dbi_result result)
{
struct gsm_sms *sms = sms_alloc();
- const unsigned char *user_data;
- unsigned int user_data_len;
- const char *text, *addr;
+ const char *addr;
if (!sms)
return NULL;
@@ -426,20 +439,9 @@
sms->dst.ton = dbi_result_get_ulonglong(result, "dest_ton");
sms->dst.npi = dbi_result_get_ulonglong(result, "dest_npi");
- user_data_len = dbi_result_get_field_length(result, "user_data");
- user_data = dbi_result_get_binary(result, "user_data");
- if (user_data_len > sizeof(sms->user_data)) {
- LOGP(DDB, LOGL_ERROR,
-"SMS TP-UD length %u is too big, truncating to %zu\n",
-user_data_len, sizeof(sms->user_data));
- user_data_len = (uint8_t) sizeof(sms->user_data);
- }
- sms->user_data_len = user_data_len;
- memcpy(sms->user_data, user_data, sms->user_data_len);
+ /* Parse TP-UD, TP-UDL and decoded text */
+ parse_tp_ud_from_result(sms, result);
- text = dbi_result_get_string(result, "text");
- if (text)
- OSMO_STRLCPY_ARRAY(sms->text, t
Change in ...osmo-msc[master]: libmsc/db.c: introduce and use parse_sm_ud_from_result()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/13488 ) Change subject: libmsc/db.c: introduce and use parse_sm_ud_from_result() .. Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/13488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: If67dfb9f7d2a55fa3d45dc4689a2acff9909faf6 Gerrit-Change-Number: 13488 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 06 Jun 2019 19:45:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-msc[master]: libmsc/db.c: warn user about SMS text truncation
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-msc/+/13489 )
Change subject: libmsc/db.c: warn user about SMS text truncation
..
libmsc/db.c: warn user about SMS text truncation
In general, neither TP-User-Data nor decoded text should be
truncated. If the SMSC's database for some reason does contain
such weird messages, let's at least let the user know about it.
Change-Id: I75e852ebe44ba4784572cbffa029e13f0d3c430c
---
M src/libmsc/db.c
1 file changed, 10 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/libmsc/db.c b/src/libmsc/db.c
index a12889b..705af61 100644
--- a/src/libmsc/db.c
+++ b/src/libmsc/db.c
@@ -229,6 +229,7 @@
{
const unsigned char *user_data;
unsigned int user_data_len;
+ unsigned int text_len;
const char *text;
/* Retrieve TP-UDL (User-Data-Length) in octets (regardless of DCS) */
@@ -247,6 +248,15 @@
memcpy(sms->user_data, user_data, user_data_len);
}
+ /* Retrieve the text length (excluding '\0') */
+ text_len = dbi_result_get_field_length(result, "text");
+ if (text_len >= sizeof(sms->text)) {
+ LOGP(DDB, LOGL_ERROR,
+"SMS text length %u is too big, truncating to %zu\n",
+text_len, sizeof(sms->text) - 1);
+ /* OSMO_STRLCPY_ARRAY() does truncation for us */
+ }
+
/* Retrieve the text parsed from TP-UD (User-Data) */
text = dbi_result_get_string(result, "text");
if (text)
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/13489
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I75e852ebe44ba4784572cbffa029e13f0d3c430c
Gerrit-Change-Number: 13489
Gerrit-PatchSet: 8
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in ...osmo-msc[master]: libmsc/db.c: fix potential integer overflow
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-msc/+/13470 )
Change subject: libmsc/db.c: fix potential integer overflow
..
libmsc/db.c: fix potential integer overflow
The value of 'sms->user_data_len' is fetched from the database:
sms->user_data_len = dbi_result_get_field_length(result, "user_data");
and this is where the problem is. As per the libdbi's documentation
(see 3.5.3), dbi_result_get_field_length() returns the length in
bytes of the value stored in the specified field:
unsigned int dbi_result_get_field_length(dbi_result Result,
const char *fieldname)
so 'unsigned int' is assigned to 'uint8_t', what could lead to an
integer overflow if the value is grather than 0xff. As a result,
if the database for some reason does contain such odd TP-UD,
the truncation of 'user_data' would be done incorrectly.
Let's avoid such direct assignment, and use a separate variable.
Also, let's warn user if TP-UDL value is grether than 140, as
per 3GPP TS 03.40.
Change-Id: Ibbd588545e1a4817504c806a3d02cf59d5938ee2
Related: OS#3684
---
M src/libmsc/db.c
1 file changed, 27 insertions(+), 9 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/libmsc/db.c b/src/libmsc/db.c
index e3995a6..1fe8e6b 100644
--- a/src/libmsc/db.c
+++ b/src/libmsc/db.c
@@ -236,6 +236,7 @@
long long unsigned int sender_id;
const char *text, *daddr;
const unsigned char *user_data;
+ unsigned int user_data_len;
char buf[32];
char *quoted;
dbi_result result2;
@@ -273,10 +274,15 @@
if (daddr)
OSMO_STRLCPY_ARRAY(sms->dst.addr, daddr);
- sms->user_data_len = dbi_result_get_field_length(result, "user_data");
+ user_data_len = dbi_result_get_field_length(result, "user_data");
user_data = dbi_result_get_binary(result, "user_data");
- if (sms->user_data_len > sizeof(sms->user_data))
- sms->user_data_len = (uint8_t) sizeof(sms->user_data);
+ if (user_data_len > sizeof(sms->user_data)) {
+ LOGP(DDB, LOGL_ERROR,
+"SMS TP-UD length %u is too big, truncating to %zu\n",
+user_data_len, sizeof(sms->user_data));
+ user_data_len = (uint8_t) sizeof(sms->user_data);
+ }
+ sms->user_data_len = user_data_len;
memcpy(sms->user_data, user_data, sms->user_data_len);
text = dbi_result_get_string(result, "text");
@@ -395,6 +401,7 @@
{
struct gsm_sms *sms = sms_alloc();
const unsigned char *user_data;
+ unsigned int user_data_len;
const char *text, *addr;
if (!sms)
@@ -419,10 +426,15 @@
sms->dst.ton = dbi_result_get_ulonglong(result, "dest_ton");
sms->dst.npi = dbi_result_get_ulonglong(result, "dest_npi");
- sms->user_data_len = dbi_result_get_field_length(result, "user_data");
+ user_data_len = dbi_result_get_field_length(result, "user_data");
user_data = dbi_result_get_binary(result, "user_data");
- if (sms->user_data_len > sizeof(sms->user_data))
- sms->user_data_len = (uint8_t) sizeof(sms->user_data);
+ if (user_data_len > sizeof(sms->user_data)) {
+ LOGP(DDB, LOGL_ERROR,
+"SMS TP-UD length %u is too big, truncating to %zu\n",
+user_data_len, sizeof(sms->user_data));
+ user_data_len = (uint8_t) sizeof(sms->user_data);
+ }
+ sms->user_data_len = user_data_len;
memcpy(sms->user_data, user_data, sms->user_data_len);
text = dbi_result_get_string(result, "text");
@@ -753,6 +765,7 @@
struct gsm_sms *sms = sms_alloc();
const char *text, *daddr, *saddr;
const unsigned char *user_data;
+ unsigned int user_data_len;
time_t validity_timestamp;
if (!sms)
@@ -789,10 +802,15 @@
if (saddr)
OSMO_STRLCPY_ARRAY(sms->src.addr, saddr);
- sms->user_data_len = dbi_result_get_field_length(result, "user_data");
+ user_data_len = dbi_result_get_field_length(result, "user_data");
user_data = dbi_result_get_binary(result, "user_data");
- if (sms->user_data_len > sizeof(sms->user_data))
- sms->user_data_len = (uint8_t) sizeof(sms->user_data);
+ if (user_data_len > sizeof(sms->user_data)) {
+ LOGP(DDB, LOGL_ERROR,
+"SMS TP-UD length %u is too big, truncating to %zu\n"
Change in ...osmo-msc[master]: libmsc/db.c: warn user about SMS text truncation
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/13489 ) Change subject: libmsc/db.c: warn user about SMS text truncation .. Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/13489 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I75e852ebe44ba4784572cbffa029e13f0d3c430c Gerrit-Change-Number: 13489 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 06 Jun 2019 19:45:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: osmo-sgsn: add VTY parameter to toggle authentication
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/14194 ) Change subject: osmo-sgsn: add VTY parameter to toggle authentication .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/14194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9909145e7e0af587c28827e16301a61b13eedaa9 Gerrit-Change-Number: 14194 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 06 Jun 2019 19:45:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: osmo-sgsn: add VTY parameter to toggle authentication
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/14194 )
Change subject: osmo-sgsn: add VTY parameter to toggle authentication
..
osmo-sgsn: add VTY parameter to toggle authentication
It may be useful to have 'remote' authorization policy, but do not
require authentication in GERAN at the same time, e.g. in combination
with 'subscriber-create-on-demand' feature of OsmoHLR.
This change introduces a new VTY parameter similar to the one
that we already have in OsmoMSC:
authentication (optional|required)
Please note that 'required' only applies if 'auth-policy' is 'remote'.
Change-Id: I9909145e7e0af587c28827e16301a61b13eedaa9
---
M doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg
M doc/examples/osmo-sgsn/osmo-sgsn.cfg
M doc/manuals/vty/sgsn_vty_reference.xml
M src/gprs/sgsn_vty.c
4 files changed, 45 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg
b/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg
index b47878a..85112f4 100644
--- a/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg
+++ b/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg
@@ -10,6 +10,7 @@
ggsn 0 remote-ip 127.0.0.2
ggsn 0 gtp-version 1
ggsn 0 echo-interval 60
+ authentication optional
auth-policy accept-all
!
ns
diff --git a/doc/examples/osmo-sgsn/osmo-sgsn.cfg
b/doc/examples/osmo-sgsn/osmo-sgsn.cfg
index 263bd00..3be4d49 100644
--- a/doc/examples/osmo-sgsn/osmo-sgsn.cfg
+++ b/doc/examples/osmo-sgsn/osmo-sgsn.cfg
@@ -10,6 +10,7 @@
ggsn 0 remote-ip 127.0.0.2
ggsn 0 gtp-version 1
ggsn 0 echo-interval 60
+ authentication required
auth-policy remote
gsup remote-ip 127.0.0.1
gsup remote-port 4222
diff --git a/doc/manuals/vty/sgsn_vty_reference.xml
b/doc/manuals/vty/sgsn_vty_reference.xml
index 7619215..ed11777 100644
--- a/doc/manuals/vty/sgsn_vty_reference.xml
+++ b/doc/manuals/vty/sgsn_vty_reference.xml
@@ -2230,6 +2230,13 @@
+
+
+
+
+
+
+
diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c
index 6389d92..29c9771 100644
--- a/src/gprs/sgsn_vty.c
+++ b/src/gprs/sgsn_vty.c
@@ -211,6 +211,8 @@
if (g_cfg->gsup_server_port)
vty_out(vty, " gsup remote-port %d%s",
g_cfg->gsup_server_port, VTY_NEWLINE);
+ vty_out(vty, " authentication %s%s",
+ g_cfg->require_authentication ? "required" : "optional",
VTY_NEWLINE);
vty_out(vty, " auth-policy %s%s",
get_value_string(sgsn_auth_pol_strs, g_cfg->auth_policy),
VTY_NEWLINE);
@@ -693,6 +695,27 @@
return CMD_SUCCESS;
}
+DEFUN(cfg_authentication, cfg_authentication_cmd,
+ "authentication (optional|required)",
+ "Whether to enforce MS authentication in GERAN\n"
+ "Allow MS to attach via GERAN without authentication\n"
+ "Always require authentication\n")
+{
+ int required = (argv[0][0] == 'r');
+
+ if (vty->type != VTY_FILE) {
+ if (g_cfg->auth_policy != SGSN_AUTH_POLICY_REMOTE && required) {
+ vty_out(vty, "%% Authentication is not possible without
HLR, "
+"consider setting 'auth-policy' to
'remote'%s",
+VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+ }
+
+ g_cfg->require_authentication = required;
+ return CMD_SUCCESS;
+}
+
DEFUN(cfg_auth_policy, cfg_auth_policy_cmd,
"auth-policy (accept-all|closed|acl-only|remote)",
"Configure the Authorization policy of the SGSN. This setting
determines which subscribers are"
@@ -705,9 +728,12 @@
int val = get_string_value(sgsn_auth_pol_strs, argv[0]);
OSMO_ASSERT(val >= SGSN_AUTH_POLICY_OPEN && val <=
SGSN_AUTH_POLICY_REMOTE);
g_cfg->auth_policy = val;
- g_cfg->require_authentication = (val == SGSN_AUTH_POLICY_REMOTE);
g_cfg->require_update_location = (val == SGSN_AUTH_POLICY_REMOTE);
+ /* Authentication is not possible without HLR */
+ if (val != SGSN_AUTH_POLICY_REMOTE)
+ g_cfg->require_authentication = 0;
+
return CMD_SUCCESS;
}
@@ -1391,6 +1417,7 @@
install_element(SGSN_NODE, &cfg_ggsn_no_echo_interval_cmd);
install_element(SGSN_NODE, &cfg_imsi_acl_cmd);
install_element(SGSN_NODE, &cfg_auth_policy_cmd);
+ install_element(SGSN_NODE, &cfg_authentication_cmd);
install_element(SGSN_NODE, &cfg_encrypt_cmd);
Change in ...osmo-bsc[master]: vty: adjust config name for unit-id
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/14365 ) Change subject: vty: adjust config name for unit-id .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ide5ceb5db7403a70313405752579e30d7bb94eac Gerrit-Change-Number: 14365 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 06 Jun 2019 19:46:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bsc[master]: vty: adjust config name for unit-id
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-bsc/+/14365 )
Change subject: vty: adjust config name for unit-id
..
vty: adjust config name for unit-id
Having different names for the same config setting is misleading, so
let's stick to the one used by osmo-bts.
Change-Id: Ide5ceb5db7403a70313405752579e30d7bb94eac
---
M doc/examples/osmo-bsc/osmo-bsc-minimal.cfg
M doc/examples/osmo-bsc/osmo-bsc.cfg
M doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg
M doc/manuals/chapters/bts-examples.adoc
M doc/manuals/vty/bsc_vty_reference.xml
M doc/manuals/vty/libbsc_vty_additions.xml
M src/osmo-bsc/bsc_vty.c
7 files changed, 47 insertions(+), 22 deletions(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg
b/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg
index 850e29c..f2597b8 100644
--- a/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg
+++ b/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg
@@ -5,7 +5,7 @@
type sysmobts
band GSM-1800
location_area_code 23
- ip.access unit_id 1800 0
+ ipa unit-id 1800 0
trx 0
rf_locked 0
arfcn 868
diff --git a/doc/examples/osmo-bsc/osmo-bsc.cfg
b/doc/examples/osmo-bsc/osmo-bsc.cfg
index eec154d..926951b 100644
--- a/doc/examples/osmo-bsc/osmo-bsc.cfg
+++ b/doc/examples/osmo-bsc/osmo-bsc.cfg
@@ -36,8 +36,8 @@
channel-descrption bs-pa-mfrms 5
channel-descrption bs-ag-blks-res 1
early-classmark-sending forbidden
- ip.access unit_id 0 0
- oml ip.access stream_id 255 line 0
+ ipa unit-id 0 0
+ oml ipa stream-id 255 line 0
codec-support fr
gprs mode none
trx 0
diff --git a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg
b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg
index fd3a349..80a38ba 100644
--- a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg
+++ b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg
@@ -35,8 +35,8 @@
channel-descrption bs-pa-mfrms 5
channel-descrption bs-ag-blks-res 1
early-classmark-sending forbidden
- ip.access unit_id 0 0
- oml ip.access stream_id 255 line 0
+ ipa unit-id 0 0
+ oml ipa stream-id 255 line 0
codec-support fr
gprs mode none
trx 0
diff --git a/doc/manuals/chapters/bts-examples.adoc
b/doc/manuals/chapters/bts-examples.adoc
index 2dd8b37..58cb3ab 100644
--- a/doc/manuals/chapters/bts-examples.adoc
+++ b/doc/manuals/chapters/bts-examples.adoc
@@ -35,8 +35,8 @@
channel allocator ascending
rach tx integer 9
rach max transmission 7
- ip.access unit_id 1801 0 <4>
- oml ip.access stream_id 255 line 0
+ ipa unit-id 1801 0 <4>
+ oml ipa stream-id 255 line 0
gprs mode none
trx 0
rf_locked 0
@@ -113,8 +113,8 @@
channel allocator ascending
rach tx integer 9
rach max transmission 7
- ip.access unit_id 1800 0 <1>
- oml ip.access stream_id 255 line 0
+ ipa unit-id 1800 0 <1>
+ oml ipa stream-id 255 line 0
gprs mode none
trx 0
rf_locked 0
diff --git a/doc/manuals/vty/bsc_vty_reference.xml
b/doc/manuals/vty/bsc_vty_reference.xml
index 9992267..4d25e69 100644
--- a/doc/manuals/vty/bsc_vty_reference.xml
+++ b/doc/manuals/vty/bsc_vty_reference.xml
@@ -2884,7 +2884,7 @@
-
+
@@ -2892,7 +2892,7 @@
-
+
@@ -2922,7 +2922,7 @@
-
+
diff --git a/doc/manuals/vty/libbsc_vty_additions.xml
b/doc/manuals/vty/libbsc_vty_additions.xml
index 8685398..cf61961 100644
--- a/doc/manuals/vty/libbsc_vty_additions.xml
+++ b/doc/manuals/vty/libbsc_vty_additions.xml
@@ -11,7 +11,7 @@
BTS Configuration
This is the configuration of a single BTS.
-
+
Set the IPA stream identifier for the OML link within the IPA
multiplex. Must be the same as on the BTS side. The default
@@ -40,7 +40,7 @@
shall be used by MS in this cell. The default should be enabled.
-
+
Configure the IP address of the BSC used for RSL. Abis/IP
BTSs, including OsmoBTS and the nanoBTS will be instructed to
@@ -96,7 +96,7 @@
re-selection.
-
+
The ip.access unit ID is a parameter of the IPA
Signalling-over-IP multiplex. It is administratively
diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index 111c910..c4e091c 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -897,15 +897,15 @@
switch (bts->type) {
case GSM_BTS_TYPE_NANOBTS:
case GSM_BTS_TYPE_OSMOBTS:
- vty_out(vty, " ip.access unit_id %u %u%s",
+ vty_out(vty, " ipa unit-id %u %u%s",
bts->
Change in ...osmo-ttcn3-hacks[master]: lib/RAN: Introduce CTRL_CLIENT port to access CTRL muxed in RAN IPA conn
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14406 ) Change subject: lib/RAN: Introduce CTRL_CLIENT port to access CTRL muxed in RAN IPA conn .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14406 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: Id90c1609f0439b00379166fb9e4028d181fc023e Gerrit-Change-Number: 14406 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 08 Jun 2019 09:53:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: CTRL_Types: Fix SET value not encoded in message
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14405 ) Change subject: CTRL_Types: Fix SET value not encoded in message .. CTRL_Types: Fix SET value not encoded in message Change-Id: I9e0132429265d03caa97af2b2f44eed0327f3200 --- M library/Osmocom_CTRL_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/library/Osmocom_CTRL_Types.ttcn b/library/Osmocom_CTRL_Types.ttcn index eb22056..5c4527e 100644 --- a/library/Osmocom_CTRL_Types.ttcn +++ b/library/Osmocom_CTRL_Types.ttcn @@ -90,7 +90,7 @@ verb := "SET", id := id, variable := variable, - val := omit + val := val } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14405 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: I9e0132429265d03caa97af2b2f44eed0327f3200 Gerrit-Change-Number: 14405 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in ...osmo-ttcn3-hacks[master]: CTRL_Types: Fix SET value not encoded in message
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14405 ) Change subject: CTRL_Types: Fix SET value not encoded in message .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14405 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: I9e0132429265d03caa97af2b2f44eed0327f3200 Gerrit-Change-Number: 14405 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 08 Jun 2019 09:53:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: bsc: Introduce test TC_ctrl_location
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14407 ) Change subject: bsc: Introduce test TC_ctrl_location .. Patch Set 1: so in other words, the test should run on test_CT, not on ConnHdlr - and hence there's also no need to add a CTRL port to ConnHdlr. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14407 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: I3640f6889e3b6adc3b4601082f948543c64a2fe3 Gerrit-Change-Number: 14407 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 08 Jun 2019 09:57:36 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: bsc: Introduce test TC_ctrl_location
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14407 ) Change subject: bsc: Introduce test TC_ctrl_location .. Patch Set 1: Code-Review-1 I'm not quite sure why we would want to pass CTRL commands into the ConnHdlr. The ConnHdlr exists for each "subscriber connection", so we can have different ConnHdlr components, one for each subscriber connection. It makes sense to dispatch things like BSSAP, RSL dedicated channel/RLL, as well as MGCP to it, as all of those exist logically separate for each ConnHdlr. Hoewver, the CTRL commands are BTS-global and they should IMHO not be handled in a per-connection handler component. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14407 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: I3640f6889e3b6adc3b4601082f948543c64a2fe3 Gerrit-Change-Number: 14407 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 08 Jun 2019 09:56:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: gsm48_decode_bcd_number2: fix ENOSPC edge case
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/14397 ) Change subject: gsm48_decode_bcd_number2: fix ENOSPC edge case .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie05900aca50cc7fe8a45d17844dbfcd905fd82fe Gerrit-Change-Number: 14397 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 08 Jun 2019 09:58:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: hlr: add osmo-hlr.cfg
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14400 ) Change subject: hlr: add osmo-hlr.cfg .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14400 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: I73f673523dab8765ca87851175fafdec9fc20e1b Gerrit-Change-Number: 14400 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 08 Jun 2019 09:59:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-hlr[master]: rx_check_imei_req(): fix IMEI bounds checking
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/14399 ) Change subject: rx_check_imei_req(): fix IMEI bounds checking .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/14399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I060a8db98fb882e4815d1709a5d85bc0143a73a6 Gerrit-Change-Number: 14399 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 08 Jun 2019 09:59:37 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: hlr: f_vty_subscr_show(): add invert arg
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14401 ) Change subject: hlr: f_vty_subscr_show(): add invert arg .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/14401/1/hlr/HLR_Tests.ttcn File hlr/HLR_Tests.ttcn: https://gerrit.osmocom.org/#/c/14401/1/hlr/HLR_Tests.ttcn@297 PS1, Line 297: function f_vty_transceive_match(TELNETasp_PT pt, charstring cmd, template charstring exp_ret, I think it's a bit odd to have a function called 'match' which then has an "invert" parameter. I would argue to simply add another function like f_vty_transceive_nomatch. Particluarly as in the end, all but two lines of the two functions are different anyway. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14401 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: I176d8fd2ee74e1eb7ac797f931cd6005d398740f Gerrit-Change-Number: 14401 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Sat, 08 Jun 2019 10:01:37 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: hlr: add Check IMEI tests
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14402 )
Change subject: hlr: add Check IMEI tests
..
Patch Set 1: Code-Review-1
(2 comments)
-1 for not using f_vty_config. The other comment is optional.
https://gerrit.osmocom.org/#/c/14402/1/hlr/HLR_Tests.ttcn
File hlr/HLR_Tests.ttcn:
https://gerrit.osmocom.org/#/c/14402/1/hlr/HLR_Tests.ttcn@364
PS1, Line 364: f_vty_transceive(VTY, "configure terminal");
: f_vty_transceive(VTY, "hlr");
: if (enable) {
: f_vty_transceive(VTY, "store-imei");
: } else {
: f_vty_transceive(VTY, "no store-imei");
: }
we do have elegant helper functions for this, see f_vty_config() for simple
cases in the root node, and f_vty_config2() which traverses a path. See
examples in BTS_Tests.ttcn and MSC_Tests.ttcn
https://gerrit.osmocom.org/#/c/14402/1/hlr/HLR_Tests.ttcn@602
PS1, Line 602: setverdict(fail, "Unexpected CHECK IMEI ERROR Cause");
if you have the data aleady in 'ret', it might be useful to append it to the
setverdict statement like "setverdict(fail, "Unexpected ", ret)" and hence
give more context to the [human] reader of a log output.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14402
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: I97c8462f0817149feadd0c4865e3df6c2af92a80
Gerrit-Change-Number: 14402
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Sat, 08 Jun 2019 10:05:24 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in ...docker-playground[master]: Add script to regenerate VTY and counter documentation
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/14403 ) Change subject: Add script to regenerate VTY and counter documentation .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic5cf7f59de0c18d4c5568b89433c2b11db2a72a5 Gerrit-Change-Number: 14403 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 08 Jun 2019 10:06:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: BTS: pcu_rr_suspend clean up and release the channel
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14396 ) Change subject: BTS: pcu_rr_suspend clean up and release the channel .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14396 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: I55827626803ca81b68f905fd0df3126367951f39 Gerrit-Change-Number: 14396 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Sat, 08 Jun 2019 10:09:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: BTS: pcu_rr_suspend clean up and release the channel
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14396 )
Change subject: BTS: pcu_rr_suspend clean up and release the channel
..
BTS: pcu_rr_suspend clean up and release the channel
The testcase failed becaues of an unexpected RSL Error Indication from
the LAPDm system which was in the RSL emulation queue when tearing down
the test environment.
By calling f_rsl_chan_deact() the queue gets flushed until the RSL
deactivate channel is received. It's also more clean to release the
channel.
Fixes: OS#4051
Change-Id: I55827626803ca81b68f905fd0df3126367951f39
---
M bts/BTS_Tests.ttcn
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Hoernchen: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 9371612..3244b48 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -3999,6 +3999,11 @@
setverdict(fail, "Timeout waiting for SUSP REQ on PCUIF");
}
}
+
+ /* release the channel */
+ f_rsl_chan_deact();
+ f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr);
+ f_rslem_unregister(0, g_chan_nr);
}
testcase TC_pcu_rr_suspend() runs on test_CT {
var ConnHdlrPars pars;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14396
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: I55827626803ca81b68f905fd0df3126367951f39
Gerrit-Change-Number: 14396
Gerrit-PatchSet: 3
Gerrit-Owner: lynxis lazus
Gerrit-Reviewer: Hoernchen
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-MessageType: merged
Change in ...libosmocore[master]: gsm48_decode_bcd_number2: fix ENOSPC edge case
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/14397 ) Change subject: gsm48_decode_bcd_number2: fix ENOSPC edge case .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie05900aca50cc7fe8a45d17844dbfcd905fd82fe Gerrit-Change-Number: 14397 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 09 Jun 2019 06:52:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: gsm48_decode_bcd_number2: fix ENOSPC edge case
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/libosmocore/+/14397 )
Change subject: gsm48_decode_bcd_number2: fix ENOSPC edge case
..
gsm48_decode_bcd_number2: fix ENOSPC edge case
Return ENOSPC if the decoding buffer is one byte too small, instead of
returning 0 and silently truncating the string. Add a new "truncated"
variable to detect if the loop breaks in the final iteration.
The string is not truncated if there is exactly one 0xf ('\0') higher
nibble remaining. This is covered by the existing test case "long
15-digit (maximum) MSISDN, limited buffer".
Related: OS#4049
Change-Id: Ie05900aca50cc7fe8a45d17844dbfcd905fd82fe
---
M src/gsm/gsm48_ie.c
M tests/gsm0408/gsm0408_test.c
M tests/gsm0408/gsm0408_test.ok
3 files changed, 28 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/gsm/gsm48_ie.c b/src/gsm/gsm48_ie.c
index 59f931b..31028ba 100644
--- a/src/gsm/gsm48_ie.c
+++ b/src/gsm/gsm48_ie.c
@@ -82,6 +82,7 @@
{
uint8_t in_len;
int i;
+ bool truncated = false;
if (output_len < 1)
return -ENOSPC;
*output = '\0';
@@ -94,14 +95,23 @@
for (i = 1 + h_len; i <= in_len; i++) {
/* lower nibble */
- if (output_len <= 1)
+ if (output_len <= 1) {
+ truncated = true;
break;
+ }
*output++ = bcd_num_digits[bcd_lv[i] & 0xf];
output_len--;
/* higher nibble */
- if (output_len <= 1)
+ if (output_len <= 1) {
+ /* not truncated if there is exactly one 0xf ('\0')
higher nibble remaining */
+ if (i == in_len && (bcd_lv[i] & 0xf0) == 0xf0) {
+ break;
+ }
+
+ truncated = true;
break;
+ }
*output++ = bcd_num_digits[bcd_lv[i] >> 4];
output_len--;
}
@@ -109,7 +119,7 @@
*output++ = '\0';
/* Indicate whether the output was truncated */
- if (i < in_len)
+ if (truncated)
return -ENOSPC;
return 0;
diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c
index b5f8061..db1d45a 100644
--- a/tests/gsm0408/gsm0408_test.c
+++ b/tests/gsm0408/gsm0408_test.c
@@ -727,6 +727,17 @@
.dec_ascii = "(none)",
.dec_rc = -EIO,
},
+ {
+ .test_name = "decoding buffer is one byte too small (OS#4049)",
+
+ /* Decoding test */
+ .dec_hex = "022143", /* "1234" */
+ .dec_ascii = "123",/* '4' was truncated */
+ .dec_rc= -ENOSPC,
+
+ /* Buffer length limitations */
+ .dec_buf_lim = 4,
+ },
};
static void test_bcd_number_encode_decode()
diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok
index 844c201..d343869 100644
--- a/tests/gsm0408/gsm0408_test.ok
+++ b/tests/gsm0408/gsm0408_test.ok
@@ -186,6 +186,10 @@
- Decoding HEX (buffer limit=0) ''...
- Expected: (rc=-5) '(none)'
- Actual: (rc=-5) '(none)'
+- Running test: decoding buffer is one byte too small (OS#4049)
+ - Decoding HEX (buffer limit=4) '022143'...
+- Expected: (rc=-28) '123'
+- Actual: (rc=-28) '123'
Constructed RA:
077-121-666-5
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14397
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ie05900aca50cc7fe8a45d17844dbfcd905fd82fe
Gerrit-Change-Number: 14397
Gerrit-PatchSet: 4
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-ttcn3-hacks[master]: hlr: add osmo-hlr.cfg
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14400 ) Change subject: hlr: add osmo-hlr.cfg .. hlr: add osmo-hlr.cfg Copy osmo-hlr.cfg from docker-playground.git, but replace all IPs with 127.0.0.1. Change-Id: I73f673523dab8765ca87851175fafdec9fc20e1b --- A hlr/osmo-hlr.cfg 1 file changed, 23 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/hlr/osmo-hlr.cfg b/hlr/osmo-hlr.cfg new file mode 100644 index 000..a17881e --- /dev/null +++ b/hlr/osmo-hlr.cfg @@ -0,0 +1,23 @@ +! +! OsmoHLR example configuration +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level all debug + logging level linp error +! +line vty + bind 127.0.0.1 +ctrl + bind 127.0.0.1 +hlr + gsup + bind ip 127.0.0.1 + euse foobar + ussd route prefix *#100 internal own-msisdn + ussd route prefix *#101 internal own-imsi + ussd route prefix *100 external foobar -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14400 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: I73f673523dab8765ca87851175fafdec9fc20e1b Gerrit-Change-Number: 14400 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-bsc[master]: manuals: Add script to update vtr/counter documentation from docker
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/14404 ) Change subject: manuals: Add script to update vtr/counter documentation from docker .. Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/14404/1/doc/manuals/Makefile.am File doc/manuals/Makefile.am: https://gerrit.osmocom.org/#/c/14404/1/doc/manuals/Makefile.am@12 PS1, Line 12: regen_docs.sh \ singular/plural doesn't match -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iedd1f55d021231d86c19b6f14ff296e3a55148c8 Gerrit-Change-Number: 14404 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 09 Jun 2019 06:53:28 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-pcu[master]: EDGE: fix wrong encoding of LH bits
laforge has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/3991 ) Change subject: EDGE: fix wrong encoding of LH bits .. Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/3991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I75dd5bebc74eea85edf9582607c774d0bba0d2a6 Gerrit-Change-Number: 3991 Gerrit-PatchSet: 3 Gerrit-Owner: Minh-Quang Nguyen Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Minh-Quang Nguyen Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: laforge Gerrit-CC: lynxis lazus Gerrit-MessageType: abandon
Change in ...osmo-trx[master]: lms: Drop unusued variable masterClockRate
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-trx/+/14367 )
Change subject: lms: Drop unusued variable masterClockRate
..
lms: Drop unusued variable masterClockRate
Change-Id: I19192925d008046f474615a0476b52ddee9a9d78
---
M Transceiver52M/device/lms/LMSDevice.cpp
M Transceiver52M/device/lms/LMSDevice.h
2 files changed, 0 insertions(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
diff --git a/Transceiver52M/device/lms/LMSDevice.cpp
b/Transceiver52M/device/lms/LMSDevice.cpp
index 910a6e7..7d3ce81 100644
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -36,8 +36,6 @@
using namespace std;
-constexpr double LMSDevice::masterClockRate;
-
#define MAX_ANTENNA_LIST_SIZE 10
#define LMS_SAMPLE_RATE GSMRATE*32
#define GSM_CARRIER_BW 27.0 /* 270kHz */
diff --git a/Transceiver52M/device/lms/LMSDevice.h
b/Transceiver52M/device/lms/LMSDevice.h
index 8b5fe93..9e0944d 100644
--- a/Transceiver52M/device/lms/LMSDevice.h
+++ b/Transceiver52M/device/lms/LMSDevice.h
@@ -42,9 +42,6 @@
class LMSDevice:public RadioDevice {
private:
-
- static constexpr double masterClockRate = 52.0e6;
-
lms_device_t *m_lms_dev;
std::vector m_lms_stream_rx;
std::vector m_lms_stream_tx;
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14367
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I19192925d008046f474615a0476b52ddee9a9d78
Gerrit-Change-Number: 14367
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in ...osmo-trx[master]: lms: Fix stream_stats checks with overrun/underrun
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-trx/+/14368 )
Change subject: lms: Fix stream_stats checks with overrun/underrun
..
lms: Fix stream_stats checks with overrun/underrun
It was initially thought that underruns/overrun fields were
increasing-over-time values.
However, after reading LimeSuite code, it seems overrun and
underrun fields are actually reset upon every call to
LMS_GetStreamStatus().
Related: osmo-trx.git 928177125654c1e596ec3450a68882c031ebb929
Related: https://github.com/myriadrf/LimeSuite/issues/265
Change-Id: I677232a7b12ee83d26aa34d92f76a91d4b5a63a6
---
M Transceiver52M/device/lms/LMSDevice.cpp
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/Transceiver52M/device/lms/LMSDevice.cpp
b/Transceiver52M/device/lms/LMSDevice.cpp
index 7d3ce81..0253d4c 100644
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -583,23 +583,23 @@
return;
}
- if (status.underrun > m_ctr[chan].rx_underruns) {
+ if (status.underrun) {
changed = true;
*underrun = true;
LOGCHAN(chan, DDEV, ERROR) << "recv Underrun! ("
<< m_ctr[chan].rx_underruns << " -> "
<< status.underrun << ")";
}
- m_ctr[chan].rx_underruns = status.underrun;
+ m_ctr[chan].rx_underruns += status.underrun;
- if (status.overrun > m_ctr[chan].rx_overruns) {
+ if (status.overrun) {
changed = true;
*overrun = true;
LOGCHAN(chan, DDEV, ERROR) << "recv Overrun! ("
<< m_ctr[chan].rx_overruns << " -> "
<< status.overrun << ")";
}
- m_ctr[chan].rx_overruns = status.overrun;
+ m_ctr[chan].rx_overruns += status.overrun;
if (status.droppedPackets) {
changed = true;
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14368
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I677232a7b12ee83d26aa34d92f76a91d4b5a63a6
Gerrit-Change-Number: 14368
Gerrit-PatchSet: 4
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in pysim[master]: utils: Add DataObjectSequence.encode_multi()
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27649 ) Change subject: utils: Add DataObjectSequence.encode_multi() .. utils: Add DataObjectSequence.encode_multi() This is the analogous to the decode_multi() method. Change-Id: Ifdd1b1bd4d67f447638858c3e92742ca6f884bfa --- M pySim/utils.py 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/49/27649/1 diff --git a/pySim/utils.py b/pySim/utils.py index 8a7fcdb..ef770f9 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -1561,6 +1561,18 @@ i += 1 return encoded +def encode_multi(self, decoded) -> bytes: +"""Encode multiple occurrences of the sequence from the decoded input data. +Args: +decoded : list of json-serializable input data; one sequence per list item +Returns: +binary encoded output data +""" +encoded = bytearray() +for d in decoded: +encoded += self.encode(d) +return encoded + class CardCommand: """A single card command / instruction.""" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ifdd1b1bd4d67f447638858c3e92742ca6f884bfa Gerrit-Change-Number: 27649 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
Change in pysim[master]: ts_102_221: Add encode/write support of EF.ARR records
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/27650 )
Change subject: ts_102_221: Add encode/write support of EF.ARR records
..
ts_102_221: Add encode/write support of EF.ARR records
With this change, we can also encode/write EF.ARR records, not just
decode/read.
Change-Id: Id0da2b474d05aba12136b9cae402ad8326700182
---
M pySim/ts_102_221.py
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/50/27650/1
diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py
index 713d169..bf63f55 100644
--- a/pySim/ts_102_221.py
+++ b/pySim/ts_102_221.py
@@ -672,6 +672,11 @@
# 'un-flattening' decoder, and hence would be unable to encode :(
return dec[0]
+def _encode_record_bin(self, in_json):
+# we can only guess if we should decode for EF or DF here :(
+arr_seq = DataObjectSequence('arr', sequence=[AM_DO_EF, SC_DO])
+return arr_seq.encode_multi(in_json)
+
@with_default_category('File-Specific Commands')
class AddlShellCommands(CommandSet):
def __init__(self):
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/27650
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Id0da2b474d05aba12136b9cae402ad8326700182
Gerrit-Change-Number: 27650
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in pysim[master]: ts_102_221: Add encode/write support of EF.ARR records
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27650 ) Change subject: ts_102_221: Add encode/write support of EF.ARR records .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27650 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id0da2b474d05aba12136b9cae402ad8326700182 Gerrit-Change-Number: 27650 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 05 Apr 2022 13:00:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: utils: Add DataObjectSequence.encode_multi()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27649 ) Change subject: utils: Add DataObjectSequence.encode_multi() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ifdd1b1bd4d67f447638858c3e92742ca6f884bfa Gerrit-Change-Number: 27649 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 05 Apr 2022 13:00:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: utils: Fix bugs in DataObject encoders
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27648
)
Change subject: utils: Fix bugs in DataObject encoders
..
utils: Fix bugs in DataObject encoders
The DataObject is some weird / rarely used different code than the
normal TLV encoder/decoder. It has apparently so far only been used
for decoding, without testing the encoding side, resulting in related
bugs.
Let's fix those that I encountered today, and add a test case.
Change-Id: I31370066f43c22fc3ce9e2b9ee75986a652f6fc4
---
M pySim/utils.py
M tests/test_utils.py
2 files changed, 19 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/pySim/utils.py b/pySim/utils.py
index 555aa82..8a7fcdb 100644
--- a/pySim/utils.py
+++ b/pySim/utils.py
@@ -1333,7 +1333,7 @@
bytes encoded in TLV format.
"""
val = self.to_bytes()
-return bytes(self._compute_tag()) + bytes(len(val)) + val
+return bertlv_encode_tag(self._compute_tag()) +
bertlv_encode_len(len(val)) + val
# 'codec' interface
def decode(self, binary: bytes) -> Tuple[dict, bytes]:
@@ -1481,7 +1481,8 @@
# 'codec' interface
def encode(self, decoded) -> bytes:
-obj = self.members_by_name(decoded[0])
+obj = self.members_by_name[list(decoded)[0]]
+obj.decoded = list(decoded.values())[0]
return obj.to_tlv()
diff --git a/tests/test_utils.py b/tests/test_utils.py
index ae23461..b7f790d 100755
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -4,6 +4,22 @@
from pySim import utils
from pySim.ts_31_102 import EF_SUCI_Calc_Info
+# we don't really want to thest TS 102 221, but the underlying DataObject
codebase
+from pySim.ts_102_221 import AM_DO_EF, AM_DO_DF, SC_DO
+
+class DoTestCase(unittest.TestCase):
+
+def testSeqOfChoices(self):
+"""A sequence of two choices with each a variety of DO/TLVs"""
+arr_seq = utils.DataObjectSequence('arr', sequence=[AM_DO_EF, SC_DO])
+# input data
+dec_in = [{'access_mode': ['update_erase', 'read_search_compare']},
{'control_reference_template':'PIN1'}]
+# encode it once
+encoded = arr_seq.encode(dec_in)
+# decode again
+re_decoded = arr_seq.decode(encoded)
+self.assertEqual(dec_in, re_decoded[0])
+
class DecTestCase(unittest.TestCase):
# TS33.501 Annex C.4 test keys
hnet_pubkey_profile_b =
"0272DA71976234CE833A6907425867B82E074D44EF907DFB4B3E21C1C2256EBCD1" # ID 27 in
test file
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/27648
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I31370066f43c22fc3ce9e2b9ee75986a652f6fc4
Gerrit-Change-Number: 27648
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in pysim[master]: utils: Fix bugs in DataObject encoders
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27648 ) Change subject: utils: Fix bugs in DataObject encoders .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27648 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I31370066f43c22fc3ce9e2b9ee75986a652f6fc4 Gerrit-Change-Number: 27648 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 05 Apr 2022 13:00:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: utils: Add DataObjectSequence.encode_multi()
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27649 ) Change subject: utils: Add DataObjectSequence.encode_multi() .. utils: Add DataObjectSequence.encode_multi() This is the analogous to the decode_multi() method. Change-Id: Ifdd1b1bd4d67f447638858c3e92742ca6f884bfa --- M pySim/utils.py 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/utils.py b/pySim/utils.py index 8a7fcdb..ef770f9 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -1561,6 +1561,18 @@ i += 1 return encoded +def encode_multi(self, decoded) -> bytes: +"""Encode multiple occurrences of the sequence from the decoded input data. +Args: +decoded : list of json-serializable input data; one sequence per list item +Returns: +binary encoded output data +""" +encoded = bytearray() +for d in decoded: +encoded += self.encode(d) +return encoded + class CardCommand: """A single card command / instruction.""" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ifdd1b1bd4d67f447638858c3e92742ca6f884bfa Gerrit-Change-Number: 27649 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in pysim[master]: ts_102_221: Add encode/write support of EF.ARR records
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27650
)
Change subject: ts_102_221: Add encode/write support of EF.ARR records
..
ts_102_221: Add encode/write support of EF.ARR records
With this change, we can also encode/write EF.ARR records, not just
decode/read.
Change-Id: Id0da2b474d05aba12136b9cae402ad8326700182
---
M pySim/ts_102_221.py
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py
index 713d169..bf63f55 100644
--- a/pySim/ts_102_221.py
+++ b/pySim/ts_102_221.py
@@ -672,6 +672,11 @@
# 'un-flattening' decoder, and hence would be unable to encode :(
return dec[0]
+def _encode_record_bin(self, in_json):
+# we can only guess if we should decode for EF or DF here :(
+arr_seq = DataObjectSequence('arr', sequence=[AM_DO_EF, SC_DO])
+return arr_seq.encode_multi(in_json)
+
@with_default_category('File-Specific Commands')
class AddlShellCommands(CommandSet):
def __init__(self):
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/27650
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Id0da2b474d05aba12136b9cae402ad8326700182
Gerrit-Change-Number: 27650
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-gbproxy[master]: docs: usermanual: add new chapter gb-ns2-maintenance
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/27306 ) Change subject: docs: usermanual: add new chapter gb-ns2-maintenance .. docs: usermanual: add new chapter gb-ns2-maintenance Depends-On: I5571001a127c933397a4bc26e85410288d50fc2f (osmo-gsm-manuals.git) Change-Id: I951cc10d86de4f16d2226b34eda55202373c2524 --- M doc/manuals/osmogbproxy-usermanual.adoc 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve daniel: Looks good to me, approved diff --git a/doc/manuals/osmogbproxy-usermanual.adoc b/doc/manuals/osmogbproxy-usermanual.adoc index c371cf7..2a1b873 100644 --- a/doc/manuals/osmogbproxy-usermanual.adoc +++ b/doc/manuals/osmogbproxy-usermanual.adoc @@ -29,6 +29,7 @@ include::./common/chapters/gb-ns2-configuration-timer.adoc[] +include::./common/chapters/gb-ns2-maintenance.adoc[] include::./common/chapters/control_if.adoc[] -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/27306 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I951cc10d86de4f16d2226b34eda55202373c2524 Gerrit-Change-Number: 27306 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in libosmocore[master]: rsl: Fix tlv_parse of IPAC_DLCX_IND message
Attention is currently required from: pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27644 ) Change subject: rsl: Fix tlv_parse of IPAC_DLCX_IND message .. Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: In general I agree we should avoid introducing SYS# ticket numbers into the codebase, as it is something that other people don't have access to. On the other hand, I don't think we should waste time by copying parts of a bug report to osmocom.org, creating a non-customer-incumbered pcap file, attaching it there and re-writing this patch now. But in the future, let's avoid this please. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib637197ef3508ec94aec05d08d4e6aa15ddea055 Gerrit-Change-Number: 27644 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 05 Apr 2022 13:18:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: jenkins: Validate gsm 08.58 IEs are added to tlv_definition
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27646 ) Change subject: jenkins: Validate gsm 08.58 IEs are added to tlv_definition .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id8a679ca43eb0fcc4882780e9a95ec21c7f51972 Gerrit-Change-Number: 27646 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 05 Apr 2022 13:19:19 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo_dia2gsup[master]: docs: add a simple example to use configuration file
Attention is currently required from: lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/27647 ) Change subject: docs: add a simple example to use configuration file .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/27647 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I013f03779508bc3ee5bb378c357a5c94b40b74a0 Gerrit-Change-Number: 27647 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Tue, 05 Apr 2022 13:19:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-upf[master]: libosmo-pfcp: implement PFCP header and msg handling
Attention is currently required from: neels, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/27631 ) Change subject: libosmo-pfcp: implement PFCP header and msg handling .. Patch Set 3: Code-Review+1 (3 comments) File include/osmocom/pfcp/pfcp_msg.h: https://gerrit.osmocom.org/c/osmo-upf/+/27631/comment/1d5c28ce_fe655651 PS3, Line 69: static inline uint32_t osmo_pfcp_next_seq(uint32_t *seq_state) > This function will return 1 on first call most probably. […] I would expect no constraint whatsoevre on the starting / initial value of the sequence number. Basically every command must have a unique serial number so we can match responses to requests, and the receiver can distinguish re-transmission of a command (same seq) from a new command (different seq) https://gerrit.osmocom.org/c/osmo-upf/+/27631/comment/ca80ed75_e149434f PS3, Line 72: (*seq_state) &= 0xff; the interesting question is why we use a uint32_t variable if we only use 16 bits of it? https://gerrit.osmocom.org/c/osmo-upf/+/27631/comment/f78a1104_ebf16f72 PS3, Line 110: struct osmo_fsm_inst *peer_fi; > Looks like these 2 groups can be in a union? peers and sessins are orthogonal concepts, why do you think a message is only either part of a session or related to a peer? shouldn't it be both at the same time? -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/27631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I3f85ea052a6b7c064244a8093777e53a47c8c61e Gerrit-Change-Number: 27631 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 05 Apr 2022 13:24:47 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: msc tests: fix test so they don't depend on previous test runs
Attention is currently required from: Hoernchen, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27603 ) Change subject: msc tests: fix test so they don't depend on previous test runs .. Patch Set 2: (1 comment) Patchset: PS1: > Can you describe better the issue you are fixing here? new version of patch was fixed, but code review from pespin not addressd. I'm also agreeing with pau and waiting for it to be addressed. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27603 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: Iebaecd28a426b15baf4729f40b46dd33da79cbae Gerrit-Change-Number: 27603 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Attention: Hoernchen Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 05 Apr 2022 13:30:16 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in docker-playground[master]: new bsc-nat: msc tests
Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27625 ) Change subject: new bsc-nat: msc tests .. Patch Set 1: (1 comment) File osmo-bsc-nat-latest/osmo-bsc-nat.cfg: https://gerrit.osmocom.org/c/docker-playground/+/27625/comment/5a9cab21_ab77f3c6 PS1, Line 2: # can you include a pointer as to where the template + parametes are which generate the files? I could not immediately find it while browsing this patch. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ifdb9956a8bdde8aa3f9f62bfcfc035baab01c934 Gerrit-Change-Number: 27625 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Attention: Hoernchen Gerrit-Comment-Date: Tue, 05 Apr 2022 13:32:13 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: osmo-bts-trx: rx_{tchf,tchh}_fn(): ensure complete set of bursts
Attention is currently required from: fixeria, pespin, dexter.
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/27555 )
Change subject: osmo-bts-trx: rx_{tchf,tchh}_fn(): ensure complete set of bursts
..
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27555
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I56bebe1374eb803e3c1e9f08dda4da50a074ab0b
Gerrit-Change-Number: 27555
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: fixeria
Gerrit-Attention: pespin
Gerrit-Attention: dexter
Gerrit-Comment-Date: Tue, 05 Apr 2022 13:32:41 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmo-bsc[master]: doc/examples: avoid using deprecated configuration commands
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27628 ) Change subject: doc/examples: avoid using deprecated configuration commands .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27628 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id29fae10ec17eb3d0ac8534d8aebd7251a17577d Gerrit-Change-Number: 27628 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 05 Apr 2022 13:33:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: doc/examples: add a multi-trx config config example
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27629 ) Change subject: doc/examples: add a multi-trx config config example .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I20f86fa74dc4bd71538627ec59c5d2cd3678a089 Gerrit-Change-Number: 27629 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 05 Apr 2022 13:33:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: doc/examples: add a confmerge file with example hopping parameters
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27630 ) Change subject: doc/examples: add a confmerge file with example hopping parameters .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27630 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I205eb53901e06ee52dc64e050cfe2374cb9c771e Gerrit-Change-Number: 27630 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 05 Apr 2022 13:33:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: doc/examples: avoid using deprecated configuration commands
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27628 ) Change subject: doc/examples: avoid using deprecated configuration commands .. doc/examples: avoid using deprecated configuration commands Change-Id: Id29fae10ec17eb3d0ac8534d8aebd7251a17577d --- M doc/examples/osmo-bsc/osmo-bsc.cfg M doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/doc/examples/osmo-bsc/osmo-bsc.cfg b/doc/examples/osmo-bsc/osmo-bsc.cfg index 807bd19..c86a491 100644 --- a/doc/examples/osmo-bsc/osmo-bsc.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc.cfg @@ -17,7 +17,8 @@ handover1 power budget interval 6 handover1 power budget hysteresis 3 handover1 maximum distance - periodic location update 30 + ! T3212 is in units of 6min, so below we set 5 * 6 = 30min + timer net T3212 5 bts 0 type osmo-bts band DCS1800 @@ -71,7 +72,6 @@ phys_chan_config TCH/F hopping enabled 0 msc 0 - type normal allow-emergency allow amr-config 12_2k forbidden amr-config 10_2k forbidden @@ -84,6 +84,5 @@ mgw remote-ip 127.0.0.1 mgw remote-port 2427 mgw local-port 2727 - mgw endpoint-range 1 31 bsc mid-call-timeout 0 diff --git a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg index 335e23d..e60f39a 100644 --- a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg @@ -16,7 +16,8 @@ handover1 power budget interval 6 handover1 power budget hysteresis 3 handover1 maximum distance - periodic location update 30 + ! T3212 is in units of 6min, so below we set 5 * 6 = 30min + timer net T3212 5 bts 0 type osmo-bts band DCS1800 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27628 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id29fae10ec17eb3d0ac8534d8aebd7251a17577d Gerrit-Change-Number: 27628 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-bsc[master]: doc/examples: add a multi-trx config config example
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27629 ) Change subject: doc/examples: add a multi-trx config config example .. doc/examples: add a multi-trx config config example So far we had no multi-trx config examples at all. Let's add one. Use unique 'RSL TEI' for each TRX, as this simplifies analyzing the Abis protocol traces. Also use the new 'TCH/F_TCH/H_SDCCH8_PDCH'. Change-Id: I20f86fa74dc4bd71538627ec59c5d2cd3678a089 Fixes: OS#4748 --- A doc/examples/osmo-bsc/osmo-bsc-4trx.cfg 1 file changed, 161 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/doc/examples/osmo-bsc/osmo-bsc-4trx.cfg b/doc/examples/osmo-bsc/osmo-bsc-4trx.cfg new file mode 100644 index 000..68d6a38 --- /dev/null +++ b/doc/examples/osmo-bsc/osmo-bsc-4trx.cfg @@ -0,0 +1,161 @@ +! osmo-bsc configuration example with 4 TRX +e1_input + e1_line 0 driver ipa +network + network country code 1 + mobile network code 1 + encryption a5 0 + neci 1 + paging any use tch 0 + bts 0 + type osmo-bts + band DCS1800 + cell_identity 6969 + location_area_code 1 + base_station_id_code 63 + ms max power 15 + cell reselection hysteresis 4 + rxlev access min 0 + radio-link-timeout 32 + channel allocator ascending + rach tx integer 9 + rach max transmission 7 + channel-description attach 1 + channel-description bs-pa-mfrms 5 + channel-description bs-ag-blks-res 1 + early-classmark-sending forbidden + ipa unit-id 6969 0 + oml ipa stream-id 255 line 0 + codec-support fr hr amr + gprs mode none + trx 0 + rf_locked 0 + arfcn 871 + nominal power 23 + ! to use full TRX power, set max_power_red 0 + max_power_red 20 + rsl e1 tei 0 + timeslot 0 +phys_chan_config CCCH +hopping enabled 0 + timeslot 1 +phys_chan_config SDCCH8+CBCH +hopping enabled 0 + timeslot 2 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 3 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 4 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 5 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 6 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 7 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + trx 1 + rf_locked 0 + arfcn 873 + nominal power 23 + ! to use full TRX power, set max_power_red 0 + max_power_red 20 + rsl e1 tei 1 + timeslot 0 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 1 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 2 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 3 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 4 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 5 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 6 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 7 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + trx 2 + rf_locked 0 + arfcn 875 + nominal power 23 + ! to use full TRX power, set max_power_red 0 + max_power_red 20 + rsl e1 tei 2 + timeslot 0 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 1 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 2 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 3 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 4 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 5 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 6 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 7 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + trx 3 + rf_locked 0 + arfcn 877 + nominal power 23 + ! to use full TRX power, set max_power_red 0 + max_power_red 20 + rsl e1 tei 3 + timeslot 0 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 1 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 2 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 3 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 4 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 5 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 6 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0 + timeslot 7 +phys_chan_config TCH/F_TCH/H_SDCCH8_PDCH +hopping enabled 0
Change in osmo-bsc[master]: doc/examples: add a confmerge file with example hopping parameters
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27630 ) Change subject: doc/examples: add a confmerge file with example hopping parameters .. doc/examples: add a confmerge file with example hopping parameters This file was taken from docker-playground.git, and this is basically what we use when running the ttcn3-bts-test with hopping enabled. Change-Id: I205eb53901e06ee52dc64e050cfe2374cb9c771e --- M doc/examples/Makefile.am A doc/examples/osmo-bsc/osmo-bsc-4trx-fh.confmerge 2 files changed, 217 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 9d8cd75..c25ebc5 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST = $(OSMOCONF_FILES) -CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' +CFG_FILES = find $(srcdir) -name '*.cfg*' -o -name '*.confmerge*' | sed -e 's,^$(srcdir),,' dist-hook: for f in $$($(CFG_FILES)); do \ diff --git a/doc/examples/osmo-bsc/osmo-bsc-4trx-fh.confmerge b/doc/examples/osmo-bsc/osmo-bsc-4trx-fh.confmerge new file mode 100644 index 000..0a14631 --- /dev/null +++ b/doc/examples/osmo-bsc/osmo-bsc-4trx-fh.confmerge @@ -0,0 +1,216 @@ +! This is a confmerge file with example frequency hopping parameters. +! Use the osmo-config-merge tool to apply it to osmo-bsc-4trx.cfg. +network + bts 0 + trx 0 + timeslot 0 +! Shall not be hopping + timeslot 1 +! Intentionally non-hopping + timeslot 2 +! (c) HSN=2, MAIO=0,1 +hopping enabled 1 +hopping sequence-number 2 +hopping maio 0 +hopping arfcn add 871 +hopping arfcn add 873 + timeslot 3 +! (e) HSN=3, MAIO=3,2,1,0 +hopping enabled 1 +hopping sequence-number 3 +hopping maio 3 +hopping arfcn add 871 +hopping arfcn add 873 +hopping arfcn add 875 +hopping arfcn add 877 + timeslot 4 +! Intentionally non-hopping + timeslot 5 +! (f) HSN=5, MAIO=0,1,2,3 +hopping enabled 1 +hopping sequence-number 5 +hopping maio 0 +hopping arfcn add 871 +hopping arfcn add 873 +hopping arfcn add 875 +hopping arfcn add 877 + timeslot 6 +! (g) HSN=6, MAIO=1,0 +hopping enabled 1 +hopping sequence-number 6 +hopping maio 1 +hopping arfcn add 871 +hopping arfcn add 877 + timeslot 7 +! (i) HSN=0, MAIO=1,3 +hopping enabled 1 +hopping sequence-number 0 +hopping maio 1 +hopping arfcn add 871 +hopping arfcn add 875 + trx 1 + timeslot 0 +! (a) HSN=0, MAIO=0,1,2 +hopping enabled 1 +hopping sequence-number 0 +hopping maio 0 +hopping arfcn add 873 +hopping arfcn add 875 +hopping arfcn add 877 + timeslot 1 +! Intentionally non-hopping + timeslot 2 +! (c) HSN=2, MAIO=0,1 +hopping enabled 1 +hopping sequence-number 2 +hopping maio 1 +hopping arfcn add 871 +hopping arfcn add 873 + timeslot 3 +! (e) HSN=3, MAIO=3,2,1,0 +hopping enabled 1 +hopping sequence-number 3 +hopping maio 2 +hopping arfcn add 871 +hopping arfcn add 873 +hopping arfcn add 875 +hopping arfcn add 877 + timeslot 4 +! Intentionally non-hopping + timeslot 5 +! (f) HSN=5, MAIO=0,1,2,3 +hopping enabled 1 +hopping sequence-number 5 +hopping maio 1 +hopping arfcn add 871 +hopping arfcn add 873 +hopping arfcn add 875 +hopping arfcn add 877 + timeslot 6 +! (h) HSN=6, MAIO=1,0 +hopping enabled 1 +hopping sequence-number 6 +hopping maio 1 +hopping arfcn add 873 +hopping arfcn add 875 + timeslot 7 +! (j) HSN=0, MAIO=0,2 +hopping enabled 1 +hopping sequence-number 0 +hopping maio 0 +hopping arfcn add 873 +hopping arfcn add 877 + trx 2 + timeslot 0 +! (a) HSN=0, MAIO=0,1,2 +hopping enabled 1 +hopping sequence-number 0 +hopping maio 1 +hopping arfcn add 873 +hopping arfcn add 875 +hopping arfcn add 877 + timeslot 1 +! (b) HSN=1, MAIO=3,5 +hopping enabled 1 +hopping sequence-number 1 +hopping maio 3 +hopping arfcn add 875 +hopping arfcn add 877 + timeslot 2 +! (d) HSN=2, MAIO=2,3 +hopping enabled 1 +hopping sequence-number 2 +hopping maio 2 +hopping arfcn add 875 +hopping arfcn add 877 + timeslot 3 +! (e) HSN=3, MAIO=3,2,1,0 +hopping enabled 1 +hopping sequence-number 3 +hopping maio 1 +hopping arfcn add 871 +hopping arfcn add 873 +hopping arfcn add 875 +hopping arfcn add 877 + timeslot 4 +! Intentionally non-hopping + timeslot 5 +! (f) HSN=5, MAIO=0,1,2,3 +hopping enabled 1 +hopping sequence-number 5 +hopping maio 2 +hopping arfcn add
Change in simtrace2[master]: simtrace2-cardem-pcsc.c: Send APDUs via GSMTAP
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/27651 ) Change subject: simtrace2-cardem-pcsc.c: Send APDUs via GSMTAP .. simtrace2-cardem-pcsc.c: Send APDUs via GSMTAP Previously, only simtrace2-sniff generated GSMTAP protocol traces. Let's add the same functionality to simtrace2-cardem-pcsc. Change-Id: Iba6adf41b480d127bf11ee361c66d80fe8296313 Closes: OS#5513 --- M host/src/simtrace2-cardem-pcsc.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/51/27651/1 diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 8e143ba..20fbc69 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -164,6 +164,9 @@ msgb_free(tmsg); return rc; } + /* send via GSMTAP for wireshark tracing */ + osmo_st2_gsmtap_send_apdu(GSMTAP_SIM_APDU, tmsg->data, msgb_length(tmsg)); + msgb_apdu_sw(tmsg) = msgb_get_u16(tmsg); ac.sw[0] = msgb_apdu_sw(tmsg) >> 8; ac.sw[1] = msgb_apdu_sw(tmsg) & 0xff; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/27651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Iba6adf41b480d127bf11ee361c66d80fe8296313 Gerrit-Change-Number: 27651 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
Change in simtrace2[master]: simtrace2-cardem-pcsc.c: Send APDUs via GSMTAP
laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/simtrace2/+/27651 ) Change subject: simtrace2-cardem-pcsc.c: Send APDUs via GSMTAP .. simtrace2-cardem-pcsc.c: Send APDUs via GSMTAP Previously, only simtrace2-sniff generated GSMTAP protocol traces. Let's add the same functionality to simtrace2-cardem-pcsc. Change-Id: Iba6adf41b480d127bf11ee361c66d80fe8296313 Closes: OS#5494 --- M host/src/simtrace2-cardem-pcsc.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/51/27651/2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/27651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Iba6adf41b480d127bf11ee361c66d80fe8296313 Gerrit-Change-Number: 27651 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset
Change in simtrace2[master]: simtrace2-cardem-pcsc.c: Send APDUs via GSMTAP
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/27651 ) Change subject: simtrace2-cardem-pcsc.c: Send APDUs via GSMTAP .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/27651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Iba6adf41b480d127bf11ee361c66d80fe8296313 Gerrit-Change-Number: 27651 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 05 Apr 2022 17:29:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in simtrace2[master]: simtrace2-cardem-pcsc.c: Send APDUs via GSMTAP
laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/27651 ) Change subject: simtrace2-cardem-pcsc.c: Send APDUs via GSMTAP .. simtrace2-cardem-pcsc.c: Send APDUs via GSMTAP Previously, only simtrace2-sniff generated GSMTAP protocol traces. Let's add the same functionality to simtrace2-cardem-pcsc. Change-Id: Iba6adf41b480d127bf11ee361c66d80fe8296313 Closes: OS#5494 --- M host/src/simtrace2-cardem-pcsc.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index b7d41bd..4820f36 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -189,6 +189,9 @@ msgb_free(tmsg); return rc; } + /* send via GSMTAP for wireshark tracing */ + osmo_st2_gsmtap_send_apdu(GSMTAP_SIM_APDU, tmsg->data, msgb_length(tmsg)); + msgb_apdu_sw(tmsg) = msgb_get_u16(tmsg); ac.sw[0] = msgb_apdu_sw(tmsg) >> 8; ac.sw[1] = msgb_apdu_sw(tmsg) & 0xff; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/27651 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Iba6adf41b480d127bf11ee361c66d80fe8296313 Gerrit-Change-Number: 27651 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-e1d[master]: add example config files for octoi-server and octoi-client
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27652 ) Change subject: add example config files for octoi-server and octoi-client .. add example config files for octoi-server and octoi-client Change-Id: Ia427eb62bbfecea12c31584996a57cb82aa097a0 --- M doc/examples/Makefile.am A doc/examples/osmo-e1d-octoi-client.cfg A doc/examples/osmo-e1d-octoi-server.cfg 3 files changed, 61 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/52/27652/1 diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 9fd345c..2e070c2 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,6 +1,8 @@ OSMOCONF_FILES = \ osmo-e1d.cfg \ osmo-e1d-vpair.cfg \ + osmo-e1d-octoi-client.cfg \ + osmo-e1d-octoi-server.cfg \ $(NULL) osmoconfdir = $(sysconfdir)/osmocom diff --git a/doc/examples/osmo-e1d-octoi-client.cfg b/doc/examples/osmo-e1d-octoi-client.cfg new file mode 100644 index 000..ddb981c --- /dev/null +++ b/doc/examples/osmo-e1d-octoi-client.cfg @@ -0,0 +1,29 @@ +! +! osmo-e1d (0.3.0.17-07c2) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category-hex 0 + logging print category 1 + logging print thread-id 0 + logging timestamp 1 + logging print file 1 + logging level e1d info + logging level linp info +! +! +line vty + no login +! +e1d + interface 0 icE1usb + usb-serial dc697407e7682731 + line 0 + mode e1oip +octoi-client 90.187.70.153 10012 + local-bind 0.0.0.0 + account my_user_1 + mode ice1usb + ice1usb serial-number dc697407e7682731 diff --git a/doc/examples/osmo-e1d-octoi-server.cfg b/doc/examples/osmo-e1d-octoi-server.cfg new file mode 100644 index 000..ac5e2b7 --- /dev/null +++ b/doc/examples/osmo-e1d-octoi-server.cfg @@ -0,0 +1,30 @@ +! +! osmo-e1d (0.3.0.17-07c2) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category-hex 0 + logging print category 1 + logging print thread-id 0 + logging timestamp 1 + logging print file 1 + logging level e1d info + logging level linp info +! +! +line vty + no login +! +e1d + interface 0 icE1usb + usb-serial dc697407e7682731 + line 0 + mode e1oip +octoi-server + local-bind 0.0.0.0 10011 + account my_user1 + mode ice1usb + ice1usb serial-number dc697407e7682731 + ice1usb line-number 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ia427eb62bbfecea12c31584996a57cb82aa097a0 Gerrit-Change-Number: 27652 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
Change in osmo-e1d[master]: add example config files for octoi-server and octoi-client
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27652 ) Change subject: add example config files for octoi-server and octoi-client .. add example config files for octoi-server and octoi-client Change-Id: Ia427eb62bbfecea12c31584996a57cb82aa097a0 --- M doc/examples/Makefile.am A doc/examples/osmo-e1d-octoi-client.cfg A doc/examples/osmo-e1d-octoi-server.cfg 3 files changed, 61 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 9fd345c..2e070c2 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,6 +1,8 @@ OSMOCONF_FILES = \ osmo-e1d.cfg \ osmo-e1d-vpair.cfg \ + osmo-e1d-octoi-client.cfg \ + osmo-e1d-octoi-server.cfg \ $(NULL) osmoconfdir = $(sysconfdir)/osmocom diff --git a/doc/examples/osmo-e1d-octoi-client.cfg b/doc/examples/osmo-e1d-octoi-client.cfg new file mode 100644 index 000..ddb981c --- /dev/null +++ b/doc/examples/osmo-e1d-octoi-client.cfg @@ -0,0 +1,29 @@ +! +! osmo-e1d (0.3.0.17-07c2) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category-hex 0 + logging print category 1 + logging print thread-id 0 + logging timestamp 1 + logging print file 1 + logging level e1d info + logging level linp info +! +! +line vty + no login +! +e1d + interface 0 icE1usb + usb-serial dc697407e7682731 + line 0 + mode e1oip +octoi-client 90.187.70.153 10012 + local-bind 0.0.0.0 + account my_user_1 + mode ice1usb + ice1usb serial-number dc697407e7682731 diff --git a/doc/examples/osmo-e1d-octoi-server.cfg b/doc/examples/osmo-e1d-octoi-server.cfg new file mode 100644 index 000..ac5e2b7 --- /dev/null +++ b/doc/examples/osmo-e1d-octoi-server.cfg @@ -0,0 +1,30 @@ +! +! osmo-e1d (0.3.0.17-07c2) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category-hex 0 + logging print category 1 + logging print thread-id 0 + logging timestamp 1 + logging print file 1 + logging level e1d info + logging level linp info +! +! +line vty + no login +! +e1d + interface 0 icE1usb + usb-serial dc697407e7682731 + line 0 + mode e1oip +octoi-server + local-bind 0.0.0.0 10011 + account my_user1 + mode ice1usb + ice1usb serial-number dc697407e7682731 + ice1usb line-number 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ia427eb62bbfecea12c31584996a57cb82aa097a0 Gerrit-Change-Number: 27652 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-e1d[master]: add example config files for octoi-server and octoi-client
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27652 ) Change subject: add example config files for octoi-server and octoi-client .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ia427eb62bbfecea12c31584996a57cb82aa097a0 Gerrit-Change-Number: 27652 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 06 Apr 2022 07:17:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: bsc: as_Media_mgw: fail on DLCX
Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27658 ) Change subject: bsc: as_Media_mgw: fail on DLCX .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27658 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: I0633f60f09d58802f6be0238ef41a632d93a4327 Gerrit-Change-Number: 27658 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Thu, 07 Apr 2022 14:18:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: bsc: add TC_emerg_call_and_lcs_loc_req
Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27659 ) Change subject: bsc: add TC_emerg_call_and_lcs_loc_req .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27659 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: I95037374c45943cb14401bc48f16a39c2fcbe1f5 Gerrit-Change-Number: 27659 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Thu, 07 Apr 2022 14:18:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: bsc: add TC_emerg_call_and_lcs_loc_req
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27659 )
Change subject: bsc: add TC_emerg_call_and_lcs_loc_req
..
bsc: add TC_emerg_call_and_lcs_loc_req
An emergency call often comes with a Location Request. Make sure
osmo-bsc handles it well.
Related: SYS#5916
Change-Id: I95037374c45943cb14401bc48f16a39c2fcbe1f5
---
M bsc/BSC_Tests.ttcn
M library/BSSMAP_Templates.ttcn
2 files changed, 104 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index cce8837..a2add34 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -10093,6 +10093,105 @@
f_shutdown_helper();
}
+private function f_tc_emerg_call_and_lcs_loc_req(charstring id) runs on
MSC_ConnHdlr
+{
+ /* Make sure the CHAN RQD indicates an emergency call (0b101x). The
difference is that osmo-bsc directly
+* assigns a TCH lchan and establishing voice for the emergency call
will use Mode Modify, not reassignment to
+* another lchan. */
+ g_pars.ra := 'b7'O;
+ f_assignment_emerg_setup();
+
+ var PDU_BSSAP emerg_setup_data_ind_bssap;
+ timer T := 3.0;
+ T.start;
+ alt {
+ [] BSSAP.receive(tr_BSSAP_DTAP) -> value emerg_setup_data_ind_bssap {
+ var PDU_ML3_MS_NW verify_emerg_setup;
+ verify_emerg_setup :=
dec_PDU_ML3_MS_NW(emerg_setup_data_ind_bssap.pdu.dtap);
+ if (not isbound(verify_emerg_setup.msgs.cc.emergencySetup)) {
+ setverdict(fail, "no emergency setup");
+ }
+ }
+ [] BSSAP.receive {
+ setverdict(fail, "unexpected BSSAP message!");
+ }
+ [] T.timeout {
+ setverdict(fail, "timeout waiting for EMERGENCY SETUP!");
+ }
+ }
+
+ /* Here would usually be a CC Call Proceeding from the MSC, but what
does the BSC care about DTAP. */
+
+ /* Do a Location Request in-between the CC call setup */
+ f_bssap_le_register_imsi(g_pars.imsi, omit);
+
BSSAP.send(valueof(ts_BSSMAP_Perform_Location_Request(ts_BSSMAP_Imsi(g_pars.imsi),
+ ts_CellId_CGI('262'H, '42'H, 23, 42;
+
BSSAP_LE.receive(tr_BSSMAP_LE_PerfLocReq(BSSMAP_LE_LOC_INFO_CURRENT_GEOGRAPHIC_LOC,
?, ?));
+ /* SMLC got the TA from the BSC, now responds with geo information
data. */
+ BSSAP_LE.send(ts_BSSMAP_LE_PerfLocResp(gad_ell_point_unc_circle, omit));
+ BSSAP_LE.receive(BSSAP_LE_Conn_Prim:CONN_PRIM_DISC_IND);
+
BSSAP.receive(tr_BSSMAP_Perform_Location_Response(tr_BSSMAP_IE_LocationEstimate(gad_ell_point_unc_circle)));
+
+ /* Go on with voice call assignment */
+ var template PDU_BSSAP exp_compl := f_gen_exp_compl();
+ var PDU_BSSAP ass_cmd := f_gen_ass_req();
+
+ /* Below speechOrDataIndicator and codecList are copied from an
emergency call captured during tests.
+* They seem a bit weird (AMR-WB, and the order differ between
speechId_DataIndicator and the codecList), but
+* seems a good idea to see how osmo-bsc reacts to this. */
+ ass_cmd.pdu.bssmap.assignmentRequest.channelType := {
+ elementIdentifier := '0B'O, /* overwritten */
+ lengthIndicator := 0, /* overwritten */
+ speechOrDataIndicator := '0001'B, /* speech */
+ spare1_4 := ''B,
+ channelRateAndType := ChRate_TCHForH_Fpref,
+ speechId_DataIndicator := 'c2918105'O
+ };
+ ass_cmd.pdu.bssmap.assignmentRequest.codecList :=
valueof(ts_BSSMAP_IE_CodecList({
+ ts_CodecHR, ts_CodecAMR_WB, ts_CodecEFR, ts_CodecFR}));
+
+ f_rslem_dchan_queue_enable();
+
+ var ExpectCriteria mgcpcrit := {
+ connid := omit,
+ endpoint := omit,
+ transid := omit
+ };
+ f_create_mgcp_expect(mgcpcrit);
+
+ BSSAP.send(ass_cmd);
+
+ var AssignmentState st := valueof(ts_AssignmentStateInit);
+ st.voice_call := true;
+ st.is_assignment := false;
+ alt {
+ [] as_modify(st);
+ [] as_Media();
+ [st.modify_done] BSSAP.receive(exp_compl) {
+ setverdict(pass);
+ }
+ }
+
+ /* Voice call carries on ... */
+ f_sleep(2.0);
+
+ setverdict(pass);
+ f_perform_clear();
+}
+
+testcase TC_emerg_call_and_lcs_loc_req() runs on test_CT {
+ var MSC_ConnHdlr vc_conn;
+ var TestHdlrParams pars := f_gen_test_hdlr_pars();
+
+ f_init(1, true);
+ f_s
Change in osmo-ttcn3-hacks[master]: bsc: as_Media_mgw: fail on DLCX
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27658 )
Change subject: bsc: as_Media_mgw: fail on DLCX
..
bsc: as_Media_mgw: fail on DLCX
as_Media_mgw() is used to establish a voice stream. If a DLCX happens as
part of that, that should be flagged as a problem.
In fact the Mode Modify test with current osmo-bsc does exhibit a DLCX
right upon the Assignment Complete message, which is a bug fixed in
I5ab10ee7fd9c5d7608e8a06893881d990943feed.
This patch now correctly flags this as a failure.
In the two tests
TC_ho_in_fail_no_detect, TC_ho_in_fail_no_detect2
the expected failure causes expected DLCX, so exempt those.
Related: SYS#5916
Change-Id: I0633f60f09d58802f6be0238ef41a632d93a4327
---
M bsc/BSC_Tests.ttcn
M bsc/MSC_ConnectionHandler.ttcn
2 files changed, 16 insertions(+), 5 deletions(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 4683dc7..cce8837 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -6553,7 +6553,7 @@
f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit});
f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR);
- activate(as_Media());
+ activate(as_Media(fail_on_dlcx := false));
BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc,
f_gen_handover_req()));
@@ -6643,7 +6643,7 @@
f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit});
f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", FR_AMR);
- activate(as_Media());
+ activate(as_Media(fail_on_dlcx := false));
BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc,
f_gen_handover_req()));
diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index db2e9ef..06f9ebe 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -373,7 +373,7 @@
/* altstep for handling of MGCP media related commands. Activated by
as_Media() to test
* MGW level media handling */
-altstep as_Media_mgw(boolean norepeat := false) runs on MSC_ConnHdlr {
+altstep as_Media_mgw(boolean norepeat := false, boolean fail_on_dlcx := true)
runs on MSC_ConnHdlr {
var MgcpCommand mgcp_cmd;
var template MgcpResponse mgcp_resp;
var MGCP_RecvFrom mrf;
@@ -383,6 +383,9 @@
var template MgcpMessage msg_mdcx := {
command := tr_MDCX
}
+ var template MgcpMessage msg_dlcx := {
+ command := tr_DLCX
+ }
var template MgcpMessage msg_resp;
[g_pars.aoip] MGCP.receive(tr_CRCX) -> value mgcp_cmd {
@@ -422,13 +425,21 @@
repeat;
}
}
+
+ [fail_on_dlcx and g_pars.aoip] MGCP.receive(tr_DLCX) {
+ setverdict(fail, "Unexpected DLCX received");
+ }
+
+ [fail_on_dlcx and not g_pars.aoip]
MGCP_MULTI.receive(tr_MGCP_RecvFrom_any(msg_dlcx)) {
+ setverdict(fail, "Unexpected DLCX received");
+ }
}
/* Altsteps for handling of media related commands. Can be activated by a given
* test case if it expects to see media related handling (i.e. voice calls) */
-altstep as_Media() runs on MSC_ConnHdlr {
+altstep as_Media(boolean fail_on_dlcx := true) runs on MSC_ConnHdlr {
[] as_Media_ipacc();
- [] as_Media_mgw();
+ [] as_Media_mgw(fail_on_dlcx := fail_on_dlcx);
}
type port Coord_PT message
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27658
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: I0633f60f09d58802f6be0238ef41a632d93a4327
Gerrit-Change-Number: 27658
Gerrit-PatchSet: 3
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bsc[master]: assignment_fsm: always mark MGCP ci as completed
Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27656 ) Change subject: assignment_fsm: always mark MGCP ci as completed .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5ab10ee7fd9c5d7608e8a06893881d990943feed Gerrit-Change-Number: 27656 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Thu, 07 Apr 2022 14:19:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: assignment_fsm: always update RTP info
Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27657 ) Change subject: assignment_fsm: always update RTP info .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0788d1f013b8f820f559b6ed58a5f9bb8a02e0b4 Gerrit-Change-Number: 27657 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Thu, 07 Apr 2022 14:19:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: assignment_fsm: always update RTP info
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/27657 )
Change subject: assignment_fsm: always update RTP info
..
assignment_fsm: always update RTP info
When the assignment succeeds, the assignment_request has taken effect
and whatever it requested should now be in effect.
Hence copy the new RTP information from the assignment_request to the
conn's storage indicating what is currently used, always, not only when
lchan_changed == true. The RTP information may have changed also from a
Mode Modify where the lchan stays the same but changes its mode of use,
e.g. from signalling to voice.
When there is no RTP involved, this data is zero or empty, so there is
no harm in copying it, always.
Related: SYS#5916
Change-Id: I0788d1f013b8f820f559b6ed58a5f9bb8a02e0b4
---
M src/osmo-bsc/assignment_fsm.c
1 file changed, 6 insertions(+), 7 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c
index c7fc335..7deca65 100644
--- a/src/osmo-bsc/assignment_fsm.c
+++ b/src/osmo-bsc/assignment_fsm.c
@@ -287,13 +287,12 @@
* the MGW endpoint right away. If successful, the conn continues to
use the endpoint. */
conn->assignment.created_ci_for_msc = NULL;
- if (lchan_changed) {
- /* New RTP information is now accepted */
- conn->user_plane.msc_assigned_cic =
conn->assignment.req.msc_assigned_cic;
- osmo_strlcpy(conn->user_plane.msc_assigned_rtp_addr,
conn->assignment.req.msc_rtp_addr,
-sizeof(conn->user_plane.msc_assigned_rtp_addr));
- conn->user_plane.msc_assigned_rtp_port =
conn->assignment.req.msc_rtp_port;
- }
+ /* New RTP information is now accepted. If there is no RTP stream, this
information is zero / empty. Either way
+* store the result of this assignment. */
+ conn->user_plane.msc_assigned_cic =
conn->assignment.req.msc_assigned_cic;
+ osmo_strlcpy(conn->user_plane.msc_assigned_rtp_addr,
conn->assignment.req.msc_rtp_addr,
+sizeof(conn->user_plane.msc_assigned_rtp_addr));
+ conn->user_plane.msc_assigned_rtp_port =
conn->assignment.req.msc_rtp_port;
assignment_count_result(CTR_ASSIGNMENT_COMPLETED);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27657
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I0788d1f013b8f820f559b6ed58a5f9bb8a02e0b4
Gerrit-Change-Number: 27657
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bsc[master]: assignment_fsm: always mark MGCP ci as completed
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/27656 )
Change subject: assignment_fsm: always mark MGCP ci as completed
..
assignment_fsm: always mark MGCP ci as completed
When the assignment fails, we roll back the MSC side RTP endpoint at the
MGW that may have been created before the failure occured. On success,
we clear the mgcp_ci pointer so it is not rolled back.
Always clear this, not only when lchan_changed == true. That is because
a channel Mode Modify may also have added a voice stream that should
retain the newly created RTP endpoint at the MGW.
If no voice stream is involved, the pointer should already be NULL.
There is no reason to have a condition for clearing this pointer.
Just always clear it.
This fixes all voice calls that modify a TCH lchan from signalling-only
to voice mode. Before this patch, their MSC side RTP endpoint was DLCX'd
right on assignment success.
In particular, this fixes Emergency Calls (which usually get a TCH lchan
assigned right from the start, and hence do a Mode Modify to add voice).
Related: SYS#5916
Change-Id: I5ab10ee7fd9c5d7608e8a06893881d990943feed
---
M src/osmo-bsc/assignment_fsm.c
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c
index 8d5e841..c7fc335 100644
--- a/src/osmo-bsc/assignment_fsm.c
+++ b/src/osmo-bsc/assignment_fsm.c
@@ -283,11 +283,11 @@
}
}
- if (lchan_changed) {
- /* Rembered this only for error handling: should assignment
fail, assignment_reset() will release
-* the MGW endpoint right away. If successful, the conn
continues to use the endpoint. */
- conn->assignment.created_ci_for_msc = NULL;
+ /* Rembered this only for error handling: should assignment fail,
assignment_reset() will release
+* the MGW endpoint right away. If successful, the conn continues to
use the endpoint. */
+ conn->assignment.created_ci_for_msc = NULL;
+ if (lchan_changed) {
/* New RTP information is now accepted */
conn->user_plane.msc_assigned_cic =
conn->assignment.req.msc_assigned_cic;
osmo_strlcpy(conn->user_plane.msc_assigned_rtp_addr,
conn->assignment.req.msc_rtp_addr,
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27656
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I5ab10ee7fd9c5d7608e8a06893881d990943feed
Gerrit-Change-Number: 27656
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: octsim: initial commit
Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27341 ) Change subject: octsim: initial commit .. Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27341/comment/23d0a5ea_3a62c272 PS1, Line 7: octsim: initial commit there could be some more commitlog explaining what this is about. yes, somehow octsim related, but what/when/how are those tests used, maybe a link to the octsim product page (not everyone looking at osmocom ttcn3 tests might know it) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27341 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: Iada6422d694eb5fc862477c8b43b8642c8d96692 Gerrit-Change-Number: 27341 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Attention: Hoernchen Gerrit-Comment-Date: Thu, 07 Apr 2022 14:21:26 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ci[master]: jobs: Add ttcn3-pgw-test jenkins job
Attention is currently required from: osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27660 ) Change subject: jobs: Add ttcn3-pgw-test jenkins job .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I363a7a8eb524abfeb45c81603c29cea96f86a787 Gerrit-Change-Number: 27660 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 07 Apr 2022 17:22:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pgw: Add T_guard
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27661 ) Change subject: pgw: Add T_guard .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27661 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: I9dce4aee4a0b1181bb7dc1a53fb254e6d17cf22e Gerrit-Change-Number: 27661 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 07 Apr 2022 17:23:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pgw: Add expected_results.xml
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27682 ) Change subject: pgw: Add expected_results.xml .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27682 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: I451b10a7b79854e630e7f2d487423dc39ade5bbd Gerrit-Change-Number: 27682 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 07 Apr 2022 17:23:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pgw: Add expected_results.xml
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27682 ) Change subject: pgw: Add expected_results.xml .. pgw: Add expected_results.xml Change-Id: I451b10a7b79854e630e7f2d487423dc39ade5bbd --- A pgw/expected_results.xml 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/pgw/expected_results.xml b/pgw/expected_results.xml new file mode 100644 index 000..65daf0e --- /dev/null +++ b/pgw/expected_results.xml @@ -0,0 +1,9 @@ + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27682 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: I451b10a7b79854e630e7f2d487423dc39ade5bbd Gerrit-Change-Number: 27682 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: pgw: Add T_guard
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27661 )
Change subject: pgw: Add T_guard
..
pgw: Add T_guard
Change-Id: I9dce4aee4a0b1181bb7dc1a53fb254e6d17cf22e
---
M pgw/PGW_Tests.ttcn
1 file changed, 14 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
laforge: Looks good to me, approved
diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn
index d9f4979..a65ca43 100644
--- a/pgw/PGW_Tests.ttcn
+++ b/pgw/PGW_Tests.ttcn
@@ -40,6 +40,16 @@
var DIAMETER_Emulation_CT vc_DIAMETER;
port DIAMETER_PT DIAMETER_UNIT;
port DIAMETEREM_PROC_PT DIAMETER_PROC;
+ /* global test case guard timer (actual timeout value is set in
f_init()) */
+ timer T_guard;
+}
+
+/* global altstep for global guard timer; */
+altstep as_Tguard() runs on PGW_Test_CT {
+ [] T_guard.timeout {
+ setverdict(fail, "Timeout of T_guard");
+ mtc.stop;
+ }
}
/* per-session component; we typically have 1..N per testcase */
@@ -138,7 +148,10 @@
f_diameter_wait_capability(DIAMETER_UNIT);
}
-private function f_init() runs on PGW_Test_CT {
+private function f_init(float guard_timeout := 60.0) runs on PGW_Test_CT {
+ T_guard.start(guard_timeout);
+ activate(as_Tguard());
+
var Gtp2EmulationCfg cfg := {
gtpc_bind_ip := mp_local_hostname_c,
gtpc_bind_port := GTP2C_PORT,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27661
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: I9dce4aee4a0b1181bb7dc1a53fb254e6d17cf22e
Gerrit-Change-Number: 27661
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
