From efe85d33d4948a20de1baec2e8956113714ec72e Mon Sep 17 00:00:00 2001 From: Philipp Maier Date: Sun, 9 Apr 2017 12:32:51 +0200 Subject: Implement AoIP, port to M3UA SIGTRAN (large addition and refactoring) This was originally a long series of commits converging to the final result seen in this patch. It does not make much sense to review the smaller steps' trial and error, we need to review this entire change as a whole. Implement AoIP in osmo-msc and osmo-bsc. Change over to the new libosmo-sigtran API with support for proper SCCP/M3UA/SCTP stacking, as mandated by 3GPP specifications for the IuCS and IuPS interfaces. From here on, a separate osmo-stp process is required for SCCP routing between OsmoBSC / OsmoHNBGW <-> OsmoMSC / OsmoSGSN jenkins.sh: build from libosmo-sccp and osmo-iuh master branches now for new M3UA SIGTRAN. Patch-by: pmaier, nhofmeyr, laforge Change-Id: I5ae4e05ee7c57cad341ea5e86af37c1f6b0ffa77 --- src/libmsc/iucs.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'src/libmsc/iucs.c') diff --git a/src/libmsc/iucs.c b/src/libmsc/iucs.c index aeda1406a..be026c857 100644 --- a/src/libmsc/iucs.c +++ b/src/libmsc/iucs.c @@ -40,8 +40,8 @@ static struct gsm_subscriber_connection *subscr_conn_allocate_iu(struct gsm_netw { struct gsm_subscriber_connection *conn; - DEBUGP(DIUCS, "Allocating IuCS subscriber conn: lac %d, link_id %p, conn_id %" PRIx32 "\n", - lac, ue->link, ue->conn_id); + DEBUGP(DIUCS, "Allocating IuCS subscriber conn: lac %d, conn_id %" PRIx32 "\n", + lac, ue->conn_id); conn = talloc_zero(network, struct gsm_subscriber_connection); if (!conn) @@ -61,8 +61,7 @@ static int same_ue_conn(struct ue_conn_ctx *a, struct ue_conn_ctx *b) { if (a == b) return 1; - return (a->link == b->link) - && (a->conn_id == b->conn_id); + return (a->conn_id == b->conn_id); } static inline void log_subscribers(struct gsm_network *network) @@ -78,8 +77,7 @@ static inline void log_subscribers(struct gsm_network *network) case RAN_UTRAN_IU: DEBUGPC(DIUCS, " Iu"); if (conn->iu.ue_ctx) { - DEBUGPC(DIUCS, " link %p, conn_id %d", - conn->iu.ue_ctx->link, + DEBUGPC(DIUCS, " conn_id %d", conn->iu.ue_ctx->conn_id ); } @@ -101,7 +99,7 @@ static inline void log_subscribers(struct gsm_network *network) DEBUGP(DIUCS, "subscribers registered: %d\n", i); } -/* Return an existing IuCS subscriber connection record for the given link and +/* Return an existing IuCS subscriber connection record for the given * connection IDs, or return NULL if not found. */ struct gsm_subscriber_connection *subscr_conn_lookup_iu( struct gsm_network *network, @@ -109,8 +107,8 @@ struct gsm_subscriber_connection *subscr_conn_lookup_iu( { struct gsm_subscriber_connection *conn; - DEBUGP(DIUCS, "Looking for IuCS subscriber: link_id %p, conn_id %" PRIx32 "\n", - ue->link, ue->conn_id); + DEBUGP(DIUCS, "Looking for IuCS subscriber: conn_id %" PRIx32 "\n", + ue->conn_id); log_subscribers(network); llist_for_each_entry(conn, &network->subscr_conns, entry) { @@ -118,12 +116,12 @@ struct gsm_subscriber_connection *subscr_conn_lookup_iu( continue; if (!same_ue_conn(conn->iu.ue_ctx, ue)) continue; - DEBUGP(DIUCS, "Found IuCS subscriber for link_id %p, conn_id %" PRIx32 "\n", - ue->link, ue->conn_id); + DEBUGP(DIUCS, "Found IuCS subscriber for conn_id %" PRIx32 "\n", + ue->conn_id); return conn; } - DEBUGP(DIUCS, "No IuCS subscriber found for link_id %p, conn_id %" PRIx32 "\n", - ue->link, ue->conn_id); + DEBUGP(DIUCS, "No IuCS subscriber found for conn_id %" PRIx32 "\n", + ue->conn_id); return NULL; } -- cgit v1.2.3