Change in osmo-ttcn3-hacks[master]: msc: fix Iu mo call

2019-11-23 Thread laforge 
laforge has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15939 )

Change subject: msc: fix Iu mo call
..

msc: fix Iu mo call

Change-Id: I0ead36333ab665147b8d222070ea5cf8afc555ec
---
M library/ranap/RANAP_Templates.ttcn
M msc/BSC_ConnectionHandler.ttcn
2 files changed, 48 insertions(+), 31 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/library/ranap/RANAP_Templates.ttcn 
b/library/ranap/RANAP_Templates.ttcn
index df4ea03..a1b0a59 100644
--- a/library/ranap/RANAP_Templates.ttcn
+++ b/library/ranap/RANAP_Templates.ttcn
@@ -1305,7 +1305,7 @@
protocolIEs := {
{
id := id_RAB_SetupOrModifyList,
-   criticality := reject,
+   criticality := ignore,
value_ := {
rAB_SetupOrModifyList 
:= rab_sml
}
diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index 4330b53..7bbae34 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -1091,6 +1091,20 @@
}
 }

+private altstep as_optional_mgcp_dlcx(CallParameters cpars) runs on 
BSC_ConnHdlr {
+   var MgcpCommand mgcp_cmd;
+   var boolean respond_to_dlcx := not (isbound(cpars.mgw_drop_dlcx) and 
valueof(cpars.mgw_drop_dlcx));
+   [] MGCP.receive(tr_DLCX(?)) -> value mgcp_cmd {
+   log("as_optional_mgcp_dlcx: rx MGCP DLCX");
+   if (respond_to_dlcx) {
+   MGCP.send(ts_DLCX_ACK2(mgcp_cmd.line.trans_id));
+   }
+   /* Without this 'repeat', currently active other interleave and 
alt series exit as soon as a
+* DLCX is handled. */
+   repeat;
+   }
+}
+
 function f_mo_call_establish(inout CallParameters cpars)
 runs on BSC_ConnHdlr {

@@ -1099,6 +1113,7 @@
var template MgcpResponse mgcp_resp;
var boolean respond_to_dlcx;
var PDU_BSSAP bssap;
+   var RANAP_PDU ranap;
var MgcpOsmuxCID osmux_cid;

cpars.mo_call := true;
@@ -1193,11 +1208,29 @@
}
BSSAP.send(bssap);
}
-   /*
-   [!g_pars.ran_is_geran] BSSAP.receive(tr_RANAP_RabAssReq(rab_sml)) {
-   //BSSAP.send(ts_RANAP_RabAssResp(rab_sml)); FIXME
+   [] BSSAP.receive(tr_RANAP_RabAssReq(*)) -> value ranap {
+   log("f_mo_call_establish 4.iu: rx RANAP RAB Assignment 
Request");
+   var RAB_SetupOrModifiedList l := {
+   {
+   {
+   id := id_RAB_SetupOrModifiedItem,
+   criticality := ignore,
+   value_ := {
+ rAB_SetupOrModifiedItem := {
+   rAB_ID := int2bit(23, 8),
+   transportLayerAddress := 
hex2bit( '350001c0a8021500'H),
+   iuTransportAssociation := {
+   bindingID := '040c'O
+   },
+   dl_dataVolumes := omit,
+   iE_Extensions := omit
+   }
+   }
+   }
+   }
+   };
+   BSSAP.send(ts_RANAP_RabAssResp(l));
}
-   */

/* MDCX setting up the RAN side remote RTP address received from 
Assignment Complete */
[] MGCP.receive(tr_MDCX) -> value mgcp_cmd {
@@ -1315,48 +1348,32 @@
respond_to_dlcx := not (isbound(cpars.mgw_drop_dlcx) and 
valueof(cpars.mgw_drop_dlcx));

var default mdcx := 
activate(as_optional_mgcp_mdcx(cpars.mgw_conn_2.mgw_rtp_ip, 
cpars.mgw_conn_2.mgw_rtp_port));
+   var default dlcx := activate(as_optional_mgcp_dlcx(cpars));

/* clearing of radio channel */
-   interleave {
-   //[g_pars.ran_is_geran] BSSAP.receive(t_clear) {
-   [] BSSAP.receive(t_clear) {
+   alt {
+   [g_pars.ran_is_geran] BSSAP.receive(t_clear) {
log("f_call_hangup 5: rx BSSAP Clear Command");
BSSAP.send(ts_BSSMAP_ClearComplete);
BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND);
log("f_call_hangup 6: rx SCCP DISC");
+   setverdict(pass)

Change in osmo-ttcn3-hacks[master]: msc: fix Iu mo call

2019-11-18 Thread laforge 
laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15939 )

Change subject: msc: fix Iu mo call
..


Patch Set 3: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15939
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: I0ead36333ab665147b8d222070ea5cf8afc555ec
Gerrit-Change-Number: 15939
Gerrit-PatchSet: 3
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Reviewer: pespin 
Gerrit-Comment-Date: Tue, 19 Nov 2019 00:59:08 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in osmo-ttcn3-hacks[master]: msc: fix Iu mo call

2019-11-14 Thread pespin 
pespin has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15939 )

Change subject: msc: fix Iu mo call
..


Patch Set 3: Code-Review+1


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15939
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: I0ead36333ab665147b8d222070ea5cf8afc555ec
Gerrit-Change-Number: 15939
Gerrit-PatchSet: 3
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin 
Gerrit-CC: laforge 
Gerrit-Comment-Date: Thu, 14 Nov 2019 12:21:54 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

Change in osmo-ttcn3-hacks[master]: msc: fix Iu mo call

2019-11-14 Thread laforge 
laforge has uploaded a new patch set (#3) to the change originally created by 
neels. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15939 )

Change subject: msc: fix Iu mo call
..

msc: fix Iu mo call

Change-Id: I0ead36333ab665147b8d222070ea5cf8afc555ec
---
M library/ranap/RANAP_Templates.ttcn
M msc/BSC_ConnectionHandler.ttcn
2 files changed, 48 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/39/15939/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15939
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: I0ead36333ab665147b8d222070ea5cf8afc555ec
Gerrit-Change-Number: 15939
Gerrit-PatchSet: 3
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge 
Gerrit-MessageType: newpatchset

Change in osmo-ttcn3-hacks[master]: msc: fix Iu mo call

2019-11-14 Thread laforge 
laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15939 )

Change subject: msc: fix Iu mo call
..


Patch Set 2:

see my earlier review comment regarding criticality. I cannot see any related 
change in v2.


--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15939
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: I0ead36333ab665147b8d222070ea5cf8afc555ec
Gerrit-Change-Number: 15939
Gerrit-PatchSet: 2
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge 
Gerrit-Comment-Date: Thu, 14 Nov 2019 10:33:12 +
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

Change in osmo-ttcn3-hacks[master]: msc: fix Iu mo call

2019-11-04 Thread laforge 
laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15939 )

Change subject: msc: fix Iu mo call
..


Patch Set 1:

(1 comment)

https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15939/1/library/ranap/RANAP_Templates.ttcn
File library/ranap/RANAP_Templates.ttcn:

https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15939/1/library/ranap/RANAP_Templates.ttcn@1309
PS1, Line 1309: value_ := {
actually, the criticality specified by Section 9.1.2 of TS 25.413 is "ignore" 
so we should set it here.  The purpose of the tests is to test the specs as 
closely as possible, while not making too many assumptions on the 
implementation details.  However, as the criticality permitted here is only 
'ignore', we should check for that.



--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15939
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: I0ead36333ab665147b8d222070ea5cf8afc555ec
Gerrit-Change-Number: 15939
Gerrit-PatchSet: 1
Gerrit-Owner: neels 
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge 
Gerrit-Comment-Date: Mon, 04 Nov 2019 10:38:23 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

Change in osmo-ttcn3-hacks[master]: msc: fix Iu mo call

2019-11-03 Thread neels 
neels has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15939 )


Change subject: msc: fix Iu mo call
..

msc: fix Iu mo call

Change-Id: I0ead36333ab665147b8d222070ea5cf8afc555ec
---
M library/ranap/RANAP_Templates.ttcn
M msc/BSC_ConnectionHandler.ttcn
2 files changed, 48 insertions(+), 31 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/39/15939/1

diff --git a/library/ranap/RANAP_Templates.ttcn 
b/library/ranap/RANAP_Templates.ttcn
index df4ea03..c616231 100644
--- a/library/ranap/RANAP_Templates.ttcn
+++ b/library/ranap/RANAP_Templates.ttcn
@@ -1305,7 +1305,7 @@
protocolIEs := {
{
id := id_RAB_SetupOrModifyList,
-   criticality := reject,
+   criticality := ?,
value_ := {
rAB_SetupOrModifyList 
:= rab_sml
}
diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index 23697da..b11d24b 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -1091,6 +1091,20 @@
}
 }

+private altstep as_optional_mgcp_dlcx(CallParameters cpars) runs on 
BSC_ConnHdlr {
+   var MgcpCommand mgcp_cmd;
+   var boolean respond_to_dlcx := not (isbound(cpars.mgw_drop_dlcx) and 
valueof(cpars.mgw_drop_dlcx));
+   [] MGCP.receive(tr_DLCX(?)) -> value mgcp_cmd {
+   log("as_optional_mgcp_dlcx: rx MGCP DLCX");
+   if (respond_to_dlcx) {
+   MGCP.send(ts_DLCX_ACK2(mgcp_cmd.line.trans_id));
+   }
+   /* Without this 'repeat', currently active other interleave and 
alt series exit as soon as a
+* DLCX is handled. */
+   repeat;
+   }
+}
+
 function f_mo_call_establish(inout CallParameters cpars)
 runs on BSC_ConnHdlr {

@@ -1099,6 +1113,7 @@
var template MgcpResponse mgcp_resp;
var boolean respond_to_dlcx;
var PDU_BSSAP bssap;
+   var RANAP_PDU ranap;
var MgcpOsmuxCID osmux_cid;

cpars.mo_call := true;
@@ -1193,11 +1208,29 @@
}
BSSAP.send(bssap);
}
-   /*
-   [!g_pars.ran_is_geran] BSSAP.receive(tr_RANAP_RabAssReq(rab_sml)) {
-   //BSSAP.send(ts_RANAP_RabAssResp(rab_sml)); FIXME
+   [] BSSAP.receive(tr_RANAP_RabAssReq(*)) -> value ranap {
+   log("f_mo_call_establish 4.iu: rx RANAP RAB Assignment 
Request");
+   var RAB_SetupOrModifiedList l := {
+   {
+   {
+   id := id_RAB_SetupOrModifiedItem,
+   criticality := ignore,
+   value_ := {
+ rAB_SetupOrModifiedItem := {
+   rAB_ID := int2bit(23, 8),
+   transportLayerAddress := 
hex2bit( '350001c0a8021500'H),
+   iuTransportAssociation := {
+   bindingID := '040c'O
+   },
+   dl_dataVolumes := omit,
+   iE_Extensions := omit
+   }
+   }
+   }
+   }
+   };
+   BSSAP.send(ts_RANAP_RabAssResp(l));
}
-   */

/* MDCX setting up the RAN side remote RTP address received from 
Assignment Complete */
[] MGCP.receive(tr_MDCX) -> value mgcp_cmd {
@@ -1315,48 +1348,32 @@
respond_to_dlcx := not (isbound(cpars.mgw_drop_dlcx) and 
valueof(cpars.mgw_drop_dlcx));

var default mdcx := 
activate(as_optional_mgcp_mdcx(cpars.mgw_conn_2.mgw_rtp_ip, 
cpars.mgw_conn_2.mgw_rtp_port));
+   var default dlcx := activate(as_optional_mgcp_dlcx(cpars));

/* clearing of radio channel */
-   interleave {
-   //[g_pars.ran_is_geran] BSSAP.receive(t_clear) {
-   [] BSSAP.receive(t_clear) {
+   alt {
+   [g_pars.ran_is_geran] BSSAP.receive(t_clear) {
log("f_call_hangup 5: rx BSSAP Clear Command");
BSSAP.send(ts_BSSMAP_ClearComplete);
BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND);
log("f_call_hangup 6: rx SCCP DISC");
+   setverdict(pass);
}
-   /*
-   [!g_pars