diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
index 914683f..af11385 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
@@ -298,8 +298,17 @@
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 2
   llist_count(&vsub->cs.requests) == 0
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 3
+DLSMS Going to send a MT SMS
 DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071 callref 40000001) New transaction
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage increases to: 4
+DLSMS SMC(0) instance created for network
+DLSMS SMR(0) instance created for network.
+DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE
+DLSMS SMR(0) TX SMS RP-DATA
+DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK
+DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE
+DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING
+DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071 due to MMSMS_EST_REQ
 DMM Subscriber IMSI-901700000004620:MSISDN-46071 not paged yet, start paging.
   GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
   strcmp(paging_expecting_imsi, imsi) == 0
@@ -407,7 +416,13 @@
 DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED
 DPAG Paging success for IMSI-901700000004620:MSISDN-46071 (event=0)
 DPAG Calling paging cbfn.
+DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0)
 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + trans_sms == 1 (0x20: trans_sms)
+DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING
+DLSMS SMC(0) send CP data
+DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK
+DLSMS sending CP message (trans=0)
+DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 64 70 f1 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 
 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A
 - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
 - DTAP matches expected message
@@ -426,19 +441,39 @@
   MSC <--GERAN-A-- MS: SMS:0x04
 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4)
+DLSMS receiving data (trans_id=0, msg_type=SMS:0x04)
 DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING
 DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING
+DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK
+DLSMS SMC(0) received CP-ACK
+DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED
 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 1 (0x20: trans_sms)
   llist_count(&net->ran_conns) == 1
 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that
   MSC <--GERAN-A-- MS: SMS:0x01
 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
+DLSMS receiving data (trans_id=0, msg_type=SMS:0x01)
 DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING
+DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED
+DLSMS SMC(0) received CP-DATA
+DLSMS sending CP message (trans=0)
+DLSMS GSM4.11 TX 09 04 
 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-46071 via GERAN-A
 - DTAP --GERAN-A--> MS: SMS:0x04: 0904
 - DTAP matches expected message
+DLSMS MNSMS-DATA/EST-IND
+DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK
+DLSMS SMR(0) RX SMS RP-ACK
+DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE
+DLSMS RX SMS RP-ACK (MO)
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 3
+DLSMS SMR(0) TX: MNSMS-REL-REQ
+DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED
+DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE
+DLSMS Got MMSMS_REL_REQ, destroying transaction.
+DLSMS SMR(0) clearing SMR instance
+DLSMS SMC(0) clearing instance
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071 usage decreases to: 2
 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - trans_sms == 1 (0x2: dtap)
 DREF IMSI-901700000004620:MSISDN-46071: MSC conn use - dtap == 0 (0x0: )
@@ -838,8 +873,17 @@
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 2
   llist_count(&vsub->cs.requests) == 0
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 3
+DLSMS Going to send a MT SMS
 DCC (ti 00 sub IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 callref 40000002) New transaction
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage increases to: 4
+DLSMS SMC(0) instance created for network
+DLSMS SMR(0) instance created for network.
+DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE
+DLSMS SMR(0) TX SMS RP-DATA
+DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK
+DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE
+DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING
+DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 due to MMSMS_EST_REQ
 DMM Subscriber IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 not paged yet, start paging.
   GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0x03020100, LAC 23
   paging_expecting_tmsi == 0x03020100
@@ -947,7 +991,13 @@
 DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED
 DPAG Paging success for IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 (event=0)
 DPAG Calling paging cbfn.
+DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0)
 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + trans_sms == 1 (0x20: trans_sms)
+DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING
+DLSMS SMC(0) send CP data
+DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK
+DLSMS sending CP message (trans=0)
+DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 64 70 f1 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 
 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 via GERAN-A
 - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
 - DTAP matches expected message
@@ -966,19 +1016,39 @@
   MSC <--GERAN-A-- MS: SMS:0x04
 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4)
+DLSMS receiving data (trans_id=0, msg_type=SMS:0x04)
 DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING
 DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING
+DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK
+DLSMS SMC(0) received CP-ACK
+DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED
 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use - dtap == 1 (0x20: trans_sms)
   llist_count(&net->ran_conns) == 1
 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that
   MSC <--GERAN-A-- MS: SMS:0x01
 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
+DLSMS receiving data (trans_id=0, msg_type=SMS:0x01)
 DMM RAN_conn(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING
+DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED
+DLSMS SMC(0) received CP-DATA
+DLSMS sending CP message (trans=0)
+DLSMS GSM4.11 TX 09 04 
 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 via GERAN-A
 - DTAP --GERAN-A--> MS: SMS:0x04: 0904
 - DTAP matches expected message
+DLSMS MNSMS-DATA/EST-IND
+DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK
+DLSMS SMR(0) RX SMS RP-ACK
+DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE
+DLSMS RX SMS RP-ACK (MO)
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage decreases to: 3
+DLSMS SMR(0) TX: MNSMS-REL-REQ
+DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED
+DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE
+DLSMS Got MMSMS_REL_REQ, destroying transaction.
+DLSMS SMR(0) clearing SMR instance
+DLSMS SMC(0) clearing instance
 DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 usage decreases to: 2
 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use - trans_sms == 1 (0x2: dtap)
 DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use - dtap == 0 (0x0: )
@@ -2086,8 +2156,17 @@
 DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 2
   llist_count(&vsub->cs.requests) == 0
 DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 3
+DLSMS Going to send a MT SMS
 DCC (ti 00 sub IMSI-901700000010650:MSISDN-42342 callref 40000003) New transaction
 DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage increases to: 4
+DLSMS SMC(0) instance created for network
+DLSMS SMR(0) instance created for network.
+DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE
+DLSMS SMR(0) TX SMS RP-DATA
+DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK
+DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE
+DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING
+DLSMS Initiating Paging procedure for IMSI-901700000010650:MSISDN-42342 due to MMSMS_EST_REQ
 DMM Subscriber IMSI-901700000010650:MSISDN-42342 not paged yet, start paging.
   GERAN-A sends out paging request to IMSI 901700000010650, TMSI 0xffffffff, LAC 23
   strcmp(paging_expecting_imsi, imsi) == 0
@@ -2185,7 +2264,13 @@
 DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED
 DPAG Paging success for IMSI-901700000010650:MSISDN-42342 (event=0)
 DPAG Calling paging cbfn.
+DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0)
 DREF IMSI-901700000010650:MSISDN-42342: MSC conn use + trans_sms == 1 (0x20: trans_sms)
+DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING
+DLSMS SMC(0) send CP data
+DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK
+DLSMS sending CP message (trans=0)
+DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 24 43 f2 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 
 DMSC msc_tx 91 bytes to IMSI-901700000010650:MSISDN-42342 via GERAN-A
 - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
 - DTAP matches expected message
@@ -2204,19 +2289,39 @@
   MSC <--GERAN-A-- MS: SMS:0x04
 DREF IMSI-901700000010650:MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4)
+DLSMS receiving data (trans_id=0, msg_type=SMS:0x04)
 DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING
 DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING
+DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK
+DLSMS SMC(0) received CP-ACK
+DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED
 DREF IMSI-901700000010650:MSISDN-42342: MSC conn use - dtap == 1 (0x20: trans_sms)
   llist_count(&net->ran_conns) == 1
 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that
   MSC <--GERAN-A-- MS: SMS:0x01
 DREF IMSI-901700000010650:MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
+DLSMS receiving data (trans_id=0, msg_type=SMS:0x01)
 DMM RAN_conn(IMSI-901700000010650:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING
+DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED
+DLSMS SMC(0) received CP-DATA
+DLSMS sending CP message (trans=0)
+DLSMS GSM4.11 TX 09 04 
 DMSC msc_tx 2 bytes to IMSI-901700000010650:MSISDN-42342 via GERAN-A
 - DTAP --GERAN-A--> MS: SMS:0x04: 0904
 - DTAP matches expected message
+DLSMS MNSMS-DATA/EST-IND
+DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK
+DLSMS SMR(0) RX SMS RP-ACK
+DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE
+DLSMS RX SMS RP-ACK (MO)
 DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage decreases to: 3
+DLSMS SMR(0) TX: MNSMS-REL-REQ
+DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED
+DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE
+DLSMS Got MMSMS_REL_REQ, destroying transaction.
+DLSMS SMR(0) clearing SMR instance
+DLSMS SMC(0) clearing instance
 DREF VLR subscr IMSI-901700000010650:MSISDN-42342 usage decreases to: 2
 DREF IMSI-901700000010650:MSISDN-42342: MSC conn use - trans_sms == 1 (0x2: dtap)
 DREF IMSI-901700000010650:MSISDN-42342: MSC conn use - dtap == 0 (0x0: )
@@ -2576,8 +2681,17 @@
 DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 2
   llist_count(&vsub->cs.requests) == 0
 DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 3
+DLSMS Going to send a MT SMS
 DCC (ti 00 sub IMSI-901700000004620:MSISDN-42342 callref 40000004) New transaction
 DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 4
+DLSMS SMC(0) instance created for network
+DLSMS SMR(0) instance created for network.
+DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE
+DLSMS SMR(0) TX SMS RP-DATA
+DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK
+DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE
+DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING
+DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-42342 due to MMSMS_EST_REQ
 DMM Subscriber IMSI-901700000004620:MSISDN-42342 not paged yet, start paging.
   GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
   strcmp(paging_expecting_imsi, imsi) == 0
@@ -2685,7 +2799,13 @@
 DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED
 DPAG Paging success for IMSI-901700000004620:MSISDN-42342 (event=0)
 DPAG Calling paging cbfn.
+DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0)
 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use + trans_sms == 1 (0x20: trans_sms)
+DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING
+DLSMS SMC(0) send CP data
+DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK
+DLSMS sending CP message (trans=0)
+DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 24 43 f2 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 
 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-42342 via GERAN-A
 - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
 - DTAP matches expected message
@@ -2704,19 +2824,39 @@
   MSC <--GERAN-A-- MS: SMS:0x04
 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4)
+DLSMS receiving data (trans_id=0, msg_type=SMS:0x04)
 DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING
 DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING
+DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK
+DLSMS SMC(0) received CP-ACK
+DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED
 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use - dtap == 1 (0x20: trans_sms)
   llist_count(&net->ran_conns) == 1
 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that
   MSC <--GERAN-A-- MS: SMS:0x01
 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
+DLSMS receiving data (trans_id=0, msg_type=SMS:0x01)
 DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING
+DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED
+DLSMS SMC(0) received CP-DATA
+DLSMS sending CP message (trans=0)
+DLSMS GSM4.11 TX 09 04 
 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-42342 via GERAN-A
 - DTAP --GERAN-A--> MS: SMS:0x04: 0904
 - DTAP matches expected message
+DLSMS MNSMS-DATA/EST-IND
+DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK
+DLSMS SMR(0) RX SMS RP-ACK
+DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE
+DLSMS RX SMS RP-ACK (MO)
 DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage decreases to: 3
+DLSMS SMR(0) TX: MNSMS-REL-REQ
+DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED
+DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE
+DLSMS Got MMSMS_REL_REQ, destroying transaction.
+DLSMS SMR(0) clearing SMR instance
+DLSMS SMC(0) clearing instance
 DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage decreases to: 2
 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use - trans_sms == 1 (0x2: dtap)
 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use - dtap == 0 (0x0: )
@@ -3076,8 +3216,17 @@
 DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 2
   llist_count(&vsub->cs.requests) == 0
 DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 3
+DLSMS Going to send a MT SMS
 DCC (ti 00 sub IMSI-901700000004620:MSISDN-42342 callref 40000005) New transaction
 DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage increases to: 4
+DLSMS SMC(0) instance created for network
+DLSMS SMR(0) instance created for network.
+DLSMS SMR(0) message SM-RL-DATA_REQ received in state IDLE
+DLSMS SMR(0) TX SMS RP-DATA
+DLSMS SMR(0) new RP state IDLE -> WAIT_FOR_RP_ACK
+DLSMS SMC(0) message MNSMS-EST-REQ received in state IDLE
+DLSMS SMC(0) new CP state IDLE -> MM_CONN_PENDING
+DLSMS Initiating Paging procedure for IMSI-901700000004620:MSISDN-42342 due to MMSMS_EST_REQ
 DMM Subscriber IMSI-901700000004620:MSISDN-42342 not paged yet, start paging.
   GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
   strcmp(paging_expecting_imsi, imsi) == 0
@@ -3180,7 +3329,13 @@
 DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_ACCEPTED
 DPAG Paging success for IMSI-901700000004620:MSISDN-42342 (event=0)
 DPAG Calling paging cbfn.
+DLSMS paging_cb_mmsms_est_req(hooknum=1, event=0)
 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use + trans_sms == 1 (0x20: trans_sms)
+DLSMS SMC(0) message MMSMS-EST-CNF received in state MM_CONN_PENDING
+DLSMS SMC(0) send CP data
+DLSMS SMC(0) new CP state MM_CONN_PENDING -> WAIT_CP_ACK
+DLSMS sending CP message (trans=0)
+DLSMS GSM4.11 TX 09 01 58 01 00 07 91 44 77 58 10 06 50 00 4c 00 05 80 24 43 f2 00 00 07 10 10 00 00 00 00 44 50 79 da 1e 1e e7 41 69 37 48 5e 9e a7 c9 65 37 3d 1d 66 83 c2 70 38 3b 3d 0e d3 d3 6f f7 1c 94 9e 83 c2 20 72 79 9e 96 87 c5 ec 32 a8 1d 96 af cb f4 b4 fb 0c 7a c3 e9 e9 b7 db 05 
 DMSC msc_tx 91 bytes to IMSI-901700000004620:MSISDN-42342 via GERAN-A
 - DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
 - DTAP matches expected message
@@ -3199,19 +3354,39 @@
   MSC <--GERAN-A-- MS: SMS:0x04
 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4)
+DLSMS receiving data (trans_id=0, msg_type=SMS:0x04)
 DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING
 DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING
+DLSMS SMC(0) message MMSMS-DATA-IND (CP ACK) received in state WAIT_CP_ACK
+DLSMS SMC(0) received CP-ACK
+DLSMS SMC(0) new CP state WAIT_CP_ACK -> MM_ESTABLISHED
 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use - dtap == 1 (0x20: trans_sms)
   llist_count(&net->ran_conns) == 1
 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that
   MSC <--GERAN-A-- MS: SMS:0x01
 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
+DLSMS receiving data (trans_id=0, msg_type=SMS:0x01)
 DMM RAN_conn(IMSI-901700000004620:MSISDN-42342:GERAN-A-0:PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING
+DLSMS SMC(0) message MMSMS-DATA-IND (CP DATA) received in state MM_ESTABLISHED
+DLSMS SMC(0) received CP-DATA
+DLSMS sending CP message (trans=0)
+DLSMS GSM4.11 TX 09 04 
 DMSC msc_tx 2 bytes to IMSI-901700000004620:MSISDN-42342 via GERAN-A
 - DTAP --GERAN-A--> MS: SMS:0x04: 0904
 - DTAP matches expected message
+DLSMS MNSMS-DATA/EST-IND
+DLSMS SMR(0) message MNSMS-DATA-IND received in state WAIT_FOR_RP_ACK
+DLSMS SMR(0) RX SMS RP-ACK
+DLSMS SMR(0) new RP state WAIT_FOR_RP_ACK -> IDLE
+DLSMS RX SMS RP-ACK (MO)
 DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage decreases to: 3
+DLSMS SMR(0) TX: MNSMS-REL-REQ
+DLSMS SMC(0) message MNSMS-REL-REQ received in state MM_ESTABLISHED
+DLSMS SMC(0) new CP state MM_ESTABLISHED -> IDLE
+DLSMS Got MMSMS_REL_REQ, destroying transaction.
+DLSMS SMR(0) clearing SMR instance
+DLSMS SMC(0) clearing instance
 DREF VLR subscr IMSI-901700000004620:MSISDN-42342 usage decreases to: 2
 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use - trans_sms == 1 (0x2: dtap)
 DREF IMSI-901700000004620:MSISDN-42342: MSC conn use - dtap == 0 (0x0: )