This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Harald Welte gerrit-no-reply at lists.osmocom.org
Review at https://gerrit.osmocom.org/6182
RSL_Emulation: Permit registration of explicit Channel Number
During assignment or hand-over, a given TTCN-3 component may be
interested in registering more than one channel number. Add an explicit
procedure port with associated registration procedure, similar to what
we already do in GSUP, MNCC and others.
Change-Id: Iba37bf9541c779b79e179f995cdfa677633fadeb
---
M bsc/BSC_Tests.ttcn
M library/RSL_Emulation.ttcn
2 files changed, 77 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/6182/1
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 29150ce..7e5b675 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -1222,6 +1222,7 @@
connect(vc_conn:BSSMAPEM, vc_BSSMAP:PROC);
connect(vc_conn:MGCP_PROC, vc_MGCP:MGCP_PROC);
connect(vc_conn:RSL, bts[0].rsl.vc_RSL:CLIENT_PT);
+ connect(vc_conn:RSL_PROC, bts[0].rsl.vc_RSL:RSL_PROC);
connect(vc_conn:BSSAP, vc_BSSMAP:CLIENT);
connect(vc_conn:MGCP, vc_MGCP:MGCP_CLIENT);
vc_conn.start(derefers(fn)(id));
diff --git a/library/RSL_Emulation.ttcn b/library/RSL_Emulation.ttcn
index a19e627..cbcff2c 100644
--- a/library/RSL_Emulation.ttcn
+++ b/library/RSL_Emulation.ttcn
@@ -31,6 +31,7 @@
type component RSL_DchanHdlr {
/* port facing up towards dedicated channel handler */
port RSL_DCHAN_PT RSL;
+ port RSLEM_PROC_PT RSL_PROC;
var RslChannelNr g_chan_nr;
};
@@ -46,6 +47,12 @@
type port RSL_DCHAN_PT message {
inout RSLDC_ChanRqd, RSL_Message;
+} with { extension "internal" };
+
+signature RSLEM_register(uint8_t trx_nr, RslChannelNr chan_nr, RSL_DchanHdlr hdlr);
+
+type port RSLEM_PROC_PT procedure {
+ inout RSLEM_register;
} with { extension "internal" };
/***********************************************************************
@@ -163,7 +170,8 @@
runs on RSL_Emulation_CT return integer {
var integer i;
for (i := 0; i < sizeof(ConnectionTable); i := i+1) {
- if (not ispresent(ConnectionTable[i].ra)) {
+ if (not ispresent(ConnectionTable[i].ra) and
+ not ispresent(ConnectionTable[i].trx_nr)) {
ConnectionTable[i].ra := ra;
ConnectionTable[i].ra_fn := fn;
ConnectionTable[i].comp_ref := comp_ref;
@@ -174,14 +182,52 @@
return -1;
}
+/* create an ew client with given RA and FN */
+private function f_cid_create_cnr(uint8_t trx_nr, RslChannelNr chan_nr, RSL_DchanHdlr comp_ref)
+runs on RSL_Emulation_CT return integer {
+ var integer i;
+ for (i := 0; i < sizeof(ConnectionTable); i := i+1) {
+ if (not ispresent(ConnectionTable[i].ra) and
+ not ispresent(ConnectionTable[i].trx_nr)) {
+ ConnectionTable[i].stream_id := f_streamId_by_trx(trx_nr);
+ ConnectionTable[i].trx_nr := trx_nr;
+ ConnectionTable[i].chan_nr := chan_nr;
+ ConnectionTable[i].comp_ref := comp_ref;
+ return i;
+ }
+ }
+ log("No free entry in conn table for ", trx_nr, chan_nr, comp_ref);
+ return -1;
+}
+
+
+/* create an ew client with given RA and FN */
+private function f_cid_delete_cnr(IpaStreamId stream_id, RslChannelNr chan_nr, RSL_DchanHdlr comp_ref)
+runs on RSL_Emulation_CT return integer {
+ var integer i;
+ for (i := 0; i < sizeof(ConnectionTable); i := i+1) {
+ if (ConnectionTable[i].comp_ref == null) {
+ continue;
+ }
+ if (ConnectionTable[i].stream_id == stream_id and
+ ConnectionTable[i].chan_nr == chan_nr and
+ ConnectionTable[i].comp_ref == comp_ref) {
+ f_cid_clear(i);
+ }
+ }
+ log("Unable to find entry to delete for ", stream_id, chan_nr, comp_ref);
+ return -1;
+}
+
+
private function f_cid_clear(integer cid)
runs on RSL_Emulation_CT {
ConnectionTable[cid].ra := omit;
ConnectionTable[cid].ra_fn := omit;
- ConnectionTable[cid].ra_fn := omit;
ConnectionTable[cid].trx_nr := omit;
ConnectionTable[cid].stream_id := omit;
ConnectionTable[cid].chan_nr := omit;
+ ConnectionTable[cid].comp_ref := null;
}
type component RSL_Emulation_CT {
@@ -189,6 +235,7 @@
port IPA_RSL_PT IPA_PT;
/* port facing up towards dedicated channel handler */
port RSL_DCHAN_PT CLIENT_PT;
+ port RSLEM_PROC_PT RSL_PROC;
/* state of all concurrent connections / dedicated channels */
var ConnectionData ConnectionTable[64];
@@ -205,12 +252,24 @@
return enum2int(id);
}
+private function f_streamId_by_trx(uint8_t trx_nr) return IpaStreamId {
+ select (trx_nr) {
+ case (0) { return IPAC_PROTO_RSL_TRX0; }
+ case (1) { return IPAC_PROTO_RSL_TRX1; }
+ case (2) { return IPAC_PROTO_RSL_TRX2; }
+ case (3) { return IPAC_PROTO_RSL_TRX3; }
+ }
+ self.stop;
+}
+
function main() runs on RSL_Emulation_CT {
var ASP_RSL_Unitdata rx_rsl;
var RSL_Message rx_rsl_msg;
var RSLDC_ChanRqd chan_rqd;
var RSL_DchanHdlr vc_conn;
+ var RslChannelNr chan_nr;
+ var uint8_t trx_nr;
var integer cid;
var integer i;
@@ -236,6 +295,7 @@
cid := f_cid_by_ra_fn(ra, fn);
if (cid == -1) {
setverdict(fail, "IMM ASS for unknown DChan");
+ self.stop;
}
/* update client with trx_nr */
ConnectionTable[cid].trx_nr := f_trx_by_streamId(rx_rsl.streamId);
@@ -280,7 +340,7 @@
/* blindly acknowledge all channel activations */
[] IPA_PT.receive(tr_RSL(tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV))) -> value rx_rsl {
- var RslChannelNr chan_nr := rx_rsl.rsl.ies[0].body.chan_nr;
+ chan_nr := rx_rsl.rsl.ies[0].body.chan_nr;
IPA_PT.send(ts_ASP_RSL_UD(rx_rsl.streamId, ts_RSL_CHAN_ACT_ACK(chan_nr, 23)));
}
@@ -313,6 +373,12 @@
IPA_PT.send(ts_ASP_RSL_UD(ConnectionTable[cid].stream_id, rx_rsl_msg));
}
+ /* explicit registration, e.g. in (non-immediate) assignment case */
+ [] RSL_PROC.getcall(RSLEM_register:{?,?,?}) -> param(trx_nr, chan_nr, vc_conn) {
+ f_cid_create_cnr(trx_nr, chan_nr, vc_conn);
+ RSL_PROC.reply(RSLEM_register:{trx_nr, chan_nr, vc_conn});
+ }
+
}
}
}
@@ -327,4 +393,11 @@
}
}
+/* client/conn_hdlr side function to use procedure port to register stream_id/chan_nr */
+function f_rslem_register(uint8_t trx_nr, RslChannelNr chan_nr) runs on RSL_DchanHdlr {
+ RSL_PROC.call(RSLEM_register:{trx_nr, chan_nr, self}) {
+ [] RSL_PROC.getreply(RSLEM_register:{?,?,?}) {};
+ }
+}
+
}
--
To view, visit https://gerrit.osmocom.org/6182
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba37bf9541c779b79e179f995cdfa677633fadeb
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>