paulmataruso/osmo-mgw
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git synced 2025-10-23 08:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

cscn: record and use LAC on incoming InitialUE msg

Browse Source 
Add lac argument to gsm0408_rcvmsg_iucs(), to record the LAC in newly
allocated gsm_subscriber_connections.

In effect, fix the LAC sent to UE during Location Updating Accept message.
Before, 0 was stored as LAC and sent to the UE, regardless of the actual
LAC in use.
This commit is contained in:
Neels Hofmeyr
2016-03-22 19:25:58 +01:00
parent 54fc3a1318
commit edafdc14f3
3 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
openbsc/include/openbsc/iu_cs.h
View File

@@ -1,6 +1,7 @@
#pragma once
int gsm0408_rcvmsg_iucs(struct gsm_network *network, struct msgb *msg);
int gsm0408_rcvmsg_iucs(struct gsm_network *network, struct msgb *msg,
uint16_t *lac);
struct gsm_subscriber_connection *subscr_conn_lookup_iu(struct gsm_network *network,
struct ue_conn_ctx *ue);

36
openbsc/src/libmsc/iu_cs.c
View File

@@ -9,13 +9,14 @@
#include <openbsc/gsm_subscriber.h>
/* For A-interface see libbsc/bsc_api.c subscr_con_allocate() */
struct gsm_subscriber_connection *subscr_conn_allocate_iu(struct gsm_network *network,
struct ue_conn_ctx *ue)
static struct gsm_subscriber_connection *subscr_conn_allocate_iu(struct gsm_network *network,
struct ue_conn_ctx *ue,
uint16_t lac)
{
struct gsm_subscriber_connection *conn;
DEBUGP(DIUCS, "Allocating IuCS subscriber conn: link_id %p, conn_id %" PRIx32 "\n",
ue->link, ue->conn_id);
DEBUGP(DIUCS, "Allocating IuCS subscriber conn: lac %d, link_id %p, conn_id %" PRIx32 "\n",
lac, ue->link, ue->conn_id);
conn = talloc_zero(network, struct gsm_subscriber_connection);
if (!conn)
@@ -24,6 +25,7 @@ struct gsm_subscriber_connection *subscr_conn_allocate_iu(struct gsm_network *ne
conn->network = network;
conn->via_iface = IFACE_IU;
conn->iu.ue_ctx = ue;
conn->lac = lac;
llist_add_tail(&conn->entry, &network->subscr_conns);
return conn;
@@ -101,7 +103,8 @@ struct gsm_subscriber_connection *subscr_conn_lookup_iu(
* sent the msg.
*
* For A-interface see libbsc/bsc_api.c gsm0408_rcvmsg(). */
int gsm0408_rcvmsg_iucs(struct gsm_network *network, struct msgb *msg)
int gsm0408_rcvmsg_iucs(struct gsm_network *network, struct msgb *msg,
uint16_t *lac)
{
int rc;
struct ue_conn_ctx *ue_ctx;
@@ -113,6 +116,19 @@ int gsm0408_rcvmsg_iucs(struct gsm_network *network, struct msgb *msg)
* search? */
conn = subscr_conn_lookup_iu(network, ue_ctx);
if (conn && lac && (conn->lac != *lac)) {
LOGP(DIUCS, LOGL_ERROR, "IuCS subscriber has changed LAC"
" within the same connection, discarding connection:"
" %s from LAC %d to %d\n",
subscr_name(conn->subscr), conn->lac, *lac);
/* Deallocate conn with previous LAC */
msc_subscr_con_free(conn);
/* At this point we could be tolerant and allocate a new
* connection, but changing the LAC within the same connection
* is shifty. Rather cancel everything. */
return -1;
}
if (conn) {
/* if we already have a connection, handle DTAP.
gsm0408_dispatch() is aka msc_dtap() */
@@ -128,7 +144,15 @@ int gsm0408_rcvmsg_iucs(struct gsm_network *network, struct msgb *msg)
} else {
/* allocate a new connection */
conn = subscr_conn_allocate_iu(network, ue_ctx);
if (!lac) {
LOGP(DIUCS, LOGL_ERROR, "New IuCS subscriber"
" but no LAC available. Expecting an InitialUE"
" message containing a LAI IE."
" Dropping connection.\n");
return -1;
}
conn = subscr_conn_allocate_iu(network, ue_ctx, *lac);
if (!conn)
abort();

2
openbsc/src/osmo-cscn/cscn_main.c
View File

@@ -321,7 +321,7 @@ static int rcvmsg_iu_cs(struct msgb *msg, struct gprs_ra_id *ra_id, /* FIXME gpr
{
DEBUGP(DIUCS, "got Iu-CS message: %s\n",
osmo_hexdump(msg->data, msg->len));
return gsm0408_rcvmsg_iucs(cscn_network, msg);
return gsm0408_rcvmsg_iucs(cscn_network, msg, ra_id? &ra_id->lac : NULL);
}
static int rx_iu_event(struct ue_conn_ctx *ctx, enum iu_event_type type,