Neels Hofmeyr has uploaded this change for review. (
https://gerrit.osmocom.org/9627
Change subject: log / comment tweaks
......................................................................
log / comment tweaks
MSC_ConnectionHandler: log content of IPA CRCX ACK. The IPACC CRCX isn't
easily readable in wireshark, and I wanted to see what we were actually
sending.
BSC_Tests: sprinkle logs to illustrate what the dyn PDCH tests expect.
BSC_Tests: tweak comment to mention that inter-BSC HO MT *does* allow N-CONNECT
from MSC.
f_tc_assignment_fr_a5_1_codec_missing: mark the missing IE beyond doubt.
Change-Id: I93c2914e766e200d89308cc81dd803e939b9b28c
---
M bsc/BSC_Tests.ttcn
M bsc/MSC_ConnectionHandler.ttcn
2 files changed, 12 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/27/9627/1
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index df51e7f..3bd1096 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -522,7 +522,8 @@
* Assignment Testing
***********************************************************************/
-/* Verify that the BSC refuses any BSSAP connection from the MSC (They are all
BSC->MSC direction) */
+/* Verify that the BSC refuses any BSSAP connection from the MSC (They are all
BSC->MSC direction,
+ * except for the inter-BSC handover, MT side) */
testcase TC_outbound_connect() runs on test_CT {
f_init(1);
@@ -1577,6 +1578,8 @@
const OCT8 kc := '0001020304050607'O;
ass_cmd.pdu.bssmap.assignmentRequest.channelType :=
valueof(ts_BSSMAP_IE_ChannelType);
+ /* Omit: ass_cmd.pdu.bssmap.assignmentRequest.codecList */
+
f_establish_fully(ass_cmd, exp_fail);
}
testcase TC_assignment_fr_a5_1_codec_missing() runs on test_CT {
@@ -2289,26 +2292,31 @@
var RslChannelNr chan_nr := valueof(t_RslChanNr_Bm(6));
+ log("TCH/F_PDCH pchan starts out in TCH/F mode:");
f_ts_dyn_mode_assert(0, 0, chan_nr.tn, TCHF_MODE);
/* The BSC will activate the dynamic PDCH by default, so confirm that */
rsl_unused := f_exp_ipa_rx(0, tr_RSL_IPA_PDCH_ACT(chan_nr));
f_ipa_tx(0, ts_RSL_IPA_PDCH_ACT_ACK(chan_nr,
ts_RSL_IE_FrameNumber(2342)));
f_sleep(1.0);
+ log("TCH/F_PDCH pchan, PDCH ACT was ACKed, so now in PDCH mode:");
f_ts_dyn_mode_assert(0, 0, chan_nr.tn, PDCH_MODE);
/* De-activate it via VTY */
f_dyn_ipa_pdch_deact(0, 0, chan_nr.tn);
f_sleep(1.0);
+ log("TCH/F_PDCH pchan, PDCH DEACT via VTY, so now back in TCH/F mode:");
f_ts_dyn_mode_assert(0, 0, chan_nr.tn, TCHF_MODE);
/* re-activate it via VTY */
f_dyn_ipa_pdch_act(0, 0, chan_nr.tn);
f_sleep(1.0);
+ log("TCH/F_PDCH pchan, PDCH ACT via VTY, so now in PDCH mode:");
f_ts_dyn_mode_assert(0, 0, chan_nr.tn, PDCH_MODE);
/* and finally de-activate it again */
f_dyn_ipa_pdch_deact(0, 0, chan_nr.tn);
f_sleep(1.0);
+ log("TCH/F_PDCH pchan, PDCH DEACT via VTY, so now back in TCH/F mode:");
f_ts_dyn_mode_assert(0, 0, chan_nr.tn, TCHF_MODE);
setverdict(pass);
@@ -2401,12 +2409,14 @@
var RslChannelNr chan_nr := valueof(t_RslChanNr_PDCH(6));
+ log("TCH/F_TCH/H_PDCH pchan starts out in disabled mode:");
f_ts_dyn_mode_assert(0, 0, chan_nr.tn, NONE_MODE);
/* The BSC will activate the dynamic PDCH by default, so confirm that */
rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr, ?));
f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, 2342));
f_sleep(1.0);
+ log("TCH/F_TCH/H_PDCH requested to PDCH ACT on startup, which was
ACKed, so now in PDCH:");
f_ts_dyn_mode_assert(0, 0, chan_nr.tn, PDCH_MODE);
setverdict(pass);
diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index 0846762..dffe331 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -147,6 +147,7 @@
if (f_rsl_find_ie(rsl, RSL_IE_IPAC_RTP_PAYLOAD2, ie)) {
g_media.bts.rtp_pt := ie.ipa_rtp_pt2;
}
+ log("Sending IPA CRCX ACK: host=", g_media.bts.bts.host, "
port=", g_media.bts.bts.port_nr, " pt=", g_media.bts.rtp_pt);
RSL.send(ts_RSL_IPA_CRCX_ACK(g_chan_nr, g_media.bts.conn_id,
oct2int(f_inet_addr(g_media.bts.bts.host)),
g_media.bts.bts.port_nr,
--
To view, visit https://gerrit.osmocom.org/9627
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I93c2914e766e200d89308cc81dd803e939b9b28c
Gerrit-Change-Number: 9627
Gerrit-PatchSet: 1
Gerrit-Owner: Neels Hofmeyr <[email protected]>
