Change in osmo-msc[master]: Store subscriber's cell identity in ran_conn

2019-01-24 Thread Max 
Max has posted comments on this change. ( https://gerrit.osmocom.org/11746 )

Change subject: Store subscriber's cell identity in ran_conn
..


Patch Set 6:

(1 comment)

> Meta: AFAIK we already store the entire CGI in the vlr_subscr?
> maybe we should instead drop the LAC info from struct ran_conn completely?

Fine by me.

> (code looks like we are never storing the CI part of vls_subscr->cgi, that 
> would be nice to fix)

The question is if it's ok to use vls_subscr's CGI - do we have 1:1 relation 
between ran_conn and vls_subscr after your handover changes?

> Meta meta: in the course of inter-MSC HO I am refactoring what the ran_conn 
> represents, so I'd prefer to park this patch and revisit after the inter-MSC 
> changes, to avoid merge conflicts and back-and-forths.

I understand your concerns although it's kinda inconvenient to halt all OsmoMSC 
development until you're done with HO. Any chance you could start pushing 
ran_conn related changes to gerrit perhaps?

https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c
File src/libmsc/a_iface_bssap.c:

https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c@320
PS2, Line 320:  case CELL_IDENT_CI:
> a CELL_IDENT_CI is *only* a CI without a LAC;

So it's impossible to have CI without LAC? Do you have a spec reference I can 
add in here instead of FIXME?



--
To view, visit https://gerrit.osmocom.org/11746
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e
Gerrit-Change-Number: 11746
Gerrit-PatchSet: 6
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Stefan Sperling 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Thu, 24 Jan 2019 12:11:25 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in osmo-msc[master]: Store subscriber's cell identity in ran_conn

2019-01-14 Thread Neels Hofmeyr 
Neels Hofmeyr has posted comments on this change. ( 
https://gerrit.osmocom.org/11746 )

Change subject: Store subscriber's cell identity in ran_conn
..


Patch Set 6:

(1 comment)

Meta: AFAIK we already store the entire CGI in the vlr_subscr?
maybe we should instead drop the LAC info from struct ran_conn completely?
(code looks like we are never storing the CI part of vls_subscr->cgi, that 
would be nice to fix)

Meta meta: in the course of inter-MSC HO I am refactoring what the ran_conn 
represents, so I'd prefer to park this patch and revisit after the inter-MSC 
changes, to avoid merge conflicts and back-and-forths.

https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c
File src/libmsc/a_iface_bssap.c:

https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c@320
PS2, Line 320:  case CELL_IDENT_CI:
a CELL_IDENT_CI is *only* a CI without a LAC; since any CI number can be 
re-used within each LAC, the CELL_IDENT_CI is intrinsically ambiguous.
I'm not sure who thought of specifying this Cell Identifier type, maybe it 
makes sense if your network has only one LAC??
Haven't seen it used anywhere.

I think it's okay to require a LAC, so I'd rather drop the FIXME comment.



--
To view, visit https://gerrit.osmocom.org/11746
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e
Gerrit-Change-Number: 11746
Gerrit-PatchSet: 6
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Stefan Sperling 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Mon, 14 Jan 2019 17:37:56 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in osmo-msc[master]: Store subscriber's cell identity in ran_conn

2019-01-10 Thread Max 
Max has posted comments on this change. ( https://gerrit.osmocom.org/11746 )

Change subject: Store subscriber's cell identity in ran_conn
..


Patch Set 6:

This change is ready for review.


--
To view, visit https://gerrit.osmocom.org/11746
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e
Gerrit-Change-Number: 11746
Gerrit-PatchSet: 6
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Stefan Sperling 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Thu, 10 Jan 2019 11:01:19 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in osmo-msc[master]: Store subscriber's cell identity

2019-01-08 Thread Vadim Yanitskiy 
Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/11746 )

Change subject: Store subscriber's cell identity
..


Patch Set 4:

(1 comment)

https://gerrit.osmocom.org/#/c/11746/4/src/libmsc/iucs.c
File src/libmsc/iucs.c:

https://gerrit.osmocom.org/#/c/11746/4/src/libmsc/iucs.c@59
PS4, Line 59: /* FIXME: is there equivalent for CI? */
https://en.wikipedia.org/wiki/Cell_ID



--
To view, visit https://gerrit.osmocom.org/11746
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e
Gerrit-Change-Number: 11746
Gerrit-PatchSet: 4
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Stefan Sperling 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Tue, 08 Jan 2019 12:54:29 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in osmo-msc[master]: Store subscriber's cell identity

2019-01-08 Thread Vadim Yanitskiy 
Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/11746 )

Change subject: Store subscriber's cell identity
..


Patch Set 4:

(1 comment)

https://gerrit.osmocom.org/#/c/11746/4//COMMIT_MSG
Commit Message:

https://gerrit.osmocom.org/#/c/11746/4//COMMIT_MSG@7
PS4, Line 7: Store
Please clarify *where*, for example:

  libmsc/ran_conn.h: store subscriber's cell identity
  Store subscriber's cell identity in ran_conn

Otherwise one can assume that it's stored in VLR.



--
To view, visit https://gerrit.osmocom.org/11746
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e
Gerrit-Change-Number: 11746
Gerrit-PatchSet: 4
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Stefan Sperling 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Tue, 08 Jan 2019 12:51:37 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in osmo-msc[master]: Store subscriber's cell identity

2019-01-08 Thread Max 
Hello Stefan Sperling, Vadim Yanitskiy, Neels Hofmeyr, Harald Welte, Jenkins 
Builder,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/11746

to look at the new patch set (#4).

Change subject: Store subscriber's cell identity
..

Store subscriber's cell identity

It's defined similar to LAC and could be potentially useful for
constructing GCR for LCLS.

Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e
Related: OS#2487
---
M include/osmocom/msc/ran_conn.h
M src/libmsc/a_iface_bssap.c
M src/libmsc/iucs.c
M src/libmsc/ran_conn.c
M tests/msc_vlr/msc_vlr_test_rest.c
M tests/msc_vlr/msc_vlr_tests.c
6 files changed, 20 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/46/11746/4
--
To view, visit https://gerrit.osmocom.org/11746
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e
Gerrit-Change-Number: 11746
Gerrit-PatchSet: 4
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Stefan Sperling 
Gerrit-Reviewer: Vadim Yanitskiy

Change in osmo-msc[master]: Store subscriber's cell identity

2019-01-07 Thread Harald Welte 
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11746 )

Change subject: Store subscriber's cell identity
..


Patch Set 3: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/11746
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e
Gerrit-Change-Number: 11746
Gerrit-PatchSet: 3
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Stefan Sperling 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Mon, 07 Jan 2019 16:01:23 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-msc[master]: Store subscriber's cell identity

2018-12-28 Thread Max 
Max has posted comments on this change. ( https://gerrit.osmocom.org/11746 )

Change subject: Store subscriber's cell identity
..


Patch Set 3:

(1 comment)

https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c
File src/libmsc/a_iface_bssap.c:

https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c@51
PS2, Line 51: struct osmo_sccp_user *scu, int conn_id)
> Programmers arguing about whitespace? Unheard of!

Python is a punishment for our sins! :)



--
To view, visit https://gerrit.osmocom.org/11746
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e
Gerrit-Change-Number: 11746
Gerrit-PatchSet: 3
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Stefan Sperling 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-CC: Harald Welte 
Gerrit-Comment-Date: Fri, 28 Dec 2018 14:43:25 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in osmo-msc[master]: Store subscriber's cell identity

2018-12-17 Thread Stefan Sperling 
Stefan Sperling has posted comments on this change. ( 
https://gerrit.osmocom.org/11746 )

Change subject: Store subscriber's cell identity
..


Patch Set 3: Code-Review+1

I don't see any harm from this but it would be nice to have a more clearly 
defined use case.


--
To view, visit https://gerrit.osmocom.org/11746
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e
Gerrit-Change-Number: 11746
Gerrit-PatchSet: 3
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Stefan Sperling 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-CC: Harald Welte 
Gerrit-Comment-Date: Mon, 17 Dec 2018 10:23:19 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes

Change in osmo-msc[master]: Store subscriber's cell identity

2018-12-17 Thread Stefan Sperling 
Stefan Sperling has posted comments on this change. ( 
https://gerrit.osmocom.org/11746 )

Change subject: Store subscriber's cell identity
..


Patch Set 3:

(1 comment)

https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c
File src/libmsc/a_iface_bssap.c:

https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c@51
PS2, Line 51: struct osmo_sccp_user *scu, int conn_id)
> How this makes it worse? The line I've added is properly aligned. […]
Programmers arguing about whitespace? Unheard of!



--
To view, visit https://gerrit.osmocom.org/11746
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e
Gerrit-Change-Number: 11746
Gerrit-PatchSet: 3
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-CC: Harald Welte 
Gerrit-CC: Stefan Sperling 
Gerrit-Comment-Date: Mon, 17 Dec 2018 10:21:38 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in osmo-msc[master]: Store subscriber's cell identity

2018-12-17 Thread Max 
Max has posted comments on this change. ( https://gerrit.osmocom.org/11746 )

Change subject: Store subscriber's cell identity
..


Patch Set 3:

(1 comment)

This change is ready for review.

https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c
File src/libmsc/a_iface_bssap.c:

https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c@51
PS2, Line 51: struct osmo_sccp_user *scu, int conn_id)
> TBH, this looks ugly. I am not a big fun of such fancy […]
How this makes it worse? The line I've added is properly aligned. Feel free to 
submit patch which aligns the rest of them right.



--
To view, visit https://gerrit.osmocom.org/11746
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e
Gerrit-Change-Number: 11746
Gerrit-PatchSet: 3
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-CC: Harald Welte 
Gerrit-Comment-Date: Mon, 17 Dec 2018 09:39:50 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: No

Change in osmo-msc[master]: Store subscriber's cell identity

2018-12-06 Thread Vadim Yanitskiy 
Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/11746 )

Change subject: Store subscriber's cell identity
..


Patch Set 2: Code-Review-1

(2 comments)

https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c
File src/libmsc/a_iface_bssap.c:

https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c@51
PS2, Line 51: struct osmo_sccp_user *scu, int conn_id)
TBH, this looks ugly. I am not a big fun of such fancy
\t\t\t...\s\s... alignment in general, but let's don't
make it even worse please ;)


https://gerrit.osmocom.org/#/c/11746/2/src/libmsc/a_iface_bssap.c@321
PS2, Line 321: ci = cil.id_list[0].ci;
If 'break' statement is not required here, please add a
comment to suppress possible warnings (e.g. from Coverity).



--
To view, visit https://gerrit.osmocom.org/11746
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e
Gerrit-Change-Number: 11746
Gerrit-PatchSet: 2
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-CC: Harald Welte 
Gerrit-Comment-Date: Thu, 06 Dec 2018 11:54:31 +
Gerrit-HasComments: Yes
Gerrit-HasLabels: Yes

Change in osmo-msc[master]: Store subscriber's cell identity

2018-12-06 Thread Max 
Max has posted comments on this change. ( https://gerrit.osmocom.org/11746 )

Change subject: Store subscriber's cell identity
..


Set Ready For Review


--
To view, visit https://gerrit.osmocom.org/11746
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e
Gerrit-Change-Number: 11746
Gerrit-PatchSet: 2
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-CC: Harald Welte 
Gerrit-Comment-Date: Thu, 06 Dec 2018 10:46:11 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in osmo-msc[master]: Store subscriber's cell identity

2018-12-06 Thread Max 
Max has posted comments on this change. ( https://gerrit.osmocom.org/11746 )

Change subject: Store subscriber's cell identity
..


Set Ready For Review


--
To view, visit https://gerrit.osmocom.org/11746
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e
Gerrit-Change-Number: 11746
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Max 
Gerrit-CC: Harald Welte 
Gerrit-Comment-Date: Thu, 06 Dec 2018 09:41:28 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in osmo-msc[master]: Store subscriber's cell identity

2018-11-18 Thread Harald Welte 
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/11746 )

Change subject: Store subscriber's cell identity
..


Patch Set 1:

can you please point me to the spec reference that states the CI is part of the 
GCR?


--
To view, visit https://gerrit.osmocom.org/11746
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e
Gerrit-Change-Number: 11746
Gerrit-PatchSet: 1
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-CC: Harald Welte 
Gerrit-Comment-Date: Sun, 18 Nov 2018 20:32:37 +
Gerrit-HasComments: No
Gerrit-HasLabels: No

Change in osmo-msc[master]: Store subscriber's cell identity

2018-11-12 Thread Max 
Max has uploaded this change for review. ( https://gerrit.osmocom.org/11746


Change subject: Store subscriber's cell identity
..

Store subscriber's cell identity

It's defined similar to LAC and could be potentially useful for
constructing GCR for LCLS.

Change-Id: I8544c30ea800ce8356a227b03a8b21bf3252be7e
Related: OS#2487
---
M include/osmocom/msc/gsm_data.h
M include/osmocom/msc/osmo_msc.h
M src/libmsc/a_iface_bssap.c
M src/libmsc/iucs.c
M src/libmsc/subscr_conn.c
M tests/msc_vlr/msc_vlr_test_rest.c
M tests/msc_vlr/msc_vlr_tests.c
7 files changed, 18 insertions(+), 12 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/46/11746/1

diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h
index 085248c..213ee02 100644
--- a/include/osmocom/msc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -127,7 +127,8 @@
/* connected via 2G or 3G? */
enum ran_type via_ran;

-   uint16_t lac;
+   uint16_t lac; /* 3GPP TS 24.008 §10.5.1.3 */
+   uint16_t ci;  /* 3GPP TS 24.008 §10.5.1.1 */
struct gsm_encr encr;

/* "Temporary" storage for the case the VLR asked for Cipher Mode 
Command, but the MSC still
diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h
index 3ffb65c..e0b4f46 100644
--- a/include/osmocom/msc/osmo_msc.h
+++ b/include/osmocom/msc/osmo_msc.h
@@ -48,7 +48,7 @@
 };

 struct gsm_subscriber_connection *msc_subscr_conn_alloc(struct gsm_network 
*network,
-   enum ran_type via_ran, 
uint16_t lac);
+   enum ran_type via_ran, 
uint16_t lac, uint16_t ci);

 void msc_subscr_conn_update_id(struct gsm_subscriber_connection *conn,
   enum complete_layer3_type from, const char *id);
diff --git a/src/libmsc/a_iface_bssap.c b/src/libmsc/a_iface_bssap.c
index 282fd73..5e7db63 100644
--- a/src/libmsc/a_iface_bssap.c
+++ b/src/libmsc/a_iface_bssap.c
@@ -48,13 +48,14 @@
 /* Allocate a new subscriber connection */
 static struct gsm_subscriber_connection *subscr_conn_allocate_a(const struct 
a_conn_info *a_conn_info,
struct 
gsm_network *network,
-   uint16_t lac, 
struct osmo_sccp_user *scu, int conn_id)
+   uint16_t lac, 
uint16_t ci,
+   struct 
osmo_sccp_user *scu, int conn_id)
 {
struct gsm_subscriber_connection *conn;

-   LOGP(DMSC, LOGL_DEBUG, "Allocating A-Interface subscriber conn: lac %i, 
conn_id %i\n", lac, conn_id);
+   LOGP(DMSC, LOGL_DEBUG, "Allocating A-Interface subscriber conn: lac %i, 
ci %i, conn_id %i\n", lac, ci, conn_id);

-   conn = msc_subscr_conn_alloc(network, RAN_GERAN_A, lac);
+   conn = msc_subscr_conn_alloc(network, RAN_GERAN_A, lac, ci);
if (!conn)
return NULL;

@@ -257,7 +258,7 @@
  struct msgb *msg, struct tlv_parsed *tp)
 {
struct gsm0808_cell_id_list2 cil;
-   uint16_t lac = 0;
+   uint16_t lac = 0, ci = 0;
uint8_t data_length;
const uint8_t *data;
int rc;
@@ -296,11 +297,13 @@
return -EINVAL;
}
lac = id->lai.lac;
+   ci = id->cell_identity;
break;
}
case CELL_IDENT_LAC_AND_CI: {
const struct osmo_lac_and_ci_id *id = 
_list[0].lac_and_ci;
lac = id->lac;
+   ci = id->ci;
break;
}
case CELL_IDENT_LAI_AND_LAC: {
@@ -317,7 +320,8 @@
lac = cil.id_list[0].lac;
break;

-   case CELL_IDENT_CI:
+   case CELL_IDENT_CI: /* FIXME: why LAC is mandatory is we have CI? */
+   ci = cil.id_list[0].ci;
case CELL_IDENT_NO_CELL:
case CELL_IDENT_BSS:
LOGP(DBSSAP, LOGL_ERROR,
@@ -342,7 +346,7 @@
}

/* Create new subscriber context */
-   conn = subscr_conn_allocate_a(a_conn_info, network, lac, scu, 
a_conn_info->conn_id);
+   conn = subscr_conn_allocate_a(a_conn_info, network, lac, ci, scu, 
a_conn_info->conn_id);

/* Handover location update to the MSC code */
rc = msc_compl_l3(conn, msg, 0);
diff --git a/src/libmsc/iucs.c b/src/libmsc/iucs.c
index a3092f8..0fe7e78 100644
--- a/src/libmsc/iucs.c
+++ b/src/libmsc/iucs.c
@@ -57,7 +57,7 @@
DEBUGP(DIUCS, "Allocating IuCS subscriber conn: lac %d, conn_id %" 
PRIx32 "\n",
   lac, ue->conn_id);

-   conn = msc_subscr_conn_alloc(network, RAN_UTRAN_IU, lac);
+   conn = msc_subscr_conn_alloc(network, RAN_UTRAN_IU, lac, 0); /* FIXME: 
is there equivalent for CI? */
if