Port gbproxy to NS2

Since NS2 has a different abstraction we mock up the prim send/recv
functions and don't test NS like the old tests did.

Related: SYS#4998
Change-Id: Iecfd0408a35a11638d254c1db3c1d477b1a11524

3 files changed, 3054 insertions, 4754 deletions

diff --git a/tests/gbproxy/gbproxy_test.c b/tests/gbproxy/gbproxy_test.c
index 6433eb606..166298007 100644
--- a/tests/gbproxy/gbproxy_test.c
+++ b/tests/gbproxy/gbproxy_test.c
@@ -1,9 +1,8 @@
 /* test routines for gbproxy
  * send NS messages to the gbproxy and dumps what happens
- * (C) 2013 by sysmocom s.f.m.c. GmbH
+ * (C) 2013-2020 by sysmocom s.f.m.c. GmbH
  * Author: Jacob Erlbeck <jerlbeck@sysmocom.de>
  */
-
 #undef _GNU_SOURCE
 #define _GNU_SOURCE
 
@@ -17,20 +16,23 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
+#include <talloc.h>
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/application.h>
 #include <osmocom/core/utils.h>
 #include <osmocom/core/logging.h>
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/signal.h>
+#include <osmocom/core/socket.h>
 #include <osmocom/core/rate_ctr.h>
 #include <osmocom/gsm/tlv.h>
 #include <osmocom/gsm/gsm_utils.h>
 #include <osmocom/gsm/protocol/gsm_04_08_gprs.h>
 #include <osmocom/gprs/gprs_msgb.h>
-#include <osmocom/gprs/gprs_ns.h>
+#include <osmocom/gprs/gprs_ns2.h>
 #include <osmocom/gprs/gprs_bssgp.h>
-
+#include <osmocom/core/prim.h>
+#include <osmocom/vty/command.h>
 #include <osmocom/sgsn/gb_proxy.h>
 #include <osmocom/sgsn/gprs_utils.h>
 #include <osmocom/sgsn/gprs_llc.h>
@@ -466,108 +468,87 @@ static const unsigned char llc_ui_ll11_dns_resp_dl[] = {
 	0x76, 0x65, 0x72, 0xc0, 0x14, 0xaa, 0xdf, 0x31
 };
 
-static int gprs_process_message(struct gprs_ns_inst *nsi, const char *text,
-				struct sockaddr_in *peer, const unsigned char* data,
-				size_t data_len);
-
-static void send_ns_reset(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr,
-			  enum ns_cause cause, uint16_t nsvci, uint16_t nsei)
-{
-	/* GPRS Network Service, PDU type: NS_RESET,
-	 */
-	unsigned char msg[12] = {
-		0x02, 0x00, 0x81, 0x01, 0x01, 0x82, 0x11, 0x22,
-		0x04, 0x82, 0x11, 0x22
-	};
-
-	msg[3] = cause;
-	msg[6] = nsvci / 256;
-	msg[7] = nsvci % 256;
-	msg[10] = nsei / 256;
-	msg[11] = nsei % 256;
-
-	gprs_process_message(nsi, "RESET", src_addr, msg, sizeof(msg));
-}
-
-static void send_ns_reset_ack(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr,
-			      uint16_t nsvci, uint16_t nsei)
-{
-	/* GPRS Network Service, PDU type: NS_RESET_ACK,
-	 */
-	unsigned char msg[9] = {
-		0x03, 0x01, 0x82, 0x11, 0x22,
-		0x04, 0x82, 0x11, 0x22
-	};
-
-	msg[3] = nsvci / 256;
-	msg[4] = nsvci % 256;
-	msg[7] = nsei / 256;
-	msg[8] = nsei % 256;
-
-	gprs_process_message(nsi, "RESET_ACK", src_addr, msg, sizeof(msg));
-}
-
-static void send_ns_alive(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr)
+#define NS_ALLOC_HEADROOM	128
+#define NS_ALLOC_SIZE	3072
+static int gprs_ns2_callback(struct osmo_prim_hdr *oph, void *ctx);
+static void send_ns_unitdata(struct gprs_ns2_inst *nsi, const char *text,
+			     uint16_t nsei, uint16_t nsbvci,
+			     const unsigned char *bssgp_msg, size_t bssgp_msg_size)
 {
-	/* GPRS Network Service, PDU type: NS_ALIVE */
-	unsigned char msg[1] = {
-		0x0a
-	};
+	struct msgb *msg;
+	struct osmo_gprs_ns2_prim nsp = {};
+	nsp.nsei = nsei;
+	nsp.bvci = nsbvci;
+	//nsp.u.unitdata.change
+
+	if (bssgp_msg_size > NS_ALLOC_SIZE - NS_ALLOC_HEADROOM) {
+		fprintf(stderr, "message too long: %zu\n", bssgp_msg_size);
+		return;
+	}
 
-	gprs_process_message(nsi, "ALIVE", src_addr, msg, sizeof(msg));
-}
+	msg = msgb_alloc_headroom(NS_ALLOC_SIZE, NS_ALLOC_HEADROOM,
+					       "GPRS/NS");
+	OSMO_ASSERT(msg);
+	memmove(msg->data, bssgp_msg, bssgp_msg_size);
+	msgb_bssgph(msg) = msg->data;
+	msg->l2h = msg->data;
+	msg->l3h = msg->data;
+	msgb_put(msg, bssgp_msg_size);
 
-static void send_ns_alive_ack(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr)
-{
-	/* GPRS Network Service, PDU type: NS_ALIVE_ACK */
-	unsigned char msg[1] = {
-		0x0b
-	};
+	printf("PROCESSING %s from NSEI %d\n%s\n\n",
+	       text, nsei,
+	       osmo_hexdump(bssgp_msg, bssgp_msg_size));
 
-	gprs_process_message(nsi, "ALIVE_ACK", src_addr, msg, sizeof(msg));
-}
 
-static void send_ns_unblock(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr)
-{
-	/* GPRS Network Service, PDU type: NS_UNBLOCK */
-	unsigned char msg[1] = {
-		0x06
-	};
+	//gprs_process_message(nsi, text ? text : "UNITDATA", nsei, msg, bssgp_msg_size + 4);
+	osmo_prim_init(&nsp.oph, SAP_NS, PRIM_NS_UNIT_DATA,
+			PRIM_OP_INDICATION, msg);
 
-	gprs_process_message(nsi, "UNBLOCK", src_addr, msg, sizeof(msg));
+	gprs_ns2_callback(&nsp.oph, &gbcfg);
+	talloc_free(msg);
 }
+static int gbprox_test_bssgp_send_cb(void *ctx, struct msgb *msg);
 
-static void send_ns_unblock_ack(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr)
+/* wrap */
+int gprs_ns2_recv_prim(struct gprs_ns2_inst *nsi, struct osmo_prim_hdr *oph)
 {
-	/* GPRS Network Service, PDU type: NS_UNBLOCK_ACK */
-	unsigned char msg[1] = {
-		0x07
-	};
+	struct osmo_gprs_ns2_prim *nsp;
 
-	gprs_process_message(nsi, "UNBLOCK_ACK", src_addr, msg, sizeof(msg));
-}
+	if (oph->sap != SAP_NS)
+		return 0;
 
-static void send_ns_unitdata(struct gprs_ns_inst *nsi, const char *text,
-			     struct sockaddr_in *src_addr, uint16_t nsbvci,
-			     const unsigned char *bssgp_msg, size_t bssgp_msg_size)
-{
-	/* GPRS Network Service, PDU type: NS_UNITDATA */
-	unsigned char msg[4096] = {
-		0x00, 0x00, 0x00, 0x00
-	};
+	nsp = container_of(oph, struct osmo_gprs_ns2_prim, oph);
 
-	OSMO_ASSERT(bssgp_msg_size <= sizeof(msg) - 4);
+	if (oph->operation != PRIM_OP_REQUEST) {
+		LOGP(DPCU, LOGL_NOTICE, "NS: %s Unknown prim %d from NS\n",
+		     get_value_string(osmo_prim_op_names, oph->operation),
+		     oph->operation);
+		return 0;
+	}
 
-	msg[2] = nsbvci / 256;
-	msg[3] = nsbvci % 256;
-	memcpy(msg + 4, bssgp_msg, bssgp_msg_size);
+	switch (oph->primitive) {
+	case PRIM_NS_UNIT_DATA:
+		/* hand the message into the BSSGP implementation */
+		msgb_bssgph(oph->msg) = oph->msg->l3h;
+		msgb_bvci(oph->msg) = nsp->bvci;
+		msgb_nsei(oph->msg) = nsp->nsei;
+		printf("NS2 UD REQUEST, prim %d, msg length %zu, bvci 0x%04x\n%s\n\n",
+			oph->primitive, msgb_bssgp_len(oph->msg), nsp->bvci,
+			osmo_hexdump(msgb_l3(oph->msg), msgb_l3len(oph->msg)));
+		return gbprox_test_bssgp_send_cb(&gbcfg, oph->msg);
+		break;
+	default:
+		printf("NS2 REQUEST, prim %d, bvci 0x%04x\n\n",
+			oph->primitive, nsp->bvci);
 
-	gprs_process_message(nsi, text ? text : "UNITDATA", src_addr, msg, bssgp_msg_size + 4);
+		break;
+	}
+	return 0;
 }
 
 static void send_bssgp_ul_unitdata(
-	struct gprs_ns_inst *nsi, const char *text,
-	struct sockaddr_in *src_addr, uint16_t nsbvci, uint32_t tlli,
+	struct gprs_ns2_inst *nsi, const char *text,
+	uint16_t nsei, uint16_t nsbvci, uint32_t tlli,
 	struct gprs_ra_id *raid, uint16_t cell_id,
 	const uint8_t *llc_msg, size_t llc_msg_size)
 {
@@ -595,12 +576,12 @@ static void send_bssgp_ul_unitdata(
 	memcpy(msg + 23, llc_msg, llc_msg_size);
 
 	send_ns_unitdata(nsi, text ? text : "BSSGP UL UNITDATA",
-			 src_addr, nsbvci, msg, bssgp_msg_size);
+			 nsei, nsbvci, msg, bssgp_msg_size);
 }
 
 static void send_bssgp_dl_unitdata(
-	struct gprs_ns_inst *nsi, const char *text,
-	struct sockaddr_in *src_addr, uint16_t nsbvci, uint32_t tlli,
+	struct gprs_ns2_inst *nsi, const char *text,
+	uint16_t nsei, uint16_t nsbvci, uint32_t tlli,
 	int with_racap_drx, const uint8_t *imsi, size_t imsi_size,
 	const uint8_t *llc_msg, size_t llc_msg_size)
 {
@@ -662,11 +643,11 @@ static void send_bssgp_dl_unitdata(
 
 
 	send_ns_unitdata(nsi, text ? text : "BSSGP DL UNITDATA",
-			 src_addr, nsbvci, msg, bssgp_msg_size);
+			 nsei, nsbvci, msg, bssgp_msg_size);
 }
 
-static void send_bssgp_reset(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr,
-			     uint16_t bvci)
+static void send_bssgp_reset(struct gprs_ns2_inst *nsi,
+			     uint16_t nsei, uint16_t bvci)
 {
 	/* GPRS Network Service, PDU type: NS_UNITDATA, BVCI 0
 	 * BSSGP RESET */
@@ -679,11 +660,11 @@ static void send_bssgp_reset(struct gprs_ns_inst *nsi, struct sockaddr_in *src_a
 	msg[3] = bvci / 256;
 	msg[4] = bvci % 256;
 
-	send_ns_unitdata(nsi, "BVC_RESET", src_addr, 0, msg, sizeof(msg));
+	send_ns_unitdata(nsi, "BVC_RESET", nsei, 0, msg, sizeof(msg));
 }
 
-static void send_bssgp_reset_ack(struct gprs_ns_inst *nsi,
-				 struct sockaddr_in *src_addr, uint16_t bvci)
+static void send_bssgp_reset_ack(struct gprs_ns2_inst *nsi,
+				 uint16_t nsei, uint16_t bvci)
 {
 	/* GPRS Network Service, PDU type: NS_UNITDATA, BVCI 0
 	 * BSSGP RESET_ACK */
@@ -695,11 +676,11 @@ static void send_bssgp_reset_ack(struct gprs_ns_inst *nsi,
 	msg[3] = bvci / 256;
 	msg[4] = bvci % 256;
 
-	send_ns_unitdata(nsi, "BVC_RESET_ACK", src_addr, 0, msg, sizeof(msg));
+	send_ns_unitdata(nsi, "BVC_RESET_ACK", nsei, 0, msg, sizeof(msg));
 }
 
-static void send_bssgp_suspend(struct gprs_ns_inst *nsi,
-			       struct sockaddr_in *src_addr,
+static void send_bssgp_suspend(struct gprs_ns2_inst *nsi,
+			       uint16_t nsei,
 			       uint32_t tlli,
 			       struct gprs_ra_id *raid)
 {
@@ -716,11 +697,11 @@ static void send_bssgp_suspend(struct gprs_ns_inst *nsi,
 
 	gsm48_encode_ra((struct gsm48_ra_id *)(msg + 9), raid);
 
-	send_ns_unitdata(nsi, "BVC_SUSPEND", src_addr, 0, msg, sizeof(msg));
+	send_ns_unitdata(nsi, "BVC_SUSPEND", nsei, 0, msg, sizeof(msg));
 }
 
-static void send_bssgp_suspend_ack(struct gprs_ns_inst *nsi,
-				   struct sockaddr_in *src_addr,
+static void send_bssgp_suspend_ack(struct gprs_ns2_inst *nsi,
+				   uint16_t nsei,
 				   uint32_t tlli,
 				   struct gprs_ra_id *raid)
 {
@@ -738,11 +719,11 @@ static void send_bssgp_suspend_ack(struct gprs_ns_inst *nsi,
 
 	gsm48_encode_ra((struct gsm48_ra_id *)(msg + 9), raid);
 
-	send_ns_unitdata(nsi, "BVC_SUSPEND_ACK", src_addr, 0, msg, sizeof(msg));
+	send_ns_unitdata(nsi, "BVC_SUSPEND_ACK", nsei, 0, msg, sizeof(msg));
 }
 
-static void send_bssgp_llc_discarded(struct gprs_ns_inst *nsi,
-				     struct sockaddr_in *src_addr,
+static void send_bssgp_llc_discarded(struct gprs_ns2_inst *nsi,
+				     uint16_t nsei,
 				     uint16_t bvci, uint32_t tlli,
 				     unsigned n_frames, unsigned n_octets)
 {
@@ -764,11 +745,11 @@ static void send_bssgp_llc_discarded(struct gprs_ns_inst *nsi,
 	msg[17] = (uint8_t)(n_octets >> 8);
 	msg[18] = (uint8_t)(n_octets >> 0);
 
-	send_ns_unitdata(nsi, "LLC_DISCARDED", src_addr, 0, msg, sizeof(msg));
+	send_ns_unitdata(nsi, "LLC_DISCARDED", nsei, 0, msg, sizeof(msg));
 }
 
-static void send_bssgp_paging(struct gprs_ns_inst *nsi,
-			      struct sockaddr_in *src_addr,
+static void send_bssgp_paging(struct gprs_ns2_inst *nsi,
+			      uint16_t nsei,
 			      const uint8_t *imsi, size_t imsi_size,
 			      struct gprs_ra_id *raid, uint32_t ptmsi)
 {
@@ -811,11 +792,11 @@ static void send_bssgp_paging(struct gprs_ns_inst *nsi,
 		bssgp_msg_size += 6;
 	}
 
-	send_ns_unitdata(nsi, "PAGING_PS", src_addr, 0, msg, bssgp_msg_size);
+	send_ns_unitdata(nsi, "PAGING_PS", nsei, 0, msg, bssgp_msg_size);
 }
 
-static void send_bssgp_flow_control_bvc(struct gprs_ns_inst *nsi,
-					struct sockaddr_in *src_addr,
+static void send_bssgp_flow_control_bvc(struct gprs_ns2_inst *nsi,
+					uint16_t nsei,
 					uint16_t bvci, uint8_t tag)
 {
 	/* GPRS Network Service, PDU type: NS_UNITDATA,
@@ -828,12 +809,12 @@ static void send_bssgp_flow_control_bvc(struct gprs_ns_inst *nsi,
 
 	msg[3] = tag;
 
-	send_ns_unitdata(nsi, "FLOW_CONTROL_BVC", src_addr, bvci,
+	send_ns_unitdata(nsi, "FLOW_CONTROL_BVC", nsei, bvci,
 			 msg, sizeof(msg));
 }
 
-static void send_bssgp_flow_control_bvc_ack(struct gprs_ns_inst *nsi,
-					    struct sockaddr_in *src_addr,
+static void send_bssgp_flow_control_bvc_ack(struct gprs_ns2_inst *nsi,
+					    uint16_t nsei,
 					    uint16_t bvci, uint8_t tag)
 {
 	/* GPRS Network Service, PDU type: NS_UNITDATA,
@@ -844,13 +825,13 @@ static void send_bssgp_flow_control_bvc_ack(struct gprs_ns_inst *nsi,
 
 	msg[3] = tag;
 
-	send_ns_unitdata(nsi, "FLOW_CONTROL_BVC_ACK", src_addr, bvci,
+	send_ns_unitdata(nsi, "FLOW_CONTROL_BVC_ACK", nsei, bvci,
 			 msg, sizeof(msg));
 }
 
 static void send_llc_ul_ui(
-	struct gprs_ns_inst *nsi, const char *text,
-	struct sockaddr_in *src_addr, uint16_t nsbvci, uint32_t tlli,
+	struct gprs_ns2_inst *nsi, const char *text,
+	uint16_t nsei, uint16_t nsbvci, uint32_t tlli,
 	struct gprs_ra_id *raid, uint16_t cell_id,
 	unsigned sapi, unsigned nu,
 	const uint8_t *msg, size_t msg_size)
@@ -880,13 +861,13 @@ static void send_llc_ul_ui(
 	llc_msg[3 + msg_size + 2] = (uint8_t)(fcs >> 16);
 
 	send_bssgp_ul_unitdata(nsi, text ? text : "LLC UI",
-			       src_addr, nsbvci, tlli, raid, cell_id,
+			       nsei, nsbvci, tlli, raid, cell_id,
 			       llc_msg, llc_msg_size);
 }
 
 static void send_llc_dl_ui(
-	struct gprs_ns_inst *nsi, const char *text,
-	struct sockaddr_in *src_addr, uint16_t nsbvci, uint32_t tlli,
+	struct gprs_ns2_inst *nsi, const char *text,
+	uint16_t nsei, uint16_t nsbvci, uint32_t tlli,
 	int with_racap_drx, const uint8_t *imsi, size_t imsi_size,
 	unsigned sapi, unsigned nu,
 	const uint8_t *msg, size_t msg_size)
@@ -918,156 +899,147 @@ static void send_llc_dl_ui(
 	llc_msg[3 + msg_size + 2] = (uint8_t)(fcs >> 16);
 
 	send_bssgp_dl_unitdata(nsi, text ? text : "LLC UI",
-			       src_addr, nsbvci, tlli,
+			       nsei, nsbvci, tlli,
 			       with_racap_drx, imsi, imsi_size,
 			       llc_msg, llc_msg_size);
 }
 
 
-static void setup_ns(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr,
-		     uint16_t nsvci, uint16_t nsei)
+/* STATUS indications */
+static void send_ns_avail(struct gprs_ns2_inst *nsi,
+			  uint16_t sgsn_nsei)
+{
+	struct osmo_gprs_ns2_prim nsp = {};
+	nsp.nsei = sgsn_nsei;
+	nsp.bvci = 0;
+	nsp.u.status.cause = NS_AFF_CAUSE_RECOVERY;
+	nsp.u.status.transfer = -1;
+	nsp.u.status.first = true;
+	osmo_prim_init(&nsp.oph, SAP_NS, PRIM_NS_STATUS,
+			PRIM_OP_INDICATION, NULL);
+
+	gprs_ns2_callback(&nsp.oph, &gbcfg);
+}
+
+static void setup_ns(struct gprs_ns2_inst *nsi,
+		     uint16_t nsei)
 {
-	printf("Setup NS-VC: remote 0x%08x:%d, "
-	       "NSVCI 0x%04x(%d), NSEI 0x%04x(%d)\n\n",
-	       ntohl(src_addr->sin_addr.s_addr), ntohs(src_addr->sin_port),
-	       nsvci, nsvci, nsei, nsei);
-
-	send_ns_reset(nsi, src_addr, NS_CAUSE_OM_INTERVENTION, nsvci, nsei);
-	send_ns_alive(nsi, src_addr);
-	send_ns_unblock(nsi, src_addr);
-	send_ns_alive_ack(nsi, src_addr);
+	printf("Setup NS-VC: "
+	       "NSEI 0x%04x(%d)\n\n",
+	       nsei, nsei);
+	send_ns_avail(nsi, nsei);
 }
 
-static void setup_bssgp(struct gprs_ns_inst *nsi, struct sockaddr_in *src_addr,
-		     uint16_t bvci)
+static void setup_bssgp(struct gprs_ns2_inst *nsi,
+		     uint16_t nsei, uint16_t bvci)
 {
-	printf("Setup BSSGP: remote 0x%08x:%d, "
+	printf("Setup BSSGP: "
 	       "BVCI 0x%04x(%d)\n\n",
-	       ntohl(src_addr->sin_addr.s_addr), ntohs(src_addr->sin_port),
 	       bvci, bvci);
 
-	send_bssgp_reset(nsi, src_addr, bvci);
+	send_bssgp_reset(nsi, nsei, bvci);
 }
 
-static void connect_sgsn(struct gprs_ns_inst *nsi, struct sockaddr_in *sgsn_peer,
+static void connect_sgsn(struct gprs_ns2_inst *nsi,
 			 uint32_t sgsn_nsei)
 {
-	gprs_ns_nsip_connect(nsi, sgsn_peer, sgsn_nsei, sgsn_nsei+1);
-	send_ns_reset_ack(nsi, sgsn_peer, sgsn_nsei+1, sgsn_nsei);
-	send_ns_alive_ack(nsi, sgsn_peer);
-	send_ns_unblock_ack(nsi, sgsn_peer);
-	send_ns_alive(nsi, sgsn_peer);
+	send_ns_avail(nsi, sgsn_nsei);
 }
 
-static void configure_sgsn_peer(struct sockaddr_in *sgsn_peer)
+/* Function used to send a BSSGP message through NS */
+static int gbprox_test_bssgp_send_cb(void *ctx, struct msgb *msg)
 {
-	sgsn_peer->sin_family = AF_INET;
-	sgsn_peer->sin_port = htons(32000);
-	sgsn_peer->sin_addr.s_addr = htonl(REMOTE_SGSN_ADDR);
-}
-
-static void configure_sgsn2_peer(struct sockaddr_in *sgsn_peer)
-{
-	sgsn_peer->sin_family = AF_INET;
-	sgsn_peer->sin_port = htons(32001);
-	sgsn_peer->sin_addr.s_addr = htonl(REMOTE_SGSN2_ADDR);
-}
+	int rc;
+	struct gbproxy_config *cfg = (struct gbproxy_config *) ctx;
 
-static void configure_bss_peers(struct sockaddr_in *bss_peers, size_t size)
-{
-	size_t i;
+	uint16_t nsei = msgb_nsei(msg);
+	uint16_t bvci = msgb_bvci(msg);
 
-	for (i = 0; i < size; ++i) {
-		bss_peers[i].sin_family = AF_INET;
-		bss_peers[i].sin_port = htons((i + 1) * 1111);
-		bss_peers[i].sin_addr.s_addr = htonl(REMOTE_BSS_ADDR);
+	if (received_messages) {
+		struct msgb *msg_copy;
+		msg_copy = bssgp_msgb_copy(msg, "received_messages");
+		llist_add_tail(&msg_copy->list, received_messages);
 	}
-}
 
-int gprs_ns_rcvmsg(struct gprs_ns_inst *nsi, struct msgb *msg,
-		   struct sockaddr_in *saddr, enum gprs_ns_ll ll);
+	if (nsei == cfg->nsip_sgsn_nsei)
+		printf("Message for SGSN");
+	else if (nsei == cfg->nsip_sgsn2_nsei)
+		printf("Message for SGSN2");
+	else
+		printf("Message for BSS");
+	printf(" (NSEI=%d BVCI=%d):\n%s\n\n", nsei, bvci, msgb_hexdump(msg));
 
-/* override */
-int gprs_ns_callback(enum gprs_ns_evt event, struct gprs_nsvc *nsvc,
-			 struct msgb *msg, uint16_t bvci)
-{
-	printf("CALLBACK, event %d, msg length %zu, bvci 0x%04x\n%s\n\n",
-			event, msgb_bssgp_len(msg), bvci,
-			osmo_hexdump(msgb_l2(msg), msgb_l2len(msg)));
+	rc = msgb_length(msg);
+	msgb_free(msg);
 
-	switch (event) {
-	case GPRS_NS_EVT_UNIT_DATA:
-		return gbprox_rcvmsg(&gbcfg, msg, nsvc->nsei, bvci, nsvc->nsvci);
-	default:
-		break;
-	}
-	return 0;
+	return rc;
 }
 
-/* override */
-ssize_t sendto(int sockfd, const void *buf, size_t len, int flags,
-		const struct sockaddr *dest_addr, socklen_t addrlen)
+static void gprs_ns2_test_prim_status_cb(struct gbproxy_config *cfg, struct osmo_gprs_ns2_prim *nsp)
 {
-	typedef ssize_t (*sendto_t)(int, const void *, size_t, int,
-			const struct sockaddr *, socklen_t);
-	static sendto_t real_sendto = NULL;
-	uint32_t dest_host = htonl(((struct sockaddr_in *)dest_addr)->sin_addr.s_addr);
-	int      dest_port = htons(((struct sockaddr_in *)dest_addr)->sin_port);
-
-	if (!real_sendto)
-		real_sendto = dlsym(RTLD_NEXT, "sendto");
-
-	if (dest_host == REMOTE_BSS_ADDR)
-		printf("MESSAGE to BSS at 0x%08x:%d, msg length %zu\n%s\n\n",
-		       dest_host, dest_port,
-		       len, osmo_hexdump(buf, len));
-	else if (dest_host == REMOTE_SGSN_ADDR)
-		printf("MESSAGE to SGSN at 0x%08x:%d, msg length %zu\n%s\n\n",
-		       dest_host, dest_port,
-		       len, osmo_hexdump(buf, len));
-	else if (dest_host == REMOTE_SGSN2_ADDR)
-		printf("MESSAGE to SGSN 2 at 0x%08x:%d, msg length %zu\n%s\n\n",
-		       dest_host, dest_port,
-		       len, osmo_hexdump(buf, len));
-	else
-		return real_sendto(sockfd, buf, len, flags, dest_addr, addrlen);
-
-	return len;
+	enum gprs_ns2_affecting_cause cause = nsp->u.status.cause;
+
+	switch (cause) {
+		case NS_AFF_CAUSE_RECOVERY:
+			LOGP(DPCU, LOGL_NOTICE, "NS-NSE %d became available\n", nsp->nsei);
+			break;
+		case NS_AFF_CAUSE_FAILURE:
+			LOGP(DPCU, LOGL_NOTICE, "NS-NSE %d became unavailable\n", nsp->nsei);
+			break;
+		case NS_AFF_CAUSE_VC_RECOVERY:
+			LOGP(DPCU, LOGL_NOTICE, "NS-NSE %d NS-VC %s became available\n", nsp->nsei, nsp->u.status.nsvc);
+			break;
+		case NS_AFF_CAUSE_VC_FAILURE:
+			LOGP(DPCU, LOGL_NOTICE, "NS-NSE %d NS-VC %s became unavailable\n", nsp->nsei, nsp->u.status.nsvc);
+			break;
+		default:
+			LOGP(DPCU, LOGL_NOTICE, "Unhandled status %d (NS-NSE %d)\n", cause, nsp->nsei);
+			break;
+	}
 }
 
+int gprs_ns2_prim_cb(struct osmo_prim_hdr *oph, void *ctx);
+
 /* override */
-int gprs_ns_sendmsg(struct gprs_ns_inst *nsi, struct msgb *msg)
+static int gprs_ns2_callback(struct osmo_prim_hdr *oph, void *ctx)
 {
-	typedef int (*gprs_ns_sendmsg_t)(struct gprs_ns_inst *nsi, struct msgb *msg);
-	static gprs_ns_sendmsg_t real_gprs_ns_sendmsg = NULL;
-	uint16_t bvci = msgb_bvci(msg);
-	uint16_t nsei = msgb_nsei(msg);
+	struct osmo_gprs_ns2_prim *nsp;
+	struct gbproxy_config *cfg = (struct gbproxy_config *) ctx;
 
-	size_t len = msgb_length(msg);
+	if (oph->sap != SAP_NS)
+		return 0;
 
-	if (!real_gprs_ns_sendmsg)
-		real_gprs_ns_sendmsg = dlsym(RTLD_NEXT, "gprs_ns_sendmsg");
+	nsp = container_of(oph, struct osmo_gprs_ns2_prim, oph);
 
-	if (nsei == SGSN_NSEI)
-		printf("NS UNITDATA MESSAGE to SGSN, BVCI 0x%04x, "
-		       "msg length %zu (%s)\n",
-		       bvci, len, __func__);
-	else if (nsei == SGSN2_NSEI)
-		printf("NS UNITDATA MESSAGE to SGSN 2, BVCI 0x%04x, "
-		       "msg length %zu (%s)\n",
-		       bvci, len, __func__);
-	else
-		printf("NS UNITDATA MESSAGE to BSS, BVCI 0x%04x, "
-		       "msg length %zu (%s)\n",
-		       bvci, len, __func__);
+	if (oph->operation != PRIM_OP_INDICATION) {
+		LOGP(DPCU, LOGL_NOTICE, "NS: %s Unknown prim %d from NS\n",
+		     get_value_string(osmo_prim_op_names, oph->operation),
+		     oph->operation);
+		return 0;
+	}
 
-	if (received_messages) {
-		struct msgb *msg_copy;
-		msg_copy = bssgp_msgb_copy(msg, "received_messages");
-		llist_add_tail(&msg_copy->list, received_messages);
+	switch (oph->primitive) {
+	case PRIM_NS_UNIT_DATA:
+		/* hand the message into the BSSGP implementation */
+		msgb_bssgph(oph->msg) = oph->msg->l3h;
+		msgb_bvci(oph->msg) = nsp->bvci;
+		msgb_nsei(oph->msg) = nsp->nsei;
+		printf("NS2 CALLBACK, prim %d, msg length %zu, bvci 0x%04x\n%s\n\n",
+			oph->primitive, msgb_bssgp_len(oph->msg), nsp->bvci,
+			osmo_hexdump(msgb_l2(oph->msg), msgb_l2len(oph->msg)));
+		break;
+	case PRIM_NS_STATUS:
+		gprs_ns2_test_prim_status_cb(cfg, nsp);
+	default:
+		printf("NS2 CALLBACK, prim %d, bvci 0x%04x\n\n",
+			oph->primitive, nsp->bvci);
+
+		break;
 	}
 
-	return real_gprs_ns_sendmsg(nsi, msg);
+	/* Hand off to gbproxy */
+	return gprs_ns2_prim_cb(oph, ctx);
+
 }
 
 /* Get the next message from the receive FIFO
@@ -1213,270 +1185,102 @@ static struct expect_result *expect_gmm_msg(int match_nsei, int match_bvci,
 	return result;
 }
 
-static void dump_rate_ctr_group(FILE *stream, const char *prefix,
-			    struct rate_ctr_group *ctrg)
-{
-	unsigned int i;
-
-	for (i = 0; i < ctrg->desc->num_ctr; i++) {
-		struct rate_ctr *ctr = &ctrg->ctr[i];
-		if (ctr->current && !strchr(ctrg->desc->ctr_desc[i].name, '.'))
-			fprintf(stream, " %s%s: %llu%s",
-				prefix, ctrg->desc->ctr_desc[i].description,
-				(long long)ctr->current,
-				"\n");
-	};
-}
-
-/* Signal handler for signals from NS layer */
-static int test_signal(unsigned int subsys, unsigned int signal,
-		  void *handler_data, void *signal_data)
-{
-	struct ns_signal_data *nssd = signal_data;
-	int rc;
-
-	if (subsys != SS_L_NS)
-		return 0;
-
-	switch (signal) {
-	case S_NS_RESET:
-		printf("==> got signal NS_RESET, NS-VC 0x%04x/%s\n",
-		       nssd->nsvc->nsvci,
-		       gprs_ns_ll_str(nssd->nsvc));
-		break;
-
-	case S_NS_ALIVE_EXP:
-		printf("==> got signal NS_ALIVE_EXP, NS-VC 0x%04x/%s\n",
-		       nssd->nsvc->nsvci,
-		       gprs_ns_ll_str(nssd->nsvc));
-		break;
-
-	case S_NS_BLOCK:
-		printf("==> got signal NS_BLOCK, NS-VC 0x%04x/%s\n",
-		       nssd->nsvc->nsvci,
-		       gprs_ns_ll_str(nssd->nsvc));
-		break;
-
-	case S_NS_UNBLOCK:
-		printf("==> got signal NS_UNBLOCK, NS-VC 0x%04x/%s\n",
-		       nssd->nsvc->nsvci,
-		       gprs_ns_ll_str(nssd->nsvc));
-		break;
-
-	case S_NS_REPLACED:
-		printf("==> got signal NS_REPLACED: 0x%04x/%s",
-		       nssd->nsvc->nsvci,
-		       gprs_ns_ll_str(nssd->nsvc));
-		printf(" -> 0x%04x/%s\n",
-		       nssd->old_nsvc->nsvci,
-		       gprs_ns_ll_str(nssd->old_nsvc));
-		break;
-
-	default:
-		printf("==> got signal %d, NS-VC 0x%04x/%s\n", signal,
-		       nssd->nsvc->nsvci,
-		       gprs_ns_ll_str(nssd->nsvc));
-		break;
-	}
-	printf("\n");
-	rc = gbprox_signal(subsys, signal, handler_data, signal_data);
-	return rc;
-}
-
-static int gprs_process_message(struct gprs_ns_inst *nsi, const char *text, struct sockaddr_in *peer, const unsigned char* data, size_t data_len)
-{
-	struct msgb *msg;
-	int ret;
-	if (data_len > NS_ALLOC_SIZE - NS_ALLOC_HEADROOM) {
-		fprintf(stderr, "message too long: %zu\n", data_len);
-		return -1;
-	}
-
-	msg = gprs_ns_msgb_alloc();
-	OSMO_ASSERT(msg);
-	memmove(msg->data, data, data_len);
-	msg->l2h = msg->data;
-	msgb_put(msg, data_len);
-
-	printf("PROCESSING %s from 0x%08x:%d\n%s\n\n",
-	       text, ntohl(peer->sin_addr.s_addr), ntohs(peer->sin_port),
-	       osmo_hexdump(data, data_len));
-
-	ret = gprs_ns_rcvmsg(nsi, msg, peer, GPRS_NS_LL_UDP);
-
-	/* gprs_ns_rcvmsg() in old libosmocore returns "number of bytes
-	 * transmitted by any response PDU we sent as a result of the
-	 * received message", while modern libosmocore simply retunrs '0'
-	 * for any successfully received message.  Let's make sure any
-	 * non-negative responses lead to a reproducible test output
-	 * with both old and new libosmocore. */
-	printf("result (%s) = %d\n\n", text, ret < 0 ? ret : 0);
-
-	msgb_free(msg);
-
-	return ret;
-}
-
-static void gprs_dump_nsi(struct gprs_ns_inst *nsi)
-{
-	struct gprs_nsvc *nsvc;
-
-	printf("Current NS-VCIs:\n");
-	llist_for_each_entry(nsvc, &nsi->gprs_nsvcs, list) {
-		struct sockaddr_in *peer = &(nsvc->ip.bts_addr);
-		printf("    VCI 0x%04x, NSEI 0x%04x, peer 0x%08x:%d%s%s\n",
-		       nsvc->nsvci, nsvc->nsei,
-		       ntohl(peer->sin_addr.s_addr), ntohs(peer->sin_port),
-		       nsvc->state & NSE_S_BLOCKED ? ", blocked" : "",
-		       nsvc->state & NSE_S_ALIVE   ? "" : ", dead"
-		      );
-		dump_rate_ctr_group(stdout, "        ", nsvc->ctrg);
-	}
-	printf("\n");
-}
-
 static void test_gbproxy()
 {
-	struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx);
-	struct sockaddr_in bss_peer[4] = {{0},};
-	struct sockaddr_in sgsn_peer= {0};
+	struct gprs_ns2_inst *nsi = gprs_ns2_instantiate(tall_sgsn_ctx, gprs_ns2_callback, &gbcfg);
+	uint16_t bss_nsei[2] = {0x1000, 0x2000};
 
-	bssgp_nsi = nsi;
-	gbcfg.nsi = bssgp_nsi;
+	gbcfg.nsi = nsi;
 	gbcfg.nsip_sgsn_nsei = SGSN_NSEI;
 
-	configure_sgsn_peer(&sgsn_peer);
-	configure_bss_peers(bss_peer, ARRAY_SIZE(bss_peer));
+	bssgp_set_bssgp_callback(gbprox_test_bssgp_send_cb, &gbcfg);
 
 	printf("=== %s ===\n", __func__);
 	printf("--- Initialise SGSN ---\n\n");
 
-	connect_sgsn(nsi, &sgsn_peer, SGSN_NSEI);
-	gprs_dump_nsi(nsi);
+	connect_sgsn(nsi, SGSN_NSEI);
 
 	printf("--- Initialise BSS 1 ---\n\n");
 
-	setup_ns(nsi, &bss_peer[0], 0x1001, 0x1000);
-	setup_bssgp(nsi, &bss_peer[0], 0x1002);
-	gprs_dump_nsi(nsi);
+	setup_ns(nsi, bss_nsei[0]);
+	setup_bssgp(nsi, bss_nsei[0], 0x1002);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_bssgp_reset_ack(nsi, &sgsn_peer, 0x1002);
+	send_bssgp_reset_ack(nsi, SGSN_NSEI, 0x1002);
 
 	printf("--- Initialise BSS 2 ---\n\n");
 
-	setup_ns(nsi, &bss_peer[1], 0x2001, 0x2000);
-	setup_bssgp(nsi, &bss_peer[1], 0x2002);
-	gprs_dump_nsi(nsi);
-	dump_peers(stdout, 0, 0, &gbcfg);
-
-	send_bssgp_reset_ack(nsi, &sgsn_peer, 0x2002);
-
-	printf("--- Move BSS 1 to new port ---\n\n");
-
-	setup_ns(nsi, &bss_peer[2], 0x1001, 0x1000);
-	gprs_dump_nsi(nsi);
+	setup_ns(nsi, bss_nsei[1]);
+	setup_bssgp(nsi, bss_nsei[1], 0x2002);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	printf("--- Move BSS 2 to former BSS 1 port ---\n\n");
-
-	setup_ns(nsi, &bss_peer[0], 0x2001, 0x2000);
-	gprs_dump_nsi(nsi);
-	dump_peers(stdout, 0, 0, &gbcfg);
-
-	printf("--- Move BSS 1 to current BSS 2 port ---\n\n");
-
-	setup_ns(nsi, &bss_peer[0], 0x2001, 0x2000);
-	gprs_dump_nsi(nsi);
-	dump_peers(stdout, 0, 0, &gbcfg);
-
-	printf("--- Move BSS 2 to new port ---\n\n");
-
-	setup_ns(nsi, &bss_peer[3], 0x2001, 0x2000);
-	gprs_dump_nsi(nsi);
-	dump_peers(stdout, 0, 0, &gbcfg);
-
-	printf("--- Move BSS 2 to former BSS 1 port ---\n\n");
-
-	setup_ns(nsi, &bss_peer[2], 0x2001, 0x2000);
-	gprs_dump_nsi(nsi);
-	dump_peers(stdout, 0, 0, &gbcfg);
-
-	printf("--- Move BSS 1 to original BSS 1 port ---\n\n");
-
-	setup_ns(nsi, &bss_peer[0], 0x1001, 0x1000);
-	gprs_dump_nsi(nsi);
-	dump_peers(stdout, 0, 0, &gbcfg);
+	send_bssgp_reset_ack(nsi, SGSN_NSEI, 0x2002);
 
 	printf("--- Reset BSS 1 with a new BVCI ---\n\n");
 
-	setup_bssgp(nsi, &bss_peer[0], 0x1012);
-	gprs_dump_nsi(nsi);
+	setup_bssgp(nsi, bss_nsei[0], 0x1012);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_bssgp_reset_ack(nsi, &sgsn_peer, 0x1012);
+	send_bssgp_reset_ack(nsi, SGSN_NSEI, 0x1012);
 
 	printf("--- Reset BSS 1 with the old BVCI ---\n\n");
 
-	setup_bssgp(nsi, &bss_peer[0], 0x1002);
-	gprs_dump_nsi(nsi);
+	setup_bssgp(nsi, bss_nsei[0], 0x1002);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_bssgp_reset_ack(nsi, &sgsn_peer, 0x1002);
+	send_bssgp_reset_ack(nsi, SGSN_NSEI, 0x1002);
 
 	printf("--- Reset BSS 1 with the old BVCI again ---\n\n");
 
-	setup_bssgp(nsi, &bss_peer[0], 0x1002);
-	gprs_dump_nsi(nsi);
+	setup_bssgp(nsi, bss_nsei[0], 0x1002);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_bssgp_reset_ack(nsi, &sgsn_peer, 0x1002);
+	send_bssgp_reset_ack(nsi, SGSN_NSEI, 0x1002);
 
 	printf("--- Send message from BSS 1 to SGSN, BVCI 0x1012 ---\n\n");
 
-	send_ns_unitdata(nsi, NULL, &bss_peer[0], 0x1012, (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, bss_nsei[0], 0x1012, (uint8_t *)"", 0);
 
 	printf("--- Send message from SGSN to BSS 1, BVCI 0x1012 ---\n\n");
 
-	send_ns_unitdata(nsi, NULL, &sgsn_peer, 0x1012, (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, SGSN_NSEI, 0x1012, (uint8_t *)"", 0);
 
 	printf("--- Send message from BSS 1 to SGSN, BVCI 0x1002 ---\n\n");
 
-	send_ns_unitdata(nsi, NULL, &bss_peer[0], 0x1012, (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, bss_nsei[0], 0x1012, (uint8_t *)"", 0);
 
 	printf("--- Send message from SGSN to BSS 1, BVCI 0x1002 ---\n\n");
 
-	send_ns_unitdata(nsi, NULL, &sgsn_peer, 0x1012, (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, SGSN_NSEI, 0x1012, (uint8_t *)"", 0);
 
 	printf("--- Send message from BSS 2 to SGSN, BVCI 0x2002 ---\n\n");
 
-	send_ns_unitdata(nsi, NULL, &bss_peer[0], 0x2002, (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, bss_nsei[0], 0x2002, (uint8_t *)"", 0);
 
 	printf("--- Send message from SGSN to BSS 2, BVCI 0x2002 ---\n\n");
 
-	send_ns_unitdata(nsi, NULL, &sgsn_peer, 0x2002, (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, SGSN_NSEI, 0x2002, (uint8_t *)"", 0);
 
 	printf("--- Reset BSS 1 with the old BVCI on BSS2's link ---\n\n");
 
-	setup_bssgp(nsi, &bss_peer[2], 0x1002);
-	gprs_dump_nsi(nsi);
+	setup_bssgp(nsi, bss_nsei[0], 0x1002);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	dump_global(stdout, 0);
 
-	send_bssgp_reset_ack(nsi, &sgsn_peer, 0x1002);
+	send_bssgp_reset_ack(nsi, SGSN_NSEI, 0x1002);
 
 	printf("--- Send message from BSS 1 to SGSN, BVCI 0x1002 ---\n\n");
 
-	send_ns_unitdata(nsi, NULL, &bss_peer[0], 0x1012, (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, bss_nsei[0], 0x1012, (uint8_t *)"", 0);
 
 	printf("--- Send message from SGSN to BSS 1, BVCI 0x1002 ---\n\n");
 
-	send_ns_unitdata(nsi, NULL, &sgsn_peer, 0x1012, (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, SGSN_NSEI, 0x1012, (uint8_t *)"", 0);
 
 	printf("--- Send message from SGSN to BSS 1, BVCI 0x10ff (invalid) ---\n\n");
 
-	send_ns_unitdata(nsi, NULL, &sgsn_peer, 0x10ff, (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, SGSN_NSEI, 0x10ff, (uint8_t *)"", 0);
 
 	/* Find peer */
 	OSMO_ASSERT(gbproxy_peer_by_bvci(&gbcfg, 0xeeee) == NULL);
@@ -1499,147 +1303,136 @@ static void test_gbproxy()
 	dump_global(stdout, 0);
 
 	gbprox_reset(&gbcfg);
-	gprs_ns_destroy(nsi);
+	gprs_ns2_free(nsi);
 	nsi = NULL;
 }
 
 static void test_gbproxy_ident_changes()
 {
-	struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx);
-	struct sockaddr_in bss_peer[1] = {{0},};
-	struct sockaddr_in sgsn_peer= {0};
-	uint16_t nsei[2] = {0x1000, 0x2000};
-	uint16_t nsvci[2] = {0x1001, 0x2001};
+	struct gprs_ns2_inst *nsi = gprs_ns2_instantiate(tall_sgsn_ctx, gprs_ns2_callback, &gbcfg);
+	uint16_t bss_nsei[2] = {0x1000, 0x2000};
 	uint16_t bvci[4] = {0x1002, 0x2002, 0x3002, 0x4002};
 
-	bssgp_nsi = nsi;
-	gbcfg.nsi = bssgp_nsi;
+	gbcfg.nsi = nsi;
 	gbcfg.nsip_sgsn_nsei = SGSN_NSEI;
 
-	configure_sgsn_peer(&sgsn_peer);
-	configure_bss_peers(bss_peer, ARRAY_SIZE(bss_peer));
+	bssgp_set_bssgp_callback(gbprox_test_bssgp_send_cb, &gbcfg);
 
 	printf("=== %s ===\n", __func__);
 	printf("--- Initialise SGSN ---\n\n");
 
-	connect_sgsn(nsi, &sgsn_peer, SGSN_NSEI);
-	gprs_dump_nsi(nsi);
+	connect_sgsn(nsi, SGSN_NSEI);
 
 	printf("--- Initialise BSS 1 ---\n\n");
 
-	setup_ns(nsi, &bss_peer[0], nsvci[0], nsei[0]);
-	gprs_dump_nsi(nsi);
+	setup_ns(nsi, bss_nsei[0]);
 
 	printf("--- Setup BVCI 1 ---\n\n");
 
-	setup_bssgp(nsi, &bss_peer[0], bvci[0]);
-	send_bssgp_reset_ack(nsi, &sgsn_peer, bvci[0]);
+	setup_bssgp(nsi, bss_nsei[0], bvci[0]);
+	send_bssgp_reset_ack(nsi, SGSN_NSEI, bvci[0]);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	printf("--- Setup BVCI 2 ---\n\n");
 
-	setup_bssgp(nsi, &bss_peer[0], bvci[1]);
-	send_bssgp_reset_ack(nsi, &sgsn_peer, bvci[1]);
+	setup_bssgp(nsi, bss_nsei[0], bvci[1]);
+	send_bssgp_reset_ack(nsi, SGSN_NSEI, bvci[1]);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	printf("--- Send message from BSS 1 to SGSN and back, BVCI 1 ---\n\n");
 
-	send_ns_unitdata(nsi, NULL, &bss_peer[0], bvci[0], (uint8_t *)"", 0);
-	send_ns_unitdata(nsi, NULL, &sgsn_peer, bvci[0], (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, bss_nsei[0], bvci[0], (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, SGSN_NSEI, bvci[0], (uint8_t *)"", 0);
 
 	printf("--- Send message from BSS 1 to SGSN and back, BVCI 2 ---\n\n");
 
-	send_ns_unitdata(nsi, NULL, &bss_peer[0], bvci[1], (uint8_t *)"", 0);
-	send_ns_unitdata(nsi, NULL, &sgsn_peer, bvci[1], (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, bss_nsei[0], bvci[1], (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, SGSN_NSEI, bvci[1], (uint8_t *)"", 0);
 
 	printf("--- Change NSEI ---\n\n");
 
-	setup_ns(nsi, &bss_peer[0], nsvci[0], nsei[1]);
-	gprs_dump_nsi(nsi);
+	setup_ns(nsi, bss_nsei[1]);
 
 	printf("--- Setup BVCI 1 ---\n\n");
 
-	setup_bssgp(nsi, &bss_peer[0], bvci[0]);
-	send_bssgp_reset_ack(nsi, &sgsn_peer, bvci[0]);
+	setup_bssgp(nsi, bss_nsei[1], bvci[0]);
+	send_bssgp_reset_ack(nsi, SGSN_NSEI, bvci[0]);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	printf("--- Setup BVCI 3 ---\n\n");
 
-	setup_bssgp(nsi, &bss_peer[0], bvci[2]);
-	send_bssgp_reset_ack(nsi, &sgsn_peer, bvci[2]);
+	setup_bssgp(nsi, bss_nsei[1], bvci[2]);
+	send_bssgp_reset_ack(nsi, SGSN_NSEI, bvci[2]);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	printf("--- Send message from BSS 1 to SGSN and back, BVCI 1 ---\n\n");
 
-	send_ns_unitdata(nsi, NULL, &bss_peer[0], bvci[0], (uint8_t *)"", 0);
-	send_ns_unitdata(nsi, NULL, &sgsn_peer, bvci[0], (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, bss_nsei[1], bvci[0], (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, SGSN_NSEI, bvci[0], (uint8_t *)"", 0);
 
 	printf("--- Send message from BSS 1 to SGSN and back, BVCI 2 "
 	       " (should fail) ---\n\n");
 
-	send_ns_unitdata(nsi, NULL, &bss_peer[0], bvci[1], (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, bss_nsei[1], bvci[1], (uint8_t *)"", 0);
 	dump_peers(stdout, 0, 0, &gbcfg);
-	send_ns_unitdata(nsi, NULL, &sgsn_peer, bvci[1], (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, SGSN_NSEI, bvci[1], (uint8_t *)"", 0);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	printf("--- Send message from BSS 1 to SGSN and back, BVCI 3 ---\n\n");
 
-	send_ns_unitdata(nsi, NULL, &bss_peer[0], bvci[2], (uint8_t *)"", 0);
-	send_ns_unitdata(nsi, NULL, &sgsn_peer, bvci[2], (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, bss_nsei[0], bvci[2], (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, SGSN_NSEI, bvci[2], (uint8_t *)"", 0);
 
 	printf("--- Change NSVCI ---\n\n");
 
-	setup_ns(nsi, &bss_peer[0], nsvci[1], nsei[1]);
-	gprs_dump_nsi(nsi);
+	setup_ns(nsi, bss_nsei[1]);
 
 	printf("--- Setup BVCI 1 ---\n\n");
 
-	setup_bssgp(nsi, &bss_peer[0], bvci[0]);
-	send_bssgp_reset_ack(nsi, &sgsn_peer, bvci[0]);
+	setup_bssgp(nsi, bss_nsei[1], bvci[0]);
+	send_bssgp_reset_ack(nsi, SGSN_NSEI, bvci[0]);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	printf("--- Setup BVCI 4 ---\n\n");
 
-	setup_bssgp(nsi, &bss_peer[0], bvci[3]);
-	send_bssgp_reset_ack(nsi, &sgsn_peer, bvci[3]);
+	setup_bssgp(nsi, bss_nsei[1], bvci[3]);
+	send_bssgp_reset_ack(nsi, SGSN_NSEI, bvci[3]);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	printf("--- Send message from BSS 1 to SGSN and back, BVCI 1 ---\n\n");
 
-	send_ns_unitdata(nsi, NULL, &bss_peer[0], bvci[0], (uint8_t *)"", 0);
-	send_ns_unitdata(nsi, NULL, &sgsn_peer, bvci[0], (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, bss_nsei[1], bvci[0], (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, SGSN_NSEI, bvci[0], (uint8_t *)"", 0);
 
 	printf("--- Send message from BSS 1 to SGSN and back, BVCI 2 "
 	       " (should fail) ---\n\n");
 
-	send_ns_unitdata(nsi, NULL, &bss_peer[0], bvci[1], (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, bss_nsei[1], bvci[1], (uint8_t *)"", 0);
 	dump_peers(stdout, 0, 0, &gbcfg);
-	send_ns_unitdata(nsi, NULL, &sgsn_peer, bvci[1], (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, SGSN_NSEI, bvci[1], (uint8_t *)"", 0);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	printf("--- Send message from BSS 1 to SGSN and back, BVCI 3 ---\n\n");
 
-	send_ns_unitdata(nsi, NULL, &bss_peer[0], bvci[2], (uint8_t *)"", 0);
-	send_ns_unitdata(nsi, NULL, &sgsn_peer, bvci[2], (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, bss_nsei[1], bvci[2], (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, SGSN_NSEI, bvci[2], (uint8_t *)"", 0);
 
 	printf("--- Send message from BSS 1 to SGSN and back, BVCI 4 ---\n\n");
 
-	send_ns_unitdata(nsi, NULL, &bss_peer[0], bvci[3], (uint8_t *)"", 0);
-	send_ns_unitdata(nsi, NULL, &sgsn_peer, bvci[3], (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, bss_nsei[1], bvci[3], (uint8_t *)"", 0);
+	send_ns_unitdata(nsi, NULL, SGSN_NSEI, bvci[3], (uint8_t *)"", 0);
 
 	dump_global(stdout, 0);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	gbprox_reset(&gbcfg);
-	gprs_ns_destroy(nsi);
+	gprs_ns2_free(nsi);
 	nsi = NULL;
 }
 
 static void test_gbproxy_ra_patching()
 {
-	struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx);
-	struct sockaddr_in bss_peer[1] = {{0},};
-	struct sockaddr_in sgsn_peer= {0};
+	struct gprs_ns2_inst *nsi = gprs_ns2_instantiate(tall_sgsn_ctx, gprs_ns2_callback, &gbcfg);
 	struct  gprs_ra_id rai_bss =
 		{.mcc = 112, .mnc = 332, .lac = 16464, .rac = 96};
 	struct  gprs_ra_id rai_sgsn =
@@ -1659,18 +1452,18 @@ static void test_gbproxy_ra_patching()
 	LLIST_HEAD(rcv_list);
 	struct expect_result *expect_res;
 
+	uint16_t bss_nsei[1] = { 0x1000 };
+
 	OSMO_ASSERT(local_tlli == gprs_tmsi2tlli(ptmsi, TLLI_LOCAL));
 
-	bssgp_nsi = nsi;
-	gbcfg.nsi = bssgp_nsi;
+	gbcfg.nsi = nsi;
 	gbcfg.nsip_sgsn_nsei = SGSN_NSEI;
 	gbcfg.core_plmn = (struct osmo_plmn_id){ .mcc = 123, .mnc = 456 };
 	gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100);
 	gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar");
 	gbcfg.patch_ptmsi = 0;
 
-	configure_sgsn_peer(&sgsn_peer);
-	configure_bss_peers(bss_peer, ARRAY_SIZE(bss_peer));
+	bssgp_set_bssgp_callback(gbprox_test_bssgp_send_cb, &gbcfg);
 
 	if (gbproxy_set_patch_filter(&gbcfg.matches[GBPROX_MATCH_PATCHING],
 				     patch_re, &err_msg) != 0) {
@@ -1683,17 +1476,15 @@ static void test_gbproxy_ra_patching()
 	printf("=== %s ===\n", __func__);
 	printf("--- Initialise SGSN ---\n\n");
 
-	connect_sgsn(nsi, &sgsn_peer, SGSN_NSEI);
-	gprs_dump_nsi(nsi);
+	connect_sgsn(nsi, SGSN_NSEI);
 
 	printf("--- Initialise BSS 1 ---\n\n");
 
-	setup_ns(nsi, &bss_peer[0], 0x1001, 0x1000);
+	setup_ns(nsi, bss_nsei[0]);
 
 	received_messages = &rcv_list;
 
-	setup_bssgp(nsi, &bss_peer[0], 0x1002);
-	gprs_dump_nsi(nsi);
+	setup_bssgp(nsi, bss_nsei[0], 0x1002);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	peer = gbproxy_peer_by_nsei(&gbcfg, 0x1000);
@@ -1701,15 +1492,15 @@ static void test_gbproxy_ra_patching()
 
 	OSMO_ASSERT(expect_bssgp_msg(SGSN_NSEI, 0, BSSGP_PDUT_BVC_RESET));
 
-	send_bssgp_reset_ack(nsi, &sgsn_peer, 0x1002);
+	send_bssgp_reset_ack(nsi, SGSN_NSEI, 0x1002);
 
 	OSMO_ASSERT(expect_bssgp_msg(0x1000, 0, BSSGP_PDUT_BVC_RESET_ACK));
 
-	send_bssgp_suspend(nsi, &bss_peer[0], 0xccd1758b, &rai_bss);
+	send_bssgp_suspend(nsi, bss_nsei[0], 0xccd1758b, &rai_bss);
 
 	OSMO_ASSERT(expect_bssgp_msg(SGSN_NSEI, 0, BSSGP_PDUT_SUSPEND));
 
-	send_bssgp_suspend_ack(nsi, &sgsn_peer, 0xccd1758b, &rai_sgsn);
+	send_bssgp_suspend_ack(nsi, SGSN_NSEI, 0xccd1758b, &rai_sgsn);
 
 	OSMO_ASSERT(expect_bssgp_msg(0x1000, 0, BSSGP_PDUT_SUSPEND_ACK));
 
@@ -1721,7 +1512,7 @@ static void test_gbproxy_ra_patching()
 
 	printf("--- Send message from BSS 1 to SGSN, BVCI 0x1002 ---\n\n");
 
-	send_llc_ul_ui(nsi, "ATTACH REQUEST", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST", bss_nsei[0], 0x1002,
 		       foreign_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, 0,
 		       dtap_attach_req, sizeof(dtap_attach_req));
@@ -1729,14 +1520,14 @@ static void test_gbproxy_ra_patching()
 	OSMO_ASSERT(4 == peer->ctrg->ctr[GBPROX_PEER_CTR_RAID_PATCHED_BSS].current);
 	OSMO_ASSERT(expect_gmm_msg(SGSN_NSEI, 0x1002, GSM48_MT_GMM_ATTACH_REQ));
 
-	send_llc_dl_ui(nsi, "IDENT REQUEST", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "IDENT REQUEST", SGSN_NSEI, 0x1002,
 		       foreign_tlli, 0, NULL, 0,
 		       GPRS_SAPI_GMM, 0,
 		       dtap_identity_req, sizeof(dtap_identity_req));
 
 	OSMO_ASSERT(expect_gmm_msg(0x1000, 0x1002, GSM48_MT_GMM_ID_REQ));
 
-	send_llc_ul_ui(nsi, "IDENT RESPONSE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "IDENT RESPONSE", bss_nsei[0], 0x1002,
 		       foreign_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, 3,
 		       dtap_identity_resp, sizeof(dtap_identity_resp));
@@ -1746,7 +1537,7 @@ static void test_gbproxy_ra_patching()
 	OSMO_ASSERT(5 == peer->ctrg->ctr[GBPROX_PEER_CTR_RAID_PATCHED_BSS].current);
 	OSMO_ASSERT(1 == peer->ctrg->ctr[GBPROX_PEER_CTR_RAID_PATCHED_SGSN].current);
 
-	send_llc_dl_ui(nsi, "ATTACH ACCEPT", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "ATTACH ACCEPT", SGSN_NSEI, 0x1002,
 		       foreign_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, 1,
 		       dtap_attach_acc, sizeof(dtap_attach_acc));
@@ -1778,7 +1569,7 @@ static void test_gbproxy_ra_patching()
 	OSMO_ASSERT(!link_info->sgsn_tlli.bss_validated);
 	OSMO_ASSERT(!link_info->sgsn_tlli.net_validated);
 
-	send_llc_ul_ui(nsi, "ATTACH COMPLETE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH COMPLETE", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, 4,
 		       dtap_attach_complete, sizeof(dtap_attach_complete));
@@ -1799,7 +1590,7 @@ static void test_gbproxy_ra_patching()
 	OSMO_ASSERT(!link_info->sgsn_tlli.net_validated);
 
 	/* Replace APN (1) */
-	send_llc_ul_ui(nsi, "ACT PDP CTX REQ (REPLACE APN)", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ACT PDP CTX REQ (REPLACE APN)", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, 3,
 		       dtap_act_pdp_ctx_req, sizeof(dtap_act_pdp_ctx_req));
@@ -1819,7 +1610,7 @@ static void test_gbproxy_ra_patching()
 	OSMO_ASSERT(link_info->sgsn_tlli.bss_validated);
 	OSMO_ASSERT(!link_info->sgsn_tlli.net_validated);
 
-	send_llc_dl_ui(nsi, "GMM INFO", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "GMM INFO", SGSN_NSEI, 0x1002,
 		       local_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, 2,
 		       dtap_gmm_information, sizeof(dtap_gmm_information));
@@ -1836,7 +1627,7 @@ static void test_gbproxy_ra_patching()
 	OSMO_ASSERT(link_info->sgsn_tlli.current == local_tlli);
 
 	/* Replace APN (2) */
-	send_llc_ul_ui(nsi, "ACT PDP CTX REQ (REPLACE APN)", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ACT PDP CTX REQ (REPLACE APN)", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, 3,
 		       dtap_act_pdp_ctx_req, sizeof(dtap_act_pdp_ctx_req));
@@ -1851,7 +1642,7 @@ static void test_gbproxy_ra_patching()
 	gbcfg.core_apn_size = 0;
 
 	/* Remove APN */
-	send_llc_ul_ui(nsi, "ACT PDP CTX REQ (REMOVE APN)", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ACT PDP CTX REQ (REMOVE APN)", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, 3,
 		       dtap_act_pdp_ctx_req, sizeof(dtap_act_pdp_ctx_req));
@@ -1865,7 +1656,7 @@ static void test_gbproxy_ra_patching()
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	/* Detach */
-	send_llc_ul_ui(nsi, "DETACH REQ", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "DETACH REQ", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, 6,
 		       dtap_detach_req, sizeof(dtap_detach_req));
@@ -1875,7 +1666,7 @@ static void test_gbproxy_ra_patching()
 	OSMO_ASSERT(10 == peer->ctrg->ctr[GBPROX_PEER_CTR_RAID_PATCHED_BSS].current);
 	OSMO_ASSERT(2 == peer->ctrg->ctr[GBPROX_PEER_CTR_RAID_PATCHED_SGSN].current);
 
-	send_llc_dl_ui(nsi, "DETACH ACC", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "DETACH ACC", SGSN_NSEI, 0x1002,
 		       local_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, 5,
 		       dtap_detach_acc, sizeof(dtap_detach_acc));
@@ -1886,7 +1677,7 @@ static void test_gbproxy_ra_patching()
 
 	printf("--- RA update ---\n\n");
 
-	send_llc_ul_ui(nsi, "RA UPD REQ", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "RA UPD REQ", bss_nsei[0], 0x1002,
 		       foreign_tlli, &rai_bss, 0x7080,
 		       GPRS_SAPI_GMM, 5,
 		       dtap_ra_upd_req, sizeof(dtap_ra_upd_req));
@@ -1895,7 +1686,7 @@ static void test_gbproxy_ra_patching()
 
 	OSMO_ASSERT(12 == peer->ctrg->ctr[GBPROX_PEER_CTR_RAID_PATCHED_BSS].current);
 
-	send_llc_dl_ui(nsi, "RA UPD ACC", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "RA UPD ACC", SGSN_NSEI, 0x1002,
 		       foreign_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, 6,
 		       dtap_ra_upd_acc, sizeof(dtap_ra_upd_acc));
@@ -1905,7 +1696,7 @@ static void test_gbproxy_ra_patching()
 	OSMO_ASSERT(3 == peer->ctrg->ctr[GBPROX_PEER_CTR_RAID_PATCHED_SGSN].current);
 
 	/* Remove APN */
-	send_llc_ul_ui(nsi, "ACT PDP CTX REQ (REMOVE APN)", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ACT PDP CTX REQ (REMOVE APN)", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, 3,
 		       dtap_act_pdp_ctx_req, sizeof(dtap_act_pdp_ctx_req));
@@ -1919,7 +1710,7 @@ static void test_gbproxy_ra_patching()
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	/* Detach (power off -> no Detach Accept) */
-	send_llc_ul_ui(nsi, "DETACH REQ (PWR OFF)", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "DETACH REQ (PWR OFF)", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, 6,
 		       dtap_detach_po_req, sizeof(dtap_detach_po_req));
@@ -1936,7 +1727,7 @@ static void test_gbproxy_ra_patching()
 	/* The RAI in the Attach Request message differs from the RAI in the
 	 * BSSGP message, only patch the latter */
 
-	send_llc_ul_ui(nsi, "ATTACH REQUEST (foreign RAI)", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST (foreign RAI)", bss_nsei[0], 0x1002,
 		       foreign_tlli2, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, 0,
 		       dtap_attach_req2, sizeof(dtap_attach_req2));
@@ -1946,7 +1737,7 @@ static void test_gbproxy_ra_patching()
 	OSMO_ASSERT(15 == peer->ctrg->ctr[GBPROX_PEER_CTR_RAID_PATCHED_BSS].current);
 
 	printf("TLLI is already detached, shouldn't patch\n");
-	send_llc_ul_ui(nsi, "ACT PDP CTX REQ", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ACT PDP CTX REQ", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, 3,
 		       dtap_act_pdp_ctx_req, sizeof(dtap_act_pdp_ctx_req));
@@ -1954,7 +1745,7 @@ static void test_gbproxy_ra_patching()
 	OSMO_ASSERT(expect_gmm_msg(SGSN_NSEI, 0x1002, GSM48_MT_GSM_ACT_PDP_REQ));
 
 	printf("Invalid RAI, shouldn't patch\n");
-	send_bssgp_suspend_ack(nsi, &sgsn_peer, 0xccd1758b, &rai_unknown);
+	send_bssgp_suspend_ack(nsi, SGSN_NSEI, 0xccd1758b, &rai_unknown);
 
 	/* TODO: The following breaks with the current libosmocore, enable it
 	 * again (and remove the plain expect_msg), when the msgb_bssgph patch
@@ -1973,15 +1764,13 @@ static void test_gbproxy_ra_patching()
 
 	gbproxy_clear_patch_filter(&gbcfg.matches[GBPROX_MATCH_PATCHING]);
 	gbprox_reset(&gbcfg);
-	gprs_ns_destroy(nsi);
+	gprs_ns2_free(nsi);
 	nsi = NULL;
 }
 
 static void test_gbproxy_ptmsi_assignment()
 {
-	struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx);
-	struct sockaddr_in bss_peer[1] = {{0},};
-	struct sockaddr_in sgsn_peer= {0};
+	struct gprs_ns2_inst *nsi = gprs_ns2_instantiate(tall_sgsn_ctx, gprs_ns2_callback, &gbcfg);
 	struct  gprs_ra_id rai_bss =
 		{.mcc = 112, .mnc = 332, .lac = 16464, .rac = 96};
 	struct  gprs_ra_id rai_unknown =
@@ -2002,62 +1791,61 @@ static void test_gbproxy_ptmsi_assignment()
 	unsigned bss_nu = 0;
 	unsigned sgsn_nu = 0;
 
+	uint16_t bss_nsei[1] = { 0x1000 };
+
 	OSMO_ASSERT(local_tlli == gprs_tmsi2tlli(ptmsi, TLLI_LOCAL));
 
-	bssgp_nsi = nsi;
-	gbcfg.nsi = bssgp_nsi;
+	gbcfg.nsi = nsi;
 	gbcfg.nsip_sgsn_nsei = SGSN_NSEI;
 	gbcfg.core_plmn = (struct osmo_plmn_id){};
 	gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100);
 	gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar");
 	gbcfg.patch_ptmsi = 0;
 
-	configure_sgsn_peer(&sgsn_peer);
-	configure_bss_peers(bss_peer, ARRAY_SIZE(bss_peer));
+	bssgp_set_bssgp_callback(gbprox_test_bssgp_send_cb, &gbcfg);
 
 	printf("=== %s ===\n", __func__);
 	printf("--- Initialise SGSN ---\n\n");
 
-	connect_sgsn(nsi, &sgsn_peer, SGSN_NSEI);
+	connect_sgsn(nsi, SGSN_NSEI);
 
 	printf("--- Initialise BSS 1 ---\n\n");
 
-	setup_ns(nsi, &bss_peer[0], 0x1001, 0x1000);
-	setup_bssgp(nsi, &bss_peer[0], 0x1002);
+	setup_ns(nsi, bss_nsei[0]);
+	setup_bssgp(nsi, bss_nsei[0], 0x1002);
 
 	peer = gbproxy_peer_by_nsei(&gbcfg, 0x1000);
 	OSMO_ASSERT(peer != NULL);
 
-	send_bssgp_reset_ack(nsi, &sgsn_peer, 0x1002);
+	send_bssgp_reset_ack(nsi, SGSN_NSEI, 0x1002);
 
-	gprs_dump_nsi(nsi);
 	dump_global(stdout, 0);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	printf("--- Establish first LLC connection ---\n\n");
 
-	send_llc_ul_ui(nsi, "ATTACH REQUEST", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST", bss_nsei[0], 0x1002,
 		       foreign_tlli1, &rai_unknown, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req, sizeof(dtap_attach_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "IDENT REQUEST", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "IDENT REQUEST", SGSN_NSEI, 0x1002,
 		       foreign_tlli1, 0, NULL, 0,
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_identity_req, sizeof(dtap_identity_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "IDENT RESPONSE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "IDENT RESPONSE", bss_nsei[0], 0x1002,
 		       foreign_tlli1, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_identity_resp, sizeof(dtap_identity_resp));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "ATTACH ACCEPT", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "ATTACH ACCEPT", SGSN_NSEI, 0x1002,
 		       foreign_tlli1, 1, imsi1, sizeof(imsi1),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_attach_acc, sizeof(dtap_attach_acc));
@@ -2074,7 +1862,7 @@ static void test_gbproxy_ptmsi_assignment()
 	OSMO_ASSERT(!link_info->tlli.net_validated);
 	OSMO_ASSERT(link_info->tlli.ptmsi == ptmsi);
 
-	send_llc_ul_ui(nsi, "ATTACH COMPLETE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH COMPLETE", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_complete, sizeof(dtap_attach_complete));
@@ -2090,7 +1878,7 @@ static void test_gbproxy_ptmsi_assignment()
 	OSMO_ASSERT(link_info->tlli.ptmsi == ptmsi);
 
 
-	send_llc_dl_ui(nsi, "GMM INFO", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "GMM INFO", SGSN_NSEI, 0x1002,
 		       local_tlli, 1, imsi1, sizeof(imsi1),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_gmm_information, sizeof(dtap_gmm_information));
@@ -2110,28 +1898,28 @@ static void test_gbproxy_ptmsi_assignment()
 
 	printf("--- Establish second LLC connection with the same P-TMSI ---\n\n");
 
-	send_llc_ul_ui(nsi, "ATTACH REQUEST", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST", bss_nsei[0], 0x1002,
 		       foreign_tlli2, &rai_unknown, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req, sizeof(dtap_attach_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "IDENT REQUEST", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "IDENT REQUEST", SGSN_NSEI, 0x1002,
 		       foreign_tlli2, 0, NULL, 0,
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_identity_req, sizeof(dtap_identity_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "IDENT RESPONSE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "IDENT RESPONSE", bss_nsei[0], 0x1002,
 		       foreign_tlli2, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_identity2_resp, sizeof(dtap_identity2_resp));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "ATTACH ACCEPT", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "ATTACH ACCEPT", SGSN_NSEI, 0x1002,
 		       foreign_tlli2, 1, imsi2, sizeof(imsi2),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_attach_acc, sizeof(dtap_attach_acc));
@@ -2148,7 +1936,7 @@ static void test_gbproxy_ptmsi_assignment()
 	OSMO_ASSERT(!link_info->tlli.net_validated);
 	OSMO_ASSERT(link_info->tlli.ptmsi == ptmsi);
 
-	send_llc_ul_ui(nsi, "ATTACH COMPLETE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH COMPLETE", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_complete, sizeof(dtap_attach_complete));
@@ -2163,7 +1951,7 @@ static void test_gbproxy_ptmsi_assignment()
 	OSMO_ASSERT(!link_info->tlli.net_validated);
 	OSMO_ASSERT(link_info->tlli.ptmsi == ptmsi);
 
-	send_llc_dl_ui(nsi, "GMM INFO", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "GMM INFO", SGSN_NSEI, 0x1002,
 		       local_tlli, 1, imsi2, sizeof(imsi2),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_gmm_information, sizeof(dtap_gmm_information));
@@ -2187,7 +1975,7 @@ static void test_gbproxy_ptmsi_assignment()
 	gbcfg.core_apn = NULL;
 
 	gbprox_reset(&gbcfg);
-	gprs_ns_destroy(nsi);
+	gprs_ns2_free(nsi);
 	nsi = NULL;
 
 	cleanup_test();
@@ -2195,9 +1983,7 @@ static void test_gbproxy_ptmsi_assignment()
 
 static void test_gbproxy_ptmsi_patching()
 {
-	struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx);
-	struct sockaddr_in bss_peer[1] = {{0},};
-	struct sockaddr_in sgsn_peer= {0};
+	struct gprs_ns2_inst *nsi = gprs_ns2_instantiate(tall_sgsn_ctx, gprs_ns2_callback, &gbcfg);
 	struct  gprs_ra_id rai_bss =
 		{.mcc = 112, .mnc = 332, .lac = 16464, .rac = 96};
 	struct  gprs_ra_id rai_sgsn =
@@ -2233,6 +2019,8 @@ static void test_gbproxy_ptmsi_patching()
 	unsigned sgsn_nu = 0;
 	int old_ctr;
 
+	uint16_t bss_nsei[1] = { 0x1000 };
+
 	OSMO_ASSERT(local_sgsn_tlli == gprs_tmsi2tlli(sgsn_ptmsi, TLLI_LOCAL));
 	OSMO_ASSERT(local_sgsn_tlli2 == gprs_tmsi2tlli(sgsn_ptmsi2, TLLI_LOCAL));
 	OSMO_ASSERT(local_sgsn_tlli3 == gprs_tmsi2tlli(sgsn_ptmsi3, TLLI_LOCAL));
@@ -2240,60 +2028,57 @@ static void test_gbproxy_ptmsi_patching()
 	OSMO_ASSERT(local_bss_tlli2 == gprs_tmsi2tlli(bss_ptmsi2, TLLI_LOCAL));
 	OSMO_ASSERT(local_bss_tlli3 == gprs_tmsi2tlli(bss_ptmsi3, TLLI_LOCAL));
 
-	bssgp_nsi = nsi;
-	gbcfg.nsi = bssgp_nsi;
+	gbcfg.nsi = nsi;
 	gbcfg.nsip_sgsn_nsei = SGSN_NSEI;
 	gbcfg.core_plmn = (struct osmo_plmn_id){ .mcc = 123, .mnc = 456 };
 	gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100);
 	gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar");
 	gbcfg.patch_ptmsi = 1;
 
-	configure_sgsn_peer(&sgsn_peer);
-	configure_bss_peers(bss_peer, ARRAY_SIZE(bss_peer));
+	bssgp_set_bssgp_callback(gbprox_test_bssgp_send_cb, &gbcfg);
 
 	printf("=== %s ===\n", __func__);
 	printf("--- Initialise SGSN ---\n\n");
 
-	connect_sgsn(nsi, &sgsn_peer, SGSN_NSEI);
+	connect_sgsn(nsi, SGSN_NSEI);
 
 	printf("--- Initialise BSS 1 ---\n\n");
 
-	setup_ns(nsi, &bss_peer[0], 0x1001, 0x1000);
-	setup_bssgp(nsi, &bss_peer[0], 0x1002);
+	setup_ns(nsi, bss_nsei[0]);
+	setup_bssgp(nsi, bss_nsei[0], 0x1002);
 
 	peer = gbproxy_peer_by_nsei(&gbcfg, 0x1000);
 	OSMO_ASSERT(peer != NULL);
 
-	send_bssgp_reset_ack(nsi, &sgsn_peer, 0x1002);
+	send_bssgp_reset_ack(nsi, SGSN_NSEI, 0x1002);
 
-	gprs_dump_nsi(nsi);
 	dump_global(stdout, 0);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	printf("--- Send message from BSS 1 to SGSN, BVCI 0x1002 ---\n\n");
 
-	send_llc_ul_ui(nsi, "ATTACH REQUEST", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli, &rai_unknown, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req, sizeof(dtap_attach_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "IDENT REQUEST", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "IDENT REQUEST", SGSN_NSEI, 0x1002,
 		       random_sgsn_tlli, 0, NULL, 0,
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_identity_req, sizeof(dtap_identity_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "IDENT RESPONSE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "IDENT RESPONSE", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_identity_resp, sizeof(dtap_identity_resp));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "ATTACH ACCEPT", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "ATTACH ACCEPT", SGSN_NSEI, 0x1002,
 		       random_sgsn_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_attach_acc, sizeof(dtap_attach_acc));
@@ -2313,7 +2098,7 @@ static void test_gbproxy_ptmsi_patching()
 	OSMO_ASSERT(!link_info->sgsn_tlli.net_validated);
 	OSMO_ASSERT(link_info->sgsn_tlli.ptmsi == sgsn_ptmsi);
 
-	send_llc_ul_ui(nsi, "ATTACH COMPLETE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH COMPLETE", bss_nsei[0], 0x1002,
 		       local_bss_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_complete, sizeof(dtap_attach_complete));
@@ -2331,7 +2116,7 @@ static void test_gbproxy_ptmsi_patching()
 	OSMO_ASSERT(link_info->sgsn_tlli.bss_validated);
 	OSMO_ASSERT(!link_info->sgsn_tlli.net_validated);
 
-	send_llc_dl_ui(nsi, "GMM INFO", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "GMM INFO", SGSN_NSEI, 0x1002,
 		       local_sgsn_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_gmm_information, sizeof(dtap_gmm_information));
@@ -2345,7 +2130,7 @@ static void test_gbproxy_ptmsi_patching()
 	OSMO_ASSERT(link_info->sgsn_tlli.current == local_sgsn_tlli);
 	OSMO_ASSERT(link_info->sgsn_tlli.assigned == 0);
 
-	send_llc_ul_ui(nsi, "ACT PDP CTX REQ (REPLACE APN)", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ACT PDP CTX REQ (REPLACE APN)", bss_nsei[0], 0x1002,
 		       local_bss_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_act_pdp_ctx_req, sizeof(dtap_act_pdp_ctx_req));
@@ -2353,20 +2138,20 @@ static void test_gbproxy_ptmsi_patching()
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	/* Non-DTAP */
-	send_bssgp_ul_unitdata(nsi, "XID (UL)", &bss_peer[0], 0x1002,
+	send_bssgp_ul_unitdata(nsi, "XID (UL)", bss_nsei[0], 0x1002,
 			       local_bss_tlli, &rai_bss, cell_id,
 			       llc_u_xid_ul, sizeof(llc_u_xid_ul));
 
-	send_bssgp_dl_unitdata(nsi, "XID (DL)", &sgsn_peer, 0x1002,
+	send_bssgp_dl_unitdata(nsi, "XID (DL)", SGSN_NSEI, 0x1002,
 			       local_sgsn_tlli, 1, imsi, sizeof(imsi),
 			       llc_u_xid_dl, sizeof(llc_u_xid_dl));
 
-	send_bssgp_ul_unitdata(nsi, "LL11 DNS QUERY (UL)", &bss_peer[0], 0x1002,
+	send_bssgp_ul_unitdata(nsi, "LL11 DNS QUERY (UL)", bss_nsei[0], 0x1002,
 			       local_bss_tlli, &rai_bss, cell_id,
 			       llc_ui_ll11_dns_query_ul,
 			       sizeof(llc_ui_ll11_dns_query_ul));
 
-	send_bssgp_dl_unitdata(nsi, "LL11 DNS RESP (DL)", &sgsn_peer, 0x1002,
+	send_bssgp_dl_unitdata(nsi, "LL11 DNS RESP (DL)", SGSN_NSEI, 0x1002,
 			       local_sgsn_tlli, 1, imsi, sizeof(imsi),
 			       llc_ui_ll11_dns_resp_dl,
 			       sizeof(llc_ui_ll11_dns_resp_dl));
@@ -2374,12 +2159,12 @@ static void test_gbproxy_ptmsi_patching()
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	/* Repeated RA Update Requests */
-	send_llc_ul_ui(nsi, "RA UPD REQ (P-TMSI 2)", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "RA UPD REQ (P-TMSI 2)", bss_nsei[0], 0x1002,
 		       local_bss_tlli, &rai_bss, 0x7080,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_ra_upd_req, sizeof(dtap_ra_upd_req));
 
-	send_llc_dl_ui(nsi, "RA UDP ACC (P-TMSI 2)", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "RA UDP ACC (P-TMSI 2)", SGSN_NSEI, 0x1002,
 		       local_sgsn_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_ra_upd_acc2, sizeof(dtap_ra_upd_acc2));
@@ -2400,12 +2185,12 @@ static void test_gbproxy_ptmsi_patching()
 	OSMO_ASSERT(!link_info->sgsn_tlli.net_validated);
 	OSMO_ASSERT(link_info->sgsn_tlli.ptmsi == sgsn_ptmsi2);
 
-	send_llc_ul_ui(nsi, "RA UPD REQ (P-TMSI 3)", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "RA UPD REQ (P-TMSI 3)", bss_nsei[0], 0x1002,
 		       local_bss_tlli2, &rai_bss, 0x7080,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_ra_upd_req, sizeof(dtap_ra_upd_req));
 
-	send_llc_dl_ui(nsi, "RA UDP ACC (P-TMSI 3)", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "RA UDP ACC (P-TMSI 3)", SGSN_NSEI, 0x1002,
 		       local_sgsn_tlli2, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_ra_upd_acc3, sizeof(dtap_ra_upd_acc3));
@@ -2427,7 +2212,7 @@ static void test_gbproxy_ptmsi_patching()
 	OSMO_ASSERT(!link_info->sgsn_tlli.net_validated);
 	OSMO_ASSERT(link_info->sgsn_tlli.ptmsi == sgsn_ptmsi3);
 
-	send_llc_ul_ui(nsi, "RA UPD COMPLETE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "RA UPD COMPLETE", bss_nsei[0], 0x1002,
 		       local_bss_tlli3, &rai_bss, 0x7080,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_ra_upd_complete, sizeof(dtap_ra_upd_complete));
@@ -2440,7 +2225,7 @@ static void test_gbproxy_ptmsi_patching()
 	OSMO_ASSERT(link_info->sgsn_tlli.bss_validated);
 	OSMO_ASSERT(!link_info->sgsn_tlli.net_validated);
 
-	send_llc_dl_ui(nsi, "GMM INFO", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "GMM INFO", SGSN_NSEI, 0x1002,
 		       local_sgsn_tlli3, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_gmm_information, sizeof(dtap_gmm_information));
@@ -2455,22 +2240,22 @@ static void test_gbproxy_ptmsi_patching()
 	OSMO_ASSERT(link_info->sgsn_tlli.assigned == 0);
 
 	/* Other messages */
-	send_bssgp_llc_discarded(nsi, &bss_peer[0], 0x1002,
+	send_bssgp_llc_discarded(nsi, bss_nsei[0], 0x1002,
 				 local_bss_tlli3, 1, 12);
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_bssgp_suspend(nsi, &bss_peer[0], local_bss_tlli3, &rai_bss);
+	send_bssgp_suspend(nsi, bss_nsei[0], local_bss_tlli3, &rai_bss);
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_bssgp_suspend_ack(nsi, &sgsn_peer, local_sgsn_tlli3, &rai_sgsn);
+	send_bssgp_suspend_ack(nsi, SGSN_NSEI, local_sgsn_tlli3, &rai_sgsn);
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	old_ctr = peer->ctrg->ctr[GBPROX_PEER_CTR_PTMSI_PATCHED_SGSN].current;
 
-	send_bssgp_paging(nsi, &sgsn_peer, imsi, sizeof(imsi), &rai_bss, sgsn_ptmsi3);
+	send_bssgp_paging(nsi, SGSN_NSEI, imsi, sizeof(imsi), &rai_bss, sgsn_ptmsi3);
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
@@ -2478,42 +2263,42 @@ static void test_gbproxy_ptmsi_patching()
 		    peer->ctrg->ctr[GBPROX_PEER_CTR_PTMSI_PATCHED_SGSN].current);
 
 	/* Bad case: Invalid BVCI */
-	send_bssgp_llc_discarded(nsi, &bss_peer[0], 0xeee1,
+	send_bssgp_llc_discarded(nsi, bss_nsei[0], 0xeee1,
 				 local_bss_tlli3, 1, 12);
 	dump_global(stdout, 0);
 
 	/* Bad case: Invalid RAI */
-	send_bssgp_suspend_ack(nsi, &sgsn_peer, local_sgsn_tlli3, &rai_unknown);
+	send_bssgp_suspend_ack(nsi, SGSN_NSEI, local_sgsn_tlli3, &rai_unknown);
 
 	dump_global(stdout, 0);
 
 	/* Bad case: Invalid MCC (LAC ok) */
-	send_bssgp_suspend_ack(nsi, &sgsn_peer, local_sgsn_tlli3,
+	send_bssgp_suspend_ack(nsi, SGSN_NSEI, local_sgsn_tlli3,
 			       &rai_wrong_mcc_sgsn);
 
 	dump_global(stdout, 0);
 
 	/* Bad case: Invalid TLLI from SGSN (IMSI unknown) */
-	send_llc_dl_ui(nsi, "GMM INFO", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "GMM INFO", SGSN_NSEI, 0x1002,
 		       unknown_sgsn_tlli, 1, NULL, 0,
 		       GPRS_SAPI_GMM, 2,
 		       dtap_gmm_information, sizeof(dtap_gmm_information));
 
 	/* Bad case: Invalid TLLI from SGSN (IMSI known) */
-	send_llc_dl_ui(nsi, "GMM INFO", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "GMM INFO", SGSN_NSEI, 0x1002,
 		       unknown_sgsn_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, 3,
 		       dtap_gmm_information, sizeof(dtap_gmm_information));
 
 	/* Detach */
-	send_llc_ul_ui(nsi, "DETACH REQ", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "DETACH REQ", bss_nsei[0], 0x1002,
 		       local_bss_tlli3, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_detach_req, sizeof(dtap_detach_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "DETACH ACC", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "DETACH ACC", SGSN_NSEI, 0x1002,
 		       local_sgsn_tlli3, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_detach_acc, sizeof(dtap_detach_acc));
@@ -2526,7 +2311,7 @@ static void test_gbproxy_ptmsi_patching()
 	gbcfg.core_apn = NULL;
 
 	gbprox_reset(&gbcfg);
-	gprs_ns_destroy(nsi);
+	gprs_ns2_free(nsi);
 	nsi = NULL;
 
 	cleanup_test();
@@ -2534,9 +2319,7 @@ static void test_gbproxy_ptmsi_patching()
 
 static void test_gbproxy_ptmsi_patching_bad_cases()
 {
-	struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx);
-	struct sockaddr_in bss_peer[1] = {{0},};
-	struct sockaddr_in sgsn_peer= {0};
+	struct gprs_ns2_inst *nsi = gprs_ns2_instantiate(tall_sgsn_ctx, gprs_ns2_callback, &gbcfg);
 	struct  gprs_ra_id rai_bss =
 		{.mcc = 112, .mnc = 332, .lac = 16464, .rac = 96};
 	struct  gprs_ra_id rai_unknown =
@@ -2557,64 +2340,62 @@ static void test_gbproxy_ptmsi_patching_bad_cases()
 	struct gbproxy_peer *peer;
 	unsigned bss_nu = 0;
 	unsigned sgsn_nu = 0;
+	uint16_t bss_nsei[] = { 0x1000 };
 
 	OSMO_ASSERT(local_sgsn_tlli == gprs_tmsi2tlli(sgsn_ptmsi, TLLI_LOCAL));
 	OSMO_ASSERT(local_bss_tlli == gprs_tmsi2tlli(bss_ptmsi, TLLI_LOCAL));
 
-	bssgp_nsi = nsi;
-	gbcfg.nsi = bssgp_nsi;
+	gbcfg.nsi = nsi;
 	gbcfg.nsip_sgsn_nsei = SGSN_NSEI;
 	gbcfg.core_plmn = (struct osmo_plmn_id){ .mcc = 123, .mnc = 456 };
 	gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100);
 	gbcfg.core_apn_size = gprs_str_to_apn(gbcfg.core_apn, 100, "foo.bar");
 	gbcfg.patch_ptmsi = 1;
 
-	configure_sgsn_peer(&sgsn_peer);
-	configure_bss_peers(bss_peer, ARRAY_SIZE(bss_peer));
+	bssgp_set_bssgp_callback(gbprox_test_bssgp_send_cb, &gbcfg);
 
 	printf("=== %s ===\n", __func__);
 	printf("--- Initialise SGSN ---\n\n");
 
-	connect_sgsn(nsi, &sgsn_peer, SGSN_NSEI);
+	connect_sgsn(nsi, SGSN_NSEI);
 
 	printf("--- Initialise BSS 1 ---\n\n");
 
-	setup_ns(nsi, &bss_peer[0], 0x1001, 0x1000);
-	setup_bssgp(nsi, &bss_peer[0], 0x1002);
+	setup_ns(nsi, bss_nsei[0]);
+	setup_bssgp(nsi, bss_nsei[0], 0x1002);
 
 	peer = gbproxy_peer_by_nsei(&gbcfg, 0x1000);
 	OSMO_ASSERT(peer != NULL);
 
-	send_bssgp_reset_ack(nsi, &sgsn_peer, 0x1002);
+	send_bssgp_reset_ack(nsi, SGSN_NSEI, 0x1002);
 
-	gprs_dump_nsi(nsi);
 	dump_global(stdout, 0);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	printf("--- Send message from BSS 1 to SGSN, BVCI 0x1002 ---\n\n");
 
-	send_llc_ul_ui(nsi, "ATTACH REQUEST", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli, &rai_unknown, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req, sizeof(dtap_attach_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "IDENT REQUEST", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "IDENT REQUEST", SGSN_NSEI, 0x1002,
 		       random_sgsn_tlli, 0, NULL, 0,
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_identity_req, sizeof(dtap_identity_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "IDENT RESPONSE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "IDENT RESPONSE", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_identity_resp, sizeof(dtap_identity_resp));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "ATTACH ACCEPT", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "ATTACH ACCEPT", SGSN_NSEI, 0x1002,
 		       random_sgsn_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_attach_acc, sizeof(dtap_attach_acc));
@@ -2634,7 +2415,7 @@ static void test_gbproxy_ptmsi_patching_bad_cases()
 	OSMO_ASSERT(!link_info->sgsn_tlli.net_validated);
 	OSMO_ASSERT(link_info->sgsn_tlli.ptmsi == sgsn_ptmsi);
 
-	send_llc_dl_ui(nsi, "ATTACH ACCEPT (duplicated)", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "ATTACH ACCEPT (duplicated)", SGSN_NSEI, 0x1002,
 		       random_sgsn_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_attach_acc, sizeof(dtap_attach_acc));
@@ -2654,7 +2435,7 @@ static void test_gbproxy_ptmsi_patching_bad_cases()
 	OSMO_ASSERT(!link_info->sgsn_tlli.net_validated);
 	OSMO_ASSERT(link_info->sgsn_tlli.ptmsi == sgsn_ptmsi);
 
-	send_llc_ul_ui(nsi, "ATTACH COMPLETE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH COMPLETE", bss_nsei[0], 0x1002,
 		       local_bss_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_complete, sizeof(dtap_attach_complete));
@@ -2672,7 +2453,7 @@ static void test_gbproxy_ptmsi_patching_bad_cases()
 	OSMO_ASSERT(link_info->sgsn_tlli.bss_validated);
 	OSMO_ASSERT(!link_info->sgsn_tlli.net_validated);
 
-	send_llc_dl_ui(nsi, "GMM INFO", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "GMM INFO", SGSN_NSEI, 0x1002,
 		       local_sgsn_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_gmm_information, sizeof(dtap_gmm_information));
@@ -2687,14 +2468,14 @@ static void test_gbproxy_ptmsi_patching_bad_cases()
 	OSMO_ASSERT(link_info->sgsn_tlli.assigned == 0);
 
 	/* Detach */
-	send_llc_ul_ui(nsi, "DETACH REQ", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "DETACH REQ", bss_nsei[0], 0x1002,
 		       local_bss_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_detach_req, sizeof(dtap_detach_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "DETACH ACC", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "DETACH ACC", SGSN_NSEI, 0x1002,
 		       local_sgsn_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_detach_acc, sizeof(dtap_detach_acc));
@@ -2707,7 +2488,7 @@ static void test_gbproxy_ptmsi_patching_bad_cases()
 	gbcfg.core_apn = NULL;
 
 	gbprox_reset(&gbcfg);
-	gprs_ns_destroy(nsi);
+	gprs_ns2_free(nsi);
 	nsi = NULL;
 
 	cleanup_test();
@@ -2716,9 +2497,7 @@ static void test_gbproxy_ptmsi_patching_bad_cases()
 
 static void test_gbproxy_imsi_acquisition()
 {
-	struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx);
-	struct sockaddr_in bss_peer[1] = {{0},};
-	struct sockaddr_in sgsn_peer= {0};
+	struct gprs_ns2_inst *nsi = gprs_ns2_instantiate(tall_sgsn_ctx, gprs_ns2_callback, &gbcfg);
 	struct  gprs_ra_id rai_bss =
 		{.mcc = 112, .mnc = 332, .lac = 16464, .rac = 96};
 	struct  gprs_ra_id rai_sgsn =
@@ -2744,11 +2523,11 @@ static void test_gbproxy_imsi_acquisition()
 	struct gbproxy_peer *peer;
 	unsigned bss_nu = 0;
 	unsigned sgsn_nu = 0;
+	uint16_t bss_nsei[] = { 0x1000 };
 
 	OSMO_ASSERT(local_sgsn_tlli == gprs_tmsi2tlli(sgsn_ptmsi, TLLI_LOCAL));
 
-	bssgp_nsi = nsi;
-	gbcfg.nsi = bssgp_nsi;
+	gbcfg.nsi = nsi;
 	gbcfg.nsip_sgsn_nsei = SGSN_NSEI;
 	gbcfg.core_plmn = (struct osmo_plmn_id){ .mcc = 123, .mnc = 456 };
 	gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100);
@@ -2756,59 +2535,57 @@ static void test_gbproxy_imsi_acquisition()
 	gbcfg.patch_ptmsi = 1;
 	gbcfg.acquire_imsi = 1;
 
-	configure_sgsn_peer(&sgsn_peer);
-	configure_bss_peers(bss_peer, ARRAY_SIZE(bss_peer));
+	bssgp_set_bssgp_callback(gbprox_test_bssgp_send_cb, &gbcfg);
 
 	printf("=== %s ===\n", __func__);
 	printf("--- Initialise SGSN ---\n\n");
 
-	connect_sgsn(nsi, &sgsn_peer, SGSN_NSEI);
+	connect_sgsn(nsi, SGSN_NSEI);
 
 	printf("--- Initialise BSS 1 ---\n\n");
 
-	setup_ns(nsi, &bss_peer[0], 0x1001, 0x1000);
-	setup_bssgp(nsi, &bss_peer[0], 0x1002);
+	setup_ns(nsi, bss_nsei[0]);
+	setup_bssgp(nsi, bss_nsei[0], 0x1002);
 
 	peer = gbproxy_peer_by_nsei(&gbcfg, 0x1000);
 	OSMO_ASSERT(peer != NULL);
 
-	send_bssgp_reset_ack(nsi, &sgsn_peer, 0x1002);
+	send_bssgp_reset_ack(nsi, SGSN_NSEI, 0x1002);
 
-	gprs_dump_nsi(nsi);
 	dump_global(stdout, 0);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	printf("--- Send message from BSS 1 to SGSN, BVCI 0x1002 ---\n\n");
 
-	send_llc_ul_ui(nsi, "ATTACH REQUEST", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req, sizeof(dtap_attach_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "IDENT RESPONSE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "IDENT RESPONSE", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_identity_resp, sizeof(dtap_identity_resp));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "IDENT REQUEST", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "IDENT REQUEST", SGSN_NSEI, 0x1002,
 		       random_sgsn_tlli, 0, NULL, 0,
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_identity_req, sizeof(dtap_identity_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "IDENT RESPONSE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "IDENT RESPONSE", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_identity_resp, sizeof(dtap_identity_resp));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "ATTACH ACCEPT", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "ATTACH ACCEPT", SGSN_NSEI, 0x1002,
 		       random_sgsn_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_attach_acc, sizeof(dtap_attach_acc));
@@ -2828,7 +2605,7 @@ static void test_gbproxy_imsi_acquisition()
 	OSMO_ASSERT(!link_info->sgsn_tlli.net_validated);
 	OSMO_ASSERT(link_info->sgsn_tlli.ptmsi == sgsn_ptmsi);
 
-	send_llc_ul_ui(nsi, "ATTACH COMPLETE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH COMPLETE", bss_nsei[0], 0x1002,
 		       local_bss_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_complete, sizeof(dtap_attach_complete));
@@ -2846,7 +2623,7 @@ static void test_gbproxy_imsi_acquisition()
 	OSMO_ASSERT(link_info->sgsn_tlli.bss_validated);
 	OSMO_ASSERT(!link_info->sgsn_tlli.net_validated);
 
-	send_llc_dl_ui(nsi, "GMM INFO", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "GMM INFO", SGSN_NSEI, 0x1002,
 		       local_sgsn_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_gmm_information, sizeof(dtap_gmm_information));
@@ -2861,20 +2638,20 @@ static void test_gbproxy_imsi_acquisition()
 	OSMO_ASSERT(link_info->sgsn_tlli.assigned == 0);
 
 	/* Non-DTAP */
-	send_bssgp_ul_unitdata(nsi, "XID (UL)", &bss_peer[0], 0x1002,
+	send_bssgp_ul_unitdata(nsi, "XID (UL)", bss_nsei[0], 0x1002,
 			       local_bss_tlli, &rai_bss, cell_id,
 			       llc_u_xid_ul, sizeof(llc_u_xid_ul));
 
-	send_bssgp_dl_unitdata(nsi, "XID (DL)", &sgsn_peer, 0x1002,
+	send_bssgp_dl_unitdata(nsi, "XID (DL)", SGSN_NSEI, 0x1002,
 			       local_sgsn_tlli, 1, imsi, sizeof(imsi),
 			       llc_u_xid_dl, sizeof(llc_u_xid_dl));
 
-	send_bssgp_ul_unitdata(nsi, "LL11 DNS QUERY (UL)", &bss_peer[0], 0x1002,
+	send_bssgp_ul_unitdata(nsi, "LL11 DNS QUERY (UL)", bss_nsei[0], 0x1002,
 			       local_bss_tlli, &rai_bss, cell_id,
 			       llc_ui_ll11_dns_query_ul,
 			       sizeof(llc_ui_ll11_dns_query_ul));
 
-	send_bssgp_dl_unitdata(nsi, "LL11 DNS RESP (DL)", &sgsn_peer, 0x1002,
+	send_bssgp_dl_unitdata(nsi, "LL11 DNS RESP (DL)", SGSN_NSEI, 0x1002,
 			       local_sgsn_tlli, 1, imsi, sizeof(imsi),
 			       llc_ui_ll11_dns_resp_dl,
 			       sizeof(llc_ui_ll11_dns_resp_dl));
@@ -2882,49 +2659,49 @@ static void test_gbproxy_imsi_acquisition()
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	/* Other messages */
-	send_bssgp_llc_discarded(nsi, &bss_peer[0], 0x1002,
+	send_bssgp_llc_discarded(nsi, bss_nsei[0], 0x1002,
 				 local_bss_tlli, 1, 12);
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_bssgp_llc_discarded(nsi, &sgsn_peer, 0x1002,
+	send_bssgp_llc_discarded(nsi, SGSN_NSEI, 0x1002,
 				 local_sgsn_tlli, 1, 12);
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_bssgp_suspend(nsi, &bss_peer[0], local_bss_tlli, &rai_bss);
+	send_bssgp_suspend(nsi, bss_nsei[0], local_bss_tlli, &rai_bss);
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_bssgp_suspend_ack(nsi, &sgsn_peer, local_sgsn_tlli, &rai_sgsn);
+	send_bssgp_suspend_ack(nsi, SGSN_NSEI, local_sgsn_tlli, &rai_sgsn);
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	/* Bad case: Invalid BVCI */
-	send_bssgp_llc_discarded(nsi, &bss_peer[0], 0xeee1,
+	send_bssgp_llc_discarded(nsi, bss_nsei[0], 0xeee1,
 				 local_bss_tlli, 1, 12);
 	dump_global(stdout, 0);
 
 	/* Bad case: Invalid RAI */
-	send_bssgp_suspend_ack(nsi, &sgsn_peer, local_sgsn_tlli, &rai_unknown);
+	send_bssgp_suspend_ack(nsi, SGSN_NSEI, local_sgsn_tlli, &rai_unknown);
 
 	dump_global(stdout, 0);
 
 	/* Bad case: Invalid MCC (LAC ok) */
-	send_bssgp_suspend_ack(nsi, &sgsn_peer, local_sgsn_tlli,
+	send_bssgp_suspend_ack(nsi, SGSN_NSEI, local_sgsn_tlli,
 			       &rai_wrong_mcc_sgsn);
 
 	dump_global(stdout, 0);
 
 	/* Detach */
-	send_llc_ul_ui(nsi, "DETACH REQ", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "DETACH REQ", bss_nsei[0], 0x1002,
 		       local_bss_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_detach_req, sizeof(dtap_detach_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "DETACH ACC", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "DETACH ACC", SGSN_NSEI, 0x1002,
 		       local_sgsn_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_detach_acc, sizeof(dtap_detach_acc));
@@ -2933,19 +2710,19 @@ static void test_gbproxy_imsi_acquisition()
 
 	/* RA Update request */
 
-	send_llc_ul_ui(nsi, "RA UPD REQ", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "RA UPD REQ", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli, &rai_unknown, 0x7080,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_ra_upd_req, sizeof(dtap_ra_upd_req));
 
-	send_llc_ul_ui(nsi, "IDENT RESPONSE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "IDENT RESPONSE", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_identity_resp, sizeof(dtap_identity_resp));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "RA UDP ACC", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "RA UDP ACC", SGSN_NSEI, 0x1002,
 		       random_sgsn_tlli2, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_ra_upd_acc, sizeof(dtap_ra_upd_acc));
@@ -2954,14 +2731,14 @@ static void test_gbproxy_imsi_acquisition()
 
 	/* Detach */
 
-	send_llc_ul_ui(nsi, "DETACH REQ", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "DETACH REQ", bss_nsei[0], 0x1002,
 		       local_bss_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_detach_req, sizeof(dtap_detach_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "DETACH ACC", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "DETACH ACC", SGSN_NSEI, 0x1002,
 		       local_sgsn_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_detach_acc, sizeof(dtap_detach_acc));
@@ -2970,17 +2747,17 @@ static void test_gbproxy_imsi_acquisition()
 
 	/* Special case: Repeated Attach Requests */
 
-	send_llc_ul_ui(nsi, "ATTACH REQUEST", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli, &rai_unknown, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req, sizeof(dtap_attach_req));
 
-	send_llc_ul_ui(nsi, "ATTACH REQUEST", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli, &rai_unknown, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req, sizeof(dtap_attach_req));
 
-	send_llc_ul_ui(nsi, "DETACH REQ", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "DETACH REQ", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_detach_req, sizeof(dtap_detach_req));
@@ -2989,7 +2766,7 @@ static void test_gbproxy_imsi_acquisition()
 
 	/* Special case: Detach from an unknown TLLI */
 
-	send_llc_ul_ui(nsi, "DETACH REQ (unknown TLLI)", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "DETACH REQ (unknown TLLI)", bss_nsei[0], 0x1002,
 		       other_bss_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_detach_req, sizeof(dtap_detach_req));
@@ -2998,17 +2775,17 @@ static void test_gbproxy_imsi_acquisition()
 
 	/* Special case: Repeated RA Update Requests */
 
-	send_llc_ul_ui(nsi, "RA UPD REQ", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "RA UPD REQ", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli, &rai_unknown, 0x7080,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_ra_upd_req, sizeof(dtap_ra_upd_req));
 
-	send_llc_ul_ui(nsi, "RA UPD REQ", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "RA UPD REQ", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli, &rai_unknown, 0x7080,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_ra_upd_req, sizeof(dtap_ra_upd_req));
 
-	send_llc_ul_ui(nsi, "DETACH REQ", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "DETACH REQ", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_detach_req, sizeof(dtap_detach_req));
@@ -3021,7 +2798,7 @@ static void test_gbproxy_imsi_acquisition()
 	gbcfg.core_apn = NULL;
 
 	gbprox_reset(&gbcfg);
-	gprs_ns_destroy(nsi);
+	gprs_ns2_free(nsi);
 	nsi = NULL;
 
 	cleanup_test();
@@ -3029,9 +2806,7 @@ static void test_gbproxy_imsi_acquisition()
 
 static void test_gbproxy_secondary_sgsn()
 {
-	struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx);
-	struct sockaddr_in bss_peer[1] = {{0},};
-	struct sockaddr_in sgsn_peer[2]= {{0},};
+	struct gprs_ns2_inst *nsi = gprs_ns2_instantiate(tall_sgsn_ctx, gprs_ns2_callback, &gbcfg);
 	struct  gprs_ra_id rai_bss =
 		{.mcc = 112, .mnc = 332, .lac = 16464, .rac = 96};
 	struct  gprs_ra_id rai_sgsn =
@@ -3071,12 +2846,12 @@ static void test_gbproxy_secondary_sgsn()
 
 	const char *err_msg = NULL;
 	const char *filter_re = "999999";
+	uint16_t bss_nsei[]  = { 0x1000 };
 
 	OSMO_ASSERT(local_sgsn_tlli == gprs_tmsi2tlli(sgsn_ptmsi, TLLI_LOCAL));
 	OSMO_ASSERT(local_sgsn_tlli2 == gprs_tmsi2tlli(sgsn_ptmsi2, TLLI_LOCAL));
 
-	bssgp_nsi = nsi;
-	gbcfg.nsi = bssgp_nsi;
+	gbcfg.nsi = nsi;
 	gbcfg.nsip_sgsn_nsei = SGSN_NSEI;
 	gbcfg.core_plmn = (struct osmo_plmn_id){ .mcc = 123, .mnc = 456 };
 	gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100);
@@ -3094,72 +2869,69 @@ static void test_gbproxy_secondary_sgsn()
 		OSMO_ASSERT(err_msg == NULL);
 	}
 
-	configure_sgsn_peer(&sgsn_peer[0]);
-	configure_sgsn2_peer(&sgsn_peer[1]);
-	configure_bss_peers(bss_peer, ARRAY_SIZE(bss_peer));
+	bssgp_set_bssgp_callback(gbprox_test_bssgp_send_cb, &gbcfg);
 
 	printf("=== %s ===\n", __func__);
 	printf("--- Initialise SGSN 1 ---\n\n");
 
-	connect_sgsn(nsi, &sgsn_peer[0], SGSN_NSEI);
+	connect_sgsn(nsi, SGSN_NSEI);
 
 	printf("--- Initialise SGSN 2 ---\n\n");
 
-	connect_sgsn(nsi, &sgsn_peer[1], SGSN2_NSEI);
+	connect_sgsn(nsi, SGSN2_NSEI);
 
 	printf("--- Initialise BSS 1 ---\n\n");
 
-	setup_ns(nsi, &bss_peer[0], 0x1001, 0x1000);
-	setup_bssgp(nsi, &bss_peer[0], 0x0);
-	send_bssgp_reset_ack(nsi, &sgsn_peer[0], 0x0);
-	setup_bssgp(nsi, &bss_peer[0], 0x1002);
-	send_bssgp_reset_ack(nsi, &sgsn_peer[0], 0x1002);
-	send_bssgp_reset_ack(nsi, &sgsn_peer[1], 0x1002);
+	setup_ns(nsi, bss_nsei[0]);
+	setup_bssgp(nsi, bss_nsei[0], 0x0);
+	send_bssgp_reset_ack(nsi, SGSN_NSEI, 0x0);
+	setup_bssgp(nsi, bss_nsei[0], 0x1002);
+	send_bssgp_reset_ack(nsi, SGSN_NSEI, 0x1002);
+	send_bssgp_reset_ack(nsi, SGSN2_NSEI, 0x1002);
 
 	peer = gbproxy_peer_by_nsei(&gbcfg, 0x1000);
 	OSMO_ASSERT(peer != NULL);
 
-	gprs_dump_nsi(nsi);
 	dump_global(stdout, 0);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	printf("--- Flow control ---\n\n");
 
-	send_bssgp_flow_control_bvc(nsi, &bss_peer[0], 0x1002, 1);
-	send_bssgp_flow_control_bvc_ack(nsi, &sgsn_peer[0], 0x1002, 1);
-	send_bssgp_flow_control_bvc_ack(nsi, &sgsn_peer[1], 0x1002, 1);
+	send_bssgp_flow_control_bvc(nsi, bss_nsei[0], 0x1002, 1);
+	send_bssgp_flow_control_bvc_ack(nsi, SGSN_NSEI, 0x1002, 1);
+	send_bssgp_flow_control_bvc_ack(nsi, SGSN2_NSEI, 0x1002, 1);
 
 	printf("--- Establish GPRS connection (SGSN 1) ---\n\n");
 
-	send_llc_ul_ui(nsi, "ATTACH REQUEST", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli, &rai_unknown, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req, sizeof(dtap_attach_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "IDENT RESPONSE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "IDENT RESPONSE", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_identity_resp, sizeof(dtap_identity_resp));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "IDENT REQUEST", &sgsn_peer[0], 0x1002,
+	send_llc_dl_ui(nsi, "IDENT REQUEST", SGSN_NSEI, 0x1002,
 		       random_sgsn_tlli, 0, NULL, 0,
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_identity_req, sizeof(dtap_identity_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "IDENT RESPONSE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "IDENT RESPONSE", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_identity_resp, sizeof(dtap_identity_resp));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "ATTACH ACCEPT", &sgsn_peer[0], 0x1002,
+	send_llc_dl_ui(nsi, "ATTACH ACCEPT", SGSN_NSEI, 0x1002,
 		       random_sgsn_tlli, 1, imsi1, sizeof(imsi1),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_attach_acc, sizeof(dtap_attach_acc));
@@ -3180,7 +2952,7 @@ static void test_gbproxy_secondary_sgsn()
 	OSMO_ASSERT(!link_info->sgsn_tlli.net_validated);
 	OSMO_ASSERT(link_info->sgsn_tlli.ptmsi == sgsn_ptmsi);
 
-	send_llc_ul_ui(nsi, "ATTACH COMPLETE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH COMPLETE", bss_nsei[0], 0x1002,
 		       local_bss_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_complete, sizeof(dtap_attach_complete));
@@ -3199,7 +2971,7 @@ static void test_gbproxy_secondary_sgsn()
 	OSMO_ASSERT(link_info->sgsn_tlli.bss_validated);
 	OSMO_ASSERT(!link_info->sgsn_tlli.net_validated);
 
-	send_llc_dl_ui(nsi, "GMM INFO", &sgsn_peer[0], 0x1002,
+	send_llc_dl_ui(nsi, "GMM INFO", SGSN_NSEI, 0x1002,
 		       local_sgsn_tlli, 1, imsi1, sizeof(imsi1),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_gmm_information, sizeof(dtap_gmm_information));
@@ -3215,20 +2987,20 @@ static void test_gbproxy_secondary_sgsn()
 	OSMO_ASSERT(link_info->sgsn_tlli.assigned == 0);
 
 	/* Non-DTAP */
-	send_bssgp_ul_unitdata(nsi, "XID (UL)", &bss_peer[0], 0x1002,
+	send_bssgp_ul_unitdata(nsi, "XID (UL)", bss_nsei[0], 0x1002,
 			       local_bss_tlli, &rai_bss, cell_id,
 			       llc_u_xid_ul, sizeof(llc_u_xid_ul));
 
-	send_bssgp_dl_unitdata(nsi, "XID (DL)", &sgsn_peer[0], 0x1002,
+	send_bssgp_dl_unitdata(nsi, "XID (DL)", SGSN_NSEI, 0x1002,
 			       local_sgsn_tlli, 1, imsi1, sizeof(imsi1),
 			       llc_u_xid_dl, sizeof(llc_u_xid_dl));
 
-	send_bssgp_ul_unitdata(nsi, "LL11 DNS QUERY (UL)", &bss_peer[0], 0x1002,
+	send_bssgp_ul_unitdata(nsi, "LL11 DNS QUERY (UL)", bss_nsei[0], 0x1002,
 			       local_bss_tlli, &rai_bss, cell_id,
 			       llc_ui_ll11_dns_query_ul,
 			       sizeof(llc_ui_ll11_dns_query_ul));
 
-	send_bssgp_dl_unitdata(nsi, "LL11 DNS RESP (DL)", &sgsn_peer[0], 0x1002,
+	send_bssgp_dl_unitdata(nsi, "LL11 DNS RESP (DL)", SGSN_NSEI, 0x1002,
 			       local_sgsn_tlli, 1, imsi1, sizeof(imsi1),
 			       llc_ui_ll11_dns_resp_dl,
 			       sizeof(llc_ui_ll11_dns_resp_dl));
@@ -3236,55 +3008,55 @@ static void test_gbproxy_secondary_sgsn()
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	/* Other messages */
-	send_bssgp_llc_discarded(nsi, &bss_peer[0], 0x1002,
+	send_bssgp_llc_discarded(nsi, bss_nsei[0], 0x1002,
 				 local_bss_tlli, 1, 12);
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_bssgp_llc_discarded(nsi, &sgsn_peer[0], 0x1002,
+	send_bssgp_llc_discarded(nsi, SGSN_NSEI, 0x1002,
 				 local_sgsn_tlli, 1, 12);
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_bssgp_suspend(nsi, &bss_peer[0], local_bss_tlli, &rai_bss);
+	send_bssgp_suspend(nsi, bss_nsei[0], local_bss_tlli, &rai_bss);
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_bssgp_suspend_ack(nsi, &sgsn_peer[0], local_sgsn_tlli, &rai_sgsn);
+	send_bssgp_suspend_ack(nsi, SGSN_NSEI, local_sgsn_tlli, &rai_sgsn);
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	printf("--- Establish GPRS connection (SGSN 2) ---\n\n");
 
-	send_llc_ul_ui(nsi, "ATTACH REQUEST", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli2, &rai_unknown, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req, sizeof(dtap_attach_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "IDENT RESPONSE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "IDENT RESPONSE", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli2, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_identity2_resp, sizeof(dtap_identity2_resp));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "IDENT REQUEST", &sgsn_peer[1], 0x1002,
+	send_llc_dl_ui(nsi, "IDENT REQUEST", SGSN2_NSEI, 0x1002,
 		       random_sgsn_tlli2, 0, NULL, 0,
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_identity_req, sizeof(dtap_identity_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "IDENT RESPONSE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "IDENT RESPONSE", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli2, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_identity2_resp, sizeof(dtap_identity2_resp));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "ATTACH ACCEPT", &sgsn_peer[1], 0x1002,
+	send_llc_dl_ui(nsi, "ATTACH ACCEPT", SGSN2_NSEI, 0x1002,
 		       random_sgsn_tlli2, 1, imsi2, sizeof(imsi2),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_attach_acc2, sizeof(dtap_attach_acc2));
@@ -3305,7 +3077,7 @@ static void test_gbproxy_secondary_sgsn()
 	OSMO_ASSERT(!link_info->sgsn_tlli.net_validated);
 	OSMO_ASSERT(link_info->sgsn_tlli.ptmsi == sgsn_ptmsi2);
 
-	send_llc_ul_ui(nsi, "ATTACH COMPLETE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH COMPLETE", bss_nsei[0], 0x1002,
 		       local_bss_tlli2, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_complete, sizeof(dtap_attach_complete));
@@ -3324,7 +3096,7 @@ static void test_gbproxy_secondary_sgsn()
 	OSMO_ASSERT(link_info->sgsn_tlli.bss_validated);
 	OSMO_ASSERT(!link_info->sgsn_tlli.net_validated);
 
-	send_llc_dl_ui(nsi, "GMM INFO", &sgsn_peer[1], 0x1002,
+	send_llc_dl_ui(nsi, "GMM INFO", SGSN2_NSEI, 0x1002,
 		       local_sgsn_tlli2, 1, imsi2, sizeof(imsi2),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_gmm_information, sizeof(dtap_gmm_information));
@@ -3340,20 +3112,20 @@ static void test_gbproxy_secondary_sgsn()
 	OSMO_ASSERT(link_info->sgsn_tlli.assigned == 0);
 
 	/* Non-DTAP */
-	send_bssgp_ul_unitdata(nsi, "XID (UL)", &bss_peer[0], 0x1002,
+	send_bssgp_ul_unitdata(nsi, "XID (UL)", bss_nsei[0], 0x1002,
 			       local_bss_tlli2, &rai_bss, cell_id,
 			       llc_u_xid_ul, sizeof(llc_u_xid_ul));
 
-	send_bssgp_dl_unitdata(nsi, "XID (DL)", &sgsn_peer[1], 0x1002,
+	send_bssgp_dl_unitdata(nsi, "XID (DL)", SGSN2_NSEI, 0x1002,
 			       local_sgsn_tlli2, 1, imsi2, sizeof(imsi2),
 			       llc_u_xid_dl, sizeof(llc_u_xid_dl));
 
-	send_bssgp_ul_unitdata(nsi, "LL11 DNS QUERY (UL)", &bss_peer[0], 0x1002,
+	send_bssgp_ul_unitdata(nsi, "LL11 DNS QUERY (UL)", bss_nsei[0], 0x1002,
 			       local_bss_tlli2, &rai_bss, cell_id,
 			       llc_ui_ll11_dns_query_ul,
 			       sizeof(llc_ui_ll11_dns_query_ul));
 
-	send_bssgp_dl_unitdata(nsi, "LL11 DNS RESP (DL)", &sgsn_peer[1], 0x1002,
+	send_bssgp_dl_unitdata(nsi, "LL11 DNS RESP (DL)", SGSN2_NSEI, 0x1002,
 			       local_sgsn_tlli2, 1, imsi2, sizeof(imsi2),
 			       llc_ui_ll11_dns_resp_dl,
 			       sizeof(llc_ui_ll11_dns_resp_dl));
@@ -3361,55 +3133,55 @@ static void test_gbproxy_secondary_sgsn()
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	/* Other messages */
-	send_bssgp_llc_discarded(nsi, &bss_peer[0], 0x1002,
+	send_bssgp_llc_discarded(nsi, bss_nsei[0], 0x1002,
 				 local_bss_tlli2, 1, 12);
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_bssgp_llc_discarded(nsi, &sgsn_peer[1], 0x1002,
+	send_bssgp_llc_discarded(nsi, SGSN2_NSEI, 0x1002,
 				 local_sgsn_tlli2, 1, 12);
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_bssgp_suspend(nsi, &bss_peer[0], local_bss_tlli2, &rai_bss);
+	send_bssgp_suspend(nsi, bss_nsei[0], local_bss_tlli2, &rai_bss);
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_bssgp_suspend_ack(nsi, &sgsn_peer[1], local_sgsn_tlli2, &rai_sgsn);
+	send_bssgp_suspend_ack(nsi, SGSN2_NSEI, local_sgsn_tlli2, &rai_sgsn);
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	printf("--- Establish GPRS connection (SGSN 2, P-TMSI collision) ---\n\n");
 
-	send_llc_ul_ui(nsi, "ATTACH REQUEST", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli3, &rai_unknown, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req, sizeof(dtap_attach_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "IDENT RESPONSE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "IDENT RESPONSE", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli3, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_identity3_resp, sizeof(dtap_identity3_resp));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "IDENT REQUEST", &sgsn_peer[1], 0x1002,
+	send_llc_dl_ui(nsi, "IDENT REQUEST", SGSN2_NSEI, 0x1002,
 		       random_sgsn_tlli3, 0, NULL, 0,
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_identity_req, sizeof(dtap_identity_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "IDENT RESPONSE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "IDENT RESPONSE", bss_nsei[0], 0x1002,
 		       foreign_bss_tlli3, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_identity3_resp, sizeof(dtap_identity3_resp));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "ATTACH ACCEPT (P-TMSI 1)", &sgsn_peer[1], 0x1002,
+	send_llc_dl_ui(nsi, "ATTACH ACCEPT (P-TMSI 1)", SGSN2_NSEI, 0x1002,
 		       random_sgsn_tlli3, 1, imsi3, sizeof(imsi3),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_attach_acc, sizeof(dtap_attach_acc));
@@ -3430,7 +3202,7 @@ static void test_gbproxy_secondary_sgsn()
 	OSMO_ASSERT(!link_info->sgsn_tlli.net_validated);
 	OSMO_ASSERT(link_info->sgsn_tlli.ptmsi == sgsn_ptmsi);
 
-	send_llc_ul_ui(nsi, "ATTACH COMPLETE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH COMPLETE", bss_nsei[0], 0x1002,
 		       local_bss_tlli3, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_complete, sizeof(dtap_attach_complete));
@@ -3451,7 +3223,7 @@ static void test_gbproxy_secondary_sgsn()
 	OSMO_ASSERT(link_info->sgsn_tlli.bss_validated);
 	OSMO_ASSERT(!link_info->sgsn_tlli.net_validated);
 
-	send_llc_dl_ui(nsi, "GMM INFO", &sgsn_peer[1], 0x1002,
+	send_llc_dl_ui(nsi, "GMM INFO", SGSN2_NSEI, 0x1002,
 		       local_sgsn_tlli, 1, imsi3, sizeof(imsi3),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_gmm_information, sizeof(dtap_gmm_information));
@@ -3472,14 +3244,14 @@ static void test_gbproxy_secondary_sgsn()
 	printf("--- Shutdown GPRS connection (SGSN 1) ---\n\n");
 
 	/* Detach */
-	send_llc_ul_ui(nsi, "DETACH REQ", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "DETACH REQ", bss_nsei[0], 0x1002,
 		       local_bss_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_detach_req, sizeof(dtap_detach_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "DETACH ACC", &sgsn_peer[0], 0x1002,
+	send_llc_dl_ui(nsi, "DETACH ACC", SGSN_NSEI, 0x1002,
 		       local_sgsn_tlli, 1, imsi1, sizeof(imsi1),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_detach_acc, sizeof(dtap_detach_acc));
@@ -3488,14 +3260,14 @@ static void test_gbproxy_secondary_sgsn()
 
 	printf("--- Shutdown GPRS connection (SGSN 2) ---\n\n");
 
-	send_llc_ul_ui(nsi, "DETACH REQ", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "DETACH REQ", bss_nsei[0], 0x1002,
 		       local_bss_tlli2, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_detach_req, sizeof(dtap_detach_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "DETACH ACC", &sgsn_peer[1], 0x1002,
+	send_llc_dl_ui(nsi, "DETACH ACC", SGSN2_NSEI, 0x1002,
 		       local_sgsn_tlli2, 1, imsi2, sizeof(imsi2),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_detach_acc, sizeof(dtap_detach_acc));
@@ -3504,14 +3276,14 @@ static void test_gbproxy_secondary_sgsn()
 
 	printf("--- Shutdown GPRS connection (SGSN 2, P-TMSI 1) ---\n\n");
 
-	send_llc_ul_ui(nsi, "DETACH REQ", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "DETACH REQ", bss_nsei[0], 0x1002,
 		       local_bss_tlli3, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_detach_req, sizeof(dtap_detach_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "DETACH ACC", &sgsn_peer[1], 0x1002,
+	send_llc_dl_ui(nsi, "DETACH ACC", SGSN2_NSEI, 0x1002,
 		       local_sgsn_tlli, 1, imsi3, sizeof(imsi3),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_detach_acc, sizeof(dtap_detach_acc));
@@ -3525,7 +3297,7 @@ static void test_gbproxy_secondary_sgsn()
 
 	gbproxy_clear_patch_filter(&gbcfg.matches[GBPROX_MATCH_ROUTING]);
 	gbprox_reset(&gbcfg);
-	gprs_ns_destroy(nsi);
+	gprs_ns2_free(nsi);
 	nsi = NULL;
 
 	cleanup_test();
@@ -3533,9 +3305,7 @@ static void test_gbproxy_secondary_sgsn()
 
 static void test_gbproxy_keep_info()
 {
-	struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx);
-	struct sockaddr_in bss_peer[1] = {{0},};
-	struct sockaddr_in sgsn_peer= {0};
+	struct gprs_ns2_inst *nsi = gprs_ns2_instantiate(tall_sgsn_ctx, gprs_ns2_callback, &gbcfg);
 	struct  gprs_ra_id rai_bss =
 		{.mcc = 112, .mnc = 332, .lac = 16464, .rac = 96};
 	uint16_t cell_id = 0x1234;
@@ -3549,13 +3319,13 @@ static void test_gbproxy_keep_info()
 	struct gbproxy_peer *peer;
 	unsigned bss_nu = 0;
 	unsigned sgsn_nu = 0;
+	uint16_t bss_nsei[] = { 0x1000 };
 
 	LLIST_HEAD(rcv_list);
 
 	OSMO_ASSERT(local_tlli == gprs_tmsi2tlli(ptmsi, TLLI_LOCAL));
 
-	bssgp_nsi = nsi;
-	gbcfg.nsi = bssgp_nsi;
+	gbcfg.nsi = nsi;
 	gbcfg.nsip_sgsn_nsei = SGSN_NSEI;
 	gbcfg.patch_ptmsi = 0;
 	gbcfg.acquire_imsi = 1;
@@ -3566,25 +3336,23 @@ static void test_gbproxy_keep_info()
 	gbcfg.nsip_sgsn2_nsei = 0xffff;
 	gbcfg.keep_link_infos = GBPROX_KEEP_ALWAYS;
 
-	configure_sgsn_peer(&sgsn_peer);
-	configure_bss_peers(bss_peer, ARRAY_SIZE(bss_peer));
+	bssgp_set_bssgp_callback(gbprox_test_bssgp_send_cb, &gbcfg);
 
 	printf("=== %s ===\n", __func__);
 	printf("--- Initialise SGSN ---\n\n");
 
-	connect_sgsn(nsi, &sgsn_peer, SGSN_NSEI);
+	connect_sgsn(nsi, SGSN_NSEI);
 
 	printf("--- Initialise BSS 1 ---\n\n");
 
-	setup_ns(nsi, &bss_peer[0], 0x1001, 0x1000);
-	setup_bssgp(nsi, &bss_peer[0], 0x1002);
+	setup_ns(nsi, bss_nsei[0]);
+	setup_bssgp(nsi, bss_nsei[0], 0x1002);
 
 	peer = gbproxy_peer_by_nsei(&gbcfg, 0x1000);
 	OSMO_ASSERT(peer != NULL);
 
-	send_bssgp_reset_ack(nsi, &sgsn_peer, 0x1002);
+	send_bssgp_reset_ack(nsi, SGSN_NSEI, 0x1002);
 
-	gprs_dump_nsi(nsi);
 	dump_global(stdout, 0);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
@@ -3592,7 +3360,7 @@ static void test_gbproxy_keep_info()
 
 	received_messages = &rcv_list;
 
-	send_llc_ul_ui(nsi, "ATTACH REQUEST", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST", bss_nsei[0], 0x1002,
 		       foreign_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req, sizeof(dtap_attach_req));
@@ -3607,7 +3375,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(!link_info->is_deregistered);
 	OSMO_ASSERT(link_info->imsi_acq_pending);
 
-	send_llc_ul_ui(nsi, "IDENT RESPONSE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "IDENT RESPONSE", bss_nsei[0], 0x1002,
 		       foreign_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_identity_resp, sizeof(dtap_identity_resp));
@@ -3622,7 +3390,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(!link_info->imsi_acq_pending);
 	OSMO_ASSERT(gprs_tlli_type(link_info->sgsn_tlli.current) == TLLI_FOREIGN);
 
-	send_llc_dl_ui(nsi, "IDENT REQUEST", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "IDENT REQUEST", SGSN_NSEI, 0x1002,
 		       foreign_tlli, 0, NULL, 0,
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_identity_req, sizeof(dtap_identity_req));
@@ -3631,7 +3399,7 @@ static void test_gbproxy_keep_info()
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "IDENT RESPONSE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "IDENT RESPONSE", bss_nsei[0], 0x1002,
 		       foreign_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_identity_resp, sizeof(dtap_identity_resp));
@@ -3645,7 +3413,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(link_info->imsi_len > 0);
 	OSMO_ASSERT(gbproxy_link_info_by_imsi(peer, imsi, sizeof(imsi)));
 
-	send_llc_dl_ui(nsi, "ATTACH ACCEPT", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "ATTACH ACCEPT", SGSN_NSEI, 0x1002,
 		       foreign_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_attach_acc, sizeof(dtap_attach_acc));
@@ -3654,7 +3422,7 @@ static void test_gbproxy_keep_info()
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "ATTACH COMPLETE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH COMPLETE", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_complete, sizeof(dtap_attach_complete));
@@ -3663,7 +3431,7 @@ static void test_gbproxy_keep_info()
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "GMM INFO", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "GMM INFO", SGSN_NSEI, 0x1002,
 		       local_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_gmm_information, sizeof(dtap_gmm_information));
@@ -3676,7 +3444,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(link_info);
 
 	/* Detach (MO) */
-	send_llc_ul_ui(nsi, "DETACH REQ", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "DETACH REQ", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_detach_req, sizeof(dtap_detach_req));
@@ -3688,7 +3456,7 @@ static void test_gbproxy_keep_info()
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "DETACH ACC", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "DETACH ACC", SGSN_NSEI, 0x1002,
 		       local_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_detach_acc, sizeof(dtap_detach_acc));
@@ -3705,7 +3473,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(!expect_msg());
 
 	/* Re-Attach */
-	send_llc_ul_ui(nsi, "ATTACH REQUEST", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST", bss_nsei[0], 0x1002,
 		       foreign_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req3, sizeof(dtap_attach_req3));
@@ -3723,7 +3491,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(!link_info->imsi_acq_pending);
 	OSMO_ASSERT(gprs_tlli_type(link_info->sgsn_tlli.current) == TLLI_FOREIGN);
 
-	send_llc_dl_ui(nsi, "ATTACH ACCEPT", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "ATTACH ACCEPT", SGSN_NSEI, 0x1002,
 		       foreign_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_attach_acc, sizeof(dtap_attach_acc));
@@ -3732,7 +3500,7 @@ static void test_gbproxy_keep_info()
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "ATTACH COMPLETE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH COMPLETE", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_complete, sizeof(dtap_attach_complete));
@@ -3742,7 +3510,7 @@ static void test_gbproxy_keep_info()
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	/* Detach (MT) */
-	send_llc_dl_ui(nsi, "DETACH REQ (re-attach)", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "DETACH REQ (re-attach)", SGSN_NSEI, 0x1002,
 		       local_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_mt_detach_rea_req, sizeof(dtap_mt_detach_rea_req));
@@ -3754,7 +3522,7 @@ static void test_gbproxy_keep_info()
 	link_info = gbproxy_link_info_by_tlli(peer, local_tlli);
 	OSMO_ASSERT(link_info);
 
-	send_llc_ul_ui(nsi, "DETACH ACC", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "DETACH ACC", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_mt_detach_acc, sizeof(dtap_mt_detach_acc));
@@ -3770,7 +3538,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(link_info->is_deregistered);
 
 	/* Re-Attach */
-	send_llc_ul_ui(nsi, "ATTACH REQUEST", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST", bss_nsei[0], 0x1002,
 		       foreign_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req3, sizeof(dtap_attach_req3));
@@ -3787,7 +3555,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(!link_info->is_deregistered);
 	OSMO_ASSERT(!link_info->imsi_acq_pending);
 
-	send_llc_dl_ui(nsi, "ATTACH ACCEPT", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "ATTACH ACCEPT", SGSN_NSEI, 0x1002,
 		       foreign_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_attach_acc, sizeof(dtap_attach_acc));
@@ -3796,7 +3564,7 @@ static void test_gbproxy_keep_info()
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "ATTACH COMPLETE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH COMPLETE", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_complete, sizeof(dtap_attach_complete));
@@ -3806,7 +3574,7 @@ static void test_gbproxy_keep_info()
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	/* Detach (MT) */
-	send_llc_dl_ui(nsi, "DETACH REQ", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "DETACH REQ", SGSN_NSEI, 0x1002,
 		       local_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_mt_detach_req, sizeof(dtap_mt_detach_req));
@@ -3818,7 +3586,7 @@ static void test_gbproxy_keep_info()
 	link_info = gbproxy_link_info_by_tlli(peer, local_tlli);
 	OSMO_ASSERT(link_info);
 
-	send_llc_ul_ui(nsi, "DETACH ACC", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "DETACH ACC", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_mt_detach_acc, sizeof(dtap_mt_detach_acc));
@@ -3834,7 +3602,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(link_info->is_deregistered);
 
 	/* Re-Attach with IMSI */
-	send_llc_ul_ui(nsi, "ATTACH REQUEST (IMSI)", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST (IMSI)", bss_nsei[0], 0x1002,
 		       foreign_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req4, sizeof(dtap_attach_req4));
@@ -3852,7 +3620,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(!link_info->imsi_acq_pending);
 	OSMO_ASSERT(link_info->sgsn_tlli.current == foreign_tlli);
 
-	send_llc_dl_ui(nsi, "ATTACH ACCEPT", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "ATTACH ACCEPT", SGSN_NSEI, 0x1002,
 		       foreign_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_attach_acc, sizeof(dtap_attach_acc));
@@ -3861,7 +3629,7 @@ static void test_gbproxy_keep_info()
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "ATTACH COMPLETE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH COMPLETE", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_complete, sizeof(dtap_attach_complete));
@@ -3871,7 +3639,7 @@ static void test_gbproxy_keep_info()
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	/* Detach (MT) */
-	send_llc_dl_ui(nsi, "DETACH REQ", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "DETACH REQ", SGSN_NSEI, 0x1002,
 		       local_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_mt_detach_req, sizeof(dtap_mt_detach_req));
@@ -3883,7 +3651,7 @@ static void test_gbproxy_keep_info()
 	link_info = gbproxy_link_info_by_tlli(peer, local_tlli);
 	OSMO_ASSERT(link_info);
 
-	send_llc_ul_ui(nsi, "DETACH ACC", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "DETACH ACC", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_mt_detach_acc, sizeof(dtap_mt_detach_acc));
@@ -3899,7 +3667,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(link_info->is_deregistered);
 
 	/* Re-Attach */
-	send_llc_ul_ui(nsi, "ATTACH REQUEST", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST", bss_nsei[0], 0x1002,
 		       foreign_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req3, sizeof(dtap_attach_req3));
@@ -3916,7 +3684,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(!link_info->is_deregistered);
 	OSMO_ASSERT(!link_info->imsi_acq_pending);
 
-	send_llc_dl_ui(nsi, "ATTACH ACCEPT", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "ATTACH ACCEPT", SGSN_NSEI, 0x1002,
 		       foreign_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_attach_acc, sizeof(dtap_attach_acc));
@@ -3925,7 +3693,7 @@ static void test_gbproxy_keep_info()
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "ATTACH COMPLETE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH COMPLETE", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_complete, sizeof(dtap_attach_complete));
@@ -3935,14 +3703,14 @@ static void test_gbproxy_keep_info()
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	/* RA update procedure (reject -> Detach) */
-	send_llc_ul_ui(nsi, "RA UPD REQ", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "RA UPD REQ", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, 0x7080,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_ra_upd_req, sizeof(dtap_ra_upd_req));
 
 	OSMO_ASSERT(expect_gmm_msg(SGSN_NSEI, 0x1002, GSM48_MT_GMM_RA_UPD_REQ));
 
-	send_llc_dl_ui(nsi, "RA UDP REJ", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "RA UDP REJ", SGSN_NSEI, 0x1002,
 		       local_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_ra_upd_rej, sizeof(dtap_ra_upd_rej));
@@ -3958,7 +3726,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(link_info->is_deregistered);
 
 	/* Bad case: Re-Attach with wrong (initial) P-TMSI */
-	send_llc_ul_ui(nsi, "ATTACH REQUEST", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST", bss_nsei[0], 0x1002,
 		       foreign_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req, sizeof(dtap_attach_req));
@@ -3975,7 +3743,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(!link_info->is_deregistered);
 	OSMO_ASSERT(link_info->imsi_acq_pending);
 
-	send_llc_ul_ui(nsi, "IDENT RESPONSE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "IDENT RESPONSE", bss_nsei[0], 0x1002,
 		       foreign_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_identity_resp, sizeof(dtap_identity_resp));
@@ -3992,7 +3760,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(!link_info->is_deregistered);
 	OSMO_ASSERT(!link_info->imsi_acq_pending);
 
-	send_llc_dl_ui(nsi, "ATTACH ACCEPT", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "ATTACH ACCEPT", SGSN_NSEI, 0x1002,
 		       foreign_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_attach_acc, sizeof(dtap_attach_acc));
@@ -4007,7 +3775,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(link_info == link_info2);
 	OSMO_ASSERT(link_info->imsi_len > 0);
 
-	send_llc_ul_ui(nsi, "ATTACH COMPLETE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH COMPLETE", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_complete, sizeof(dtap_attach_complete));
@@ -4017,7 +3785,7 @@ static void test_gbproxy_keep_info()
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	/* Detach (MT) */
-	send_llc_dl_ui(nsi, "DETACH REQ", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "DETACH REQ", SGSN_NSEI, 0x1002,
 		       local_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_mt_detach_req, sizeof(dtap_mt_detach_req));
@@ -4029,7 +3797,7 @@ static void test_gbproxy_keep_info()
 	link_info = gbproxy_link_info_by_tlli(peer, local_tlli);
 	OSMO_ASSERT(link_info);
 
-	send_llc_ul_ui(nsi, "DETACH ACC", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "DETACH ACC", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_mt_detach_acc, sizeof(dtap_mt_detach_acc));
@@ -4046,7 +3814,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(!expect_msg());
 
 	/* Bad case: Re-Attach with local TLLI */
-	send_llc_ul_ui(nsi, "ATTACH REQUEST (local TLLI)", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST (local TLLI)", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req3, sizeof(dtap_attach_req3));
@@ -4064,7 +3832,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(!link_info->imsi_acq_pending);
 	OSMO_ASSERT(link_info->sgsn_tlli.current == local_tlli);
 
-	send_llc_dl_ui(nsi, "ATTACH ACCEPT", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "ATTACH ACCEPT", SGSN_NSEI, 0x1002,
 		       local_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_attach_acc, sizeof(dtap_attach_acc));
@@ -4073,7 +3841,7 @@ static void test_gbproxy_keep_info()
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "ATTACH COMPLETE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH COMPLETE", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_complete, sizeof(dtap_attach_complete));
@@ -4083,7 +3851,7 @@ static void test_gbproxy_keep_info()
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	/* Detach (MT) */
-	send_llc_dl_ui(nsi, "DETACH REQ (re-attach)", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "DETACH REQ (re-attach)", SGSN_NSEI, 0x1002,
 		       local_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_mt_detach_rea_req, sizeof(dtap_mt_detach_rea_req));
@@ -4095,7 +3863,7 @@ static void test_gbproxy_keep_info()
 	link_info = gbproxy_link_info_by_tlli(peer, local_tlli);
 	OSMO_ASSERT(link_info);
 
-	send_llc_ul_ui(nsi, "DETACH ACC", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "DETACH ACC", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_mt_detach_acc, sizeof(dtap_mt_detach_acc));
@@ -4112,7 +3880,7 @@ static void test_gbproxy_keep_info()
 
 	/* Bad case: Unexpected Re-Attach with IMSI after completed attachment
 	 * procedure */
-	send_llc_ul_ui(nsi, "ATTACH REQUEST", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST", bss_nsei[0], 0x1002,
 		       foreign_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req3, sizeof(dtap_attach_req3));
@@ -4129,7 +3897,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(!link_info->is_deregistered);
 	OSMO_ASSERT(!link_info->imsi_acq_pending);
 
-	send_llc_dl_ui(nsi, "ATTACH ACCEPT", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "ATTACH ACCEPT", SGSN_NSEI, 0x1002,
 		       foreign_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_attach_acc, sizeof(dtap_attach_acc));
@@ -4138,7 +3906,7 @@ static void test_gbproxy_keep_info()
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "ATTACH COMPLETE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH COMPLETE", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_complete, sizeof(dtap_attach_complete));
@@ -4147,7 +3915,7 @@ static void test_gbproxy_keep_info()
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "GMM INFO", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "GMM INFO", SGSN_NSEI, 0x1002,
 		       local_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_gmm_information, sizeof(dtap_gmm_information));
@@ -4157,7 +3925,7 @@ static void test_gbproxy_keep_info()
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	send_llc_ul_ui(nsi, "ATTACH REQUEST (unexpected, IMSI)",
-		       &bss_peer[0], 0x1002,
+		       bss_nsei[0], 0x1002,
 		       foreign_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req4, sizeof(dtap_attach_req4));
@@ -4176,7 +3944,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(link_info->sgsn_tlli.current == foreign_tlli);
 	OSMO_ASSERT(link_info->sgsn_tlli.assigned == 0);
 
-	send_llc_dl_ui(nsi, "ATTACH ACCEPT", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "ATTACH ACCEPT", SGSN_NSEI, 0x1002,
 		       foreign_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_attach_acc, sizeof(dtap_attach_acc));
@@ -4185,7 +3953,7 @@ static void test_gbproxy_keep_info()
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "ATTACH COMPLETE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH COMPLETE", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_complete, sizeof(dtap_attach_complete));
@@ -4195,7 +3963,7 @@ static void test_gbproxy_keep_info()
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	/* Detach (MT) */
-	send_llc_dl_ui(nsi, "DETACH REQ", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "DETACH REQ", SGSN_NSEI, 0x1002,
 		       local_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_mt_detach_req, sizeof(dtap_mt_detach_req));
@@ -4207,7 +3975,7 @@ static void test_gbproxy_keep_info()
 	link_info = gbproxy_link_info_by_tlli(peer, local_tlli);
 	OSMO_ASSERT(link_info);
 
-	send_llc_ul_ui(nsi, "DETACH ACC", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "DETACH ACC", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_mt_detach_acc, sizeof(dtap_mt_detach_acc));
@@ -4224,7 +3992,7 @@ static void test_gbproxy_keep_info()
 
 	/* Bad case: Unexpected Re-Attach with P-TMSI after completed attachment
 	 * procedure */
-	send_llc_ul_ui(nsi, "ATTACH REQUEST", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST", bss_nsei[0], 0x1002,
 		       foreign_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req3, sizeof(dtap_attach_req3));
@@ -4241,7 +4009,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(!link_info->is_deregistered);
 	OSMO_ASSERT(!link_info->imsi_acq_pending);
 
-	send_llc_dl_ui(nsi, "ATTACH ACCEPT", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "ATTACH ACCEPT", SGSN_NSEI, 0x1002,
 		       foreign_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_attach_acc, sizeof(dtap_attach_acc));
@@ -4250,7 +4018,7 @@ static void test_gbproxy_keep_info()
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "ATTACH COMPLETE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH COMPLETE", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_complete, sizeof(dtap_attach_complete));
@@ -4259,7 +4027,7 @@ static void test_gbproxy_keep_info()
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "GMM INFO", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "GMM INFO", SGSN_NSEI, 0x1002,
 		       local_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_gmm_information, sizeof(dtap_gmm_information));
@@ -4268,7 +4036,7 @@ static void test_gbproxy_keep_info()
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "ATTACH REQUEST (unexpected)", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST (unexpected)", bss_nsei[0], 0x1002,
 		       foreign_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req3, sizeof(dtap_attach_req3));
@@ -4287,7 +4055,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(link_info->sgsn_tlli.current == foreign_tlli);
 	OSMO_ASSERT(link_info->sgsn_tlli.assigned == 0);
 
-	send_llc_dl_ui(nsi, "ATTACH ACCEPT", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "ATTACH ACCEPT", SGSN_NSEI, 0x1002,
 		       foreign_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_attach_acc, sizeof(dtap_attach_acc));
@@ -4296,7 +4064,7 @@ static void test_gbproxy_keep_info()
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "ATTACH COMPLETE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH COMPLETE", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_complete, sizeof(dtap_attach_complete));
@@ -4306,7 +4074,7 @@ static void test_gbproxy_keep_info()
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	/* Detach (MT) */
-	send_llc_dl_ui(nsi, "DETACH REQ", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "DETACH REQ", SGSN_NSEI, 0x1002,
 		       local_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_mt_detach_req, sizeof(dtap_mt_detach_req));
@@ -4318,7 +4086,7 @@ static void test_gbproxy_keep_info()
 	link_info = gbproxy_link_info_by_tlli(peer, local_tlli);
 	OSMO_ASSERT(link_info);
 
-	send_llc_ul_ui(nsi, "DETACH ACC", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "DETACH ACC", bss_nsei[0], 0x1002,
 		       local_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_mt_detach_acc, sizeof(dtap_mt_detach_acc));
@@ -4338,7 +4106,7 @@ static void test_gbproxy_keep_info()
 
 	gbproxy_delete_link_infos(peer);
 
-	send_llc_ul_ui(nsi, "ATTACH REQUEST", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST", bss_nsei[0], 0x1002,
 		       foreign_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req, sizeof(dtap_attach_req));
@@ -4353,7 +4121,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(!link_info->is_deregistered);
 	OSMO_ASSERT(link_info->imsi_acq_pending);
 
-	send_llc_ul_ui(nsi, "IDENT RESPONSE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "IDENT RESPONSE", bss_nsei[0], 0x1002,
 		       foreign_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_identity_resp, sizeof(dtap_identity_resp));
@@ -4370,7 +4138,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(!link_info->is_deregistered);
 	OSMO_ASSERT(!link_info->imsi_acq_pending);
 
-	send_llc_dl_ui(nsi, "ATTACH REJECT", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "ATTACH REJECT", SGSN_NSEI, 0x1002,
 		       foreign_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_attach_rej7, sizeof(dtap_attach_rej7));
@@ -4387,7 +4155,7 @@ static void test_gbproxy_keep_info()
 
 	gbproxy_delete_link_infos(peer);
 
-	send_llc_ul_ui(nsi, "ATTACH REQUEST", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST", bss_nsei[0], 0x1002,
 		       foreign_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req, sizeof(dtap_attach_req));
@@ -4402,7 +4170,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(!link_info->is_deregistered);
 	OSMO_ASSERT(link_info->imsi_acq_pending);
 
-	send_llc_ul_ui(nsi, "DETACH REQ (MO)", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "DETACH REQ (MO)", bss_nsei[0], 0x1002,
 		       foreign_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_detach_req, sizeof(dtap_detach_req));
@@ -4417,7 +4185,7 @@ static void test_gbproxy_keep_info()
 
 	gbproxy_delete_link_infos(peer);
 
-	send_llc_ul_ui(nsi, "ATTACH REQUEST", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST", bss_nsei[0], 0x1002,
 		       foreign_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req, sizeof(dtap_attach_req));
@@ -4432,7 +4200,7 @@ static void test_gbproxy_keep_info()
 	OSMO_ASSERT(!link_info->is_deregistered);
 	OSMO_ASSERT(link_info->imsi_acq_pending);
 
-	send_llc_dl_ui(nsi, "DETACH REQ (MT)", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "DETACH REQ (MT)", SGSN_NSEI, 0x1002,
 		       foreign_tlli, 1, imsi, sizeof(imsi),
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_mt_detach_req, sizeof(dtap_mt_detach_req));
@@ -4444,7 +4212,7 @@ static void test_gbproxy_keep_info()
 	link_info = gbproxy_link_info_by_tlli(peer, foreign_tlli);
 	OSMO_ASSERT(link_info);
 
-	send_llc_ul_ui(nsi, "DETACH ACC", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "DETACH ACC", bss_nsei[0], 0x1002,
 		       foreign_tlli, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_mt_detach_acc, sizeof(dtap_mt_detach_acc));
@@ -4470,7 +4238,7 @@ static void test_gbproxy_keep_info()
 	gbcfg.core_apn = NULL;
 
 	gbprox_reset(&gbcfg);
-	gprs_ns_destroy(nsi);
+	gprs_ns2_free(nsi);
 	nsi = NULL;
 
 	cleanup_test();
@@ -4838,9 +4606,7 @@ static void test_gbproxy_imsi_matching(void)
 
 static void test_gbproxy_stored_messages()
 {
-	struct gprs_ns_inst *nsi = gprs_ns_instantiate(gprs_ns_callback, tall_sgsn_ctx);
-	struct sockaddr_in bss_peer[1] = {{0},};
-	struct sockaddr_in sgsn_peer= {0};
+	struct gprs_ns2_inst *nsi = gprs_ns2_instantiate(tall_sgsn_ctx, gprs_ns2_callback, &gbcfg);
 	struct  gprs_ra_id rai_bss =
 		{.mcc = 112, .mnc = 332, .lac = 16464, .rac = 96};
 	struct  gprs_ra_id rai_unknown =
@@ -4855,11 +4621,11 @@ static void test_gbproxy_stored_messages()
 	struct gbproxy_peer *peer;
 	unsigned bss_nu = 0;
 	unsigned sgsn_nu = 0;
+	uint16_t bss_nsei[] = { 0x1000 };
 
 	OSMO_ASSERT(local_tlli == gprs_tmsi2tlli(ptmsi, TLLI_LOCAL));
 
-	bssgp_nsi = nsi;
-	gbcfg.nsi = bssgp_nsi;
+	gbcfg.nsi = nsi;
 	gbcfg.nsip_sgsn_nsei = SGSN_NSEI;
 	gbcfg.core_plmn = (struct osmo_plmn_id){};
 	gbcfg.core_apn = talloc_zero_size(tall_sgsn_ctx, 100);
@@ -4868,52 +4634,50 @@ static void test_gbproxy_stored_messages()
 	gbcfg.acquire_imsi = 1;
 	gbcfg.keep_link_infos = 0;
 
-	configure_sgsn_peer(&sgsn_peer);
-	configure_bss_peers(bss_peer, ARRAY_SIZE(bss_peer));
+	bssgp_set_bssgp_callback(gbprox_test_bssgp_send_cb, &gbcfg);
 
 	printf("=== %s ===\n", __func__);
 	printf("--- Initialise SGSN ---\n\n");
 
-	connect_sgsn(nsi, &sgsn_peer, SGSN_NSEI);
+	connect_sgsn(nsi, SGSN_NSEI);
 
 	printf("--- Initialise BSS 1 ---\n\n");
 
-	setup_ns(nsi, &bss_peer[0], 0x1001, 0x1000);
-	setup_bssgp(nsi, &bss_peer[0], 0x1002);
+	setup_ns(nsi, bss_nsei[0]);
+	setup_bssgp(nsi, bss_nsei[0], 0x1002);
 
 	peer = gbproxy_peer_by_nsei(&gbcfg, 0x1000);
 	OSMO_ASSERT(peer != NULL);
 
-	send_bssgp_reset_ack(nsi, &sgsn_peer, 0x1002);
+	send_bssgp_reset_ack(nsi, SGSN_NSEI, 0x1002);
 
-	gprs_dump_nsi(nsi);
 	dump_global(stdout, 0);
 	dump_peers(stdout, 0, 0, &gbcfg);
 
 	printf("--- Establish first LLC connection ---\n\n");
 
-	send_llc_ul_ui(nsi, "ATTACH REQUEST", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "ATTACH REQUEST", bss_nsei[0], 0x1002,
 		       foreign_tlli1, &rai_unknown, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_attach_req, sizeof(dtap_attach_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_dl_ui(nsi, "IDENT REQUEST", &sgsn_peer, 0x1002,
+	send_llc_dl_ui(nsi, "IDENT REQUEST", SGSN_NSEI, 0x1002,
 		       foreign_tlli1, 0, NULL, 0,
 		       GPRS_SAPI_GMM, sgsn_nu++,
 		       dtap_identity_req, sizeof(dtap_identity_req));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "DETACH ACCEPT", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "DETACH ACCEPT", bss_nsei[0], 0x1002,
 		       foreign_tlli1, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_detach_acc, sizeof(dtap_detach_acc));
 
 	dump_peers(stdout, 0, 0, &gbcfg);
 
-	send_llc_ul_ui(nsi, "IDENT RESPONSE", &bss_peer[0], 0x1002,
+	send_llc_ul_ui(nsi, "IDENT RESPONSE", bss_nsei[0], 0x1002,
 		       foreign_tlli1, &rai_bss, cell_id,
 		       GPRS_SAPI_GMM, bss_nu++,
 		       dtap_identity_resp, sizeof(dtap_identity_resp));
@@ -4926,7 +4690,7 @@ static void test_gbproxy_stored_messages()
 	gbcfg.core_apn = NULL;
 
 	gbprox_reset(&gbcfg);
-	gprs_ns_destroy(nsi);
+	gprs_ns2_free(nsi);
 	nsi = NULL;
 
 	cleanup_test();
@@ -5043,9 +4807,6 @@ int main(int argc, char **argv)
 	osmo_init_logging2(log_ctx, &info);
 	log_set_use_color(osmo_stderr_target, 0);
 	log_set_print_filename(osmo_stderr_target, 0);
-	osmo_signal_register_handler(SS_L_NS, &test_signal, &gbcfg);
-
-	log_set_print_filename(osmo_stderr_target, 0);
 	log_set_log_level(osmo_stderr_target, LOGL_DEBUG);
 	log_set_all_filter(osmo_stderr_target, 1);
 
@@ -5057,9 +4818,9 @@ int main(int argc, char **argv)
 	gbproxy_init_config(&gbcfg);
 	test_gbproxy();
 	test_gbproxy_ident_changes();
+	test_gbproxy_ra_patching();
 	test_gbproxy_imsi_matching();
 	test_gbproxy_ptmsi_assignment();
-	test_gbproxy_ra_patching();
 	test_gbproxy_ptmsi_patching();
 	test_gbproxy_ptmsi_patching_bad_cases();
 	test_gbproxy_imsi_acquisition();
diff --git a/tests/gbproxy/gbproxy_test.ok b/tests/gbproxy/gbproxy_test.ok
index 03de12e4a..50c7cd75e 100644
--- a/tests/gbproxy/gbproxy_test.ok
+++ b/tests/gbproxy/gbproxy_test.ok
@@ -2,635 +2,168 @@
 === test_gbproxy ===
 --- Initialise SGSN ---
 
-MESSAGE to SGSN at 0x05060708:32000, msg length 12
-02 00 81 01 01 82 01 01 04 82 01 00 
+NS2 CALLBACK, prim 2, bvci 0x0000
 
-PROCESSING RESET_ACK from 0x05060708:32000
-03 01 82 01 01 04 82 01 00 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-0a 
-
-result (RESET_ACK) = 0
-
-PROCESSING ALIVE_ACK from 0x05060708:32000
-0b 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-06 
-
-result (ALIVE_ACK) = 0
-
-PROCESSING UNBLOCK_ACK from 0x05060708:32000
-07 
-
-==> got signal NS_UNBLOCK, NS-VC 0x0101/5.6.7.8:32000
-
-result (UNBLOCK_ACK) = 0
-
-PROCESSING ALIVE from 0x05060708:32000
-0a 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-0b 
-
-result (ALIVE) = 0
-
-Current NS-VCIs:
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 4
-         Packets at NS Level  (Out): 4
-         Bytes at NS Level    ( In): 12
-         Bytes at NS Level    (Out): 15
-         NS-VC Block count         : 1
+Message for SGSN (NSEI=256 BVCI=0):
+22 04 82 00 00 07 81 08 
 
 --- Initialise BSS 1 ---
 
-Setup NS-VC: remote 0x01020304:1111, NSVCI 0x1001(4097), NSEI 0x1000(4096)
-
-PROCESSING RESET from 0x01020304:1111
-02 00 81 01 01 82 10 01 04 82 10 00 
-
-==> got signal NS_RESET, NS-VC 0x1001/1.2.3.4:1111
-
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-03 01 82 10 01 04 82 10 00 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0a 
-
-result (RESET) = 0
-
-PROCESSING ALIVE from 0x01020304:1111
-0a 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0b 
-
-result (ALIVE) = 0
-
-PROCESSING UNBLOCK from 0x01020304:1111
-06 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-07 
-
-==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111
-
-result (UNBLOCK) = 0
-
-PROCESSING ALIVE_ACK from 0x01020304:1111
-0b 
+Setup NS-VC: NSEI 0x1000(4096)
 
-result (ALIVE_ACK) = 0
+NS2 CALLBACK, prim 2, bvci 0x0000
 
-Setup BSSGP: remote 0x01020304:1111, BVCI 0x1002(4098)
+Setup BSSGP: BVCI 0x1002(4098)
 
-PROCESSING BVC_RESET from 0x01020304:1111
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+PROCESSING BVC_RESET from NSEI 4096
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 22
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-result (BVC_RESET) = 0
-
-Current NS-VCIs:
-    VCI 0x1001, NSEI 0x1000, peer 0x01020304:1111
-         Packets at NS Level  ( In): 5
-         Packets at NS Level  (Out): 4
-         Bytes at NS Level    ( In): 37
-         Bytes at NS Level    (Out): 12
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 4
-         Packets at NS Level  (Out): 5
-         Bytes at NS Level    ( In): 12
-         Bytes at NS Level    (Out): 37
-         NS-VC Block count         : 1
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
     TLLI-Cache: 0
-PROCESSING BVC_RESET_ACK from 0x05060708:32000
-00 00 00 00 23 04 82 10 02 
+PROCESSING BVC_RESET_ACK from NSEI 256
+23 04 82 10 02 
 
-CALLBACK, event 0, msg length 5, bvci 0x0000
-00 00 00 00 23 04 82 10 02 
+NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-00 00 00 00 23 04 82 10 02 
+NS2 UD REQUEST, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-result (BVC_RESET_ACK) = 0
+Message for BSS (NSEI=4096 BVCI=0):
+[L2]> [L3]> 23 04 82 10 02 
 
 --- Initialise BSS 2 ---
 
-Setup NS-VC: remote 0x01020304:2222, NSVCI 0x2001(8193), NSEI 0x2000(8192)
-
-PROCESSING RESET from 0x01020304:2222
-02 00 81 01 01 82 20 01 04 82 20 00 
-
-==> got signal NS_RESET, NS-VC 0x2001/1.2.3.4:2222
-
-MESSAGE to BSS at 0x01020304:2222, msg length 9
-03 01 82 20 01 04 82 20 00 
-
-MESSAGE to BSS at 0x01020304:2222, msg length 1
-0a 
-
-result (RESET) = 0
-
-PROCESSING ALIVE from 0x01020304:2222
-0a 
-
-MESSAGE to BSS at 0x01020304:2222, msg length 1
-0b 
-
-result (ALIVE) = 0
-
-PROCESSING UNBLOCK from 0x01020304:2222
-06 
-
-MESSAGE to BSS at 0x01020304:2222, msg length 1
-07 
-
-==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:2222
-
-result (UNBLOCK) = 0
-
-PROCESSING ALIVE_ACK from 0x01020304:2222
-0b 
-
-result (ALIVE_ACK) = 0
-
-Setup BSSGP: remote 0x01020304:2222, BVCI 0x2002(8194)
-
-PROCESSING BVC_RESET from 0x01020304:2222
-00 00 00 00 22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
-
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
-
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 22
-00 00 00 00 22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
-
-result (BVC_RESET) = 0
-
-Current NS-VCIs:
-    VCI 0x2001, NSEI 0x2000, peer 0x01020304:2222
-         Packets at NS Level  ( In): 5
-         Packets at NS Level  (Out): 4
-         Bytes at NS Level    ( In): 37
-         Bytes at NS Level    (Out): 12
-    VCI 0x1001, NSEI 0x1000, peer 0x01020304:1111
-         Packets at NS Level  ( In): 5
-         Packets at NS Level  (Out): 5
-         Bytes at NS Level    ( In): 37
-         Bytes at NS Level    (Out): 21
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 5
-         Packets at NS Level  (Out): 6
-         Bytes at NS Level    ( In): 21
-         Bytes at NS Level    (Out): 59
-         NS-VC Block count         : 1
-
-Peers:
-  NSEI 8192, BVCI 8194, not blocked, RAI 112-332-16464-96
-    TLLI-Cache: 0
-  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
-    TLLI-Cache: 0
-PROCESSING BVC_RESET_ACK from 0x05060708:32000
-00 00 00 00 23 04 82 20 02 
-
-CALLBACK, event 0, msg length 5, bvci 0x0000
-00 00 00 00 23 04 82 20 02 
-
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:2222, msg length 9
-00 00 00 00 23 04 82 20 02 
-
-result (BVC_RESET_ACK) = 0
-
---- Move BSS 1 to new port ---
-
-Setup NS-VC: remote 0x01020304:3333, NSVCI 0x1001(4097), NSEI 0x1000(4096)
-
-PROCESSING RESET from 0x01020304:3333
-02 00 81 01 01 82 10 01 04 82 10 00 
-
-==> got signal NS_RESET, NS-VC 0x1001/1.2.3.4:3333
-
-MESSAGE to BSS at 0x01020304:3333, msg length 9
-03 01 82 10 01 04 82 10 00 
-
-MESSAGE to BSS at 0x01020304:3333, msg length 1
-0a 
-
-result (RESET) = 0
+Setup NS-VC: NSEI 0x2000(8192)
 
-PROCESSING ALIVE from 0x01020304:3333
-0a 
+NS2 CALLBACK, prim 2, bvci 0x0000
 
-MESSAGE to BSS at 0x01020304:3333, msg length 1
-0b 
+Setup BSSGP: BVCI 0x2002(8194)
 
-result (ALIVE) = 0
+PROCESSING BVC_RESET from NSEI 8192
+22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-PROCESSING UNBLOCK from 0x01020304:3333
-06 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-MESSAGE to BSS at 0x01020304:3333, msg length 1
-07 
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:3333
-
-result (UNBLOCK) = 0
-
-PROCESSING ALIVE_ACK from 0x01020304:3333
-0b 
-
-result (ALIVE_ACK) = 0
-
-Current NS-VCIs:
-    VCI 0x2001, NSEI 0x2000, peer 0x01020304:2222
-         Packets at NS Level  ( In): 5
-         Packets at NS Level  (Out): 5
-         Bytes at NS Level    ( In): 37
-         Bytes at NS Level    (Out): 21
-    VCI 0x1001, NSEI 0x1000, peer 0x01020304:3333
-         Packets at NS Level  ( In): 9
-         Packets at NS Level  (Out): 9
-         Bytes at NS Level    ( In): 52
-         Bytes at NS Level    (Out): 33
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 6
-         Packets at NS Level  (Out): 6
-         Bytes at NS Level    ( In): 30
-         Bytes at NS Level    (Out): 59
-         NS-VC Block count         : 1
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
 Peers:
   NSEI 8192, BVCI 8194, not blocked, RAI 112-332-16464-96
     TLLI-Cache: 0
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
     TLLI-Cache: 0
---- Move BSS 2 to former BSS 1 port ---
-
-Setup NS-VC: remote 0x01020304:1111, NSVCI 0x2001(8193), NSEI 0x2000(8192)
-
-PROCESSING RESET from 0x01020304:1111
-02 00 81 01 01 82 20 01 04 82 20 00 
+PROCESSING BVC_RESET_ACK from NSEI 256
+23 04 82 20 02 
 
-==> got signal NS_RESET, NS-VC 0x2001/1.2.3.4:1111
+NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
+23 04 82 20 02 
 
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-03 01 82 20 01 04 82 20 00 
+NS2 UD REQUEST, prim 0, msg length 5, bvci 0x0000
+23 04 82 20 02 
 
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0a 
+Message for BSS (NSEI=8192 BVCI=0):
+[L2]> [L3]> 23 04 82 20 02 
 
-result (RESET) = 0
-
-PROCESSING ALIVE from 0x01020304:1111
-0a 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0b 
-
-result (ALIVE) = 0
-
-PROCESSING UNBLOCK from 0x01020304:1111
-06 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-07 
+--- Reset BSS 1 with a new BVCI ---
 
-==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111
+Setup BSSGP: BVCI 0x1012(4114)
 
-result (UNBLOCK) = 0
+PROCESSING BVC_RESET from NSEI 4096
+22 04 82 10 12 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-PROCESSING ALIVE_ACK from 0x01020304:1111
-0b 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 12 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-result (ALIVE_ACK) = 0
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 12 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-Current NS-VCIs:
-    VCI 0x2001, NSEI 0x2000, peer 0x01020304:1111
-         Packets at NS Level  ( In): 9
-         Packets at NS Level  (Out): 9
-         Bytes at NS Level    ( In): 52
-         Bytes at NS Level    (Out): 33
-    VCI 0x1001, NSEI 0x1000, peer 0x01020304:3333
-         Packets at NS Level  ( In): 9
-         Packets at NS Level  (Out): 9
-         Bytes at NS Level    ( In): 52
-         Bytes at NS Level    (Out): 33
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 6
-         Packets at NS Level  (Out): 6
-         Bytes at NS Level    ( In): 30
-         Bytes at NS Level    (Out): 59
-         NS-VC Block count         : 1
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 22 04 82 10 12 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
 Peers:
-  NSEI 8192, BVCI 8194, not blocked, RAI 112-332-16464-96
-    TLLI-Cache: 0
-  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
+  NSEI 4096, BVCI 4114, not blocked, RAI 112-332-16464-96
     TLLI-Cache: 0
---- Move BSS 1 to current BSS 2 port ---
-
-Setup NS-VC: remote 0x01020304:1111, NSVCI 0x2001(8193), NSEI 0x2000(8192)
-
-PROCESSING RESET from 0x01020304:1111
-02 00 81 01 01 82 20 01 04 82 20 00 
-
-==> got signal NS_RESET, NS-VC 0x2001/1.2.3.4:1111
-
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-03 01 82 20 01 04 82 20 00 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0a 
-
-result (RESET) = 0
-
-PROCESSING ALIVE from 0x01020304:1111
-0a 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0b 
-
-result (ALIVE) = 0
-
-PROCESSING UNBLOCK from 0x01020304:1111
-06 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-07 
-
-==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111
-
-result (UNBLOCK) = 0
-
-PROCESSING ALIVE_ACK from 0x01020304:1111
-0b 
-
-result (ALIVE_ACK) = 0
-
-Current NS-VCIs:
-    VCI 0x2001, NSEI 0x2000, peer 0x01020304:1111
-         Packets at NS Level  ( In): 13
-         Packets at NS Level  (Out): 13
-         Bytes at NS Level    ( In): 67
-         Bytes at NS Level    (Out): 45
-    VCI 0x1001, NSEI 0x1000, peer 0x01020304:3333
-         Packets at NS Level  ( In): 9
-         Packets at NS Level  (Out): 9
-         Bytes at NS Level    ( In): 52
-         Bytes at NS Level    (Out): 33
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 6
-         Packets at NS Level  (Out): 6
-         Bytes at NS Level    ( In): 30
-         Bytes at NS Level    (Out): 59
-         NS-VC Block count         : 1
-
-Peers:
   NSEI 8192, BVCI 8194, not blocked, RAI 112-332-16464-96
     TLLI-Cache: 0
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
     TLLI-Cache: 0
---- Move BSS 2 to new port ---
-
-Setup NS-VC: remote 0x01020304:4444, NSVCI 0x2001(8193), NSEI 0x2000(8192)
-
-PROCESSING RESET from 0x01020304:4444
-02 00 81 01 01 82 20 01 04 82 20 00 
+PROCESSING BVC_RESET_ACK from NSEI 256
+23 04 82 10 12 
 
-==> got signal NS_RESET, NS-VC 0x2001/1.2.3.4:4444
+NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 12 
 
-MESSAGE to BSS at 0x01020304:4444, msg length 9
-03 01 82 20 01 04 82 20 00 
+NS2 UD REQUEST, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 12 
 
-MESSAGE to BSS at 0x01020304:4444, msg length 1
-0a 
+Message for BSS (NSEI=4096 BVCI=0):
+[L2]> [L3]> 23 04 82 10 12 
 
-result (RESET) = 0
-
-PROCESSING ALIVE from 0x01020304:4444
-0a 
-
-MESSAGE to BSS at 0x01020304:4444, msg length 1
-0b 
-
-result (ALIVE) = 0
-
-PROCESSING UNBLOCK from 0x01020304:4444
-06 
-
-MESSAGE to BSS at 0x01020304:4444, msg length 1
-07 
+--- Reset BSS 1 with the old BVCI ---
 
-==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:4444
+Setup BSSGP: BVCI 0x1002(4098)
 
-result (UNBLOCK) = 0
+PROCESSING BVC_RESET from NSEI 4096
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-PROCESSING ALIVE_ACK from 0x01020304:4444
-0b 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-result (ALIVE_ACK) = 0
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-Current NS-VCIs:
-    VCI 0x2001, NSEI 0x2000, peer 0x01020304:4444
-         Packets at NS Level  ( In): 17
-         Packets at NS Level  (Out): 17
-         Bytes at NS Level    ( In): 82
-         Bytes at NS Level    (Out): 57
-    VCI 0x1001, NSEI 0x1000, peer 0x01020304:3333
-         Packets at NS Level  ( In): 9
-         Packets at NS Level  (Out): 9
-         Bytes at NS Level    ( In): 52
-         Bytes at NS Level    (Out): 33
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 6
-         Packets at NS Level  (Out): 6
-         Bytes at NS Level    ( In): 30
-         Bytes at NS Level    (Out): 59
-         NS-VC Block count         : 1
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
 Peers:
-  NSEI 8192, BVCI 8194, not blocked, RAI 112-332-16464-96
-    TLLI-Cache: 0
-  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
+  NSEI 4096, BVCI 4114, not blocked, RAI 112-332-16464-96
     TLLI-Cache: 0
---- Move BSS 2 to former BSS 1 port ---
-
-Setup NS-VC: remote 0x01020304:3333, NSVCI 0x2001(8193), NSEI 0x2000(8192)
-
-PROCESSING RESET from 0x01020304:3333
-02 00 81 01 01 82 20 01 04 82 20 00 
-
-==> got signal NS_REPLACED: 0x2001/1.2.3.4:4444 -> 0x1001/1.2.3.4:3333
-
-==> got signal NS_RESET, NS-VC 0x2001/1.2.3.4:3333
-
-MESSAGE to BSS at 0x01020304:3333, msg length 9
-03 01 82 20 01 04 82 20 00 
-
-MESSAGE to BSS at 0x01020304:3333, msg length 1
-0a 
-
-result (RESET) = 0
-
-PROCESSING ALIVE from 0x01020304:3333
-0a 
-
-MESSAGE to BSS at 0x01020304:3333, msg length 1
-0b 
-
-result (ALIVE) = 0
-
-PROCESSING UNBLOCK from 0x01020304:3333
-06 
-
-MESSAGE to BSS at 0x01020304:3333, msg length 1
-07 
-
-==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:3333
-
-result (UNBLOCK) = 0
-
-PROCESSING ALIVE_ACK from 0x01020304:3333
-0b 
-
-result (ALIVE_ACK) = 0
-
-Current NS-VCIs:
-    VCI 0x2001, NSEI 0x2000, peer 0x01020304:3333
-         Packets at NS Level  ( In): 20
-         Packets at NS Level  (Out): 21
-         Bytes at NS Level    ( In): 85
-         Bytes at NS Level    (Out): 69
-         NS-VC replaced other count: 1
-    VCI 0x1001, NSEI 0x1000, peer 0x00000000:0
-         Packets at NS Level  ( In): 10
-         Packets at NS Level  (Out): 9
-         Bytes at NS Level    ( In): 64
-         Bytes at NS Level    (Out): 33
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 6
-         Packets at NS Level  (Out): 6
-         Bytes at NS Level    ( In): 30
-         Bytes at NS Level    (Out): 59
-         NS-VC Block count         : 1
-
-Peers:
   NSEI 8192, BVCI 8194, not blocked, RAI 112-332-16464-96
     TLLI-Cache: 0
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
     TLLI-Cache: 0
---- Move BSS 1 to original BSS 1 port ---
-
-Setup NS-VC: remote 0x01020304:1111, NSVCI 0x1001(4097), NSEI 0x1000(4096)
-
-PROCESSING RESET from 0x01020304:1111
-02 00 81 01 01 82 10 01 04 82 10 00 
-
-==> got signal NS_RESET, NS-VC 0x1001/1.2.3.4:1111
-
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-03 01 82 10 01 04 82 10 00 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0a 
-
-result (RESET) = 0
-
-PROCESSING ALIVE from 0x01020304:1111
-0a 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0b 
+PROCESSING BVC_RESET_ACK from NSEI 256
+23 04 82 10 02 
 
-result (ALIVE) = 0
+NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-PROCESSING UNBLOCK from 0x01020304:1111
-06 
+NS2 UD REQUEST, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-07 
-
-==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111
-
-result (UNBLOCK) = 0
-
-PROCESSING ALIVE_ACK from 0x01020304:1111
-0b 
-
-result (ALIVE_ACK) = 0
-
-Current NS-VCIs:
-    VCI 0x2001, NSEI 0x2000, peer 0x01020304:3333
-         Packets at NS Level  ( In): 20
-         Packets at NS Level  (Out): 21
-         Bytes at NS Level    ( In): 85
-         Bytes at NS Level    (Out): 69
-         NS-VC replaced other count: 1
-    VCI 0x1001, NSEI 0x1000, peer 0x01020304:1111
-         Packets at NS Level  ( In): 14
-         Packets at NS Level  (Out): 13
-         Bytes at NS Level    ( In): 79
-         Bytes at NS Level    (Out): 45
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 6
-         Packets at NS Level  (Out): 6
-         Bytes at NS Level    ( In): 30
-         Bytes at NS Level    (Out): 59
-         NS-VC Block count         : 1
-
-Peers:
-  NSEI 8192, BVCI 8194, not blocked, RAI 112-332-16464-96
-    TLLI-Cache: 0
-  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
-    TLLI-Cache: 0
---- Reset BSS 1 with a new BVCI ---
+Message for BSS (NSEI=4096 BVCI=0):
+[L2]> [L3]> 23 04 82 10 02 
 
-Setup BSSGP: remote 0x01020304:1111, BVCI 0x1012(4114)
+--- Reset BSS 1 with the old BVCI again ---
 
-PROCESSING BVC_RESET from 0x01020304:1111
-00 00 00 00 22 04 82 10 12 07 81 08 08 88 11 22 33 40 50 60 10 00 
+Setup BSSGP: BVCI 0x1002(4098)
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 22 04 82 10 12 07 81 08 08 88 11 22 33 40 50 60 10 00 
+PROCESSING BVC_RESET from NSEI 4096
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 22
-00 00 00 00 22 04 82 10 12 07 81 08 08 88 11 22 33 40 50 60 10 00 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-result (BVC_RESET) = 0
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-Current NS-VCIs:
-    VCI 0x2001, NSEI 0x2000, peer 0x01020304:3333
-         Packets at NS Level  ( In): 20
-         Packets at NS Level  (Out): 21
-         Bytes at NS Level    ( In): 85
-         Bytes at NS Level    (Out): 69
-         NS-VC replaced other count: 1
-    VCI 0x1001, NSEI 0x1000, peer 0x01020304:1111
-         Packets at NS Level  ( In): 15
-         Packets at NS Level  (Out): 13
-         Bytes at NS Level    ( In): 101
-         Bytes at NS Level    (Out): 45
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 6
-         Packets at NS Level  (Out): 7
-         Bytes at NS Level    ( In): 30
-         Bytes at NS Level    (Out): 81
-         NS-VC Block count         : 1
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
 Peers:
   NSEI 4096, BVCI 4114, not blocked, RAI 112-332-16464-96
@@ -639,244 +172,117 @@ Peers:
     TLLI-Cache: 0
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
     TLLI-Cache: 0
-PROCESSING BVC_RESET_ACK from 0x05060708:32000
-00 00 00 00 23 04 82 10 12 
-
-CALLBACK, event 0, msg length 5, bvci 0x0000
-00 00 00 00 23 04 82 10 12 
-
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-00 00 00 00 23 04 82 10 12 
-
-result (BVC_RESET_ACK) = 0
-
---- Reset BSS 1 with the old BVCI ---
+PROCESSING BVC_RESET_ACK from NSEI 256
+23 04 82 10 02 
 
-Setup BSSGP: remote 0x01020304:1111, BVCI 0x1002(4098)
+NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-PROCESSING BVC_RESET from 0x01020304:1111
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+NS2 UD REQUEST, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+Message for BSS (NSEI=4096 BVCI=0):
+[L2]> [L3]> 23 04 82 10 02 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 22
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+--- Send message from BSS 1 to SGSN, BVCI 0x1012 ---
 
-result (BVC_RESET) = 0
+PROCESSING (null) from NSEI 4096
 
-Current NS-VCIs:
-    VCI 0x2001, NSEI 0x2000, peer 0x01020304:3333
-         Packets at NS Level  ( In): 20
-         Packets at NS Level  (Out): 21
-         Bytes at NS Level    ( In): 85
-         Bytes at NS Level    (Out): 69
-         NS-VC replaced other count: 1
-    VCI 0x1001, NSEI 0x1000, peer 0x01020304:1111
-         Packets at NS Level  ( In): 16
-         Packets at NS Level  (Out): 14
-         Bytes at NS Level    ( In): 123
-         Bytes at NS Level    (Out): 54
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 7
-         Packets at NS Level  (Out): 8
-         Bytes at NS Level    ( In): 39
-         Bytes at NS Level    (Out): 103
-         NS-VC Block count         : 1
 
-Peers:
-  NSEI 4096, BVCI 4114, not blocked, RAI 112-332-16464-96
-    TLLI-Cache: 0
-  NSEI 8192, BVCI 8194, not blocked, RAI 112-332-16464-96
-    TLLI-Cache: 0
-  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
-    TLLI-Cache: 0
-PROCESSING BVC_RESET_ACK from 0x05060708:32000
-00 00 00 00 23 04 82 10 02 
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x1012
 
-CALLBACK, event 0, msg length 5, bvci 0x0000
-00 00 00 00 23 04 82 10 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-00 00 00 00 23 04 82 10 02 
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x1012
 
-result (BVC_RESET_ACK) = 0
 
---- Reset BSS 1 with the old BVCI again ---
+Message for SGSN (NSEI=256 BVCI=4114):
+[L2]> [L3]> 
 
-Setup BSSGP: remote 0x01020304:1111, BVCI 0x1002(4098)
+--- Send message from SGSN to BSS 1, BVCI 0x1012 ---
 
-PROCESSING BVC_RESET from 0x01020304:1111
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+PROCESSING (null) from NSEI 256
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 22
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x1012
 
-result (BVC_RESET) = 0
 
-Current NS-VCIs:
-    VCI 0x2001, NSEI 0x2000, peer 0x01020304:3333
-         Packets at NS Level  ( In): 20
-         Packets at NS Level  (Out): 21
-         Bytes at NS Level    ( In): 85
-         Bytes at NS Level    (Out): 69
-         NS-VC replaced other count: 1
-    VCI 0x1001, NSEI 0x1000, peer 0x01020304:1111
-         Packets at NS Level  ( In): 17
-         Packets at NS Level  (Out): 15
-         Bytes at NS Level    ( In): 145
-         Bytes at NS Level    (Out): 63
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 8
-         Packets at NS Level  (Out): 9
-         Bytes at NS Level    ( In): 48
-         Bytes at NS Level    (Out): 125
-         NS-VC Block count         : 1
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x1012
 
-Peers:
-  NSEI 4096, BVCI 4114, not blocked, RAI 112-332-16464-96
-    TLLI-Cache: 0
-  NSEI 8192, BVCI 8194, not blocked, RAI 112-332-16464-96
-    TLLI-Cache: 0
-  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
-    TLLI-Cache: 0
-PROCESSING BVC_RESET_ACK from 0x05060708:32000
-00 00 00 00 23 04 82 10 02 
 
-CALLBACK, event 0, msg length 5, bvci 0x0000
-00 00 00 00 23 04 82 10 02 
+Message for BSS (NSEI=4096 BVCI=4114):
+[L2]> [L3]> 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-00 00 00 00 23 04 82 10 02 
+--- Send message from BSS 1 to SGSN, BVCI 0x1002 ---
 
-result (BVC_RESET_ACK) = 0
+PROCESSING (null) from NSEI 4096
 
---- Send message from BSS 1 to SGSN, BVCI 0x1012 ---
 
-PROCESSING UNITDATA from 0x01020304:1111
-00 00 10 12 
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x1012
 
-CALLBACK, event 0, msg length 0, bvci 0x1012
-00 00 10 12 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1012, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 4
-00 00 10 12 
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x1012
 
-result (UNITDATA) = 0
 
---- Send message from SGSN to BSS 1, BVCI 0x1012 ---
+Message for SGSN (NSEI=256 BVCI=4114):
+[L2]> [L3]> 
 
-PROCESSING UNITDATA from 0x05060708:32000
-00 00 10 12 
+--- Send message from SGSN to BSS 1, BVCI 0x1002 ---
 
-CALLBACK, event 0, msg length 0, bvci 0x1012
-00 00 10 12 
+PROCESSING (null) from NSEI 256
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1012, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 4
-00 00 10 12 
 
-result (UNITDATA) = 0
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x1012
 
---- Send message from BSS 1 to SGSN, BVCI 0x1002 ---
 
-PROCESSING UNITDATA from 0x01020304:1111
-00 00 10 12 
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x1012
 
-CALLBACK, event 0, msg length 0, bvci 0x1012
-00 00 10 12 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1012, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 4
-00 00 10 12 
+Message for BSS (NSEI=4096 BVCI=4114):
+[L2]> [L3]> 
 
-result (UNITDATA) = 0
+--- Send message from BSS 2 to SGSN, BVCI 0x2002 ---
 
---- Send message from SGSN to BSS 1, BVCI 0x1002 ---
+PROCESSING (null) from NSEI 4096
 
-PROCESSING UNITDATA from 0x05060708:32000
-00 00 10 12 
 
-CALLBACK, event 0, msg length 0, bvci 0x1012
-00 00 10 12 
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x2002
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1012, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 4
-00 00 10 12 
 
-result (UNITDATA) = 0
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x2002
 
---- Send message from BSS 2 to SGSN, BVCI 0x2002 ---
 
-PROCESSING UNITDATA from 0x01020304:1111
-00 00 20 02 
+Message for SGSN (NSEI=256 BVCI=8194):
+[L2]> [L3]> 
 
-CALLBACK, event 0, msg length 0, bvci 0x2002
-00 00 20 02 
+--- Send message from SGSN to BSS 2, BVCI 0x2002 ---
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x2002, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 4
-00 00 20 02 
+PROCESSING (null) from NSEI 256
 
-result (UNITDATA) = 0
 
---- Send message from SGSN to BSS 2, BVCI 0x2002 ---
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x2002
 
-PROCESSING UNITDATA from 0x05060708:32000
-00 00 20 02 
 
-CALLBACK, event 0, msg length 0, bvci 0x2002
-00 00 20 02 
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x2002
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x2002, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:3333, msg length 4
-00 00 20 02 
 
-result (UNITDATA) = 0
+Message for BSS (NSEI=8192 BVCI=8194):
+[L2]> [L3]> 
 
 --- Reset BSS 1 with the old BVCI on BSS2's link ---
 
-Setup BSSGP: remote 0x01020304:3333, BVCI 0x1002(4098)
+Setup BSSGP: BVCI 0x1002(4098)
 
-PROCESSING BVC_RESET from 0x01020304:3333
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+PROCESSING BVC_RESET from NSEI 4096
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 22
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-result (BVC_RESET) = 0
-
-Current NS-VCIs:
-    VCI 0x2001, NSEI 0x2000, peer 0x01020304:3333
-         Packets at NS Level  ( In): 21
-         Packets at NS Level  (Out): 22
-         Bytes at NS Level    ( In): 107
-         Bytes at NS Level    (Out): 73
-         NS-VC replaced other count: 1
-    VCI 0x1001, NSEI 0x1000, peer 0x01020304:1111
-         Packets at NS Level  ( In): 20
-         Packets at NS Level  (Out): 18
-         Bytes at NS Level    ( In): 157
-         Bytes at NS Level    (Out): 80
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 12
-         Packets at NS Level  (Out): 13
-         Bytes at NS Level    ( In): 69
-         Bytes at NS Level    (Out): 159
-         NS-VC Block count         : 1
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
 Peers:
   NSEI 4096, BVCI 4114, not blocked, RAI 112-332-16464-96
@@ -884,229 +290,140 @@ Peers:
   NSEI 8192, BVCI 8194, not blocked, RAI 112-332-16464-96
     NSEI mismatch                   : 1
     TLLI-Cache: 0
-  NSEI 8192, BVCI 4098, not blocked, RAI 112-332-16464-96
-    NSEI mismatch                   : 1
+  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
     TLLI-Cache: 0
 Gbproxy global:
-PROCESSING BVC_RESET_ACK from 0x05060708:32000
-00 00 00 00 23 04 82 10 02 
+PROCESSING BVC_RESET_ACK from NSEI 256
+23 04 82 10 02 
 
-CALLBACK, event 0, msg length 5, bvci 0x0000
-00 00 00 00 23 04 82 10 02 
+NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:3333, msg length 9
-00 00 00 00 23 04 82 10 02 
+NS2 UD REQUEST, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-result (BVC_RESET_ACK) = 0
+Message for BSS (NSEI=4096 BVCI=0):
+[L2]> [L3]> 23 04 82 10 02 
 
 --- Send message from BSS 1 to SGSN, BVCI 0x1002 ---
 
-PROCESSING UNITDATA from 0x01020304:1111
-00 00 10 12 
+PROCESSING (null) from NSEI 4096
+
+
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x1012
 
-CALLBACK, event 0, msg length 0, bvci 0x1012
-00 00 10 12 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1012, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 4
-00 00 10 12 
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x1012
 
-result (UNITDATA) = 0
+
+Message for SGSN (NSEI=256 BVCI=4114):
+[L2]> [L3]> 
 
 --- Send message from SGSN to BSS 1, BVCI 0x1002 ---
 
-PROCESSING UNITDATA from 0x05060708:32000
-00 00 10 12 
+PROCESSING (null) from NSEI 256
+
+
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x1012
 
-CALLBACK, event 0, msg length 0, bvci 0x1012
-00 00 10 12 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1012, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 4
-00 00 10 12 
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x1012
 
-result (UNITDATA) = 0
+
+Message for BSS (NSEI=4096 BVCI=4114):
+[L2]> [L3]> 
 
 --- Send message from SGSN to BSS 1, BVCI 0x10ff (invalid) ---
 
-PROCESSING UNITDATA from 0x05060708:32000
-00 00 10 ff 
+PROCESSING (null) from NSEI 256
+
 
-CALLBACK, event 0, msg length 0, bvci 0x10ff
-00 00 10 ff 
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x10ff
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 10 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 14
-00 00 00 00 41 07 81 05 04 82 10 ff 15 80 
 
-result (UNITDATA) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+41 07 81 05 04 82 10 ff 15 80 
 
 Peers:
   NSEI 8192, BVCI 8194, not blocked, RAI 112-332-16464-96
     NSEI mismatch                   : 1
     TLLI-Cache: 0
-  NSEI 8192, BVCI 4098, not blocked, RAI 112-332-16464-96
-    NSEI mismatch                   : 1
+  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
     TLLI-Cache: 0
 Gbproxy global:
     Invalid BVC Identifier          : 1
 === test_gbproxy_ident_changes ===
 --- Initialise SGSN ---
 
-MESSAGE to SGSN at 0x05060708:32000, msg length 12
-02 00 81 01 01 82 01 01 04 82 01 00 
-
-PROCESSING RESET_ACK from 0x05060708:32000
-03 01 82 01 01 04 82 01 00 
+NS2 CALLBACK, prim 2, bvci 0x0000
 
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-0a 
-
-result (RESET_ACK) = 0
-
-PROCESSING ALIVE_ACK from 0x05060708:32000
-0b 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-06 
-
-result (ALIVE_ACK) = 0
-
-PROCESSING UNBLOCK_ACK from 0x05060708:32000
-07 
-
-==> got signal NS_UNBLOCK, NS-VC 0x0101/5.6.7.8:32000
-
-result (UNBLOCK_ACK) = 0
-
-PROCESSING ALIVE from 0x05060708:32000
-0a 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-0b 
-
-result (ALIVE) = 0
-
-Current NS-VCIs:
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 4
-         Packets at NS Level  (Out): 4
-         Bytes at NS Level    ( In): 12
-         Bytes at NS Level    (Out): 15
-         NS-VC Block count         : 1
+Message for SGSN (NSEI=256 BVCI=0):
+22 04 82 00 00 07 81 08 
 
 --- Initialise BSS 1 ---
 
-Setup NS-VC: remote 0x01020304:1111, NSVCI 0x1001(4097), NSEI 0x1000(4096)
-
-PROCESSING RESET from 0x01020304:1111
-02 00 81 01 01 82 10 01 04 82 10 00 
-
-==> got signal NS_RESET, NS-VC 0x1001/1.2.3.4:1111
-
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-03 01 82 10 01 04 82 10 00 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0a 
-
-result (RESET) = 0
-
-PROCESSING ALIVE from 0x01020304:1111
-0a 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0b 
-
-result (ALIVE) = 0
-
-PROCESSING UNBLOCK from 0x01020304:1111
-06 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-07 
-
-==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111
-
-result (UNBLOCK) = 0
-
-PROCESSING ALIVE_ACK from 0x01020304:1111
-0b 
-
-result (ALIVE_ACK) = 0
+Setup NS-VC: NSEI 0x1000(4096)
 
-Current NS-VCIs:
-    VCI 0x1001, NSEI 0x1000, peer 0x01020304:1111
-         Packets at NS Level  ( In): 4
-         Packets at NS Level  (Out): 4
-         Bytes at NS Level    ( In): 15
-         Bytes at NS Level    (Out): 12
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 4
-         Packets at NS Level  (Out): 4
-         Bytes at NS Level    ( In): 12
-         Bytes at NS Level    (Out): 15
-         NS-VC Block count         : 1
+NS2 CALLBACK, prim 2, bvci 0x0000
 
 --- Setup BVCI 1 ---
 
-Setup BSSGP: remote 0x01020304:1111, BVCI 0x1002(4098)
+Setup BSSGP: BVCI 0x1002(4098)
 
-PROCESSING BVC_RESET from 0x01020304:1111
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+PROCESSING BVC_RESET from NSEI 4096
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 22
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-result (BVC_RESET) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-PROCESSING BVC_RESET_ACK from 0x05060708:32000
-00 00 00 00 23 04 82 10 02 
+PROCESSING BVC_RESET_ACK from NSEI 256
+23 04 82 10 02 
 
-CALLBACK, event 0, msg length 5, bvci 0x0000
-00 00 00 00 23 04 82 10 02 
+NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-00 00 00 00 23 04 82 10 02 
+NS2 UD REQUEST, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-result (BVC_RESET_ACK) = 0
+Message for BSS (NSEI=4096 BVCI=0):
+[L2]> [L3]> 23 04 82 10 02 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
     TLLI-Cache: 0
 --- Setup BVCI 2 ---
 
-Setup BSSGP: remote 0x01020304:1111, BVCI 0x2002(8194)
+Setup BSSGP: BVCI 0x2002(8194)
 
-PROCESSING BVC_RESET from 0x01020304:1111
-00 00 00 00 22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+PROCESSING BVC_RESET from NSEI 4096
+22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 22
-00 00 00 00 22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-result (BVC_RESET) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-PROCESSING BVC_RESET_ACK from 0x05060708:32000
-00 00 00 00 23 04 82 20 02 
+PROCESSING BVC_RESET_ACK from NSEI 256
+23 04 82 20 02 
 
-CALLBACK, event 0, msg length 5, bvci 0x0000
-00 00 00 00 23 04 82 20 02 
+NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
+23 04 82 20 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-00 00 00 00 23 04 82 20 02 
+NS2 UD REQUEST, prim 0, msg length 5, bvci 0x0000
+23 04 82 20 02 
 
-result (BVC_RESET_ACK) = 0
+Message for BSS (NSEI=4096 BVCI=0):
+[L2]> [L3]> 23 04 82 20 02 
 
 Peers:
   NSEI 4096, BVCI 8194, not blocked, RAI 112-332-16464-96
@@ -1115,137 +432,89 @@ Peers:
     TLLI-Cache: 0
 --- Send message from BSS 1 to SGSN and back, BVCI 1 ---
 
-PROCESSING UNITDATA from 0x01020304:1111
-00 00 10 02 
+PROCESSING (null) from NSEI 4096
 
-CALLBACK, event 0, msg length 0, bvci 0x1002
-00 00 10 02 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 4
-00 00 10 02 
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x1002
 
-result (UNITDATA) = 0
 
-PROCESSING UNITDATA from 0x05060708:32000
-00 00 10 02 
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x1002
 
-CALLBACK, event 0, msg length 0, bvci 0x1002
-00 00 10 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 4
-00 00 10 02 
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 
 
-result (UNITDATA) = 0
+PROCESSING (null) from NSEI 256
 
---- Send message from BSS 1 to SGSN and back, BVCI 2 ---
-
-PROCESSING UNITDATA from 0x01020304:1111
-00 00 20 02 
-
-CALLBACK, event 0, msg length 0, bvci 0x2002
-00 00 20 02 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x2002, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 4
-00 00 20 02 
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x1002
 
-result (UNITDATA) = 0
 
-PROCESSING UNITDATA from 0x05060708:32000
-00 00 20 02 
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x1002
 
-CALLBACK, event 0, msg length 0, bvci 0x2002
-00 00 20 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x2002, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 4
-00 00 20 02 
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 
 
-result (UNITDATA) = 0
+--- Send message from BSS 1 to SGSN and back, BVCI 2 ---
 
---- Change NSEI ---
+PROCESSING (null) from NSEI 4096
 
-Setup NS-VC: remote 0x01020304:1111, NSVCI 0x1001(4097), NSEI 0x2000(8192)
 
-PROCESSING RESET from 0x01020304:1111
-02 00 81 01 01 82 10 01 04 82 20 00 
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x2002
 
-==> got signal NS_RESET, NS-VC 0x1001/1.2.3.4:1111
 
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-03 01 82 10 01 04 82 20 00 
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x2002
 
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0a 
 
-result (RESET) = 0
+Message for SGSN (NSEI=256 BVCI=8194):
+[L2]> [L3]> 
 
-PROCESSING ALIVE from 0x01020304:1111
-0a 
+PROCESSING (null) from NSEI 256
 
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0b 
 
-result (ALIVE) = 0
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x2002
 
-PROCESSING UNBLOCK from 0x01020304:1111
-06 
 
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-07 
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x2002
 
-==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111
 
-result (UNBLOCK) = 0
+Message for BSS (NSEI=4096 BVCI=8194):
+[L2]> [L3]> 
 
-PROCESSING ALIVE_ACK from 0x01020304:1111
-0b 
+--- Change NSEI ---
 
-result (ALIVE_ACK) = 0
+Setup NS-VC: NSEI 0x2000(8192)
 
-Current NS-VCIs:
-    VCI 0x1001, NSEI 0x2000, peer 0x01020304:1111
-         Packets at NS Level  ( In): 12
-         Packets at NS Level  (Out): 12
-         Bytes at NS Level    ( In): 82
-         Bytes at NS Level    (Out): 50
-         NS-VC changed NSEI count  : 1
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 8
-         Packets at NS Level  (Out): 8
-         Bytes at NS Level    ( In): 38
-         Bytes at NS Level    (Out): 67
-         NS-VC Block count         : 1
+NS2 CALLBACK, prim 2, bvci 0x0000
 
 --- Setup BVCI 1 ---
 
-Setup BSSGP: remote 0x01020304:1111, BVCI 0x1002(4098)
+Setup BSSGP: BVCI 0x1002(4098)
 
-PROCESSING BVC_RESET from 0x01020304:1111
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+PROCESSING BVC_RESET from NSEI 8192
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 22
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-result (BVC_RESET) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-PROCESSING BVC_RESET_ACK from 0x05060708:32000
-00 00 00 00 23 04 82 10 02 
+PROCESSING BVC_RESET_ACK from NSEI 256
+23 04 82 10 02 
 
-CALLBACK, event 0, msg length 5, bvci 0x0000
-00 00 00 00 23 04 82 10 02 
+NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-00 00 00 00 23 04 82 10 02 
+NS2 UD REQUEST, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-result (BVC_RESET_ACK) = 0
+Message for BSS (NSEI=8192 BVCI=0):
+[L2]> [L3]> 23 04 82 10 02 
 
 Peers:
   NSEI 4096, BVCI 8194, not blocked, RAI 112-332-16464-96
@@ -1255,31 +524,31 @@ Peers:
     TLLI-Cache: 0
 --- Setup BVCI 3 ---
 
-Setup BSSGP: remote 0x01020304:1111, BVCI 0x3002(12290)
+Setup BSSGP: BVCI 0x3002(12290)
 
-PROCESSING BVC_RESET from 0x01020304:1111
-00 00 00 00 22 04 82 30 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+PROCESSING BVC_RESET from NSEI 8192
+22 04 82 30 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 22 04 82 30 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+22 04 82 30 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 22
-00 00 00 00 22 04 82 30 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+22 04 82 30 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-result (BVC_RESET) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 22 04 82 30 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-PROCESSING BVC_RESET_ACK from 0x05060708:32000
-00 00 00 00 23 04 82 30 02 
+PROCESSING BVC_RESET_ACK from NSEI 256
+23 04 82 30 02 
 
-CALLBACK, event 0, msg length 5, bvci 0x0000
-00 00 00 00 23 04 82 30 02 
+NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
+23 04 82 30 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-00 00 00 00 23 04 82 30 02 
+NS2 UD REQUEST, prim 0, msg length 5, bvci 0x0000
+23 04 82 30 02 
 
-result (BVC_RESET_ACK) = 0
+Message for BSS (NSEI=8192 BVCI=0):
+[L2]> [L3]> 23 04 82 30 02 
 
 Peers:
   NSEI 8192, BVCI 12290, not blocked, RAI 112-332-16464-96
@@ -1291,43 +560,43 @@ Peers:
     TLLI-Cache: 0
 --- Send message from BSS 1 to SGSN and back, BVCI 1 ---
 
-PROCESSING UNITDATA from 0x01020304:1111
-00 00 10 02 
+PROCESSING (null) from NSEI 8192
+
+
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x1002
+
+
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x1002
+
+
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 
 
-CALLBACK, event 0, msg length 0, bvci 0x1002
-00 00 10 02 
+PROCESSING (null) from NSEI 256
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 4
-00 00 10 02 
 
-result (UNITDATA) = 0
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x1002
 
-PROCESSING UNITDATA from 0x05060708:32000
-00 00 10 02 
 
-CALLBACK, event 0, msg length 0, bvci 0x1002
-00 00 10 02 
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x1002
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 4
-00 00 10 02 
 
-result (UNITDATA) = 0
+Message for BSS (NSEI=8192 BVCI=4098):
+[L2]> [L3]> 
 
 --- Send message from BSS 1 to SGSN and back, BVCI 2  (should fail) ---
 
-PROCESSING UNITDATA from 0x01020304:1111
-00 00 20 02 
+PROCESSING (null) from NSEI 8192
 
-CALLBACK, event 0, msg length 0, bvci 0x2002
-00 00 20 02 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x2002, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 4
-00 00 20 02 
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x2002
 
-result (UNITDATA) = 0
+
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x2002
+
+
+Message for SGSN (NSEI=256 BVCI=8194):
+[L2]> [L3]> 
 
 Peers:
   NSEI 8192, BVCI 12290, not blocked, RAI 112-332-16464-96
@@ -1338,843 +607,345 @@ Peers:
   NSEI 8192, BVCI 4098, not blocked, RAI 112-332-16464-96
     NSEI mismatch                   : 1
     TLLI-Cache: 0
-PROCESSING UNITDATA from 0x05060708:32000
-00 00 20 02 
+PROCESSING (null) from NSEI 256
+
+
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x2002
+
 
-CALLBACK, event 0, msg length 0, bvci 0x2002
-00 00 20 02 
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x2002
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x2002, msg length 0 (gprs_ns_sendmsg)
-result (UNITDATA) = -22
+
+Message for BSS (NSEI=4096 BVCI=8194):
+[L2]> [L3]> 
 
 Peers:
   NSEI 8192, BVCI 12290, not blocked, RAI 112-332-16464-96
     TLLI-Cache: 0
   NSEI 4096, BVCI 8194, not blocked, RAI 112-332-16464-96
     NSEI mismatch                   : 1
-    NS Transmission error           : 1
     TLLI-Cache: 0
   NSEI 8192, BVCI 4098, not blocked, RAI 112-332-16464-96
     NSEI mismatch                   : 1
     TLLI-Cache: 0
 --- Send message from BSS 1 to SGSN and back, BVCI 3 ---
 
-PROCESSING UNITDATA from 0x01020304:1111
-00 00 30 02 
-
-CALLBACK, event 0, msg length 0, bvci 0x3002
-00 00 30 02 
-
-NS UNITDATA MESSAGE to SGSN, BVCI 0x3002, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 4
-00 00 30 02 
-
-result (UNITDATA) = 0
-
-PROCESSING UNITDATA from 0x05060708:32000
-00 00 30 02 
-
-CALLBACK, event 0, msg length 0, bvci 0x3002
-00 00 30 02 
+PROCESSING (null) from NSEI 4096
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x3002, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 4
-00 00 30 02 
 
-result (UNITDATA) = 0
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x3002
 
---- Change NSVCI ---
-
-Setup NS-VC: remote 0x01020304:1111, NSVCI 0x2001(8193), NSEI 0x2000(8192)
-
-PROCESSING RESET from 0x01020304:1111
-02 00 81 01 01 82 20 01 04 82 20 00 
-
-==> got signal NS_REPLACED: 0x2001/0.0.0.0:0 -> 0x1001/1.2.3.4:1111
 
-==> got signal NS_RESET, NS-VC 0x2001/1.2.3.4:1111
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x3002
 
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-03 01 82 20 01 04 82 20 00 
 
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0a 
+Message for SGSN (NSEI=256 BVCI=12290):
+[L2]> [L3]> 
 
-result (RESET) = 0
+PROCESSING (null) from NSEI 256
 
-PROCESSING ALIVE from 0x01020304:1111
-0a 
 
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0b 
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x3002
 
-result (ALIVE) = 0
 
-PROCESSING UNBLOCK from 0x01020304:1111
-06 
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x3002
 
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-07 
 
-==> got signal NS_UNBLOCK, NS-VC 0x2001/1.2.3.4:1111
+Message for BSS (NSEI=8192 BVCI=12290):
+[L2]> [L3]> 
 
-result (UNBLOCK) = 0
-
-PROCESSING ALIVE_ACK from 0x01020304:1111
-0b 
+--- Change NSVCI ---
 
-result (ALIVE_ACK) = 0
+Setup NS-VC: NSEI 0x2000(8192)
 
-Current NS-VCIs:
-    VCI 0x2001, NSEI 0x2000, peer 0x01020304:1111
-         Packets at NS Level  ( In): 3
-         Packets at NS Level  (Out): 4
-         Bytes at NS Level    ( In): 3
-         Bytes at NS Level    (Out): 12
-         NS-VC replaced other count: 1
-    VCI 0x1001, NSEI 0x2000, peer 0x00000000:0
-         Packets at NS Level  ( In): 18
-         Packets at NS Level  (Out): 16
-         Bytes at NS Level    ( In): 150
-         Bytes at NS Level    (Out): 76
-         NS-VC changed NSEI count  : 1
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 13
-         Packets at NS Level  (Out): 13
-         Bytes at NS Level    ( In): 68
-         Bytes at NS Level    (Out): 123
-         NS-VC Block count         : 1
+NS2 CALLBACK, prim 2, bvci 0x0000
 
 --- Setup BVCI 1 ---
 
-Setup BSSGP: remote 0x01020304:1111, BVCI 0x1002(4098)
+Setup BSSGP: BVCI 0x1002(4098)
 
-PROCESSING BVC_RESET from 0x01020304:1111
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+PROCESSING BVC_RESET from NSEI 8192
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 22
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-result (BVC_RESET) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-PROCESSING BVC_RESET_ACK from 0x05060708:32000
-00 00 00 00 23 04 82 10 02 
+PROCESSING BVC_RESET_ACK from NSEI 256
+23 04 82 10 02 
 
-CALLBACK, event 0, msg length 5, bvci 0x0000
-00 00 00 00 23 04 82 10 02 
+NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-00 00 00 00 23 04 82 10 02 
+NS2 UD REQUEST, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-result (BVC_RESET_ACK) = 0
+Message for BSS (NSEI=8192 BVCI=0):
+[L2]> [L3]> 23 04 82 10 02 
 
 Peers:
   NSEI 8192, BVCI 12290, not blocked, RAI 112-332-16464-96
+    NSEI mismatch                   : 1
     TLLI-Cache: 0
   NSEI 4096, BVCI 8194, not blocked, RAI 112-332-16464-96
     NSEI mismatch                   : 1
-    NS Transmission error           : 1
     TLLI-Cache: 0
   NSEI 8192, BVCI 4098, not blocked, RAI 112-332-16464-96
     NSEI mismatch                   : 1
     TLLI-Cache: 0
 --- Setup BVCI 4 ---
 
-Setup BSSGP: remote 0x01020304:1111, BVCI 0x4002(16386)
+Setup BSSGP: BVCI 0x4002(16386)
 
-PROCESSING BVC_RESET from 0x01020304:1111
-00 00 00 00 22 04 82 40 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+PROCESSING BVC_RESET from NSEI 8192
+22 04 82 40 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 22 04 82 40 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+22 04 82 40 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 22
-00 00 00 00 22 04 82 40 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+22 04 82 40 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-result (BVC_RESET) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 22 04 82 40 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-PROCESSING BVC_RESET_ACK from 0x05060708:32000
-00 00 00 00 23 04 82 40 02 
+PROCESSING BVC_RESET_ACK from NSEI 256
+23 04 82 40 02 
 
-CALLBACK, event 0, msg length 5, bvci 0x0000
-00 00 00 00 23 04 82 40 02 
+NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
+23 04 82 40 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-00 00 00 00 23 04 82 40 02 
+NS2 UD REQUEST, prim 0, msg length 5, bvci 0x0000
+23 04 82 40 02 
 
-result (BVC_RESET_ACK) = 0
+Message for BSS (NSEI=8192 BVCI=0):
+[L2]> [L3]> 23 04 82 40 02 
 
 Peers:
   NSEI 8192, BVCI 16386, not blocked, RAI 112-332-16464-96
     TLLI-Cache: 0
   NSEI 8192, BVCI 12290, not blocked, RAI 112-332-16464-96
+    NSEI mismatch                   : 1
     TLLI-Cache: 0
   NSEI 4096, BVCI 8194, not blocked, RAI 112-332-16464-96
     NSEI mismatch                   : 1
-    NS Transmission error           : 1
     TLLI-Cache: 0
   NSEI 8192, BVCI 4098, not blocked, RAI 112-332-16464-96
     NSEI mismatch                   : 1
     TLLI-Cache: 0
 --- Send message from BSS 1 to SGSN and back, BVCI 1 ---
 
-PROCESSING UNITDATA from 0x01020304:1111
-00 00 10 02 
+PROCESSING (null) from NSEI 8192
+
+
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x1002
+
+
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x1002
+
 
-CALLBACK, event 0, msg length 0, bvci 0x1002
-00 00 10 02 
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 4
-00 00 10 02 
+PROCESSING (null) from NSEI 256
 
-result (UNITDATA) = 0
 
-PROCESSING UNITDATA from 0x05060708:32000
-00 00 10 02 
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x1002
 
-CALLBACK, event 0, msg length 0, bvci 0x1002
-00 00 10 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 4
-00 00 10 02 
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x1002
 
-result (UNITDATA) = 0
+
+Message for BSS (NSEI=8192 BVCI=4098):
+[L2]> [L3]> 
 
 --- Send message from BSS 1 to SGSN and back, BVCI 2  (should fail) ---
 
-PROCESSING UNITDATA from 0x01020304:1111
-00 00 20 02 
+PROCESSING (null) from NSEI 8192
 
-CALLBACK, event 0, msg length 0, bvci 0x2002
-00 00 20 02 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x2002, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 4
-00 00 20 02 
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x2002
 
-result (UNITDATA) = 0
 
-Peers:
-  NSEI 8192, BVCI 16386, not blocked, RAI 112-332-16464-96
-    TLLI-Cache: 0
-  NSEI 8192, BVCI 12290, not blocked, RAI 112-332-16464-96
-    TLLI-Cache: 0
-  NSEI 4096, BVCI 8194, not blocked, RAI 112-332-16464-96
-    NSEI mismatch                   : 2
-    NS Transmission error           : 1
-    TLLI-Cache: 0
-  NSEI 8192, BVCI 4098, not blocked, RAI 112-332-16464-96
-    NSEI mismatch                   : 1
-    TLLI-Cache: 0
-PROCESSING UNITDATA from 0x05060708:32000
-00 00 20 02 
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x2002
 
-CALLBACK, event 0, msg length 0, bvci 0x2002
-00 00 20 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x2002, msg length 0 (gprs_ns_sendmsg)
-result (UNITDATA) = -22
+Message for SGSN (NSEI=256 BVCI=8194):
+[L2]> [L3]> 
 
 Peers:
   NSEI 8192, BVCI 16386, not blocked, RAI 112-332-16464-96
     TLLI-Cache: 0
   NSEI 8192, BVCI 12290, not blocked, RAI 112-332-16464-96
+    NSEI mismatch                   : 1
     TLLI-Cache: 0
   NSEI 4096, BVCI 8194, not blocked, RAI 112-332-16464-96
     NSEI mismatch                   : 2
-    NS Transmission error           : 2
     TLLI-Cache: 0
   NSEI 8192, BVCI 4098, not blocked, RAI 112-332-16464-96
     NSEI mismatch                   : 1
     TLLI-Cache: 0
---- Send message from BSS 1 to SGSN and back, BVCI 3 ---
-
-PROCESSING UNITDATA from 0x01020304:1111
-00 00 30 02 
-
-CALLBACK, event 0, msg length 0, bvci 0x3002
-00 00 30 02 
-
-NS UNITDATA MESSAGE to SGSN, BVCI 0x3002, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 4
-00 00 30 02 
-
-result (UNITDATA) = 0
-
-PROCESSING UNITDATA from 0x05060708:32000
-00 00 30 02 
-
-CALLBACK, event 0, msg length 0, bvci 0x3002
-00 00 30 02 
-
-NS UNITDATA MESSAGE to BSS, BVCI 0x3002, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 4
-00 00 30 02 
-
-result (UNITDATA) = 0
-
---- Send message from BSS 1 to SGSN and back, BVCI 4 ---
+PROCESSING (null) from NSEI 256
 
-PROCESSING UNITDATA from 0x01020304:1111
-00 00 40 02 
 
-CALLBACK, event 0, msg length 0, bvci 0x4002
-00 00 40 02 
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x2002
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x4002, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 4
-00 00 40 02 
 
-result (UNITDATA) = 0
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x2002
 
-PROCESSING UNITDATA from 0x05060708:32000
-00 00 40 02 
 
-CALLBACK, event 0, msg length 0, bvci 0x4002
-00 00 40 02 
+Message for BSS (NSEI=4096 BVCI=8194):
+[L2]> [L3]> 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x4002, msg length 0 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 4
-00 00 40 02 
-
-result (UNITDATA) = 0
-
-Gbproxy global:
 Peers:
   NSEI 8192, BVCI 16386, not blocked, RAI 112-332-16464-96
     TLLI-Cache: 0
   NSEI 8192, BVCI 12290, not blocked, RAI 112-332-16464-96
+    NSEI mismatch                   : 1
     TLLI-Cache: 0
   NSEI 4096, BVCI 8194, not blocked, RAI 112-332-16464-96
     NSEI mismatch                   : 2
-    NS Transmission error           : 2
     TLLI-Cache: 0
   NSEI 8192, BVCI 4098, not blocked, RAI 112-332-16464-96
     NSEI mismatch                   : 1
     TLLI-Cache: 0
-=== Test IMSI/TMSI matching ===
-
-=== test_gbproxy_ptmsi_assignment ===
---- Initialise SGSN ---
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 12
-02 00 81 01 01 82 01 01 04 82 01 00 
-
-PROCESSING RESET_ACK from 0x05060708:32000
-03 01 82 01 01 04 82 01 00 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-0a 
-
-result (RESET_ACK) = 0
-
-PROCESSING ALIVE_ACK from 0x05060708:32000
-0b 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-06 
-
-result (ALIVE_ACK) = 0
-
-PROCESSING UNBLOCK_ACK from 0x05060708:32000
-07 
-
-==> got signal NS_UNBLOCK, NS-VC 0x0101/5.6.7.8:32000
+--- Send message from BSS 1 to SGSN and back, BVCI 3 ---
 
-result (UNBLOCK_ACK) = 0
+PROCESSING (null) from NSEI 8192
 
-PROCESSING ALIVE from 0x05060708:32000
-0a 
 
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-0b 
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x3002
 
-result (ALIVE) = 0
 
---- Initialise BSS 1 ---
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x3002
 
-Setup NS-VC: remote 0x01020304:1111, NSVCI 0x1001(4097), NSEI 0x1000(4096)
 
-PROCESSING RESET from 0x01020304:1111
-02 00 81 01 01 82 10 01 04 82 10 00 
+Message for SGSN (NSEI=256 BVCI=12290):
+[L2]> [L3]> 
 
-==> got signal NS_RESET, NS-VC 0x1001/1.2.3.4:1111
+PROCESSING (null) from NSEI 256
 
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-03 01 82 10 01 04 82 10 00 
 
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0a 
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x3002
 
-result (RESET) = 0
 
-PROCESSING ALIVE from 0x01020304:1111
-0a 
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x3002
 
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0b 
 
-result (ALIVE) = 0
+Message for BSS (NSEI=8192 BVCI=12290):
+[L2]> [L3]> 
 
-PROCESSING UNBLOCK from 0x01020304:1111
-06 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-07 
+--- Send message from BSS 1 to SGSN and back, BVCI 4 ---
 
-==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111
+PROCESSING (null) from NSEI 8192
 
-result (UNBLOCK) = 0
 
-PROCESSING ALIVE_ACK from 0x01020304:1111
-0b 
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x4002
 
-result (ALIVE_ACK) = 0
 
-Setup BSSGP: remote 0x01020304:1111, BVCI 0x1002(4098)
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x4002
 
-PROCESSING BVC_RESET from 0x01020304:1111
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+Message for SGSN (NSEI=256 BVCI=16386):
+[L2]> [L3]> 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 22
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+PROCESSING (null) from NSEI 256
 
-result (BVC_RESET) = 0
 
-PROCESSING BVC_RESET_ACK from 0x05060708:32000
-00 00 00 00 23 04 82 10 02 
+NS2 CALLBACK, prim 0, msg length 0, bvci 0x4002
 
-CALLBACK, event 0, msg length 5, bvci 0x0000
-00 00 00 00 23 04 82 10 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-00 00 00 00 23 04 82 10 02 
+NS2 UD REQUEST, prim 0, msg length 0, bvci 0x4002
 
-result (BVC_RESET_ACK) = 0
 
-Current NS-VCIs:
-    VCI 0x1001, NSEI 0x1000, peer 0x01020304:1111
-         Packets at NS Level  ( In): 5
-         Packets at NS Level  (Out): 5
-         Bytes at NS Level    ( In): 37
-         Bytes at NS Level    (Out): 21
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 5
-         Packets at NS Level  (Out): 5
-         Bytes at NS Level    ( In): 21
-         Bytes at NS Level    (Out): 37
-         NS-VC Block count         : 1
+Message for BSS (NSEI=8192 BVCI=16386):
+[L2]> [L3]> 
 
 Gbproxy global:
 Peers:
-  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
+  NSEI 8192, BVCI 16386, not blocked, RAI 112-332-16464-96
+    TLLI-Cache: 0
+  NSEI 8192, BVCI 12290, not blocked, RAI 112-332-16464-96
+    NSEI mismatch                   : 1
+    TLLI-Cache: 0
+  NSEI 4096, BVCI 8194, not blocked, RAI 112-332-16464-96
+    NSEI mismatch                   : 2
+    TLLI-Cache: 0
+  NSEI 8192, BVCI 4098, not blocked, RAI 112-332-16464-96
+    NSEI mismatch                   : 1
     TLLI-Cache: 0
---- Establish first LLC connection ---
-
-PROCESSING ATTACH REQUEST from 0x01020304:1111
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
-
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
-
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 75 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 79
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
-
-result (ATTACH REQUEST) = 0
-
-Peers:
-  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
-    Attach Request count            : 1
-    TLLI cache size                 : 1
-    TLLI-Cache: 1
-      TLLI 8000dead -> 8000dead, IMSI (none), AGE 0
-PROCESSING IDENT REQUEST from 0x05060708:32000
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
-
-CALLBACK, event 0, msg length 23, bvci 0x1002
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
-
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 23 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 27
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
-
-result (IDENT REQUEST) = 0
-
-Peers:
-  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
-    Attach Request count            : 1
-    TLLI cache size                 : 1
-    TLLI-Cache: 1
-      TLLI 8000dead -> 8000dead, IMSI (none), AGE 0
-PROCESSING IDENT RESPONSE from 0x01020304:1111
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
-
-CALLBACK, event 0, msg length 40, bvci 0x1002
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
-
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 40 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 44
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
-
-result (IDENT RESPONSE) = 0
-
-Peers:
-  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
-    Attach Request count            : 1
-    TLLI cache size                 : 1
-    TLLI-Cache: 1
-      TLLI 8000dead -> 8000dead, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH ACCEPT from 0x05060708:32000
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
-
-CALLBACK, event 0, msg length 88, bvci 0x1002
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
-
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 88 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 92
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
-
-result (ATTACH ACCEPT) = 0
-
-Peers:
-  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
-    Attach Request count            : 1
-    Attach Accept count             : 1
-    TLLI cache size                 : 1
-    TLLI-Cache: 1
-      TLLI 8000dead/efe2b700 -> 8000dead/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH COMPLETE from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 09 08 03 39 d7 bc 
-
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 09 08 03 39 d7 bc 
-
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 09 08 03 39 d7 bc 
-
-result (ATTACH COMPLETE) = 0
-
-Peers:
-  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
-    Attach Request count            : 1
-    Attach Accept count             : 1
-    Attach Completed count          : 1
-    TLLI cache size                 : 1
-    TLLI-Cache: 1
-      TLLI 8000dead/efe2b700 -> 8000dead/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING GMM INFO from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
-
-CALLBACK, event 0, msg length 66, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
-
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 66 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 70
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
-
-result (GMM INFO) = 0
-
-Peers:
-  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
-    Attach Request count            : 1
-    Attach Accept count             : 1
-    Attach Completed count          : 1
-    TLLI cache size                 : 1
-    TLLI-Cache: 1
-      TLLI efe2b700 -> efe2b700, IMSI 12131415161718, AGE 0
---- Establish second LLC connection with the same P-TMSI ---
-
-PROCESSING ATTACH REQUEST from 0x01020304:1111
-00 00 10 02 01 80 00 be ef 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 0d 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 46 42 6e 
-
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 80 00 be ef 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 0d 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 46 42 6e 
-
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 75 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 79
-00 00 10 02 01 80 00 be ef 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 0d 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 46 42 6e 
-
-result (ATTACH REQUEST) = 0
-
-Peers:
-  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
-    Attach Request count            : 2
-    Attach Accept count             : 1
-    Attach Completed count          : 1
-    TLLI cache size                 : 2
-    TLLI-Cache: 2
-      TLLI 8000beef -> 8000beef, IMSI (none), AGE 0
-      TLLI efe2b700 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING IDENT REQUEST from 0x05060708:32000
-00 00 10 02 00 80 00 be ef 00 50 20 16 82 02 58 0e 89 41 c0 0d 08 15 01 0c a6 18 
-
-CALLBACK, event 0, msg length 23, bvci 0x1002
-00 00 10 02 00 80 00 be ef 00 50 20 16 82 02 58 0e 89 41 c0 0d 08 15 01 0c a6 18 
-
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 23 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 27
-00 00 10 02 00 80 00 be ef 00 50 20 16 82 02 58 0e 89 41 c0 0d 08 15 01 0c a6 18 
-
-result (IDENT REQUEST) = 0
-
-Peers:
-  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
-    Attach Request count            : 2
-    Attach Accept count             : 1
-    Attach Completed count          : 1
-    TLLI cache size                 : 2
-    TLLI-Cache: 2
-      TLLI 8000beef -> 8000beef, IMSI (none), AGE 0
-      TLLI efe2b700 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING IDENT RESPONSE from 0x01020304:1111
-00 00 10 02 01 80 00 be ef 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 11 08 16 08 11 12 99 99 99 16 17 f8 15 36 87 
-
-CALLBACK, event 0, msg length 40, bvci 0x1002
-00 00 10 02 01 80 00 be ef 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 11 08 16 08 11 12 99 99 99 16 17 f8 15 36 87 
-
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 40 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 44
-00 00 10 02 01 80 00 be ef 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 11 08 16 08 11 12 99 99 99 16 17 f8 15 36 87 
-
-result (IDENT RESPONSE) = 0
-
-Peers:
-  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
-    Attach Request count            : 2
-    Attach Accept count             : 1
-    Attach Completed count          : 1
-    TLLI cache size                 : 2
-    TLLI-Cache: 2
-      TLLI 8000beef -> 8000beef, IMSI 12199999961718, AGE 0
-      TLLI efe2b700 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH ACCEPT from 0x05060708:32000
-00 00 10 02 00 80 00 be ef 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 9e 41 c0 11 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 3a 6d d4 
-
-CALLBACK, event 0, msg length 88, bvci 0x1002
-00 00 10 02 00 80 00 be ef 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 9e 41 c0 11 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 3a 6d d4 
-
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 88 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 92
-00 00 10 02 00 80 00 be ef 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 9e 41 c0 11 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 3a 6d d4 
-
-result (ATTACH ACCEPT) = 0
-
-Peers:
-  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
-    Attach Request count            : 2
-    Attach Accept count             : 2
-    Attach Completed count          : 1
-    TLLI cache size                 : 1
-    TLLI-Cache: 1
-      TLLI 8000beef/efe2b700 -> 8000beef/efe2b700, IMSI 12199999961718, AGE 0
-PROCESSING ATTACH COMPLETE from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 15 08 03 86 ac 47 
-
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 15 08 03 86 ac 47 
-
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 15 08 03 86 ac 47 
-
-result (ATTACH COMPLETE) = 0
-
-Peers:
-  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
-    Attach Request count            : 2
-    Attach Accept count             : 2
-    Attach Completed count          : 2
-    TLLI cache size                 : 1
-    TLLI-Cache: 1
-      TLLI 8000beef/efe2b700 -> 8000beef/efe2b700, IMSI 12199999961718, AGE 0
-PROCESSING GMM INFO from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 88 41 c0 15 08 21 bb c1 c6 
-
-CALLBACK, event 0, msg length 66, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 88 41 c0 15 08 21 bb c1 c6 
-
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 66 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 70
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 88 41 c0 15 08 21 bb c1 c6 
-
-result (GMM INFO) = 0
-
-Peers:
-  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
-    Attach Request count            : 2
-    Attach Accept count             : 2
-    Attach Completed count          : 2
-    TLLI cache size                 : 1
-    TLLI-Cache: 1
-      TLLI efe2b700 -> efe2b700, IMSI 12199999961718, AGE 0
-Gbproxy global:
 === test_gbproxy_ra_patching ===
 --- Initialise SGSN ---
 
-MESSAGE to SGSN at 0x05060708:32000, msg length 12
-02 00 81 01 01 82 01 01 04 82 01 00 
-
-PROCESSING RESET_ACK from 0x05060708:32000
-03 01 82 01 01 04 82 01 00 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-0a 
-
-result (RESET_ACK) = 0
-
-PROCESSING ALIVE_ACK from 0x05060708:32000
-0b 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-06 
-
-result (ALIVE_ACK) = 0
+NS2 CALLBACK, prim 2, bvci 0x0000
 
-PROCESSING UNBLOCK_ACK from 0x05060708:32000
-07 
-
-==> got signal NS_UNBLOCK, NS-VC 0x0101/5.6.7.8:32000
-
-result (UNBLOCK_ACK) = 0
-
-PROCESSING ALIVE from 0x05060708:32000
-0a 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-0b 
-
-result (ALIVE) = 0
-
-Current NS-VCIs:
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 4
-         Packets at NS Level  (Out): 4
-         Bytes at NS Level    ( In): 12
-         Bytes at NS Level    (Out): 15
-         NS-VC Block count         : 1
+Message for SGSN (NSEI=256 BVCI=0):
+22 04 82 00 00 07 81 08 
 
 --- Initialise BSS 1 ---
 
-Setup NS-VC: remote 0x01020304:1111, NSVCI 0x1001(4097), NSEI 0x1000(4096)
-
-PROCESSING RESET from 0x01020304:1111
-02 00 81 01 01 82 10 01 04 82 10 00 
-
-==> got signal NS_RESET, NS-VC 0x1001/1.2.3.4:1111
-
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-03 01 82 10 01 04 82 10 00 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0a 
-
-result (RESET) = 0
-
-PROCESSING ALIVE from 0x01020304:1111
-0a 
+Setup NS-VC: NSEI 0x1000(4096)
 
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0b 
+NS2 CALLBACK, prim 2, bvci 0x0000
 
-result (ALIVE) = 0
+Setup BSSGP: BVCI 0x1002(4098)
 
-PROCESSING UNBLOCK from 0x01020304:1111
-06 
+PROCESSING BVC_RESET from NSEI 4096
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-07 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 21 63 54 40 50 60 10 00 
 
-result (UNBLOCK) = 0
-
-PROCESSING ALIVE_ACK from 0x01020304:1111
-0b 
-
-result (ALIVE_ACK) = 0
-
-Setup BSSGP: remote 0x01020304:1111, BVCI 0x1002(4098)
-
-PROCESSING BVC_RESET from 0x01020304:1111
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
-
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
-
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 22
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 21 63 54 40 50 60 10 00 
-
-result (BVC_RESET) = 0
-
-Current NS-VCIs:
-    VCI 0x1001, NSEI 0x1000, peer 0x01020304:1111
-         Packets at NS Level  ( In): 5
-         Packets at NS Level  (Out): 4
-         Bytes at NS Level    ( In): 37
-         Bytes at NS Level    (Out): 12
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 4
-         Packets at NS Level  (Out): 5
-         Bytes at NS Level    ( In): 12
-         Bytes at NS Level    (Out): 37
-         NS-VC Block count         : 1
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 22 04 82 10 02 07 81 08 08 88 21 63 54 40 50 60 10 00 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
     RAID patched              (BSS ): 1
     TLLI-Cache: 0
-PROCESSING BVC_RESET_ACK from 0x05060708:32000
-00 00 00 00 23 04 82 10 02 
+PROCESSING BVC_RESET_ACK from NSEI 256
+23 04 82 10 02 
 
-CALLBACK, event 0, msg length 5, bvci 0x0000
-00 00 00 00 23 04 82 10 02 
+NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-00 00 00 00 23 04 82 10 02 
+NS2 UD REQUEST, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-result (BVC_RESET_ACK) = 0
+Message for BSS (NSEI=4096 BVCI=0):
+[L2]> [L3]> 23 04 82 10 02 
 
-PROCESSING BVC_SUSPEND from 0x01020304:1111
-00 00 00 00 0b 1f 84 cc d1 75 8b 1b 86 11 22 33 40 50 60 
+PROCESSING BVC_SUSPEND from NSEI 4096
+0b 1f 84 cc d1 75 8b 1b 86 11 22 33 40 50 60 
 
-CALLBACK, event 0, msg length 15, bvci 0x0000
-00 00 00 00 0b 1f 84 cc d1 75 8b 1b 86 11 22 33 40 50 60 
+NS2 CALLBACK, prim 0, msg length 15, bvci 0x0000
+0b 1f 84 cc d1 75 8b 1b 86 11 22 33 40 50 60 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 15 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 19
-00 00 00 00 0b 1f 84 cc d1 75 8b 1b 86 21 63 54 40 50 60 
+NS2 UD REQUEST, prim 0, msg length 15, bvci 0x0000
+0b 1f 84 cc d1 75 8b 1b 86 21 63 54 40 50 60 
 
-result (BVC_SUSPEND) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 0b 1f 84 cc d1 75 8b 1b 86 21 63 54 40 50 60 
 
-PROCESSING BVC_SUSPEND_ACK from 0x05060708:32000
-00 00 00 00 0c 1f 84 cc d1 75 8b 1b 86 21 63 54 40 50 60 1d 81 01 
+PROCESSING BVC_SUSPEND_ACK from NSEI 256
+0c 1f 84 cc d1 75 8b 1b 86 21 63 54 40 50 60 1d 81 01 
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 0c 1f 84 cc d1 75 8b 1b 86 21 63 54 40 50 60 1d 81 01 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+0c 1f 84 cc d1 75 8b 1b 86 21 63 54 40 50 60 1d 81 01 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 22
-00 00 00 00 0c 1f 84 cc d1 75 8b 1b 86 11 22 33 40 50 60 1d 81 01 
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+0c 1f 84 cc d1 75 8b 1b 86 11 22 33 40 50 60 1d 81 01 
 
-result (BVC_SUSPEND_ACK) = 0
+Message for BSS (NSEI=4096 BVCI=0):
+[L2]> [L3]> 0c 1f 84 cc d1 75 8b 1b 86 11 22 33 40 50 60 1d 81 01 
 
 Gbproxy global:
 Peers:
@@ -2185,113 +956,113 @@ Peers:
     TLLI-Cache: 0
 --- Send message from BSS 1 to SGSN, BVCI 0x1002 ---
 
-PROCESSING ATTACH REQUEST from 0x01020304:1111
-00 00 10 02 01 bb c5 46 79 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
+PROCESSING ATTACH REQUEST from NSEI 4096
+01 bb c5 46 79 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 bb c5 46 79 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 bb c5 46 79 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 75 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 79
-00 00 10 02 01 bb c5 46 79 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 21 63 54 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 8e cd 32 
+NS2 UD REQUEST, prim 0, msg length 75, bvci 0x1002
+01 bb c5 46 79 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 21 63 54 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 8e cd 32 
 
-result (ATTACH REQUEST) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 bb c5 46 79 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 21 63 54 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 8e cd 32 
 
-PROCESSING IDENT REQUEST from 0x05060708:32000
-00 00 10 02 00 bb c5 46 79 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
+PROCESSING IDENT REQUEST from NSEI 256
+00 bb c5 46 79 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-CALLBACK, event 0, msg length 23, bvci 0x1002
-00 00 10 02 00 bb c5 46 79 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
+NS2 CALLBACK, prim 0, msg length 23, bvci 0x1002
+00 bb c5 46 79 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 23 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 27
-00 00 10 02 00 bb c5 46 79 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
+NS2 UD REQUEST, prim 0, msg length 23, bvci 0x1002
+00 bb c5 46 79 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-result (IDENT REQUEST) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 bb c5 46 79 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-PROCESSING IDENT RESPONSE from 0x01020304:1111
-00 00 10 02 01 bb c5 46 79 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 11 01 c0 0d 08 16 08 11 12 13 14 15 16 17 f8 1d ff 1c 
+PROCESSING IDENT RESPONSE from NSEI 4096
+01 bb c5 46 79 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 11 01 c0 0d 08 16 08 11 12 13 14 15 16 17 f8 1d ff 1c 
 
-CALLBACK, event 0, msg length 40, bvci 0x1002
-00 00 10 02 01 bb c5 46 79 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 11 01 c0 0d 08 16 08 11 12 13 14 15 16 17 f8 1d ff 1c 
+NS2 CALLBACK, prim 0, msg length 40, bvci 0x1002
+01 bb c5 46 79 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 11 01 c0 0d 08 16 08 11 12 13 14 15 16 17 f8 1d ff 1c 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 40 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 44
-00 00 10 02 01 bb c5 46 79 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 11 01 c0 0d 08 16 08 11 12 13 14 15 16 17 f8 1d ff 1c 
+NS2 UD REQUEST, prim 0, msg length 40, bvci 0x1002
+01 bb c5 46 79 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 11 01 c0 0d 08 16 08 11 12 13 14 15 16 17 f8 1d ff 1c 
 
-result (IDENT RESPONSE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 bb c5 46 79 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 11 01 c0 0d 08 16 08 11 12 13 14 15 16 17 f8 1d ff 1c 
 
-PROCESSING ATTACH ACCEPT from 0x05060708:32000
-00 00 10 02 00 bb c5 46 79 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
+PROCESSING ATTACH ACCEPT from NSEI 256
+00 bb c5 46 79 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
 
-CALLBACK, event 0, msg length 88, bvci 0x1002
-00 00 10 02 00 bb c5 46 79 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
+NS2 CALLBACK, prim 0, msg length 88, bvci 0x1002
+00 bb c5 46 79 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 88 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 92
-00 00 10 02 00 bb c5 46 79 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 be 38 c0 
+NS2 UD REQUEST, prim 0, msg length 88, bvci 0x1002
+00 bb c5 46 79 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 be 38 c0 
 
-result (ATTACH ACCEPT) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 bb c5 46 79 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 be 38 c0 
 
-PROCESSING ATTACH COMPLETE from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 08 01 c0 11 08 03 ea 67 11 
+PROCESSING ATTACH COMPLETE from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 08 01 c0 11 08 03 ea 67 11 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 08 01 c0 11 08 03 ea 67 11 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 08 01 c0 11 08 03 ea 67 11 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 08 01 c0 11 08 03 ea 67 11 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 08 01 c0 11 08 03 ea 67 11 
 
-result (ATTACH COMPLETE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 08 01 c0 11 08 03 ea 67 11 
 
-PROCESSING ACT PDP CTX REQ (REPLACE APN) from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
+PROCESSING ACT PDP CTX REQ (REPLACE APN) from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
 
-CALLBACK, event 0, msg length 76, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
+NS2 CALLBACK, prim 0, msg length 76, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 81 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 85
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 3a 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 08 03 66 6f 6f 03 62 61 72 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 24 9d 75 
+NS2 UD REQUEST, prim 0, msg length 81, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 3a 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 08 03 66 6f 6f 03 62 61 72 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 24 9d 75 
 
-result (ACT PDP CTX REQ (REPLACE APN)) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 3a 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 08 03 66 6f 6f 03 62 61 72 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 24 9d 75 
 
-PROCESSING GMM INFO from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
+PROCESSING GMM INFO from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
-CALLBACK, event 0, msg length 66, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
+NS2 CALLBACK, prim 0, msg length 66, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 66 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 70
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
+NS2 UD REQUEST, prim 0, msg length 66, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
-result (GMM INFO) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
-PROCESSING ACT PDP CTX REQ (REPLACE APN) from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
+PROCESSING ACT PDP CTX REQ (REPLACE APN) from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
 
-CALLBACK, event 0, msg length 76, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
+NS2 CALLBACK, prim 0, msg length 76, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 81 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 85
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 3a 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 08 03 66 6f 6f 03 62 61 72 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 24 9d 75 
+NS2 UD REQUEST, prim 0, msg length 81, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 3a 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 08 03 66 6f 6f 03 62 61 72 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 24 9d 75 
 
-result (ACT PDP CTX REQ (REPLACE APN)) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 3a 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 08 03 66 6f 6f 03 62 61 72 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 24 9d 75 
 
-PROCESSING ACT PDP CTX REQ (REMOVE APN) from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
+PROCESSING ACT PDP CTX REQ (REMOVE APN) from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
 
-CALLBACK, event 0, msg length 76, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
+NS2 CALLBACK, prim 0, msg length 76, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 71 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 75
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 30 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 85 fa 60 
+NS2 UD REQUEST, prim 0, msg length 71, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 30 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 85 fa 60 
 
-result (ACT PDP CTX REQ (REMOVE APN)) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 30 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 85 fa 60 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -2306,29 +1077,29 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI efe2b700 -> efe2b700, IMSI 12131415161718, AGE 0, IMSI matches
-PROCESSING DETACH REQ from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 15 01 c0 19 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 7e e1 41 
+PROCESSING DETACH REQ from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 15 01 c0 19 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 7e e1 41 
 
-CALLBACK, event 0, msg length 44, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 15 01 c0 19 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 7e e1 41 
+NS2 CALLBACK, prim 0, msg length 44, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 15 01 c0 19 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 7e e1 41 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 44 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 48
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 15 01 c0 19 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 7e e1 41 
+NS2 UD REQUEST, prim 0, msg length 44, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 15 01 c0 19 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 7e e1 41 
 
-result (DETACH REQ) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 15 01 c0 19 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 7e e1 41 
 
-PROCESSING DETACH ACC from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 15 08 06 00 f7 35 f0 
+PROCESSING DETACH ACC from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 15 08 06 00 f7 35 f0 
 
-CALLBACK, event 0, msg length 67, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 15 08 06 00 f7 35 f0 
+NS2 CALLBACK, prim 0, msg length 67, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 15 08 06 00 f7 35 f0 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 67 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 71
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 15 08 06 00 f7 35 f0 
+NS2 UD REQUEST, prim 0, msg length 67, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 15 08 06 00 f7 35 f0 
 
-result (DETACH ACC) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 15 08 06 00 f7 35 f0 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -2345,41 +1116,41 @@ Peers:
     TLLI-Cache: 0
 --- RA update ---
 
-PROCESSING RA UPD REQ from 0x01020304:1111
-00 00 10 02 01 bb c5 46 79 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 96 3e 97 
+PROCESSING RA UPD REQ from NSEI 4096
+01 bb c5 46 79 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 96 3e 97 
 
-CALLBACK, event 0, msg length 85, bvci 0x1002
-00 00 10 02 01 bb c5 46 79 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 96 3e 97 
+NS2 CALLBACK, prim 0, msg length 85, bvci 0x1002
+01 bb c5 46 79 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 96 3e 97 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 85 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 89
-00 00 10 02 01 bb c5 46 79 00 00 04 08 88 21 63 54 40 50 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 21 63 54 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 1d f0 41 
+NS2 UD REQUEST, prim 0, msg length 85, bvci 0x1002
+01 bb c5 46 79 00 00 04 08 88 21 63 54 40 50 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 21 63 54 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 1d f0 41 
 
-result (RA UPD REQ) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 bb c5 46 79 00 00 04 08 88 21 63 54 40 50 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 21 63 54 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 1d f0 41 
 
-PROCESSING RA UPD ACC from 0x05060708:32000
-00 00 10 02 00 bb c5 46 79 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 19 08 09 00 49 21 63 54 40 50 60 19 54 ab b3 18 05 f4 ef e2 b7 00 17 16 d7 59 65 
+PROCESSING RA UPD ACC from NSEI 256
+00 bb c5 46 79 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 19 08 09 00 49 21 63 54 40 50 60 19 54 ab b3 18 05 f4 ef e2 b7 00 17 16 d7 59 65 
 
-CALLBACK, event 0, msg length 87, bvci 0x1002
-00 00 10 02 00 bb c5 46 79 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 19 08 09 00 49 21 63 54 40 50 60 19 54 ab b3 18 05 f4 ef e2 b7 00 17 16 d7 59 65 
+NS2 CALLBACK, prim 0, msg length 87, bvci 0x1002
+00 bb c5 46 79 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 19 08 09 00 49 21 63 54 40 50 60 19 54 ab b3 18 05 f4 ef e2 b7 00 17 16 d7 59 65 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 87 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 91
-00 00 10 02 00 bb c5 46 79 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 19 08 09 00 49 11 22 33 40 50 60 19 54 ab b3 18 05 f4 ef e2 b7 00 17 16 3a 03 54 
+NS2 UD REQUEST, prim 0, msg length 87, bvci 0x1002
+00 bb c5 46 79 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 19 08 09 00 49 11 22 33 40 50 60 19 54 ab b3 18 05 f4 ef e2 b7 00 17 16 3a 03 54 
 
-result (RA UPD ACC) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 bb c5 46 79 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 19 08 09 00 49 11 22 33 40 50 60 19 54 ab b3 18 05 f4 ef e2 b7 00 17 16 3a 03 54 
 
-PROCESSING ACT PDP CTX REQ (REMOVE APN) from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
+PROCESSING ACT PDP CTX REQ (REMOVE APN) from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
 
-CALLBACK, event 0, msg length 76, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
+NS2 CALLBACK, prim 0, msg length 76, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 71 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 75
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 30 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 85 fa 60 
+NS2 UD REQUEST, prim 0, msg length 71, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 30 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 85 fa 60 
 
-result (ACT PDP CTX REQ (REMOVE APN)) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 30 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 85 fa 60 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -2398,17 +1169,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI bbc54679/efe2b700 -> bbc54679/efe2b700, IMSI 12131415161718, AGE 0, IMSI matches
-PROCESSING DETACH REQ (PWR OFF) from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 15 01 c0 19 08 05 09 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 84 0c eb 
+PROCESSING DETACH REQ (PWR OFF) from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 15 01 c0 19 08 05 09 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 84 0c eb 
 
-CALLBACK, event 0, msg length 44, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 15 01 c0 19 08 05 09 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 84 0c eb 
+NS2 CALLBACK, prim 0, msg length 44, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 15 01 c0 19 08 05 09 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 84 0c eb 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 44 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 48
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 15 01 c0 19 08 05 09 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 84 0c eb 
+NS2 UD REQUEST, prim 0, msg length 44, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 15 01 c0 19 08 05 09 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 84 0c eb 
 
-result (DETACH REQ (PWR OFF)) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 15 01 c0 19 08 05 09 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 84 0c eb 
 
 Gbproxy global:
 Peers:
@@ -2428,43 +1199,40 @@ Peers:
     TLLI-Cache: 0
 --- Bad cases ---
 
-PROCESSING ATTACH REQUEST (foreign RAI) from 0x01020304:1111
-00 00 10 02 01 bb 00 be ef 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb 00 be ef 99 99 99 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 2d c7 df 
+PROCESSING ATTACH REQUEST (foreign RAI) from NSEI 4096
+01 bb 00 be ef 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb 00 be ef 99 99 99 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 2d c7 df 
 
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 bb 00 be ef 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb 00 be ef 99 99 99 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 2d c7 df 
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 bb 00 be ef 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb 00 be ef 99 99 99 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 2d c7 df 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 75 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 79
-00 00 10 02 01 bb 00 be ef 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb 00 be ef 99 99 99 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 2d c7 df 
+NS2 UD REQUEST, prim 0, msg length 75, bvci 0x1002
+01 bb 00 be ef 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb 00 be ef 99 99 99 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 2d c7 df 
 
-result (ATTACH REQUEST (foreign RAI)) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 bb 00 be ef 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb 00 be ef 99 99 99 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 2d c7 df 
 
 TLLI is already detached, shouldn't patch
-PROCESSING ACT PDP CTX REQ from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
+PROCESSING ACT PDP CTX REQ from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
 
-CALLBACK, event 0, msg length 76, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
+NS2 CALLBACK, prim 0, msg length 76, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 76 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 80
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
+NS2 UD REQUEST, prim 0, msg length 76, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
 
-result (ACT PDP CTX REQ) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 75 30 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
 
 Invalid RAI, shouldn't patch
-PROCESSING BVC_SUSPEND_ACK from 0x05060708:32000
-00 00 00 00 0c 1f 84 cc d1 75 8b 1b 86 00 f1 99 00 63 60 1d 81 01 
-
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 0c 1f 84 cc d1 75 8b 1b 86 00 f1 99 00 63 60 1d 81 01 
+PROCESSING BVC_SUSPEND_ACK from NSEI 256
+0c 1f 84 cc d1 75 8b 1b 86 00 f1 99 00 63 60 1d 81 01 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 28
-00 00 00 00 41 07 81 21 15 92 0c 1f 84 cc d1 75 8b 1b 86 00 f1 99 00 63 60 1d 81 01 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+0c 1f 84 cc d1 75 8b 1b 86 00 f1 99 00 63 60 1d 81 01 
 
-result (BVC_SUSPEND_ACK) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+41 07 81 21 15 92 0c 1f 84 cc d1 75 8b 1b 86 00 f1 99 00 63 60 1d 81 01 
 
 Gbproxy global:
     Invalid Routing Area Identifier : 1
@@ -2487,121 +1255,332 @@ Peers:
     TLLI-Cache: 2
       TLLI efe2b700 -> efe2b700, IMSI (none), AGE 0
       TLLI bb00beef -> bb00beef, IMSI (none), AGE 0
-=== test_gbproxy_ptmsi_patching ===
+=== Test IMSI/TMSI matching ===
+
+=== test_gbproxy_ptmsi_assignment ===
 --- Initialise SGSN ---
 
-MESSAGE to SGSN at 0x05060708:32000, msg length 12
-02 00 81 01 01 82 01 01 04 82 01 00 
+NS2 CALLBACK, prim 2, bvci 0x0000
 
-PROCESSING RESET_ACK from 0x05060708:32000
-03 01 82 01 01 04 82 01 00 
+Message for SGSN (NSEI=256 BVCI=0):
+22 04 82 00 00 07 81 08 
 
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-0a 
+--- Initialise BSS 1 ---
 
-result (RESET_ACK) = 0
+Setup NS-VC: NSEI 0x1000(4096)
 
-PROCESSING ALIVE_ACK from 0x05060708:32000
-0b 
+NS2 CALLBACK, prim 2, bvci 0x0000
 
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-06 
+Setup BSSGP: BVCI 0x1002(4098)
 
-result (ALIVE_ACK) = 0
+PROCESSING BVC_RESET from NSEI 4096
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-PROCESSING UNBLOCK_ACK from 0x05060708:32000
-07 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-==> got signal NS_UNBLOCK, NS-VC 0x0101/5.6.7.8:32000
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-result (UNBLOCK_ACK) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-PROCESSING ALIVE from 0x05060708:32000
-0a 
+PROCESSING BVC_RESET_ACK from NSEI 256
+23 04 82 10 02 
 
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-0b 
+NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-result (ALIVE) = 0
+NS2 UD REQUEST, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
---- Initialise BSS 1 ---
+Message for BSS (NSEI=4096 BVCI=0):
+[L2]> [L3]> 23 04 82 10 02 
 
-Setup NS-VC: remote 0x01020304:1111, NSVCI 0x1001(4097), NSEI 0x1000(4096)
+Gbproxy global:
+Peers:
+  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
+    TLLI-Cache: 0
+--- Establish first LLC connection ---
 
-PROCESSING RESET from 0x01020304:1111
-02 00 81 01 01 82 10 01 04 82 10 00 
+PROCESSING ATTACH REQUEST from NSEI 4096
+01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
-==> got signal NS_RESET, NS-VC 0x1001/1.2.3.4:1111
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-03 01 82 10 01 04 82 10 00 
+NS2 UD REQUEST, prim 0, msg length 75, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0a 
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
-result (RESET) = 0
+Peers:
+  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
+    Attach Request count            : 1
+    TLLI cache size                 : 1
+    TLLI-Cache: 1
+      TLLI 8000dead -> 8000dead, IMSI (none), AGE 0
+PROCESSING IDENT REQUEST from NSEI 256
+00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-PROCESSING ALIVE from 0x01020304:1111
-0a 
+NS2 CALLBACK, prim 0, msg length 23, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0b 
+NS2 UD REQUEST, prim 0, msg length 23, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-result (ALIVE) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-PROCESSING UNBLOCK from 0x01020304:1111
-06 
+Peers:
+  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
+    Attach Request count            : 1
+    TLLI cache size                 : 1
+    TLLI-Cache: 1
+      TLLI 8000dead -> 8000dead, IMSI (none), AGE 0
+PROCESSING IDENT RESPONSE from NSEI 4096
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
 
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-07 
+NS2 CALLBACK, prim 0, msg length 40, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
 
-==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111
+NS2 UD REQUEST, prim 0, msg length 40, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
 
-result (UNBLOCK) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
 
-PROCESSING ALIVE_ACK from 0x01020304:1111
-0b 
+Peers:
+  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
+    Attach Request count            : 1
+    TLLI cache size                 : 1
+    TLLI-Cache: 1
+      TLLI 8000dead -> 8000dead, IMSI 12131415161718, AGE 0
+PROCESSING ATTACH ACCEPT from NSEI 256
+00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
 
-result (ALIVE_ACK) = 0
+NS2 CALLBACK, prim 0, msg length 88, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
 
-Setup BSSGP: remote 0x01020304:1111, BVCI 0x1002(4098)
+NS2 UD REQUEST, prim 0, msg length 88, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
 
-PROCESSING BVC_RESET from 0x01020304:1111
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+Peers:
+  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
+    Attach Request count            : 1
+    Attach Accept count             : 1
+    TLLI cache size                 : 1
+    TLLI-Cache: 1
+      TLLI 8000dead/efe2b700 -> 8000dead/efe2b700, IMSI 12131415161718, AGE 0
+PROCESSING ATTACH COMPLETE from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 09 08 03 39 d7 bc 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 22
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 21 63 54 40 50 60 10 00 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 09 08 03 39 d7 bc 
 
-result (BVC_RESET) = 0
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 09 08 03 39 d7 bc 
 
-PROCESSING BVC_RESET_ACK from 0x05060708:32000
-00 00 00 00 23 04 82 10 02 
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 09 08 03 39 d7 bc 
 
-CALLBACK, event 0, msg length 5, bvci 0x0000
-00 00 00 00 23 04 82 10 02 
+Peers:
+  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
+    Attach Request count            : 1
+    Attach Accept count             : 1
+    Attach Completed count          : 1
+    TLLI cache size                 : 1
+    TLLI-Cache: 1
+      TLLI 8000dead/efe2b700 -> 8000dead/efe2b700, IMSI 12131415161718, AGE 0
+PROCESSING GMM INFO from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-00 00 00 00 23 04 82 10 02 
+NS2 CALLBACK, prim 0, msg length 66, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
-result (BVC_RESET_ACK) = 0
+NS2 UD REQUEST, prim 0, msg length 66, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
-Current NS-VCIs:
-    VCI 0x1001, NSEI 0x1000, peer 0x01020304:1111
-         Packets at NS Level  ( In): 5
-         Packets at NS Level  (Out): 5
-         Bytes at NS Level    ( In): 37
-         Bytes at NS Level    (Out): 21
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 5
-         Packets at NS Level  (Out): 5
-         Bytes at NS Level    ( In): 21
-         Bytes at NS Level    (Out): 37
-         NS-VC Block count         : 1
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
+
+Peers:
+  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
+    Attach Request count            : 1
+    Attach Accept count             : 1
+    Attach Completed count          : 1
+    TLLI cache size                 : 1
+    TLLI-Cache: 1
+      TLLI efe2b700 -> efe2b700, IMSI 12131415161718, AGE 0
+--- Establish second LLC connection with the same P-TMSI ---
+
+PROCESSING ATTACH REQUEST from NSEI 4096
+01 80 00 be ef 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 0d 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 46 42 6e 
+
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 80 00 be ef 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 0d 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 46 42 6e 
+
+NS2 UD REQUEST, prim 0, msg length 75, bvci 0x1002
+01 80 00 be ef 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 0d 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 46 42 6e 
+
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 80 00 be ef 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 0d 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 46 42 6e 
+
+Peers:
+  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
+    Attach Request count            : 2
+    Attach Accept count             : 1
+    Attach Completed count          : 1
+    TLLI cache size                 : 2
+    TLLI-Cache: 2
+      TLLI 8000beef -> 8000beef, IMSI (none), AGE 0
+      TLLI efe2b700 -> efe2b700, IMSI 12131415161718, AGE 0
+PROCESSING IDENT REQUEST from NSEI 256
+00 80 00 be ef 00 50 20 16 82 02 58 0e 89 41 c0 0d 08 15 01 0c a6 18 
+
+NS2 CALLBACK, prim 0, msg length 23, bvci 0x1002
+00 80 00 be ef 00 50 20 16 82 02 58 0e 89 41 c0 0d 08 15 01 0c a6 18 
+
+NS2 UD REQUEST, prim 0, msg length 23, bvci 0x1002
+00 80 00 be ef 00 50 20 16 82 02 58 0e 89 41 c0 0d 08 15 01 0c a6 18 
+
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 80 00 be ef 00 50 20 16 82 02 58 0e 89 41 c0 0d 08 15 01 0c a6 18 
+
+Peers:
+  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
+    Attach Request count            : 2
+    Attach Accept count             : 1
+    Attach Completed count          : 1
+    TLLI cache size                 : 2
+    TLLI-Cache: 2
+      TLLI 8000beef -> 8000beef, IMSI (none), AGE 0
+      TLLI efe2b700 -> efe2b700, IMSI 12131415161718, AGE 0
+PROCESSING IDENT RESPONSE from NSEI 4096
+01 80 00 be ef 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 11 08 16 08 11 12 99 99 99 16 17 f8 15 36 87 
+
+NS2 CALLBACK, prim 0, msg length 40, bvci 0x1002
+01 80 00 be ef 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 11 08 16 08 11 12 99 99 99 16 17 f8 15 36 87 
+
+NS2 UD REQUEST, prim 0, msg length 40, bvci 0x1002
+01 80 00 be ef 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 11 08 16 08 11 12 99 99 99 16 17 f8 15 36 87 
+
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 80 00 be ef 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 11 08 16 08 11 12 99 99 99 16 17 f8 15 36 87 
+
+Peers:
+  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
+    Attach Request count            : 2
+    Attach Accept count             : 1
+    Attach Completed count          : 1
+    TLLI cache size                 : 2
+    TLLI-Cache: 2
+      TLLI 8000beef -> 8000beef, IMSI 12199999961718, AGE 0
+      TLLI efe2b700 -> efe2b700, IMSI 12131415161718, AGE 0
+PROCESSING ATTACH ACCEPT from NSEI 256
+00 80 00 be ef 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 9e 41 c0 11 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 3a 6d d4 
+
+NS2 CALLBACK, prim 0, msg length 88, bvci 0x1002
+00 80 00 be ef 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 9e 41 c0 11 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 3a 6d d4 
+
+NS2 UD REQUEST, prim 0, msg length 88, bvci 0x1002
+00 80 00 be ef 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 9e 41 c0 11 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 3a 6d d4 
+
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 80 00 be ef 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 9e 41 c0 11 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 3a 6d d4 
+
+Peers:
+  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
+    Attach Request count            : 2
+    Attach Accept count             : 2
+    Attach Completed count          : 1
+    TLLI cache size                 : 1
+    TLLI-Cache: 1
+      TLLI 8000beef/efe2b700 -> 8000beef/efe2b700, IMSI 12199999961718, AGE 0
+PROCESSING ATTACH COMPLETE from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 15 08 03 86 ac 47 
+
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 15 08 03 86 ac 47 
+
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 15 08 03 86 ac 47 
+
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 15 08 03 86 ac 47 
+
+Peers:
+  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
+    Attach Request count            : 2
+    Attach Accept count             : 2
+    Attach Completed count          : 2
+    TLLI cache size                 : 1
+    TLLI-Cache: 1
+      TLLI 8000beef/efe2b700 -> 8000beef/efe2b700, IMSI 12199999961718, AGE 0
+PROCESSING GMM INFO from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 88 41 c0 15 08 21 bb c1 c6 
+
+NS2 CALLBACK, prim 0, msg length 66, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 88 41 c0 15 08 21 bb c1 c6 
+
+NS2 UD REQUEST, prim 0, msg length 66, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 88 41 c0 15 08 21 bb c1 c6 
+
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 88 41 c0 15 08 21 bb c1 c6 
+
+Peers:
+  NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
+    Attach Request count            : 2
+    Attach Accept count             : 2
+    Attach Completed count          : 2
+    TLLI cache size                 : 1
+    TLLI-Cache: 1
+      TLLI efe2b700 -> efe2b700, IMSI 12199999961718, AGE 0
+Gbproxy global:
+=== test_gbproxy_ptmsi_patching ===
+--- Initialise SGSN ---
+
+NS2 CALLBACK, prim 2, bvci 0x0000
+
+Message for SGSN (NSEI=256 BVCI=0):
+22 04 82 00 00 07 81 08 
+
+--- Initialise BSS 1 ---
+
+Setup NS-VC: NSEI 0x1000(4096)
+
+NS2 CALLBACK, prim 2, bvci 0x0000
+
+Setup BSSGP: BVCI 0x1002(4098)
+
+PROCESSING BVC_RESET from NSEI 4096
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 21 63 54 40 50 60 10 00 
+
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 22 04 82 10 02 07 81 08 08 88 21 63 54 40 50 60 10 00 
+
+PROCESSING BVC_RESET_ACK from NSEI 256
+23 04 82 10 02 
+
+NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
+
+NS2 UD REQUEST, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
+
+Message for BSS (NSEI=4096 BVCI=0):
+[L2]> [L3]> 23 04 82 10 02 
 
 Gbproxy global:
 Peers:
@@ -2610,17 +1589,17 @@ Peers:
     TLLI-Cache: 0
 --- Send message from BSS 1 to SGSN, BVCI 0x1002 ---
 
-PROCESSING ATTACH REQUEST from 0x01020304:1111
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
+PROCESSING ATTACH REQUEST from NSEI 4096
+01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 75 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 79
-00 00 10 02 01 78 de ad 00 00 00 04 08 88 21 63 54 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
+NS2 UD REQUEST, prim 0, msg length 75, bvci 0x1002
+01 78 de ad 00 00 00 04 08 88 21 63 54 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
-result (ATTACH REQUEST) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 78 de ad 00 00 00 04 08 88 21 63 54 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -2630,17 +1609,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead -> 78dead00, IMSI (none), AGE 0
-PROCESSING IDENT REQUEST from 0x05060708:32000
-00 00 10 02 00 78 de ad 00 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
+PROCESSING IDENT REQUEST from NSEI 256
+00 78 de ad 00 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-CALLBACK, event 0, msg length 23, bvci 0x1002
-00 00 10 02 00 78 de ad 00 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
+NS2 CALLBACK, prim 0, msg length 23, bvci 0x1002
+00 78 de ad 00 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 23 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 27
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
+NS2 UD REQUEST, prim 0, msg length 23, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-result (IDENT REQUEST) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -2651,17 +1630,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead -> 78dead00, IMSI (none), AGE 0
-PROCESSING IDENT RESPONSE from 0x01020304:1111
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
+PROCESSING IDENT RESPONSE from NSEI 4096
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
 
-CALLBACK, event 0, msg length 40, bvci 0x1002
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
+NS2 CALLBACK, prim 0, msg length 40, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 40 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 44
-00 00 10 02 01 78 de ad 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
+NS2 UD REQUEST, prim 0, msg length 40, bvci 0x1002
+01 78 de ad 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
 
-result (IDENT RESPONSE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 78 de ad 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -2672,17 +1651,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead -> 78dead00, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH ACCEPT from 0x05060708:32000
-00 00 10 02 00 78 de ad 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
+PROCESSING ATTACH ACCEPT from NSEI 256
+00 78 de ad 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
 
-CALLBACK, event 0, msg length 88, bvci 0x1002
-00 00 10 02 00 78 de ad 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
+NS2 CALLBACK, prim 0, msg length 88, bvci 0x1002
+00 78 de ad 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 88 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 92
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 c0 de ad 01 0c 0a 29 
+NS2 UD REQUEST, prim 0, msg length 88, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 c0 de ad 01 0c 0a 29 
 
-result (ATTACH ACCEPT) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 c0 de ad 01 0c 0a 29 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -2696,17 +1675,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead/c0dead01 -> 78dead00/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH COMPLETE from 0x01020304:1111
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 09 08 03 39 d7 bc 
+PROCESSING ATTACH COMPLETE from NSEI 4096
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 09 08 03 39 d7 bc 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 09 08 03 39 d7 bc 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 09 08 03 39 d7 bc 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 08 01 c0 09 08 03 39 d7 bc 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 08 01 c0 09 08 03 39 d7 bc 
 
-result (ATTACH COMPLETE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 08 01 c0 09 08 03 39 d7 bc 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -2721,17 +1700,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead/c0dead01 -> 78dead00/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING GMM INFO from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
+PROCESSING GMM INFO from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
-CALLBACK, event 0, msg length 66, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
+NS2 CALLBACK, prim 0, msg length 66, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 66 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 70
-00 00 10 02 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
+NS2 UD REQUEST, prim 0, msg length 66, bvci 0x1002
+00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
-result (GMM INFO) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -2746,17 +1725,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ACT PDP CTX REQ (REPLACE APN) from 0x01020304:1111
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
+PROCESSING ACT PDP CTX REQ (REPLACE APN) from NSEI 4096
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
 
-CALLBACK, event 0, msg length 76, bvci 0x1002
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
+NS2 CALLBACK, prim 0, msg length 76, bvci 0x1002
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 35 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 03 02 61 62 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 5a ff 02 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 81 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 85
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 3a 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 08 03 66 6f 6f 03 62 61 72 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 24 9d 75 
+NS2 UD REQUEST, prim 0, msg length 81, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 3a 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 08 03 66 6f 6f 03 62 61 72 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 24 9d 75 
 
-result (ACT PDP CTX REQ (REPLACE APN)) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 3a 01 c0 0d 0a 41 05 03 0c 00 00 1f 10 00 00 00 00 00 00 00 00 02 01 21 28 08 03 66 6f 6f 03 62 61 72 27 14 80 80 21 10 01 00 00 10 81 06 00 00 00 00 83 06 00 00 00 00 24 9d 75 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -2773,53 +1752,53 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING XID (UL) from 0x01020304:1111
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
+PROCESSING XID (UL) from NSEI 4096
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
 
-CALLBACK, event 0, msg length 38, bvci 0x1002
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
+NS2 CALLBACK, prim 0, msg length 38, bvci 0x1002
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 38 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 42
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
+NS2 UD REQUEST, prim 0, msg length 38, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
 
-result (XID (UL)) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
 
-PROCESSING XID (DL) from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
+PROCESSING XID (DL) from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
 
-CALLBACK, event 0, msg length 70, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
+NS2 CALLBACK, prim 0, msg length 70, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 70 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 74
-00 00 10 02 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
+NS2 UD REQUEST, prim 0, msg length 70, bvci 0x1002
+00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
 
-result (XID (DL)) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
 
-PROCESSING LL11 DNS QUERY (UL) from 0x01020304:1111
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
+PROCESSING LL11 DNS QUERY (UL) from NSEI 4096
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
 
-CALLBACK, event 0, msg length 89, bvci 0x1002
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
+NS2 CALLBACK, prim 0, msg length 89, bvci 0x1002
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 89 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 93
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
+NS2 UD REQUEST, prim 0, msg length 89, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
 
-result (LL11 DNS QUERY (UL)) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
 
-PROCESSING LL11 DNS RESP (DL) from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
+PROCESSING LL11 DNS RESP (DL) from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
 
-CALLBACK, event 0, msg length 267, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
+NS2 CALLBACK, prim 0, msg length 267, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 267 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 271
-00 00 10 02 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
+NS2 UD REQUEST, prim 0, msg length 267, bvci 0x1002
+00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
 
-result (LL11 DNS RESP (DL)) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -2836,29 +1815,29 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING RA UPD REQ (P-TMSI 2) from 0x01020304:1111
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 3e 01 c0 11 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 e2 6d 78 
+PROCESSING RA UPD REQ (P-TMSI 2) from NSEI 4096
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 3e 01 c0 11 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 e2 6d 78 
 
-CALLBACK, event 0, msg length 85, bvci 0x1002
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 3e 01 c0 11 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 e2 6d 78 
+NS2 CALLBACK, prim 0, msg length 85, bvci 0x1002
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 3e 01 c0 11 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 e2 6d 78 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 85 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 89
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 70 80 00 80 0e 00 3e 01 c0 11 08 08 10 21 63 54 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 69 a3 ae 
+NS2 UD REQUEST, prim 0, msg length 85, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 70 80 00 80 0e 00 3e 01 c0 11 08 08 10 21 63 54 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 69 a3 ae 
 
-result (RA UPD REQ (P-TMSI 2)) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 70 80 00 80 0e 00 3e 01 c0 11 08 08 10 21 63 54 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 69 a3 ae 
 
-PROCESSING RA UDP ACC (P-TMSI 2) from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 0d 08 09 00 49 21 63 54 40 50 60 19 54 ab b3 18 05 f4 e0 98 76 54 17 16 9f e8 ea 
+PROCESSING RA UDP ACC (P-TMSI 2) from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 0d 08 09 00 49 21 63 54 40 50 60 19 54 ab b3 18 05 f4 e0 98 76 54 17 16 9f e8 ea 
 
-CALLBACK, event 0, msg length 87, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 0d 08 09 00 49 21 63 54 40 50 60 19 54 ab b3 18 05 f4 e0 98 76 54 17 16 9f e8 ea 
+NS2 CALLBACK, prim 0, msg length 87, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 0d 08 09 00 49 21 63 54 40 50 60 19 54 ab b3 18 05 f4 e0 98 76 54 17 16 9f e8 ea 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 87 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 91
-00 00 10 02 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 0d 08 09 00 49 11 22 33 40 50 60 19 54 ab b3 18 05 f4 c0 de ad 02 17 16 bb 4d a0 
+NS2 UD REQUEST, prim 0, msg length 87, bvci 0x1002
+00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 0d 08 09 00 49 11 22 33 40 50 60 19 54 ab b3 18 05 f4 c0 de ad 02 17 16 bb 4d a0 
 
-result (RA UDP ACC (P-TMSI 2)) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 0d 08 09 00 49 11 22 33 40 50 60 19 54 ab b3 18 05 f4 c0 de ad 02 17 16 bb 4d a0 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -2877,29 +1856,29 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead01/c0dead02 -> efe2b700/e0987654, IMSI 12131415161718, AGE 0
-PROCESSING RA UPD REQ (P-TMSI 3) from 0x01020304:1111
-00 00 10 02 01 c0 de ad 02 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 96 3e 97 
+PROCESSING RA UPD REQ (P-TMSI 3) from NSEI 4096
+01 c0 de ad 02 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 96 3e 97 
 
-CALLBACK, event 0, msg length 85, bvci 0x1002
-00 00 10 02 01 c0 de ad 02 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 96 3e 97 
+NS2 CALLBACK, prim 0, msg length 85, bvci 0x1002
+01 c0 de ad 02 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 96 3e 97 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 85 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 89
-00 00 10 02 01 e0 98 76 54 00 00 04 08 88 21 63 54 40 50 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 21 63 54 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 1d f0 41 
+NS2 UD REQUEST, prim 0, msg length 85, bvci 0x1002
+01 e0 98 76 54 00 00 04 08 88 21 63 54 40 50 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 21 63 54 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 1d f0 41 
 
-result (RA UPD REQ (P-TMSI 3)) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 e0 98 76 54 00 00 04 08 88 21 63 54 40 50 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 21 63 54 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 1d f0 41 
 
-PROCESSING RA UDP ACC (P-TMSI 3) from 0x05060708:32000
-00 00 10 02 00 e0 98 76 54 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 11 08 09 00 49 21 63 54 40 50 60 19 54 ab b3 18 05 f4 e0 54 32 10 17 16 1b a3 a8 
+PROCESSING RA UDP ACC (P-TMSI 3) from NSEI 256
+00 e0 98 76 54 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 11 08 09 00 49 21 63 54 40 50 60 19 54 ab b3 18 05 f4 e0 54 32 10 17 16 1b a3 a8 
 
-CALLBACK, event 0, msg length 87, bvci 0x1002
-00 00 10 02 00 e0 98 76 54 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 11 08 09 00 49 21 63 54 40 50 60 19 54 ab b3 18 05 f4 e0 54 32 10 17 16 1b a3 a8 
+NS2 CALLBACK, prim 0, msg length 87, bvci 0x1002
+00 e0 98 76 54 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 11 08 09 00 49 21 63 54 40 50 60 19 54 ab b3 18 05 f4 e0 54 32 10 17 16 1b a3 a8 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 87 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 91
-00 00 10 02 00 c0 de ad 02 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 11 08 09 00 49 11 22 33 40 50 60 19 54 ab b3 18 05 f4 c0 de ad 03 17 16 6e 58 26 
+NS2 UD REQUEST, prim 0, msg length 87, bvci 0x1002
+00 c0 de ad 02 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 11 08 09 00 49 11 22 33 40 50 60 19 54 ab b3 18 05 f4 c0 de ad 03 17 16 6e 58 26 
 
-result (RA UDP ACC (P-TMSI 3)) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 02 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 11 08 09 00 49 11 22 33 40 50 60 19 54 ab b3 18 05 f4 c0 de ad 03 17 16 6e 58 26 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -2918,29 +1897,29 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead01/c0dead03 -> efe2b700/e0543210, IMSI 12131415161718, AGE 0
-PROCESSING RA UPD COMPLETE from 0x01020304:1111
-00 00 10 02 01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 08 01 c0 19 08 0a d5 5f 5e 
+PROCESSING RA UPD COMPLETE from NSEI 4096
+01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 08 01 c0 19 08 0a d5 5f 5e 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 08 01 c0 19 08 0a d5 5f 5e 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 08 01 c0 19 08 0a d5 5f 5e 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 e0 54 32 10 00 00 04 08 88 21 63 54 40 50 60 70 80 00 80 0e 00 08 01 c0 19 08 0a d5 5f 5e 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 e0 54 32 10 00 00 04 08 88 21 63 54 40 50 60 70 80 00 80 0e 00 08 01 c0 19 08 0a d5 5f 5e 
 
-result (RA UPD COMPLETE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 e0 54 32 10 00 00 04 08 88 21 63 54 40 50 60 70 80 00 80 0e 00 08 01 c0 19 08 0a d5 5f 5e 
 
-PROCESSING GMM INFO from 0x05060708:32000
-00 00 10 02 00 e0 54 32 10 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 15 08 21 bb c1 c6 
+PROCESSING GMM INFO from NSEI 256
+00 e0 54 32 10 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 15 08 21 bb c1 c6 
 
-CALLBACK, event 0, msg length 66, bvci 0x1002
-00 00 10 02 00 e0 54 32 10 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 15 08 21 bb c1 c6 
+NS2 CALLBACK, prim 0, msg length 66, bvci 0x1002
+00 e0 54 32 10 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 15 08 21 bb c1 c6 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 66 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 70
-00 00 10 02 00 c0 de ad 03 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 15 08 21 bb c1 c6 
+NS2 UD REQUEST, prim 0, msg length 66, bvci 0x1002
+00 c0 de ad 03 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 15 08 21 bb c1 c6 
 
-result (GMM INFO) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 03 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 15 08 21 bb c1 c6 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -2960,17 +1939,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead03 -> e0543210, IMSI 12131415161718, AGE 0
-PROCESSING LLC_DISCARDED from 0x01020304:1111
-00 00 00 00 2c 1f 84 c0 de ad 03 0f 81 01 04 82 10 02 25 83 00 00 0c 
+PROCESSING LLC_DISCARDED from NSEI 4096
+2c 1f 84 c0 de ad 03 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
-CALLBACK, event 0, msg length 19, bvci 0x0000
-00 00 00 00 2c 1f 84 c0 de ad 03 0f 81 01 04 82 10 02 25 83 00 00 0c 
+NS2 CALLBACK, prim 0, msg length 19, bvci 0x0000
+2c 1f 84 c0 de ad 03 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 19 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 23
-00 00 00 00 2c 1f 84 e0 54 32 10 0f 81 01 04 82 10 02 25 83 00 00 0c 
+NS2 UD REQUEST, prim 0, msg length 19, bvci 0x0000
+2c 1f 84 e0 54 32 10 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
-result (LLC_DISCARDED) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 2c 1f 84 e0 54 32 10 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -2990,17 +1969,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead03 -> e0543210, IMSI 12131415161718, AGE 0
-PROCESSING BVC_SUSPEND from 0x01020304:1111
-00 00 00 00 0b 1f 84 c0 de ad 03 1b 86 11 22 33 40 50 60 
+PROCESSING BVC_SUSPEND from NSEI 4096
+0b 1f 84 c0 de ad 03 1b 86 11 22 33 40 50 60 
 
-CALLBACK, event 0, msg length 15, bvci 0x0000
-00 00 00 00 0b 1f 84 c0 de ad 03 1b 86 11 22 33 40 50 60 
+NS2 CALLBACK, prim 0, msg length 15, bvci 0x0000
+0b 1f 84 c0 de ad 03 1b 86 11 22 33 40 50 60 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 15 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 19
-00 00 00 00 0b 1f 84 e0 54 32 10 1b 86 21 63 54 40 50 60 
+NS2 UD REQUEST, prim 0, msg length 15, bvci 0x0000
+0b 1f 84 e0 54 32 10 1b 86 21 63 54 40 50 60 
 
-result (BVC_SUSPEND) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 0b 1f 84 e0 54 32 10 1b 86 21 63 54 40 50 60 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3020,17 +1999,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead03 -> e0543210, IMSI 12131415161718, AGE 0
-PROCESSING BVC_SUSPEND_ACK from 0x05060708:32000
-00 00 00 00 0c 1f 84 e0 54 32 10 1b 86 21 63 54 40 50 60 1d 81 01 
+PROCESSING BVC_SUSPEND_ACK from NSEI 256
+0c 1f 84 e0 54 32 10 1b 86 21 63 54 40 50 60 1d 81 01 
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 0c 1f 84 e0 54 32 10 1b 86 21 63 54 40 50 60 1d 81 01 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+0c 1f 84 e0 54 32 10 1b 86 21 63 54 40 50 60 1d 81 01 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 22
-00 00 00 00 0c 1f 84 c0 de ad 03 1b 86 11 22 33 40 50 60 1d 81 01 
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+0c 1f 84 c0 de ad 03 1b 86 11 22 33 40 50 60 1d 81 01 
 
-result (BVC_SUSPEND_ACK) = 0
+Message for BSS (NSEI=4096 BVCI=0):
+[L2]> [L3]> 0c 1f 84 c0 de ad 03 1b 86 11 22 33 40 50 60 1d 81 01 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3050,17 +2029,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead03 -> e0543210, IMSI 12131415161718, AGE 0
-PROCESSING PAGING_PS from 0x05060708:32000
-00 00 00 00 06 0d 88 11 12 13 14 15 16 17 f8 0a 82 07 04 1b 86 11 22 33 40 50 60 18 83 00 00 00 20 84 e0 54 32 10 
+PROCESSING PAGING_PS from NSEI 256
+06 0d 88 11 12 13 14 15 16 17 f8 0a 82 07 04 1b 86 11 22 33 40 50 60 18 83 00 00 00 20 84 e0 54 32 10 
 
-CALLBACK, event 0, msg length 34, bvci 0x0000
-00 00 00 00 06 0d 88 11 12 13 14 15 16 17 f8 0a 82 07 04 1b 86 11 22 33 40 50 60 18 83 00 00 00 20 84 e0 54 32 10 
+NS2 CALLBACK, prim 0, msg length 34, bvci 0x0000
+06 0d 88 11 12 13 14 15 16 17 f8 0a 82 07 04 1b 86 11 22 33 40 50 60 18 83 00 00 00 20 84 e0 54 32 10 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 34 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 38
-00 00 00 00 06 0d 88 11 12 13 14 15 16 17 f8 0a 82 07 04 1b 86 11 22 33 40 50 60 18 83 00 00 00 20 84 c0 de ad 03 
+NS2 UD REQUEST, prim 0, msg length 34, bvci 0x0000
+06 0d 88 11 12 13 14 15 16 17 f8 0a 82 07 04 1b 86 11 22 33 40 50 60 18 83 00 00 00 20 84 c0 de ad 03 
 
-result (PAGING_PS) = 0
+Message for BSS (NSEI=4096 BVCI=0):
+[L2]> [L3]> 06 0d 88 11 12 13 14 15 16 17 f8 0a 82 07 04 1b 86 11 22 33 40 50 60 18 83 00 00 00 20 84 c0 de ad 03 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3080,84 +2059,81 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead03 -> e0543210, IMSI 12131415161718, AGE 0
-PROCESSING LLC_DISCARDED from 0x01020304:1111
-00 00 00 00 2c 1f 84 c0 de ad 03 0f 81 01 04 82 ee e1 25 83 00 00 0c 
+PROCESSING LLC_DISCARDED from NSEI 4096
+2c 1f 84 c0 de ad 03 0f 81 01 04 82 ee e1 25 83 00 00 0c 
 
-CALLBACK, event 0, msg length 19, bvci 0x0000
-00 00 00 00 2c 1f 84 c0 de ad 03 0f 81 01 04 82 ee e1 25 83 00 00 0c 
+NS2 CALLBACK, prim 0, msg length 19, bvci 0x0000
+2c 1f 84 c0 de ad 03 0f 81 01 04 82 ee e1 25 83 00 00 0c 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 19 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 23
-00 00 00 00 2c 1f 84 e0 54 32 10 0f 81 01 04 82 ee e1 25 83 00 00 0c 
+NS2 UD REQUEST, prim 0, msg length 19, bvci 0x0000
+2c 1f 84 e0 54 32 10 0f 81 01 04 82 ee e1 25 83 00 00 0c 
 
-result (LLC_DISCARDED) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 2c 1f 84 e0 54 32 10 0f 81 01 04 82 ee e1 25 83 00 00 0c 
 
 Gbproxy global:
-PROCESSING BVC_SUSPEND_ACK from 0x05060708:32000
-00 00 00 00 0c 1f 84 e0 54 32 10 1b 86 00 f1 99 00 63 60 1d 81 01 
-
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 0c 1f 84 e0 54 32 10 1b 86 00 f1 99 00 63 60 1d 81 01 
+PROCESSING BVC_SUSPEND_ACK from NSEI 256
+0c 1f 84 e0 54 32 10 1b 86 00 f1 99 00 63 60 1d 81 01 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 28
-00 00 00 00 41 07 81 21 15 92 0c 1f 84 e0 54 32 10 1b 86 00 f1 99 00 63 60 1d 81 01 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+0c 1f 84 e0 54 32 10 1b 86 00 f1 99 00 63 60 1d 81 01 
 
-result (BVC_SUSPEND_ACK) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+41 07 81 21 15 92 0c 1f 84 e0 54 32 10 1b 86 00 f1 99 00 63 60 1d 81 01 
 
 Gbproxy global:
     Invalid Routing Area Identifier : 1
     Patch error: no peer            : 1
-PROCESSING BVC_SUSPEND_ACK from 0x05060708:32000
-00 00 00 00 0c 1f 84 e0 54 32 10 1b 86 99 69 54 40 50 60 1d 81 01 
+PROCESSING BVC_SUSPEND_ACK from NSEI 256
+0c 1f 84 e0 54 32 10 1b 86 99 69 54 40 50 60 1d 81 01 
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 0c 1f 84 e0 54 32 10 1b 86 99 69 54 40 50 60 1d 81 01 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+0c 1f 84 e0 54 32 10 1b 86 99 69 54 40 50 60 1d 81 01 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 22
-00 00 00 00 0c 1f 84 c0 de ad 03 1b 86 11 22 33 40 50 60 1d 81 01 
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+0c 1f 84 c0 de ad 03 1b 86 11 22 33 40 50 60 1d 81 01 
 
-result (BVC_SUSPEND_ACK) = 0
+Message for BSS (NSEI=4096 BVCI=0):
+[L2]> [L3]> 0c 1f 84 c0 de ad 03 1b 86 11 22 33 40 50 60 1d 81 01 
 
 Gbproxy global:
     Invalid Routing Area Identifier : 1
     Patch error: no peer            : 1
-PROCESSING GMM INFO from 0x05060708:32000
-00 00 10 02 00 ee ba db ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 00 83 00 00 00 0e 88 41 c0 09 08 21 04 ba 3d 
+PROCESSING GMM INFO from NSEI 256
+00 ee ba db ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 00 83 00 00 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
-CALLBACK, event 0, msg length 58, bvci 0x1002
-00 00 10 02 00 ee ba db ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 00 83 00 00 00 0e 88 41 c0 09 08 21 04 ba 3d 
+NS2 CALLBACK, prim 0, msg length 58, bvci 0x1002
+00 ee ba db ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 00 83 00 00 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 58 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 62
-00 00 10 02 00 ee ba db ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 00 83 00 00 00 0e 88 41 c0 09 08 21 04 ba 3d 
+NS2 UD REQUEST, prim 0, msg length 58, bvci 0x1002
+00 ee ba db ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 00 83 00 00 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
-result (GMM INFO) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 ee ba db ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 00 83 00 00 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
-PROCESSING GMM INFO from 0x05060708:32000
-00 00 10 02 00 ee ba db ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 0d 08 21 68 71 6b 
+PROCESSING GMM INFO from NSEI 256
+00 ee ba db ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 0d 08 21 68 71 6b 
 
-CALLBACK, event 0, msg length 66, bvci 0x1002
-00 00 10 02 00 ee ba db ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 0d 08 21 68 71 6b 
+NS2 CALLBACK, prim 0, msg length 66, bvci 0x1002
+00 ee ba db ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 0d 08 21 68 71 6b 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 66 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 70
-00 00 10 02 00 ee ba db ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 0d 08 21 68 71 6b 
+NS2 UD REQUEST, prim 0, msg length 66, bvci 0x1002
+00 ee ba db ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 0d 08 21 68 71 6b 
 
-result (GMM INFO) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 ee ba db ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 0d 08 21 68 71 6b 
 
-PROCESSING DETACH REQ from 0x01020304:1111
-00 00 10 02 01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 1d 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb aa cc a3 
+PROCESSING DETACH REQ from NSEI 4096
+01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 1d 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb aa cc a3 
 
-CALLBACK, event 0, msg length 44, bvci 0x1002
-00 00 10 02 01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 1d 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb aa cc a3 
+NS2 CALLBACK, prim 0, msg length 44, bvci 0x1002
+01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 1d 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb aa cc a3 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 44 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 48
-00 00 10 02 01 e0 54 32 10 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 15 01 c0 1d 08 05 01 18 05 f4 e0 54 32 10 19 03 b9 97 cb ea 6d af 
+NS2 UD REQUEST, prim 0, msg length 44, bvci 0x1002
+01 e0 54 32 10 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 15 01 c0 1d 08 05 01 18 05 f4 e0 54 32 10 19 03 b9 97 cb ea 6d af 
 
-result (DETACH REQ) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 e0 54 32 10 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 15 01 c0 1d 08 05 01 18 05 f4 e0 54 32 10 19 03 b9 97 cb ea 6d af 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3180,17 +2156,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead03 -> e0543210, IMSI 12131415161718, AGE 0
-PROCESSING DETACH ACC from 0x05060708:32000
-00 00 10 02 00 e0 54 32 10 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 19 08 06 00 04 ff 52 
+PROCESSING DETACH ACC from NSEI 256
+00 e0 54 32 10 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 19 08 06 00 04 ff 52 
 
-CALLBACK, event 0, msg length 67, bvci 0x1002
-00 00 10 02 00 e0 54 32 10 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 19 08 06 00 04 ff 52 
+NS2 CALLBACK, prim 0, msg length 67, bvci 0x1002
+00 e0 54 32 10 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 19 08 06 00 04 ff 52 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 67 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 71
-00 00 10 02 00 c0 de ad 03 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 19 08 06 00 04 ff 52 
+NS2 UD REQUEST, prim 0, msg length 67, bvci 0x1002
+00 c0 de ad 03 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 19 08 06 00 04 ff 52 
 
-result (DETACH ACC) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 03 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 19 08 06 00 04 ff 52 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3218,118 +2194,42 @@ Gbproxy global:
 === test_gbproxy_ptmsi_patching_bad_cases ===
 --- Initialise SGSN ---
 
-MESSAGE to SGSN at 0x05060708:32000, msg length 12
-02 00 81 01 01 82 01 01 04 82 01 00 
+NS2 CALLBACK, prim 2, bvci 0x0000
 
-PROCESSING RESET_ACK from 0x05060708:32000
-03 01 82 01 01 04 82 01 00 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-0a 
-
-result (RESET_ACK) = 0
-
-PROCESSING ALIVE_ACK from 0x05060708:32000
-0b 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-06 
-
-result (ALIVE_ACK) = 0
-
-PROCESSING UNBLOCK_ACK from 0x05060708:32000
-07 
-
-==> got signal NS_UNBLOCK, NS-VC 0x0101/5.6.7.8:32000
-
-result (UNBLOCK_ACK) = 0
-
-PROCESSING ALIVE from 0x05060708:32000
-0a 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-0b 
-
-result (ALIVE) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+22 04 82 00 00 07 81 08 
 
 --- Initialise BSS 1 ---
 
-Setup NS-VC: remote 0x01020304:1111, NSVCI 0x1001(4097), NSEI 0x1000(4096)
-
-PROCESSING RESET from 0x01020304:1111
-02 00 81 01 01 82 10 01 04 82 10 00 
-
-==> got signal NS_RESET, NS-VC 0x1001/1.2.3.4:1111
-
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-03 01 82 10 01 04 82 10 00 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0a 
-
-result (RESET) = 0
-
-PROCESSING ALIVE from 0x01020304:1111
-0a 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0b 
-
-result (ALIVE) = 0
-
-PROCESSING UNBLOCK from 0x01020304:1111
-06 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-07 
-
-==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111
-
-result (UNBLOCK) = 0
-
-PROCESSING ALIVE_ACK from 0x01020304:1111
-0b 
+Setup NS-VC: NSEI 0x1000(4096)
 
-result (ALIVE_ACK) = 0
+NS2 CALLBACK, prim 2, bvci 0x0000
 
-Setup BSSGP: remote 0x01020304:1111, BVCI 0x1002(4098)
+Setup BSSGP: BVCI 0x1002(4098)
 
-PROCESSING BVC_RESET from 0x01020304:1111
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+PROCESSING BVC_RESET from NSEI 4096
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 22
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 21 63 54 40 50 60 10 00 
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 21 63 54 40 50 60 10 00 
 
-result (BVC_RESET) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 22 04 82 10 02 07 81 08 08 88 21 63 54 40 50 60 10 00 
 
-PROCESSING BVC_RESET_ACK from 0x05060708:32000
-00 00 00 00 23 04 82 10 02 
+PROCESSING BVC_RESET_ACK from NSEI 256
+23 04 82 10 02 
 
-CALLBACK, event 0, msg length 5, bvci 0x0000
-00 00 00 00 23 04 82 10 02 
+NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-00 00 00 00 23 04 82 10 02 
+NS2 UD REQUEST, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-result (BVC_RESET_ACK) = 0
-
-Current NS-VCIs:
-    VCI 0x1001, NSEI 0x1000, peer 0x01020304:1111
-         Packets at NS Level  ( In): 5
-         Packets at NS Level  (Out): 5
-         Bytes at NS Level    ( In): 37
-         Bytes at NS Level    (Out): 21
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 5
-         Packets at NS Level  (Out): 5
-         Bytes at NS Level    ( In): 21
-         Bytes at NS Level    (Out): 37
-         NS-VC Block count         : 1
+Message for BSS (NSEI=4096 BVCI=0):
+[L2]> [L3]> 23 04 82 10 02 
 
 Gbproxy global:
 Peers:
@@ -3338,17 +2238,17 @@ Peers:
     TLLI-Cache: 0
 --- Send message from BSS 1 to SGSN, BVCI 0x1002 ---
 
-PROCESSING ATTACH REQUEST from 0x01020304:1111
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
+PROCESSING ATTACH REQUEST from NSEI 4096
+01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 75 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 79
-00 00 10 02 01 78 de ad 00 00 00 04 08 88 21 63 54 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
+NS2 UD REQUEST, prim 0, msg length 75, bvci 0x1002
+01 78 de ad 00 00 00 04 08 88 21 63 54 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
-result (ATTACH REQUEST) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 78 de ad 00 00 00 04 08 88 21 63 54 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3358,17 +2258,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead -> 78dead00, IMSI (none), AGE 0
-PROCESSING IDENT REQUEST from 0x05060708:32000
-00 00 10 02 00 78 de ad 00 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
+PROCESSING IDENT REQUEST from NSEI 256
+00 78 de ad 00 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-CALLBACK, event 0, msg length 23, bvci 0x1002
-00 00 10 02 00 78 de ad 00 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
+NS2 CALLBACK, prim 0, msg length 23, bvci 0x1002
+00 78 de ad 00 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 23 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 27
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
+NS2 UD REQUEST, prim 0, msg length 23, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-result (IDENT REQUEST) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3379,17 +2279,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead -> 78dead00, IMSI (none), AGE 0
-PROCESSING IDENT RESPONSE from 0x01020304:1111
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
+PROCESSING IDENT RESPONSE from NSEI 4096
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
 
-CALLBACK, event 0, msg length 40, bvci 0x1002
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
+NS2 CALLBACK, prim 0, msg length 40, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 40 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 44
-00 00 10 02 01 78 de ad 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
+NS2 UD REQUEST, prim 0, msg length 40, bvci 0x1002
+01 78 de ad 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
 
-result (IDENT RESPONSE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 78 de ad 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3400,17 +2300,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead -> 78dead00, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH ACCEPT from 0x05060708:32000
-00 00 10 02 00 78 de ad 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
+PROCESSING ATTACH ACCEPT from NSEI 256
+00 78 de ad 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
 
-CALLBACK, event 0, msg length 88, bvci 0x1002
-00 00 10 02 00 78 de ad 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
+NS2 CALLBACK, prim 0, msg length 88, bvci 0x1002
+00 78 de ad 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 88 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 92
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 c0 de ad 01 0c 0a 29 
+NS2 UD REQUEST, prim 0, msg length 88, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 c0 de ad 01 0c 0a 29 
 
-result (ATTACH ACCEPT) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 c0 de ad 01 0c 0a 29 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3424,17 +2324,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead/c0dead01 -> 78dead00/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH ACCEPT (duplicated) from 0x05060708:32000
-00 00 10 02 00 78 de ad 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 09 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 1d 9e 24 
+PROCESSING ATTACH ACCEPT (duplicated) from NSEI 256
+00 78 de ad 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 09 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 1d 9e 24 
 
-CALLBACK, event 0, msg length 88, bvci 0x1002
-00 00 10 02 00 78 de ad 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 09 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 1d 9e 24 
+NS2 CALLBACK, prim 0, msg length 88, bvci 0x1002
+00 78 de ad 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 09 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 1d 9e 24 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 88 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 92
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 09 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 c0 de ad 01 42 f6 fc 
+NS2 UD REQUEST, prim 0, msg length 88, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 09 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 c0 de ad 01 42 f6 fc 
 
-result (ATTACH ACCEPT (duplicated)) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 09 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 c0 de ad 01 42 f6 fc 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3448,17 +2348,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead/c0dead01 -> 78dead00/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH COMPLETE from 0x01020304:1111
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 09 08 03 39 d7 bc 
+PROCESSING ATTACH COMPLETE from NSEI 4096
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 09 08 03 39 d7 bc 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 09 08 03 39 d7 bc 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 09 08 03 39 d7 bc 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 08 01 c0 09 08 03 39 d7 bc 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 08 01 c0 09 08 03 39 d7 bc 
 
-result (ATTACH COMPLETE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 08 01 c0 09 08 03 39 d7 bc 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3473,17 +2373,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead/c0dead01 -> 78dead00/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING GMM INFO from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 0d 08 21 68 71 6b 
+PROCESSING GMM INFO from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 0d 08 21 68 71 6b 
 
-CALLBACK, event 0, msg length 66, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 0d 08 21 68 71 6b 
+NS2 CALLBACK, prim 0, msg length 66, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 0d 08 21 68 71 6b 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 66 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 70
-00 00 10 02 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 0d 08 21 68 71 6b 
+NS2 UD REQUEST, prim 0, msg length 66, bvci 0x1002
+00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 0d 08 21 68 71 6b 
 
-result (GMM INFO) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 0d 08 21 68 71 6b 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3498,17 +2398,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING DETACH REQ from 0x01020304:1111
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 0d 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 37 67 c6 
+PROCESSING DETACH REQ from NSEI 4096
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 0d 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 37 67 c6 
 
-CALLBACK, event 0, msg length 44, bvci 0x1002
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 0d 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 37 67 c6 
+NS2 CALLBACK, prim 0, msg length 44, bvci 0x1002
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 0d 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 37 67 c6 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 44 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 48
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 15 01 c0 0d 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 37 67 c6 
+NS2 UD REQUEST, prim 0, msg length 44, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 15 01 c0 0d 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 37 67 c6 
 
-result (DETACH REQ) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 15 01 c0 0d 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 37 67 c6 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3524,17 +2424,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING DETACH ACC from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 11 08 06 00 cf 8a 58 
+PROCESSING DETACH ACC from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 11 08 06 00 cf 8a 58 
 
-CALLBACK, event 0, msg length 67, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 11 08 06 00 cf 8a 58 
+NS2 CALLBACK, prim 0, msg length 67, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 11 08 06 00 cf 8a 58 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 67 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 71
-00 00 10 02 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 11 08 06 00 cf 8a 58 
+NS2 UD REQUEST, prim 0, msg length 67, bvci 0x1002
+00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 11 08 06 00 cf 8a 58 
 
-result (DETACH ACC) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 11 08 06 00 cf 8a 58 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3553,118 +2453,42 @@ Gbproxy global:
 === test_gbproxy_imsi_acquisition ===
 --- Initialise SGSN ---
 
-MESSAGE to SGSN at 0x05060708:32000, msg length 12
-02 00 81 01 01 82 01 01 04 82 01 00 
-
-PROCESSING RESET_ACK from 0x05060708:32000
-03 01 82 01 01 04 82 01 00 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-0a 
-
-result (RESET_ACK) = 0
-
-PROCESSING ALIVE_ACK from 0x05060708:32000
-0b 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-06 
-
-result (ALIVE_ACK) = 0
-
-PROCESSING UNBLOCK_ACK from 0x05060708:32000
-07 
-
-==> got signal NS_UNBLOCK, NS-VC 0x0101/5.6.7.8:32000
-
-result (UNBLOCK_ACK) = 0
-
-PROCESSING ALIVE from 0x05060708:32000
-0a 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-0b 
+NS2 CALLBACK, prim 2, bvci 0x0000
 
-result (ALIVE) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+22 04 82 00 00 07 81 08 
 
 --- Initialise BSS 1 ---
 
-Setup NS-VC: remote 0x01020304:1111, NSVCI 0x1001(4097), NSEI 0x1000(4096)
-
-PROCESSING RESET from 0x01020304:1111
-02 00 81 01 01 82 10 01 04 82 10 00 
-
-==> got signal NS_RESET, NS-VC 0x1001/1.2.3.4:1111
-
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-03 01 82 10 01 04 82 10 00 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0a 
-
-result (RESET) = 0
-
-PROCESSING ALIVE from 0x01020304:1111
-0a 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0b 
-
-result (ALIVE) = 0
-
-PROCESSING UNBLOCK from 0x01020304:1111
-06 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-07 
-
-==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111
-
-result (UNBLOCK) = 0
+Setup NS-VC: NSEI 0x1000(4096)
 
-PROCESSING ALIVE_ACK from 0x01020304:1111
-0b 
+NS2 CALLBACK, prim 2, bvci 0x0000
 
-result (ALIVE_ACK) = 0
+Setup BSSGP: BVCI 0x1002(4098)
 
-Setup BSSGP: remote 0x01020304:1111, BVCI 0x1002(4098)
+PROCESSING BVC_RESET from NSEI 4096
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-PROCESSING BVC_RESET from 0x01020304:1111
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 21 63 54 40 50 60 10 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 22
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 21 63 54 40 50 60 10 00 
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 22 04 82 10 02 07 81 08 08 88 21 63 54 40 50 60 10 00 
 
-result (BVC_RESET) = 0
+PROCESSING BVC_RESET_ACK from NSEI 256
+23 04 82 10 02 
 
-PROCESSING BVC_RESET_ACK from 0x05060708:32000
-00 00 00 00 23 04 82 10 02 
+NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-CALLBACK, event 0, msg length 5, bvci 0x0000
-00 00 00 00 23 04 82 10 02 
+NS2 UD REQUEST, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-00 00 00 00 23 04 82 10 02 
-
-result (BVC_RESET_ACK) = 0
-
-Current NS-VCIs:
-    VCI 0x1001, NSEI 0x1000, peer 0x01020304:1111
-         Packets at NS Level  ( In): 5
-         Packets at NS Level  (Out): 5
-         Bytes at NS Level    ( In): 37
-         Bytes at NS Level    (Out): 21
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 5
-         Packets at NS Level  (Out): 5
-         Bytes at NS Level    ( In): 21
-         Bytes at NS Level    (Out): 37
-         NS-VC Block count         : 1
+Message for BSS (NSEI=4096 BVCI=0):
+[L2]> [L3]> 23 04 82 10 02 
 
 Gbproxy global:
 Peers:
@@ -3673,17 +2497,17 @@ Peers:
     TLLI-Cache: 0
 --- Send message from BSS 1 to SGSN, BVCI 0x1002 ---
 
-PROCESSING ATTACH REQUEST from 0x01020304:1111
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
+PROCESSING ATTACH REQUEST from NSEI 4096
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 28
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
+NS2 UD REQUEST, prim 0, msg length 24, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
-result (ATTACH REQUEST) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L3]> 00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3692,17 +2516,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead -> 78dead00, IMSI (none), AGE 0, STORED 1, IMSI acquisition in progress
-PROCESSING IDENT RESPONSE from 0x01020304:1111
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
+PROCESSING IDENT RESPONSE from NSEI 4096
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
 
-CALLBACK, event 0, msg length 40, bvci 0x1002
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
+NS2 CALLBACK, prim 0, msg length 40, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 75 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 79
-00 00 10 02 01 78 de ad 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 21 63 54 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 8e cd 32 
+NS2 UD REQUEST, prim 0, msg length 75, bvci 0x1002
+01 78 de ad 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 21 63 54 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 8e cd 32 
 
-result (IDENT RESPONSE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 78 de ad 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 21 63 54 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 8e cd 32 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3712,17 +2536,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead -> 78dead00, IMSI 12131415161718, AGE 0
-PROCESSING IDENT REQUEST from 0x05060708:32000
-00 00 10 02 00 78 de ad 00 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
+PROCESSING IDENT REQUEST from NSEI 256
+00 78 de ad 00 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-CALLBACK, event 0, msg length 23, bvci 0x1002
-00 00 10 02 00 78 de ad 00 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
+NS2 CALLBACK, prim 0, msg length 23, bvci 0x1002
+00 78 de ad 00 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 23 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 27
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
+NS2 UD REQUEST, prim 0, msg length 23, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-result (IDENT REQUEST) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3733,17 +2557,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead -> 78dead00, IMSI 12131415161718, AGE 0
-PROCESSING IDENT RESPONSE from 0x01020304:1111
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
+PROCESSING IDENT RESPONSE from NSEI 4096
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
 
-CALLBACK, event 0, msg length 40, bvci 0x1002
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
+NS2 CALLBACK, prim 0, msg length 40, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 40 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 44
-00 00 10 02 01 78 de ad 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
+NS2 UD REQUEST, prim 0, msg length 40, bvci 0x1002
+01 78 de ad 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
 
-result (IDENT RESPONSE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 78 de ad 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3754,17 +2578,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead -> 78dead00, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH ACCEPT from 0x05060708:32000
-00 00 10 02 00 78 de ad 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
+PROCESSING ATTACH ACCEPT from NSEI 256
+00 78 de ad 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
 
-CALLBACK, event 0, msg length 88, bvci 0x1002
-00 00 10 02 00 78 de ad 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
+NS2 CALLBACK, prim 0, msg length 88, bvci 0x1002
+00 78 de ad 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 88 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 92
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 c0 de ad 01 0c 0a 29 
+NS2 UD REQUEST, prim 0, msg length 88, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 c0 de ad 01 0c 0a 29 
 
-result (ATTACH ACCEPT) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 c0 de ad 01 0c 0a 29 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3778,17 +2602,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead/c0dead01 -> 78dead00/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH COMPLETE from 0x01020304:1111
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 0d 08 03 55 1c ea 
+PROCESSING ATTACH COMPLETE from NSEI 4096
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 0d 08 03 55 1c ea 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 0d 08 03 55 1c ea 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 0d 08 03 55 1c ea 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 08 01 c0 0d 08 03 55 1c ea 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 08 01 c0 0d 08 03 55 1c ea 
 
-result (ATTACH COMPLETE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 08 01 c0 0d 08 03 55 1c ea 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3803,17 +2627,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead/c0dead01 -> 78dead00/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING GMM INFO from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
+PROCESSING GMM INFO from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
-CALLBACK, event 0, msg length 66, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
+NS2 CALLBACK, prim 0, msg length 66, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 66 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 70
-00 00 10 02 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
+NS2 UD REQUEST, prim 0, msg length 66, bvci 0x1002
+00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
-result (GMM INFO) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3828,53 +2652,53 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING XID (UL) from 0x01020304:1111
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
+PROCESSING XID (UL) from NSEI 4096
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
 
-CALLBACK, event 0, msg length 38, bvci 0x1002
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
+NS2 CALLBACK, prim 0, msg length 38, bvci 0x1002
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 38 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 42
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
+NS2 UD REQUEST, prim 0, msg length 38, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
 
-result (XID (UL)) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
 
-PROCESSING XID (DL) from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
+PROCESSING XID (DL) from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
 
-CALLBACK, event 0, msg length 70, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
+NS2 CALLBACK, prim 0, msg length 70, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 70 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 74
-00 00 10 02 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
+NS2 UD REQUEST, prim 0, msg length 70, bvci 0x1002
+00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
 
-result (XID (DL)) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
 
-PROCESSING LL11 DNS QUERY (UL) from 0x01020304:1111
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
+PROCESSING LL11 DNS QUERY (UL) from NSEI 4096
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
 
-CALLBACK, event 0, msg length 89, bvci 0x1002
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
+NS2 CALLBACK, prim 0, msg length 89, bvci 0x1002
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 89 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 93
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
+NS2 UD REQUEST, prim 0, msg length 89, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
 
-result (LL11 DNS QUERY (UL)) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
 
-PROCESSING LL11 DNS RESP (DL) from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
+PROCESSING LL11 DNS RESP (DL) from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
 
-CALLBACK, event 0, msg length 267, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
+NS2 CALLBACK, prim 0, msg length 267, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 267 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 271
-00 00 10 02 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
+NS2 UD REQUEST, prim 0, msg length 267, bvci 0x1002
+00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
 
-result (LL11 DNS RESP (DL)) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3889,17 +2713,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING LLC_DISCARDED from 0x01020304:1111
-00 00 00 00 2c 1f 84 c0 de ad 01 0f 81 01 04 82 10 02 25 83 00 00 0c 
+PROCESSING LLC_DISCARDED from NSEI 4096
+2c 1f 84 c0 de ad 01 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
-CALLBACK, event 0, msg length 19, bvci 0x0000
-00 00 00 00 2c 1f 84 c0 de ad 01 0f 81 01 04 82 10 02 25 83 00 00 0c 
+NS2 CALLBACK, prim 0, msg length 19, bvci 0x0000
+2c 1f 84 c0 de ad 01 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 19 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 23
-00 00 00 00 2c 1f 84 ef e2 b7 00 0f 81 01 04 82 10 02 25 83 00 00 0c 
+NS2 UD REQUEST, prim 0, msg length 19, bvci 0x0000
+2c 1f 84 ef e2 b7 00 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
-result (LLC_DISCARDED) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 2c 1f 84 ef e2 b7 00 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3914,17 +2738,14 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING LLC_DISCARDED from 0x05060708:32000
-00 00 00 00 2c 1f 84 ef e2 b7 00 0f 81 01 04 82 10 02 25 83 00 00 0c 
+PROCESSING LLC_DISCARDED from NSEI 256
+2c 1f 84 ef e2 b7 00 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
-CALLBACK, event 0, msg length 19, bvci 0x0000
-00 00 00 00 2c 1f 84 ef e2 b7 00 0f 81 01 04 82 10 02 25 83 00 00 0c 
+NS2 CALLBACK, prim 0, msg length 19, bvci 0x0000
+2c 1f 84 ef e2 b7 00 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 25 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 29
-00 00 00 00 41 07 81 27 15 93 2c 1f 84 ef e2 b7 00 0f 81 01 04 82 10 02 25 83 00 00 0c 
-
-result (LLC_DISCARDED) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+41 07 81 27 15 93 2c 1f 84 ef e2 b7 00 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3939,17 +2760,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING BVC_SUSPEND from 0x01020304:1111
-00 00 00 00 0b 1f 84 c0 de ad 01 1b 86 11 22 33 40 50 60 
+PROCESSING BVC_SUSPEND from NSEI 4096
+0b 1f 84 c0 de ad 01 1b 86 11 22 33 40 50 60 
 
-CALLBACK, event 0, msg length 15, bvci 0x0000
-00 00 00 00 0b 1f 84 c0 de ad 01 1b 86 11 22 33 40 50 60 
+NS2 CALLBACK, prim 0, msg length 15, bvci 0x0000
+0b 1f 84 c0 de ad 01 1b 86 11 22 33 40 50 60 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 15 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 19
-00 00 00 00 0b 1f 84 ef e2 b7 00 1b 86 21 63 54 40 50 60 
+NS2 UD REQUEST, prim 0, msg length 15, bvci 0x0000
+0b 1f 84 ef e2 b7 00 1b 86 21 63 54 40 50 60 
 
-result (BVC_SUSPEND) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 0b 1f 84 ef e2 b7 00 1b 86 21 63 54 40 50 60 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3964,17 +2785,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING BVC_SUSPEND_ACK from 0x05060708:32000
-00 00 00 00 0c 1f 84 ef e2 b7 00 1b 86 21 63 54 40 50 60 1d 81 01 
+PROCESSING BVC_SUSPEND_ACK from NSEI 256
+0c 1f 84 ef e2 b7 00 1b 86 21 63 54 40 50 60 1d 81 01 
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 0c 1f 84 ef e2 b7 00 1b 86 21 63 54 40 50 60 1d 81 01 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+0c 1f 84 ef e2 b7 00 1b 86 21 63 54 40 50 60 1d 81 01 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 22
-00 00 00 00 0c 1f 84 c0 de ad 01 1b 86 11 22 33 40 50 60 1d 81 01 
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+0c 1f 84 c0 de ad 01 1b 86 11 22 33 40 50 60 1d 81 01 
 
-result (BVC_SUSPEND_ACK) = 0
+Message for BSS (NSEI=4096 BVCI=0):
+[L2]> [L3]> 0c 1f 84 c0 de ad 01 1b 86 11 22 33 40 50 60 1d 81 01 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -3989,63 +2810,60 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING LLC_DISCARDED from 0x01020304:1111
-00 00 00 00 2c 1f 84 c0 de ad 01 0f 81 01 04 82 ee e1 25 83 00 00 0c 
+PROCESSING LLC_DISCARDED from NSEI 4096
+2c 1f 84 c0 de ad 01 0f 81 01 04 82 ee e1 25 83 00 00 0c 
 
-CALLBACK, event 0, msg length 19, bvci 0x0000
-00 00 00 00 2c 1f 84 c0 de ad 01 0f 81 01 04 82 ee e1 25 83 00 00 0c 
+NS2 CALLBACK, prim 0, msg length 19, bvci 0x0000
+2c 1f 84 c0 de ad 01 0f 81 01 04 82 ee e1 25 83 00 00 0c 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 19 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 23
-00 00 00 00 2c 1f 84 ef e2 b7 00 0f 81 01 04 82 ee e1 25 83 00 00 0c 
+NS2 UD REQUEST, prim 0, msg length 19, bvci 0x0000
+2c 1f 84 ef e2 b7 00 0f 81 01 04 82 ee e1 25 83 00 00 0c 
 
-result (LLC_DISCARDED) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 2c 1f 84 ef e2 b7 00 0f 81 01 04 82 ee e1 25 83 00 00 0c 
 
 Gbproxy global:
     BSSGP protocol error      (SGSN): 1
-PROCESSING BVC_SUSPEND_ACK from 0x05060708:32000
-00 00 00 00 0c 1f 84 ef e2 b7 00 1b 86 00 f1 99 00 63 60 1d 81 01 
-
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 0c 1f 84 ef e2 b7 00 1b 86 00 f1 99 00 63 60 1d 81 01 
+PROCESSING BVC_SUSPEND_ACK from NSEI 256
+0c 1f 84 ef e2 b7 00 1b 86 00 f1 99 00 63 60 1d 81 01 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 28
-00 00 00 00 41 07 81 21 15 92 0c 1f 84 ef e2 b7 00 1b 86 00 f1 99 00 63 60 1d 81 01 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+0c 1f 84 ef e2 b7 00 1b 86 00 f1 99 00 63 60 1d 81 01 
 
-result (BVC_SUSPEND_ACK) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+41 07 81 21 15 92 0c 1f 84 ef e2 b7 00 1b 86 00 f1 99 00 63 60 1d 81 01 
 
 Gbproxy global:
     Invalid Routing Area Identifier : 1
     BSSGP protocol error      (SGSN): 1
     Patch error: no peer            : 1
-PROCESSING BVC_SUSPEND_ACK from 0x05060708:32000
-00 00 00 00 0c 1f 84 ef e2 b7 00 1b 86 99 69 54 40 50 60 1d 81 01 
+PROCESSING BVC_SUSPEND_ACK from NSEI 256
+0c 1f 84 ef e2 b7 00 1b 86 99 69 54 40 50 60 1d 81 01 
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 0c 1f 84 ef e2 b7 00 1b 86 99 69 54 40 50 60 1d 81 01 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+0c 1f 84 ef e2 b7 00 1b 86 99 69 54 40 50 60 1d 81 01 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 22
-00 00 00 00 0c 1f 84 c0 de ad 01 1b 86 11 22 33 40 50 60 1d 81 01 
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+0c 1f 84 c0 de ad 01 1b 86 11 22 33 40 50 60 1d 81 01 
 
-result (BVC_SUSPEND_ACK) = 0
+Message for BSS (NSEI=4096 BVCI=0):
+[L2]> [L3]> 0c 1f 84 c0 de ad 01 1b 86 11 22 33 40 50 60 1d 81 01 
 
 Gbproxy global:
     Invalid Routing Area Identifier : 1
     BSSGP protocol error      (SGSN): 1
     Patch error: no peer            : 1
-PROCESSING DETACH REQ from 0x01020304:1111
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 11 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 6d b1 de 
+PROCESSING DETACH REQ from NSEI 4096
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 11 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 6d b1 de 
 
-CALLBACK, event 0, msg length 44, bvci 0x1002
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 11 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 6d b1 de 
+NS2 CALLBACK, prim 0, msg length 44, bvci 0x1002
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 11 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 6d b1 de 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 44 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 48
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 15 01 c0 11 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 6d b1 de 
+NS2 UD REQUEST, prim 0, msg length 44, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 15 01 c0 11 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 6d b1 de 
 
-result (DETACH REQ) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 15 01 c0 11 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 6d b1 de 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4061,17 +2879,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING DETACH ACC from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 0d 08 06 00 aa ab ee 
+PROCESSING DETACH ACC from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 0d 08 06 00 aa ab ee 
 
-CALLBACK, event 0, msg length 67, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 0d 08 06 00 aa ab ee 
+NS2 CALLBACK, prim 0, msg length 67, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 0d 08 06 00 aa ab ee 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 67 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 71
-00 00 10 02 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 0d 08 06 00 aa ab ee 
+NS2 UD REQUEST, prim 0, msg length 67, bvci 0x1002
+00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 0d 08 06 00 aa ab ee 
 
-result (DETACH ACC) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 0d 08 06 00 aa ab ee 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4086,29 +2904,29 @@ Peers:
     Detach Request count            : 1
     Detach Accept count             : 1
     TLLI-Cache: 0
-PROCESSING RA UPD REQ from 0x01020304:1111
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 96 3e 97 
+PROCESSING RA UPD REQ from NSEI 4096
+01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 96 3e 97 
 
-CALLBACK, event 0, msg length 85, bvci 0x1002
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 96 3e 97 
+NS2 CALLBACK, prim 0, msg length 85, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 96 3e 97 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 28
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
+NS2 UD REQUEST, prim 0, msg length 24, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
-result (RA UPD REQ) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L3]> 00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
-PROCESSING IDENT RESPONSE from 0x01020304:1111
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 19 08 16 08 11 12 13 14 15 16 17 f8 9f c7 7a 
+PROCESSING IDENT RESPONSE from NSEI 4096
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 19 08 16 08 11 12 13 14 15 16 17 f8 9f c7 7a 
 
-CALLBACK, event 0, msg length 40, bvci 0x1002
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 19 08 16 08 11 12 13 14 15 16 17 f8 9f c7 7a 
+NS2 CALLBACK, prim 0, msg length 40, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 19 08 16 08 11 12 13 14 15 16 17 f8 9f c7 7a 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 85 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 89
-00 00 10 02 01 78 de ad 02 00 00 04 08 88 21 63 54 00 63 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 96 3e 97 
+NS2 UD REQUEST, prim 0, msg length 85, bvci 0x1002
+01 78 de ad 02 00 00 04 08 88 21 63 54 00 63 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 96 3e 97 
 
-result (IDENT RESPONSE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 78 de ad 02 00 00 04 08 88 21 63 54 00 63 60 70 80 00 80 0e 00 3e 01 c0 15 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 96 3e 97 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4126,17 +2944,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead -> 78dead02, IMSI 12131415161718, AGE 0
-PROCESSING RA UDP ACC from 0x05060708:32000
-00 00 10 02 00 78 de ad 02 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 11 08 09 00 49 21 63 54 40 50 60 19 54 ab b3 18 05 f4 ef e2 b7 00 17 16 36 98 77 
+PROCESSING RA UDP ACC from NSEI 256
+00 78 de ad 02 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 11 08 09 00 49 21 63 54 40 50 60 19 54 ab b3 18 05 f4 ef e2 b7 00 17 16 36 98 77 
 
-CALLBACK, event 0, msg length 87, bvci 0x1002
-00 00 10 02 00 78 de ad 02 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 11 08 09 00 49 21 63 54 40 50 60 19 54 ab b3 18 05 f4 ef e2 b7 00 17 16 36 98 77 
+NS2 CALLBACK, prim 0, msg length 87, bvci 0x1002
+00 78 de ad 02 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 11 08 09 00 49 21 63 54 40 50 60 19 54 ab b3 18 05 f4 ef e2 b7 00 17 16 36 98 77 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 87 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 91
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 11 08 09 00 49 11 22 33 40 50 60 19 54 ab b3 18 05 f4 c0 de ad 03 17 16 6e 58 26 
+NS2 UD REQUEST, prim 0, msg length 87, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 11 08 09 00 49 11 22 33 40 50 60 19 54 ab b3 18 05 f4 c0 de ad 03 17 16 6e 58 26 
 
-result (RA UDP ACC) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9d 41 c0 11 08 09 00 49 11 22 33 40 50 60 19 54 ab b3 18 05 f4 c0 de ad 03 17 16 6e 58 26 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4155,17 +2973,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead/c0dead03 -> 78dead02/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING DETACH REQ from 0x01020304:1111
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 1d 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb aa cc a3 
+PROCESSING DETACH REQ from NSEI 4096
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 1d 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb aa cc a3 
 
-CALLBACK, event 0, msg length 44, bvci 0x1002
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 1d 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb aa cc a3 
+NS2 CALLBACK, prim 0, msg length 44, bvci 0x1002
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 1d 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb aa cc a3 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 28
-00 00 10 02 00 c0 de ad 01 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 06 00 11 f5 c0 
+NS2 UD REQUEST, prim 0, msg length 24, bvci 0x1002
+00 c0 de ad 01 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 06 00 11 f5 c0 
 
-result (DETACH REQ) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L3]> 00 c0 de ad 01 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 06 00 11 f5 c0 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4184,17 +3002,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead/c0dead03 -> 78dead02/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING DETACH ACC from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 15 08 06 00 f7 35 f0 
+PROCESSING DETACH ACC from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 15 08 06 00 f7 35 f0 
 
-CALLBACK, event 0, msg length 67, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 15 08 06 00 f7 35 f0 
+NS2 CALLBACK, prim 0, msg length 67, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 15 08 06 00 f7 35 f0 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 67 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 71
-00 00 10 02 00 c0 de ad 03 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 15 08 06 00 f7 35 f0 
+NS2 UD REQUEST, prim 0, msg length 67, bvci 0x1002
+00 c0 de ad 03 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 15 08 06 00 f7 35 f0 
 
-result (DETACH ACC) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 03 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 15 08 06 00 f7 35 f0 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4211,41 +3029,41 @@ Peers:
     Detach Request count            : 2
     Detach Accept count             : 2
     TLLI-Cache: 0
-PROCESSING ATTACH REQUEST from 0x01020304:1111
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 21 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 44 b6 bb 
+PROCESSING ATTACH REQUEST from NSEI 4096
+01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 21 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 44 b6 bb 
 
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 21 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 44 b6 bb 
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 21 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 44 b6 bb 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 28
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
+NS2 UD REQUEST, prim 0, msg length 24, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
-result (ATTACH REQUEST) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L3]> 00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
-PROCESSING ATTACH REQUEST from 0x01020304:1111
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 25 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 1d aa 57 
+PROCESSING ATTACH REQUEST from NSEI 4096
+01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 25 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 1d aa 57 
 
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 25 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 1d aa 57 
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 25 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 1d aa 57 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 28
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 05 08 15 01 8f 47 9e 
+NS2 UD REQUEST, prim 0, msg length 24, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 05 08 15 01 8f 47 9e 
 
-result (ATTACH REQUEST) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L3]> 00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 05 08 15 01 8f 47 9e 
 
-PROCESSING DETACH REQ from 0x01020304:1111
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 29 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb d9 1d ef 
+PROCESSING DETACH REQ from NSEI 4096
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 29 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb d9 1d ef 
 
-CALLBACK, event 0, msg length 44, bvci 0x1002
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 29 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb d9 1d ef 
+NS2 CALLBACK, prim 0, msg length 44, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 29 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb d9 1d ef 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 28
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 09 08 06 00 da 80 ca 
+NS2 UD REQUEST, prim 0, msg length 24, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 09 08 06 00 da 80 ca 
 
-result (DETACH REQ) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L3]> 00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 09 08 06 00 da 80 ca 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4262,17 +3080,17 @@ Peers:
     Detach Request count            : 3
     Detach Accept count             : 2
     TLLI-Cache: 0
-PROCESSING DETACH REQ (unknown TLLI) from 0x01020304:1111
-00 00 10 02 01 80 00 be ef 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 2d 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 0d 30 0d 
+PROCESSING DETACH REQ (unknown TLLI) from NSEI 4096
+01 80 00 be ef 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 2d 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 0d 30 0d 
 
-CALLBACK, event 0, msg length 44, bvci 0x1002
-00 00 10 02 01 80 00 be ef 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 2d 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 0d 30 0d 
+NS2 CALLBACK, prim 0, msg length 44, bvci 0x1002
+01 80 00 be ef 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 2d 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 0d 30 0d 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 28
-00 00 10 02 00 80 00 be ef 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 06 00 11 f5 c0 
+NS2 UD REQUEST, prim 0, msg length 24, bvci 0x1002
+00 80 00 be ef 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 06 00 11 f5 c0 
 
-result (DETACH REQ (unknown TLLI)) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L3]> 00 80 00 be ef 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 06 00 11 f5 c0 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4289,41 +3107,41 @@ Peers:
     Detach Request count            : 4
     Detach Accept count             : 2
     TLLI-Cache: 0
-PROCESSING RA UPD REQ from 0x01020304:1111
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 70 80 00 80 0e 00 3e 01 c0 31 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 d8 cf d8 
+PROCESSING RA UPD REQ from NSEI 4096
+01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 70 80 00 80 0e 00 3e 01 c0 31 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 d8 cf d8 
 
-CALLBACK, event 0, msg length 85, bvci 0x1002
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 70 80 00 80 0e 00 3e 01 c0 31 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 d8 cf d8 
+NS2 CALLBACK, prim 0, msg length 85, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 70 80 00 80 0e 00 3e 01 c0 31 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 d8 cf d8 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 28
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
+NS2 UD REQUEST, prim 0, msg length 24, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
-result (RA UPD REQ) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L3]> 00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
-PROCESSING RA UPD REQ from 0x01020304:1111
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 70 80 00 80 0e 00 3e 01 c0 35 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 ac 9c 37 
+PROCESSING RA UPD REQ from NSEI 4096
+01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 70 80 00 80 0e 00 3e 01 c0 35 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 ac 9c 37 
 
-CALLBACK, event 0, msg length 85, bvci 0x1002
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 70 80 00 80 0e 00 3e 01 c0 35 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 ac 9c 37 
+NS2 CALLBACK, prim 0, msg length 85, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 70 80 00 80 0e 00 3e 01 c0 35 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 ac 9c 37 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 28
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 05 08 15 01 8f 47 9e 
+NS2 UD REQUEST, prim 0, msg length 24, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 05 08 15 01 8f 47 9e 
 
-result (RA UPD REQ) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L3]> 00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 05 08 15 01 8f 47 9e 
 
-PROCESSING DETACH REQ from 0x01020304:1111
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 39 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 44 b6 8a 
+PROCESSING DETACH REQ from NSEI 4096
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 39 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 44 b6 8a 
 
-CALLBACK, event 0, msg length 44, bvci 0x1002
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 39 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 44 b6 8a 
+NS2 CALLBACK, prim 0, msg length 44, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 39 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 44 b6 8a 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 28
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 09 08 06 00 da 80 ca 
+NS2 UD REQUEST, prim 0, msg length 24, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 09 08 06 00 da 80 ca 
 
-result (DETACH REQ) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L3]> 00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 09 08 06 00 da 80 ca 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4347,194 +3165,75 @@ Gbproxy global:
 === test_gbproxy_secondary_sgsn ===
 --- Initialise SGSN 1 ---
 
-MESSAGE to SGSN at 0x05060708:32000, msg length 12
-02 00 81 01 01 82 01 01 04 82 01 00 
-
-PROCESSING RESET_ACK from 0x05060708:32000
-03 01 82 01 01 04 82 01 00 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-0a 
-
-result (RESET_ACK) = 0
-
-PROCESSING ALIVE_ACK from 0x05060708:32000
-0b 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-06 
-
-result (ALIVE_ACK) = 0
-
-PROCESSING UNBLOCK_ACK from 0x05060708:32000
-07 
-
-==> got signal NS_UNBLOCK, NS-VC 0x0101/5.6.7.8:32000
-
-result (UNBLOCK_ACK) = 0
+NS2 CALLBACK, prim 2, bvci 0x0000
 
-PROCESSING ALIVE from 0x05060708:32000
-0a 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-0b 
-
-result (ALIVE) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+22 04 82 00 00 07 81 08 
 
 --- Initialise SGSN 2 ---
 
-MESSAGE to SGSN 2 at 0x15161718:32001, msg length 12
-02 00 81 01 01 82 01 03 04 82 01 02 
-
-PROCESSING RESET_ACK from 0x15161718:32001
-03 01 82 01 03 04 82 01 02 
-
-MESSAGE to SGSN 2 at 0x15161718:32001, msg length 1
-0a 
-
-result (RESET_ACK) = 0
-
-PROCESSING ALIVE_ACK from 0x15161718:32001
-0b 
-
-MESSAGE to SGSN 2 at 0x15161718:32001, msg length 1
-06 
-
-result (ALIVE_ACK) = 0
-
-PROCESSING UNBLOCK_ACK from 0x15161718:32001
-07 
-
-==> got signal NS_UNBLOCK, NS-VC 0x0103/21.22.23.24:32001
-
-result (UNBLOCK_ACK) = 0
-
-PROCESSING ALIVE from 0x15161718:32001
-0a 
-
-MESSAGE to SGSN 2 at 0x15161718:32001, msg length 1
-0b 
-
-result (ALIVE) = 0
+NS2 CALLBACK, prim 2, bvci 0x0000
 
 --- Initialise BSS 1 ---
 
-Setup NS-VC: remote 0x01020304:1111, NSVCI 0x1001(4097), NSEI 0x1000(4096)
-
-PROCESSING RESET from 0x01020304:1111
-02 00 81 01 01 82 10 01 04 82 10 00 
-
-==> got signal NS_RESET, NS-VC 0x1001/1.2.3.4:1111
-
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-03 01 82 10 01 04 82 10 00 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0a 
-
-result (RESET) = 0
-
-PROCESSING ALIVE from 0x01020304:1111
-0a 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0b 
-
-result (ALIVE) = 0
-
-PROCESSING UNBLOCK from 0x01020304:1111
-06 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-07 
+Setup NS-VC: NSEI 0x1000(4096)
 
-==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111
+NS2 CALLBACK, prim 2, bvci 0x0000
 
-result (UNBLOCK) = 0
+Setup BSSGP: BVCI 0x0000(0)
 
-PROCESSING ALIVE_ACK from 0x01020304:1111
-0b 
+PROCESSING BVC_RESET from NSEI 4096
+22 04 82 00 00 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-result (ALIVE_ACK) = 0
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+22 04 82 00 00 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-Setup BSSGP: remote 0x01020304:1111, BVCI 0x0000(0)
+Message for BSS (NSEI=4096 BVCI=0):
+23 04 82 00 00 
 
-PROCESSING BVC_RESET from 0x01020304:1111
-00 00 00 00 22 04 82 00 00 07 81 08 08 88 11 22 33 40 50 60 10 00 
+PROCESSING BVC_RESET_ACK from NSEI 256
+23 04 82 00 00 
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 22 04 82 00 00 07 81 08 08 88 11 22 33 40 50 60 10 00 
+NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
+23 04 82 00 00 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-00 00 00 00 23 04 82 00 00 
+Setup BSSGP: BVCI 0x1002(4098)
 
-result (BVC_RESET) = 0
+PROCESSING BVC_RESET from NSEI 4096
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-PROCESSING BVC_RESET_ACK from 0x05060708:32000
-00 00 00 00 23 04 82 00 00 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-CALLBACK, event 0, msg length 5, bvci 0x0000
-00 00 00 00 23 04 82 00 00 
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 21 63 54 40 50 60 10 00 
 
-result (BVC_RESET_ACK) = -2
+Message for SGSN2 (NSEI=258 BVCI=0):
+[L2]> [L3]> 22 04 82 10 02 07 81 08 08 88 21 63 54 40 50 60 10 00 
 
-Setup BSSGP: remote 0x01020304:1111, BVCI 0x1002(4098)
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 21 63 54 40 50 60 10 00 
 
-PROCESSING BVC_RESET from 0x01020304:1111
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 22 04 82 10 02 07 81 08 08 88 21 63 54 40 50 60 10 00 
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
+PROCESSING BVC_RESET_ACK from NSEI 256
+23 04 82 10 02 
 
-NS UNITDATA MESSAGE to SGSN 2, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to SGSN 2 at 0x15161718:32001, msg length 22
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 21 63 54 40 50 60 10 00 
+NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 22
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 21 63 54 40 50 60 10 00 
+NS2 UD REQUEST, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-result (BVC_RESET) = 0
+Message for BSS (NSEI=4096 BVCI=0):
+[L2]> [L3]> 23 04 82 10 02 
 
-PROCESSING BVC_RESET_ACK from 0x05060708:32000
-00 00 00 00 23 04 82 10 02 
+PROCESSING BVC_RESET_ACK from NSEI 258
+23 04 82 10 02 
 
-CALLBACK, event 0, msg length 5, bvci 0x0000
-00 00 00 00 23 04 82 10 02 
-
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-00 00 00 00 23 04 82 10 02 
-
-result (BVC_RESET_ACK) = 0
-
-PROCESSING BVC_RESET_ACK from 0x15161718:32001
-00 00 00 00 23 04 82 10 02 
-
-CALLBACK, event 0, msg length 5, bvci 0x0000
-00 00 00 00 23 04 82 10 02 
-
-result (BVC_RESET_ACK) = 0
-
-Current NS-VCIs:
-    VCI 0x1001, NSEI 0x1000, peer 0x01020304:1111
-         Packets at NS Level  ( In): 6
-         Packets at NS Level  (Out): 6
-         Bytes at NS Level    ( In): 59
-         Bytes at NS Level    (Out): 30
-    VCI 0x0103, NSEI 0x0102, peer 0x15161718:32001
-         Packets at NS Level  ( In): 5
-         Packets at NS Level  (Out): 5
-         Bytes at NS Level    ( In): 21
-         Bytes at NS Level    (Out): 37
-         NS-VC Block count         : 1
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 6
-         Packets at NS Level  (Out): 5
-         Bytes at NS Level    ( In): 30
-         Bytes at NS Level    (Out): 37
-         NS-VC Block count         : 1
+NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
 Gbproxy global:
     Invalid BVC Identifier          : 1
@@ -4545,55 +3244,55 @@ Peers:
     TLLI-Cache: 0
 --- Flow control ---
 
-PROCESSING FLOW_CONTROL_BVC from 0x01020304:1111
-00 00 10 02 26 1e 81 01 05 82 01 dc 03 82 02 76 01 82 00 50 1c 82 02 58 06 82 00 03 
+PROCESSING FLOW_CONTROL_BVC from NSEI 4096
+26 1e 81 01 05 82 01 dc 03 82 02 76 01 82 00 50 1c 82 02 58 06 82 00 03 
 
-CALLBACK, event 0, msg length 24, bvci 0x1002
-00 00 10 02 26 1e 81 01 05 82 01 dc 03 82 02 76 01 82 00 50 1c 82 02 58 06 82 00 03 
+NS2 CALLBACK, prim 0, msg length 24, bvci 0x1002
+26 1e 81 01 05 82 01 dc 03 82 02 76 01 82 00 50 1c 82 02 58 06 82 00 03 
 
-NS UNITDATA MESSAGE to SGSN 2, BVCI 0x1002, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to SGSN 2 at 0x15161718:32001, msg length 28
-00 00 10 02 26 1e 81 01 05 82 01 dc 03 82 02 76 01 82 00 50 1c 82 02 58 06 82 00 03 
+NS2 UD REQUEST, prim 0, msg length 24, bvci 0x1002
+26 1e 81 01 05 82 01 dc 03 82 02 76 01 82 00 50 1c 82 02 58 06 82 00 03 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 28
-00 00 10 02 26 1e 81 01 05 82 01 dc 03 82 02 76 01 82 00 50 1c 82 02 58 06 82 00 03 
+Message for SGSN2 (NSEI=258 BVCI=4098):
+[L2]> [L3]> 26 1e 81 01 05 82 01 dc 03 82 02 76 01 82 00 50 1c 82 02 58 06 82 00 03 
 
-result (FLOW_CONTROL_BVC) = 0
+NS2 UD REQUEST, prim 0, msg length 24, bvci 0x1002
+26 1e 81 01 05 82 01 dc 03 82 02 76 01 82 00 50 1c 82 02 58 06 82 00 03 
 
-PROCESSING FLOW_CONTROL_BVC_ACK from 0x05060708:32000
-00 00 10 02 27 1e 81 01 
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 26 1e 81 01 05 82 01 dc 03 82 02 76 01 82 00 50 1c 82 02 58 06 82 00 03 
 
-CALLBACK, event 0, msg length 4, bvci 0x1002
-00 00 10 02 27 1e 81 01 
+PROCESSING FLOW_CONTROL_BVC_ACK from NSEI 256
+27 1e 81 01 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 4 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 8
-00 00 10 02 27 1e 81 01 
+NS2 CALLBACK, prim 0, msg length 4, bvci 0x1002
+27 1e 81 01 
 
-result (FLOW_CONTROL_BVC_ACK) = 0
+NS2 UD REQUEST, prim 0, msg length 4, bvci 0x1002
+27 1e 81 01 
 
-PROCESSING FLOW_CONTROL_BVC_ACK from 0x15161718:32001
-00 00 10 02 27 1e 81 01 
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 27 1e 81 01 
 
-CALLBACK, event 0, msg length 4, bvci 0x1002
-00 00 10 02 27 1e 81 01 
+PROCESSING FLOW_CONTROL_BVC_ACK from NSEI 258
+27 1e 81 01 
 
-result (FLOW_CONTROL_BVC_ACK) = 0
+NS2 CALLBACK, prim 0, msg length 4, bvci 0x1002
+27 1e 81 01 
 
 --- Establish GPRS connection (SGSN 1) ---
 
-PROCESSING ATTACH REQUEST from 0x01020304:1111
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
+PROCESSING ATTACH REQUEST from NSEI 4096
+01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 28
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
+NS2 UD REQUEST, prim 0, msg length 24, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
-result (ATTACH REQUEST) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L3]> 00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4602,17 +3301,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead -> 78dead00, IMSI (none), AGE 0, STORED 1, IMSI acquisition in progress, SGSN NSEI 65535
-PROCESSING IDENT RESPONSE from 0x01020304:1111
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
+PROCESSING IDENT RESPONSE from NSEI 4096
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
 
-CALLBACK, event 0, msg length 40, bvci 0x1002
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
+NS2 CALLBACK, prim 0, msg length 40, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 75 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 79
-00 00 10 02 01 78 de ad 00 00 00 04 08 88 21 63 54 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
+NS2 UD REQUEST, prim 0, msg length 75, bvci 0x1002
+01 78 de ad 00 00 00 04 08 88 21 63 54 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
-result (IDENT RESPONSE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 78 de ad 00 00 00 04 08 88 21 63 54 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4622,17 +3321,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead -> 78dead00, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING IDENT REQUEST from 0x05060708:32000
-00 00 10 02 00 78 de ad 00 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
+PROCESSING IDENT REQUEST from NSEI 256
+00 78 de ad 00 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-CALLBACK, event 0, msg length 23, bvci 0x1002
-00 00 10 02 00 78 de ad 00 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
+NS2 CALLBACK, prim 0, msg length 23, bvci 0x1002
+00 78 de ad 00 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 23 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 27
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
+NS2 UD REQUEST, prim 0, msg length 23, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-result (IDENT REQUEST) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4643,17 +3342,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead -> 78dead00, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING IDENT RESPONSE from 0x01020304:1111
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
+PROCESSING IDENT RESPONSE from NSEI 4096
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
 
-CALLBACK, event 0, msg length 40, bvci 0x1002
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
+NS2 CALLBACK, prim 0, msg length 40, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 40 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 44
-00 00 10 02 01 78 de ad 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
+NS2 UD REQUEST, prim 0, msg length 40, bvci 0x1002
+01 78 de ad 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
 
-result (IDENT RESPONSE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 78 de ad 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4664,17 +3363,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead -> 78dead00, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING ATTACH ACCEPT from 0x05060708:32000
-00 00 10 02 00 78 de ad 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
+PROCESSING ATTACH ACCEPT from NSEI 256
+00 78 de ad 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
 
-CALLBACK, event 0, msg length 88, bvci 0x1002
-00 00 10 02 00 78 de ad 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
+NS2 CALLBACK, prim 0, msg length 88, bvci 0x1002
+00 78 de ad 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 88 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 92
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 c0 de ad 01 0c 0a 29 
+NS2 UD REQUEST, prim 0, msg length 88, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 c0 de ad 01 0c 0a 29 
 
-result (ATTACH ACCEPT) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 80 00 de ad 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 c0 de ad 01 0c 0a 29 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4688,17 +3387,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead/c0dead01 -> 78dead00/efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING ATTACH COMPLETE from 0x01020304:1111
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 0d 08 03 55 1c ea 
+PROCESSING ATTACH COMPLETE from NSEI 4096
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 0d 08 03 55 1c ea 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 0d 08 03 55 1c ea 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 0d 08 03 55 1c ea 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 08 01 c0 0d 08 03 55 1c ea 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 08 01 c0 0d 08 03 55 1c ea 
 
-result (ATTACH COMPLETE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 08 01 c0 0d 08 03 55 1c ea 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4713,17 +3412,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead/c0dead01 -> 78dead00/efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING GMM INFO from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
+PROCESSING GMM INFO from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
-CALLBACK, event 0, msg length 66, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
+NS2 CALLBACK, prim 0, msg length 66, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 66 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 70
-00 00 10 02 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
+NS2 UD REQUEST, prim 0, msg length 66, bvci 0x1002
+00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
-result (GMM INFO) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4738,53 +3437,53 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING XID (UL) from 0x01020304:1111
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
+PROCESSING XID (UL) from NSEI 4096
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
 
-CALLBACK, event 0, msg length 38, bvci 0x1002
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
+NS2 CALLBACK, prim 0, msg length 38, bvci 0x1002
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 38 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 42
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
+NS2 UD REQUEST, prim 0, msg length 38, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
 
-result (XID (UL)) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
 
-PROCESSING XID (DL) from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
+PROCESSING XID (DL) from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
 
-CALLBACK, event 0, msg length 70, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
+NS2 CALLBACK, prim 0, msg length 70, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 70 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 74
-00 00 10 02 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
+NS2 UD REQUEST, prim 0, msg length 70, bvci 0x1002
+00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
 
-result (XID (DL)) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
 
-PROCESSING LL11 DNS QUERY (UL) from 0x01020304:1111
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
+PROCESSING LL11 DNS QUERY (UL) from NSEI 4096
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
 
-CALLBACK, event 0, msg length 89, bvci 0x1002
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
+NS2 CALLBACK, prim 0, msg length 89, bvci 0x1002
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 89 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 93
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
+NS2 UD REQUEST, prim 0, msg length 89, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
 
-result (LL11 DNS QUERY (UL)) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
 
-PROCESSING LL11 DNS RESP (DL) from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
+PROCESSING LL11 DNS RESP (DL) from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
 
-CALLBACK, event 0, msg length 267, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
+NS2 CALLBACK, prim 0, msg length 267, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 267 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 271
-00 00 10 02 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
+NS2 UD REQUEST, prim 0, msg length 267, bvci 0x1002
+00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
 
-result (LL11 DNS RESP (DL)) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4799,17 +3498,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING LLC_DISCARDED from 0x01020304:1111
-00 00 00 00 2c 1f 84 c0 de ad 01 0f 81 01 04 82 10 02 25 83 00 00 0c 
+PROCESSING LLC_DISCARDED from NSEI 4096
+2c 1f 84 c0 de ad 01 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
-CALLBACK, event 0, msg length 19, bvci 0x0000
-00 00 00 00 2c 1f 84 c0 de ad 01 0f 81 01 04 82 10 02 25 83 00 00 0c 
+NS2 CALLBACK, prim 0, msg length 19, bvci 0x0000
+2c 1f 84 c0 de ad 01 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 19 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 23
-00 00 00 00 2c 1f 84 ef e2 b7 00 0f 81 01 04 82 10 02 25 83 00 00 0c 
+NS2 UD REQUEST, prim 0, msg length 19, bvci 0x0000
+2c 1f 84 ef e2 b7 00 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
-result (LLC_DISCARDED) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 2c 1f 84 ef e2 b7 00 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4824,17 +3523,14 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING LLC_DISCARDED from 0x05060708:32000
-00 00 00 00 2c 1f 84 ef e2 b7 00 0f 81 01 04 82 10 02 25 83 00 00 0c 
+PROCESSING LLC_DISCARDED from NSEI 256
+2c 1f 84 ef e2 b7 00 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
-CALLBACK, event 0, msg length 19, bvci 0x0000
-00 00 00 00 2c 1f 84 ef e2 b7 00 0f 81 01 04 82 10 02 25 83 00 00 0c 
+NS2 CALLBACK, prim 0, msg length 19, bvci 0x0000
+2c 1f 84 ef e2 b7 00 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 25 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 29
-00 00 00 00 41 07 81 27 15 93 2c 1f 84 ef e2 b7 00 0f 81 01 04 82 10 02 25 83 00 00 0c 
-
-result (LLC_DISCARDED) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+41 07 81 27 15 93 2c 1f 84 ef e2 b7 00 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4849,17 +3545,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING BVC_SUSPEND from 0x01020304:1111
-00 00 00 00 0b 1f 84 c0 de ad 01 1b 86 11 22 33 40 50 60 
+PROCESSING BVC_SUSPEND from NSEI 4096
+0b 1f 84 c0 de ad 01 1b 86 11 22 33 40 50 60 
 
-CALLBACK, event 0, msg length 15, bvci 0x0000
-00 00 00 00 0b 1f 84 c0 de ad 01 1b 86 11 22 33 40 50 60 
+NS2 CALLBACK, prim 0, msg length 15, bvci 0x0000
+0b 1f 84 c0 de ad 01 1b 86 11 22 33 40 50 60 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 15 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 19
-00 00 00 00 0b 1f 84 ef e2 b7 00 1b 86 21 63 54 40 50 60 
+NS2 UD REQUEST, prim 0, msg length 15, bvci 0x0000
+0b 1f 84 ef e2 b7 00 1b 86 21 63 54 40 50 60 
 
-result (BVC_SUSPEND) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 0b 1f 84 ef e2 b7 00 1b 86 21 63 54 40 50 60 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4874,17 +3570,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING BVC_SUSPEND_ACK from 0x05060708:32000
-00 00 00 00 0c 1f 84 ef e2 b7 00 1b 86 21 63 54 40 50 60 1d 81 01 
+PROCESSING BVC_SUSPEND_ACK from NSEI 256
+0c 1f 84 ef e2 b7 00 1b 86 21 63 54 40 50 60 1d 81 01 
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 0c 1f 84 ef e2 b7 00 1b 86 21 63 54 40 50 60 1d 81 01 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+0c 1f 84 ef e2 b7 00 1b 86 21 63 54 40 50 60 1d 81 01 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 22
-00 00 00 00 0c 1f 84 c0 de ad 01 1b 86 11 22 33 40 50 60 1d 81 01 
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+0c 1f 84 c0 de ad 01 1b 86 11 22 33 40 50 60 1d 81 01 
 
-result (BVC_SUSPEND_ACK) = 0
+Message for BSS (NSEI=4096 BVCI=0):
+[L2]> [L3]> 0c 1f 84 c0 de ad 01 1b 86 11 22 33 40 50 60 1d 81 01 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4901,17 +3597,17 @@ Peers:
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
 --- Establish GPRS connection (SGSN 2) ---
 
-PROCESSING ATTACH REQUEST from 0x01020304:1111
-00 00 10 02 01 80 00 be ef 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 11 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 bf 00 5c 
+PROCESSING ATTACH REQUEST from NSEI 4096
+01 80 00 be ef 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 11 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 bf 00 5c 
 
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 80 00 be ef 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 11 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 bf 00 5c 
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 80 00 be ef 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 11 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 bf 00 5c 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 28
-00 00 10 02 00 80 00 be ef 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
+NS2 UD REQUEST, prim 0, msg length 24, bvci 0x1002
+00 80 00 be ef 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
-result (ATTACH REQUEST) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L3]> 00 80 00 be ef 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4927,17 +3623,17 @@ Peers:
     TLLI-Cache: 2
       TLLI 8000beef -> 78dead02, IMSI (none), AGE 0, STORED 1, IMSI acquisition in progress, SGSN NSEI 65535
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING IDENT RESPONSE from 0x01020304:1111
-00 00 10 02 01 80 00 be ef 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 15 08 16 08 11 12 99 99 99 16 17 f8 18 39 de 
+PROCESSING IDENT RESPONSE from NSEI 4096
+01 80 00 be ef 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 15 08 16 08 11 12 99 99 99 16 17 f8 18 39 de 
 
-CALLBACK, event 0, msg length 40, bvci 0x1002
-00 00 10 02 01 80 00 be ef 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 15 08 16 08 11 12 99 99 99 16 17 f8 18 39 de 
+NS2 CALLBACK, prim 0, msg length 40, bvci 0x1002
+01 80 00 be ef 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 15 08 16 08 11 12 99 99 99 16 17 f8 18 39 de 
 
-NS UNITDATA MESSAGE to SGSN 2, BVCI 0x1002, msg length 75 (gprs_ns_sendmsg)
-MESSAGE to SGSN 2 at 0x15161718:32001, msg length 79
-00 00 10 02 01 78 de ad 02 00 00 04 08 88 21 63 54 00 63 60 12 34 00 80 0e 00 34 01 c0 11 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 bf 00 5c 
+NS2 UD REQUEST, prim 0, msg length 75, bvci 0x1002
+01 78 de ad 02 00 00 04 08 88 21 63 54 00 63 60 12 34 00 80 0e 00 34 01 c0 11 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 bf 00 5c 
 
-result (IDENT RESPONSE) = 0
+Message for SGSN2 (NSEI=258 BVCI=4098):
+[L2]> [L3]> 01 78 de ad 02 00 00 04 08 88 21 63 54 00 63 60 12 34 00 80 0e 00 34 01 c0 11 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 bf 00 5c 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4953,17 +3649,17 @@ Peers:
     TLLI-Cache: 2
       TLLI 8000beef -> 78dead02, IMSI 12199999961718, AGE 0, IMSI matches, SGSN NSEI 258
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING IDENT REQUEST from 0x15161718:32001
-00 00 10 02 00 78 de ad 02 00 50 20 16 82 02 58 0e 89 41 c0 0d 08 15 01 0c a6 18 
+PROCESSING IDENT REQUEST from NSEI 258
+00 78 de ad 02 00 50 20 16 82 02 58 0e 89 41 c0 0d 08 15 01 0c a6 18 
 
-CALLBACK, event 0, msg length 23, bvci 0x1002
-00 00 10 02 00 78 de ad 02 00 50 20 16 82 02 58 0e 89 41 c0 0d 08 15 01 0c a6 18 
+NS2 CALLBACK, prim 0, msg length 23, bvci 0x1002
+00 78 de ad 02 00 50 20 16 82 02 58 0e 89 41 c0 0d 08 15 01 0c a6 18 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 23 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 27
-00 00 10 02 00 80 00 be ef 00 50 20 16 82 02 58 0e 89 41 c0 0d 08 15 01 0c a6 18 
+NS2 UD REQUEST, prim 0, msg length 23, bvci 0x1002
+00 80 00 be ef 00 50 20 16 82 02 58 0e 89 41 c0 0d 08 15 01 0c a6 18 
 
-result (IDENT REQUEST) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 80 00 be ef 00 50 20 16 82 02 58 0e 89 41 c0 0d 08 15 01 0c a6 18 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -4979,17 +3675,17 @@ Peers:
     TLLI-Cache: 2
       TLLI 8000beef -> 78dead02, IMSI 12199999961718, AGE 0, IMSI matches, SGSN NSEI 258
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING IDENT RESPONSE from 0x01020304:1111
-00 00 10 02 01 80 00 be ef 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 19 08 16 08 11 12 99 99 99 16 17 f8 0f 28 35 
+PROCESSING IDENT RESPONSE from NSEI 4096
+01 80 00 be ef 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 19 08 16 08 11 12 99 99 99 16 17 f8 0f 28 35 
 
-CALLBACK, event 0, msg length 40, bvci 0x1002
-00 00 10 02 01 80 00 be ef 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 19 08 16 08 11 12 99 99 99 16 17 f8 0f 28 35 
+NS2 CALLBACK, prim 0, msg length 40, bvci 0x1002
+01 80 00 be ef 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 19 08 16 08 11 12 99 99 99 16 17 f8 0f 28 35 
 
-NS UNITDATA MESSAGE to SGSN 2, BVCI 0x1002, msg length 40 (gprs_ns_sendmsg)
-MESSAGE to SGSN 2 at 0x15161718:32001, msg length 44
-00 00 10 02 01 78 de ad 02 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 11 01 c0 19 08 16 08 11 12 99 99 99 16 17 f8 0f 28 35 
+NS2 UD REQUEST, prim 0, msg length 40, bvci 0x1002
+01 78 de ad 02 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 11 01 c0 19 08 16 08 11 12 99 99 99 16 17 f8 0f 28 35 
 
-result (IDENT RESPONSE) = 0
+Message for SGSN2 (NSEI=258 BVCI=4098):
+[L2]> [L3]> 01 78 de ad 02 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 11 01 c0 19 08 16 08 11 12 99 99 99 16 17 f8 0f 28 35 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5005,17 +3701,17 @@ Peers:
     TLLI-Cache: 2
       TLLI 8000beef -> 78dead02, IMSI 12199999961718, AGE 0, IMSI matches, SGSN NSEI 258
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING ATTACH ACCEPT from 0x15161718:32001
-00 00 10 02 00 78 de ad 02 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 9e 41 c0 11 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 e0 98 76 54 cb 1c 5b 
+PROCESSING ATTACH ACCEPT from NSEI 258
+00 78 de ad 02 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 9e 41 c0 11 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 e0 98 76 54 cb 1c 5b 
 
-CALLBACK, event 0, msg length 88, bvci 0x1002
-00 00 10 02 00 78 de ad 02 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 9e 41 c0 11 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 e0 98 76 54 cb 1c 5b 
+NS2 CALLBACK, prim 0, msg length 88, bvci 0x1002
+00 78 de ad 02 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 9e 41 c0 11 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 e0 98 76 54 cb 1c 5b 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 88 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 92
-00 00 10 02 00 80 00 be ef 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 9e 41 c0 11 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 c0 de ad 03 32 40 fa 
+NS2 UD REQUEST, prim 0, msg length 88, bvci 0x1002
+00 80 00 be ef 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 9e 41 c0 11 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 c0 de ad 03 32 40 fa 
 
-result (ATTACH ACCEPT) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 80 00 be ef 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 9e 41 c0 11 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 c0 de ad 03 32 40 fa 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5031,17 +3727,17 @@ Peers:
     TLLI-Cache: 2
       TLLI 8000beef/c0dead03 -> 78dead02/e0987654, IMSI 12199999961718, AGE 0, IMSI matches, SGSN NSEI 258
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING ATTACH COMPLETE from 0x01020304:1111
-00 00 10 02 01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 1d 08 03 5e 3a ea 
+PROCESSING ATTACH COMPLETE from NSEI 4096
+01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 1d 08 03 5e 3a ea 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 1d 08 03 5e 3a ea 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 1d 08 03 5e 3a ea 
 
-NS UNITDATA MESSAGE to SGSN 2, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN 2 at 0x15161718:32001, msg length 35
-00 00 10 02 01 e0 98 76 54 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 08 01 c0 1d 08 03 5e 3a ea 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 e0 98 76 54 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 08 01 c0 1d 08 03 5e 3a ea 
 
-result (ATTACH COMPLETE) = 0
+Message for SGSN2 (NSEI=258 BVCI=4098):
+[L2]> [L3]> 01 e0 98 76 54 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 08 01 c0 1d 08 03 5e 3a ea 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5057,17 +3753,17 @@ Peers:
     TLLI-Cache: 2
       TLLI 8000beef/c0dead03 -> 78dead02/e0987654, IMSI 12199999961718, AGE 0, IMSI matches, SGSN NSEI 258
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING GMM INFO from 0x15161718:32001
-00 00 10 02 00 e0 98 76 54 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 88 41 c0 15 08 21 bb c1 c6 
+PROCESSING GMM INFO from NSEI 258
+00 e0 98 76 54 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 88 41 c0 15 08 21 bb c1 c6 
 
-CALLBACK, event 0, msg length 66, bvci 0x1002
-00 00 10 02 00 e0 98 76 54 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 88 41 c0 15 08 21 bb c1 c6 
+NS2 CALLBACK, prim 0, msg length 66, bvci 0x1002
+00 e0 98 76 54 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 88 41 c0 15 08 21 bb c1 c6 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 66 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 70
-00 00 10 02 00 c0 de ad 03 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 88 41 c0 15 08 21 bb c1 c6 
+NS2 UD REQUEST, prim 0, msg length 66, bvci 0x1002
+00 c0 de ad 03 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 88 41 c0 15 08 21 bb c1 c6 
 
-result (GMM INFO) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 03 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 88 41 c0 15 08 21 bb c1 c6 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5083,53 +3779,53 @@ Peers:
     TLLI-Cache: 2
       TLLI c0dead03 -> e0987654, IMSI 12199999961718, AGE 0, IMSI matches, SGSN NSEI 258
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING XID (UL) from 0x01020304:1111
-00 00 10 02 01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
+PROCESSING XID (UL) from NSEI 4096
+01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
 
-CALLBACK, event 0, msg length 38, bvci 0x1002
-00 00 10 02 01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
+NS2 CALLBACK, prim 0, msg length 38, bvci 0x1002
+01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
 
-NS UNITDATA MESSAGE to SGSN 2, BVCI 0x1002, msg length 38 (gprs_ns_sendmsg)
-MESSAGE to SGSN 2 at 0x15161718:32001, msg length 42
-00 00 10 02 01 e0 98 76 54 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
+NS2 UD REQUEST, prim 0, msg length 38, bvci 0x1002
+01 e0 98 76 54 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
 
-result (XID (UL)) = 0
+Message for SGSN2 (NSEI=258 BVCI=4098):
+[L2]> [L3]> 01 e0 98 76 54 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 0f 41 fb 01 00 0e 00 64 11 05 16 01 90 66 b3 28 
 
-PROCESSING XID (DL) from 0x15161718:32001
-00 00 10 02 00 e0 98 76 54 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
+PROCESSING XID (DL) from NSEI 258
+00 e0 98 76 54 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
 
-CALLBACK, event 0, msg length 70, bvci 0x1002
-00 00 10 02 00 e0 98 76 54 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
+NS2 CALLBACK, prim 0, msg length 70, bvci 0x1002
+00 e0 98 76 54 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 70 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 74
-00 00 10 02 00 c0 de ad 03 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
+NS2 UD REQUEST, prim 0, msg length 70, bvci 0x1002
+00 c0 de ad 03 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
 
-result (XID (DL)) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 03 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 8c 41 fb 30 84 10 61 b6 64 e4 a9 1a 9e 
 
-PROCESSING LL11 DNS QUERY (UL) from 0x01020304:1111
-00 00 10 02 01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
+PROCESSING LL11 DNS QUERY (UL) from NSEI 4096
+01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
 
-CALLBACK, event 0, msg length 89, bvci 0x1002
-00 00 10 02 01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
+NS2 CALLBACK, prim 0, msg length 89, bvci 0x1002
+01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
 
-NS UNITDATA MESSAGE to SGSN 2, BVCI 0x1002, msg length 89 (gprs_ns_sendmsg)
-MESSAGE to SGSN 2 at 0x15161718:32001, msg length 93
-00 00 10 02 01 e0 98 76 54 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
+NS2 UD REQUEST, prim 0, msg length 89, bvci 0x1002
+01 e0 98 76 54 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
 
-result (LL11 DNS QUERY (UL)) = 0
+Message for SGSN2 (NSEI=258 BVCI=4098):
+[L2]> [L3]> 01 e0 98 76 54 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 42 0b c0 01 65 00 00 00 45 00 00 38 95 72 00 00 45 11 20 85 0a c0 07 e4 ac 10 01 0a ad ab 00 35 00 24 0e 1c 3b e0 01 00 00 01 00 00 00 00 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 47 8f 07 
 
-PROCESSING LL11 DNS RESP (DL) from 0x15161718:32001
-00 00 10 02 00 e0 98 76 54 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
+PROCESSING LL11 DNS RESP (DL) from NSEI 258
+00 e0 98 76 54 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
 
-CALLBACK, event 0, msg length 267, bvci 0x1002
-00 00 10 02 00 e0 98 76 54 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
+NS2 CALLBACK, prim 0, msg length 267, bvci 0x1002
+00 e0 98 76 54 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 267 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 271
-00 00 10 02 00 c0 de ad 03 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
+NS2 UD REQUEST, prim 0, msg length 267, bvci 0x1002
+00 c0 de ad 03 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
 
-result (LL11 DNS RESP (DL)) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 03 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 00 d0 4b c0 01 65 00 00 00 45 00 00 c6 00 00 40 00 3e 11 7c 69 ac 10 01 0a 0a c0 07 e4 00 35 ad ab 00 b2 74 4e 3b e0 81 80 00 01 00 01 00 05 00 00 01 6d 05 68 65 69 73 65 02 64 65 00 00 01 00 01 c0 0c 00 01 00 01 00 00 0e 10 00 04 c1 63 90 58 c0 0e 00 02 00 01 00 00 0e 10 00 16 03 6e 73 32 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 03 6e 65 74 00 c0 0e 00 02 00 01 00 00 0e 10 00 10 02 6e 73 01 73 08 70 6c 75 73 6c 69 6e 65 c0 14 c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 0e c0 0e 00 02 00 01 00 00 0e 10 00 05 02 6e 73 c0 5f c0 0e 00 02 00 01 00 00 0e 10 00 12 02 6e 73 0c 70 6f 70 2d 68 61 6e 6e 6f 76 65 72 c0 14 aa df 31 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5145,17 +3841,17 @@ Peers:
     TLLI-Cache: 2
       TLLI c0dead03 -> e0987654, IMSI 12199999961718, AGE 0, IMSI matches, SGSN NSEI 258
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING LLC_DISCARDED from 0x01020304:1111
-00 00 00 00 2c 1f 84 c0 de ad 03 0f 81 01 04 82 10 02 25 83 00 00 0c 
+PROCESSING LLC_DISCARDED from NSEI 4096
+2c 1f 84 c0 de ad 03 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
-CALLBACK, event 0, msg length 19, bvci 0x0000
-00 00 00 00 2c 1f 84 c0 de ad 03 0f 81 01 04 82 10 02 25 83 00 00 0c 
+NS2 CALLBACK, prim 0, msg length 19, bvci 0x0000
+2c 1f 84 c0 de ad 03 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
-NS UNITDATA MESSAGE to SGSN 2, BVCI 0x0000, msg length 19 (gprs_ns_sendmsg)
-MESSAGE to SGSN 2 at 0x15161718:32001, msg length 23
-00 00 00 00 2c 1f 84 e0 98 76 54 0f 81 01 04 82 10 02 25 83 00 00 0c 
+NS2 UD REQUEST, prim 0, msg length 19, bvci 0x0000
+2c 1f 84 e0 98 76 54 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
-result (LLC_DISCARDED) = 0
+Message for SGSN2 (NSEI=258 BVCI=0):
+[L2]> [L3]> 2c 1f 84 e0 98 76 54 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5171,17 +3867,14 @@ Peers:
     TLLI-Cache: 2
       TLLI c0dead03 -> e0987654, IMSI 12199999961718, AGE 0, IMSI matches, SGSN NSEI 258
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING LLC_DISCARDED from 0x15161718:32001
-00 00 00 00 2c 1f 84 e0 98 76 54 0f 81 01 04 82 10 02 25 83 00 00 0c 
-
-CALLBACK, event 0, msg length 19, bvci 0x0000
-00 00 00 00 2c 1f 84 e0 98 76 54 0f 81 01 04 82 10 02 25 83 00 00 0c 
+PROCESSING LLC_DISCARDED from NSEI 258
+2c 1f 84 e0 98 76 54 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
-NS UNITDATA MESSAGE to SGSN 2, BVCI 0x0000, msg length 25 (gprs_ns_sendmsg)
-MESSAGE to SGSN 2 at 0x15161718:32001, msg length 29
-00 00 00 00 41 07 81 27 15 93 2c 1f 84 e0 98 76 54 0f 81 01 04 82 10 02 25 83 00 00 0c 
+NS2 CALLBACK, prim 0, msg length 19, bvci 0x0000
+2c 1f 84 e0 98 76 54 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
-result (LLC_DISCARDED) = 0
+Message for SGSN2 (NSEI=258 BVCI=0):
+41 07 81 27 15 93 2c 1f 84 e0 98 76 54 0f 81 01 04 82 10 02 25 83 00 00 0c 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5197,17 +3890,17 @@ Peers:
     TLLI-Cache: 2
       TLLI c0dead03 -> e0987654, IMSI 12199999961718, AGE 0, IMSI matches, SGSN NSEI 258
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING BVC_SUSPEND from 0x01020304:1111
-00 00 00 00 0b 1f 84 c0 de ad 03 1b 86 11 22 33 40 50 60 
+PROCESSING BVC_SUSPEND from NSEI 4096
+0b 1f 84 c0 de ad 03 1b 86 11 22 33 40 50 60 
 
-CALLBACK, event 0, msg length 15, bvci 0x0000
-00 00 00 00 0b 1f 84 c0 de ad 03 1b 86 11 22 33 40 50 60 
+NS2 CALLBACK, prim 0, msg length 15, bvci 0x0000
+0b 1f 84 c0 de ad 03 1b 86 11 22 33 40 50 60 
 
-NS UNITDATA MESSAGE to SGSN 2, BVCI 0x0000, msg length 15 (gprs_ns_sendmsg)
-MESSAGE to SGSN 2 at 0x15161718:32001, msg length 19
-00 00 00 00 0b 1f 84 e0 98 76 54 1b 86 21 63 54 40 50 60 
+NS2 UD REQUEST, prim 0, msg length 15, bvci 0x0000
+0b 1f 84 e0 98 76 54 1b 86 21 63 54 40 50 60 
 
-result (BVC_SUSPEND) = 0
+Message for SGSN2 (NSEI=258 BVCI=0):
+[L2]> [L3]> 0b 1f 84 e0 98 76 54 1b 86 21 63 54 40 50 60 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5223,17 +3916,17 @@ Peers:
     TLLI-Cache: 2
       TLLI c0dead03 -> e0987654, IMSI 12199999961718, AGE 0, IMSI matches, SGSN NSEI 258
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING BVC_SUSPEND_ACK from 0x15161718:32001
-00 00 00 00 0c 1f 84 e0 98 76 54 1b 86 21 63 54 40 50 60 1d 81 01 
+PROCESSING BVC_SUSPEND_ACK from NSEI 258
+0c 1f 84 e0 98 76 54 1b 86 21 63 54 40 50 60 1d 81 01 
 
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 0c 1f 84 e0 98 76 54 1b 86 21 63 54 40 50 60 1d 81 01 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+0c 1f 84 e0 98 76 54 1b 86 21 63 54 40 50 60 1d 81 01 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 22
-00 00 00 00 0c 1f 84 c0 de ad 03 1b 86 11 22 33 40 50 60 1d 81 01 
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+0c 1f 84 c0 de ad 03 1b 86 11 22 33 40 50 60 1d 81 01 
 
-result (BVC_SUSPEND_ACK) = 0
+Message for BSS (NSEI=4096 BVCI=0):
+[L2]> [L3]> 0c 1f 84 c0 de ad 03 1b 86 11 22 33 40 50 60 1d 81 01 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5251,17 +3944,17 @@ Peers:
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
 --- Establish GPRS connection (SGSN 2, P-TMSI collision) ---
 
-PROCESSING ATTACH REQUEST from 0x01020304:1111
-00 00 10 02 01 80 00 fe ed 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 21 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 44 b6 bb 
+PROCESSING ATTACH REQUEST from NSEI 4096
+01 80 00 fe ed 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 21 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 44 b6 bb 
 
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 80 00 fe ed 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 21 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 44 b6 bb 
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 80 00 fe ed 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 21 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 44 b6 bb 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 28
-00 00 10 02 00 80 00 fe ed 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
+NS2 UD REQUEST, prim 0, msg length 24, bvci 0x1002
+00 80 00 fe ed 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
-result (ATTACH REQUEST) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L3]> 00 80 00 fe ed 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5278,17 +3971,17 @@ Peers:
       TLLI 8000feed -> 78dead04, IMSI (none), AGE 0, STORED 1, IMSI acquisition in progress, SGSN NSEI 65535
       TLLI c0dead03 -> e0987654, IMSI 12199999961718, AGE 0, IMSI matches, SGSN NSEI 258
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING IDENT RESPONSE from 0x01020304:1111
-00 00 10 02 01 80 00 fe ed 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 25 08 16 08 11 12 99 99 99 26 27 f8 94 16 f5 
+PROCESSING IDENT RESPONSE from NSEI 4096
+01 80 00 fe ed 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 25 08 16 08 11 12 99 99 99 26 27 f8 94 16 f5 
 
-CALLBACK, event 0, msg length 40, bvci 0x1002
-00 00 10 02 01 80 00 fe ed 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 25 08 16 08 11 12 99 99 99 26 27 f8 94 16 f5 
+NS2 CALLBACK, prim 0, msg length 40, bvci 0x1002
+01 80 00 fe ed 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 25 08 16 08 11 12 99 99 99 26 27 f8 94 16 f5 
 
-NS UNITDATA MESSAGE to SGSN 2, BVCI 0x1002, msg length 75 (gprs_ns_sendmsg)
-MESSAGE to SGSN 2 at 0x15161718:32001, msg length 79
-00 00 10 02 01 78 de ad 04 00 00 04 08 88 21 63 54 00 63 60 12 34 00 80 0e 00 34 01 c0 21 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 44 b6 bb 
+NS2 UD REQUEST, prim 0, msg length 75, bvci 0x1002
+01 78 de ad 04 00 00 04 08 88 21 63 54 00 63 60 12 34 00 80 0e 00 34 01 c0 21 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 44 b6 bb 
 
-result (IDENT RESPONSE) = 0
+Message for SGSN2 (NSEI=258 BVCI=4098):
+[L2]> [L3]> 01 78 de ad 04 00 00 04 08 88 21 63 54 00 63 60 12 34 00 80 0e 00 34 01 c0 21 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 44 b6 bb 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5305,17 +3998,17 @@ Peers:
       TLLI 8000feed -> 78dead04, IMSI 12199999962728, AGE 0, IMSI matches, SGSN NSEI 258
       TLLI c0dead03 -> e0987654, IMSI 12199999961718, AGE 0, IMSI matches, SGSN NSEI 258
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING IDENT REQUEST from 0x15161718:32001
-00 00 10 02 00 78 de ad 04 00 50 20 16 82 02 58 0e 89 41 c0 19 08 15 01 a2 f2 a4 
+PROCESSING IDENT REQUEST from NSEI 258
+00 78 de ad 04 00 50 20 16 82 02 58 0e 89 41 c0 19 08 15 01 a2 f2 a4 
 
-CALLBACK, event 0, msg length 23, bvci 0x1002
-00 00 10 02 00 78 de ad 04 00 50 20 16 82 02 58 0e 89 41 c0 19 08 15 01 a2 f2 a4 
+NS2 CALLBACK, prim 0, msg length 23, bvci 0x1002
+00 78 de ad 04 00 50 20 16 82 02 58 0e 89 41 c0 19 08 15 01 a2 f2 a4 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 23 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 27
-00 00 10 02 00 80 00 fe ed 00 50 20 16 82 02 58 0e 89 41 c0 19 08 15 01 a2 f2 a4 
+NS2 UD REQUEST, prim 0, msg length 23, bvci 0x1002
+00 80 00 fe ed 00 50 20 16 82 02 58 0e 89 41 c0 19 08 15 01 a2 f2 a4 
 
-result (IDENT REQUEST) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 80 00 fe ed 00 50 20 16 82 02 58 0e 89 41 c0 19 08 15 01 a2 f2 a4 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5332,17 +4025,17 @@ Peers:
       TLLI 8000feed -> 78dead04, IMSI 12199999962728, AGE 0, IMSI matches, SGSN NSEI 258
       TLLI c0dead03 -> e0987654, IMSI 12199999961718, AGE 0, IMSI matches, SGSN NSEI 258
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING IDENT RESPONSE from 0x01020304:1111
-00 00 10 02 01 80 00 fe ed 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 29 08 16 08 11 12 99 99 99 26 27 f8 83 07 1e 
+PROCESSING IDENT RESPONSE from NSEI 4096
+01 80 00 fe ed 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 29 08 16 08 11 12 99 99 99 26 27 f8 83 07 1e 
 
-CALLBACK, event 0, msg length 40, bvci 0x1002
-00 00 10 02 01 80 00 fe ed 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 29 08 16 08 11 12 99 99 99 26 27 f8 83 07 1e 
+NS2 CALLBACK, prim 0, msg length 40, bvci 0x1002
+01 80 00 fe ed 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 29 08 16 08 11 12 99 99 99 26 27 f8 83 07 1e 
 
-NS UNITDATA MESSAGE to SGSN 2, BVCI 0x1002, msg length 40 (gprs_ns_sendmsg)
-MESSAGE to SGSN 2 at 0x15161718:32001, msg length 44
-00 00 10 02 01 78 de ad 04 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 11 01 c0 29 08 16 08 11 12 99 99 99 26 27 f8 83 07 1e 
+NS2 UD REQUEST, prim 0, msg length 40, bvci 0x1002
+01 78 de ad 04 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 11 01 c0 29 08 16 08 11 12 99 99 99 26 27 f8 83 07 1e 
 
-result (IDENT RESPONSE) = 0
+Message for SGSN2 (NSEI=258 BVCI=4098):
+[L2]> [L3]> 01 78 de ad 04 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 11 01 c0 29 08 16 08 11 12 99 99 99 26 27 f8 83 07 1e 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5359,17 +4052,17 @@ Peers:
       TLLI 8000feed -> 78dead04, IMSI 12199999962728, AGE 0, IMSI matches, SGSN NSEI 258
       TLLI c0dead03 -> e0987654, IMSI 12199999961718, AGE 0, IMSI matches, SGSN NSEI 258
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING ATTACH ACCEPT (P-TMSI 1) from 0x15161718:32001
-00 00 10 02 00 78 de ad 04 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 26 27 f8 00 81 00 0e 9e 41 c0 1d 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 74 91 01 
+PROCESSING ATTACH ACCEPT (P-TMSI 1) from NSEI 258
+00 78 de ad 04 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 26 27 f8 00 81 00 0e 9e 41 c0 1d 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 74 91 01 
 
-CALLBACK, event 0, msg length 88, bvci 0x1002
-00 00 10 02 00 78 de ad 04 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 26 27 f8 00 81 00 0e 9e 41 c0 1d 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 74 91 01 
+NS2 CALLBACK, prim 0, msg length 88, bvci 0x1002
+00 78 de ad 04 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 26 27 f8 00 81 00 0e 9e 41 c0 1d 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 74 91 01 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 88 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 92
-00 00 10 02 00 80 00 fe ed 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 26 27 f8 00 81 00 0e 9e 41 c0 1d 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 c0 de ad 05 3e 78 6e 
+NS2 UD REQUEST, prim 0, msg length 88, bvci 0x1002
+00 80 00 fe ed 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 26 27 f8 00 81 00 0e 9e 41 c0 1d 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 c0 de ad 05 3e 78 6e 
 
-result (ATTACH ACCEPT (P-TMSI 1)) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 80 00 fe ed 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 26 27 f8 00 81 00 0e 9e 41 c0 1d 08 02 01 49 04 11 22 33 40 50 60 19 cd d7 08 17 16 18 05 f4 c0 de ad 05 3e 78 6e 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5386,17 +4079,17 @@ Peers:
       TLLI 8000feed/c0dead05 -> 78dead04/efe2b700, IMSI 12199999962728, AGE 0, IMSI matches, SGSN NSEI 258
       TLLI c0dead03 -> e0987654, IMSI 12199999961718, AGE 0, IMSI matches, SGSN NSEI 258
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING ATTACH COMPLETE from 0x01020304:1111
-00 00 10 02 01 c0 de ad 05 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 2d 08 03 43 50 ea 
+PROCESSING ATTACH COMPLETE from NSEI 4096
+01 c0 de ad 05 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 2d 08 03 43 50 ea 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 c0 de ad 05 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 2d 08 03 43 50 ea 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 c0 de ad 05 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 2d 08 03 43 50 ea 
 
-NS UNITDATA MESSAGE to SGSN 2, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN 2 at 0x15161718:32001, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 08 01 c0 2d 08 03 43 50 ea 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 08 01 c0 2d 08 03 43 50 ea 
 
-result (ATTACH COMPLETE) = 0
+Message for SGSN2 (NSEI=258 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 08 01 c0 2d 08 03 43 50 ea 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5413,17 +4106,17 @@ Peers:
       TLLI 8000feed/c0dead05 -> 78dead04/efe2b700, IMSI 12199999962728, AGE 0, IMSI matches, SGSN NSEI 258
       TLLI c0dead03 -> e0987654, IMSI 12199999961718, AGE 0, IMSI matches, SGSN NSEI 258
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
-PROCESSING GMM INFO from 0x15161718:32001
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 26 27 f8 00 81 00 0e 88 41 c0 21 08 21 ca 60 90 
+PROCESSING GMM INFO from NSEI 258
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 26 27 f8 00 81 00 0e 88 41 c0 21 08 21 ca 60 90 
 
-CALLBACK, event 0, msg length 66, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 26 27 f8 00 81 00 0e 88 41 c0 21 08 21 ca 60 90 
+NS2 CALLBACK, prim 0, msg length 66, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 26 27 f8 00 81 00 0e 88 41 c0 21 08 21 ca 60 90 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 66 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 70
-00 00 10 02 00 c0 de ad 05 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 26 27 f8 00 81 00 0e 88 41 c0 21 08 21 ca 60 90 
+NS2 UD REQUEST, prim 0, msg length 66, bvci 0x1002
+00 c0 de ad 05 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 26 27 f8 00 81 00 0e 88 41 c0 21 08 21 ca 60 90 
 
-result (GMM INFO) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 05 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 26 27 f8 00 81 00 0e 88 41 c0 21 08 21 ca 60 90 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5442,17 +4135,17 @@ Peers:
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
 --- Shutdown GPRS connection (SGSN 1) ---
 
-PROCESSING DETACH REQ from 0x01020304:1111
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 31 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 57 e6 15 
+PROCESSING DETACH REQ from NSEI 4096
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 31 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 57 e6 15 
 
-CALLBACK, event 0, msg length 44, bvci 0x1002
-00 00 10 02 01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 31 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 57 e6 15 
+NS2 CALLBACK, prim 0, msg length 44, bvci 0x1002
+01 c0 de ad 01 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 31 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 57 e6 15 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 44 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 48
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 15 01 c0 31 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 57 e6 15 
+NS2 UD REQUEST, prim 0, msg length 44, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 15 01 c0 31 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 57 e6 15 
 
-result (DETACH REQ) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 15 01 c0 31 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 57 e6 15 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5470,17 +4163,17 @@ Peers:
       TLLI c0dead01 -> efe2b700, IMSI 12131415161718, AGE 0, SGSN NSEI 256
       TLLI c0dead05 -> efe2b700, IMSI 12199999962728, AGE 0, IMSI matches, SGSN NSEI 258
       TLLI c0dead03 -> e0987654, IMSI 12199999961718, AGE 0, IMSI matches, SGSN NSEI 258
-PROCESSING DETACH ACC from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 25 08 06 00 4d 09 cd 
+PROCESSING DETACH ACC from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 25 08 06 00 4d 09 cd 
 
-CALLBACK, event 0, msg length 67, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 25 08 06 00 4d 09 cd 
+NS2 CALLBACK, prim 0, msg length 67, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 25 08 06 00 4d 09 cd 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 67 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 71
-00 00 10 02 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 25 08 06 00 4d 09 cd 
+NS2 UD REQUEST, prim 0, msg length 67, bvci 0x1002
+00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 25 08 06 00 4d 09 cd 
 
-result (DETACH ACC) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 01 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 25 08 06 00 4d 09 cd 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5500,17 +4193,17 @@ Peers:
       TLLI c0dead03 -> e0987654, IMSI 12199999961718, AGE 0, IMSI matches, SGSN NSEI 258
 --- Shutdown GPRS connection (SGSN 2) ---
 
-PROCESSING DETACH REQ from 0x01020304:1111
-00 00 10 02 01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 35 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 83 cb f7 
+PROCESSING DETACH REQ from NSEI 4096
+01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 35 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 83 cb f7 
 
-CALLBACK, event 0, msg length 44, bvci 0x1002
-00 00 10 02 01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 35 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 83 cb f7 
+NS2 CALLBACK, prim 0, msg length 44, bvci 0x1002
+01 c0 de ad 03 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 35 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 83 cb f7 
 
-NS UNITDATA MESSAGE to SGSN 2, BVCI 0x1002, msg length 44 (gprs_ns_sendmsg)
-MESSAGE to SGSN 2 at 0x15161718:32001, msg length 48
-00 00 10 02 01 e0 98 76 54 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 15 01 c0 35 08 05 01 18 05 f4 e0 98 76 54 19 03 b9 97 cb b4 31 31 
+NS2 UD REQUEST, prim 0, msg length 44, bvci 0x1002
+01 e0 98 76 54 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 15 01 c0 35 08 05 01 18 05 f4 e0 98 76 54 19 03 b9 97 cb b4 31 31 
 
-result (DETACH REQ) = 0
+Message for SGSN2 (NSEI=258 BVCI=4098):
+[L2]> [L3]> 01 e0 98 76 54 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 15 01 c0 35 08 05 01 18 05 f4 e0 98 76 54 19 03 b9 97 cb b4 31 31 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5529,17 +4222,17 @@ Peers:
     TLLI-Cache: 2
       TLLI c0dead03 -> e0987654, IMSI 12199999961718, AGE 0, IMSI matches, SGSN NSEI 258
       TLLI c0dead05 -> efe2b700, IMSI 12199999962728, AGE 0, IMSI matches, SGSN NSEI 258
-PROCESSING DETACH ACC from 0x15161718:32001
-00 00 10 02 00 e0 98 76 54 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 89 41 c0 29 08 06 00 be c3 6f 
+PROCESSING DETACH ACC from NSEI 258
+00 e0 98 76 54 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 89 41 c0 29 08 06 00 be c3 6f 
 
-CALLBACK, event 0, msg length 67, bvci 0x1002
-00 00 10 02 00 e0 98 76 54 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 89 41 c0 29 08 06 00 be c3 6f 
+NS2 CALLBACK, prim 0, msg length 67, bvci 0x1002
+00 e0 98 76 54 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 89 41 c0 29 08 06 00 be c3 6f 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 67 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 71
-00 00 10 02 00 c0 de ad 03 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 89 41 c0 29 08 06 00 be c3 6f 
+NS2 UD REQUEST, prim 0, msg length 67, bvci 0x1002
+00 c0 de ad 03 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 89 41 c0 29 08 06 00 be c3 6f 
 
-result (DETACH ACC) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 03 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 16 17 f8 00 81 00 0e 89 41 c0 29 08 06 00 be c3 6f 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5559,17 +4252,17 @@ Peers:
       TLLI c0dead05 -> efe2b700, IMSI 12199999962728, AGE 0, IMSI matches, SGSN NSEI 258
 --- Shutdown GPRS connection (SGSN 2, P-TMSI 1) ---
 
-PROCESSING DETACH REQ from 0x01020304:1111
-00 00 10 02 01 c0 de ad 05 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 39 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 44 b6 8a 
+PROCESSING DETACH REQ from NSEI 4096
+01 c0 de ad 05 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 39 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 44 b6 8a 
 
-CALLBACK, event 0, msg length 44, bvci 0x1002
-00 00 10 02 01 c0 de ad 05 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 39 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 44 b6 8a 
+NS2 CALLBACK, prim 0, msg length 44, bvci 0x1002
+01 c0 de ad 05 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 39 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 44 b6 8a 
 
-NS UNITDATA MESSAGE to SGSN 2, BVCI 0x1002, msg length 44 (gprs_ns_sendmsg)
-MESSAGE to SGSN 2 at 0x15161718:32001, msg length 48
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 15 01 c0 39 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 44 b6 8a 
+NS2 UD REQUEST, prim 0, msg length 44, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 15 01 c0 39 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 44 b6 8a 
 
-result (DETACH REQ) = 0
+Message for SGSN2 (NSEI=258 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 21 63 54 40 50 60 12 34 00 80 0e 00 15 01 c0 39 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 44 b6 8a 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5587,17 +4280,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI c0dead05 -> efe2b700, IMSI 12199999962728, AGE 0, IMSI matches, SGSN NSEI 258
-PROCESSING DETACH ACC from 0x15161718:32001
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 26 27 f8 00 81 00 0e 89 41 c0 2d 08 06 00 86 7c c7 
+PROCESSING DETACH ACC from NSEI 258
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 26 27 f8 00 81 00 0e 89 41 c0 2d 08 06 00 86 7c c7 
 
-CALLBACK, event 0, msg length 67, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 26 27 f8 00 81 00 0e 89 41 c0 2d 08 06 00 86 7c c7 
+NS2 CALLBACK, prim 0, msg length 67, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 26 27 f8 00 81 00 0e 89 41 c0 2d 08 06 00 86 7c c7 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 67 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 71
-00 00 10 02 00 c0 de ad 05 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 26 27 f8 00 81 00 0e 89 41 c0 2d 08 06 00 86 7c c7 
+NS2 UD REQUEST, prim 0, msg length 67, bvci 0x1002
+00 c0 de ad 05 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 26 27 f8 00 81 00 0e 89 41 c0 2d 08 06 00 86 7c c7 
 
-result (DETACH ACC) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 c0 de ad 05 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 99 99 99 26 27 f8 00 81 00 0e 89 41 c0 2d 08 06 00 86 7c c7 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5620,118 +4313,42 @@ Gbproxy global:
 === test_gbproxy_keep_info ===
 --- Initialise SGSN ---
 
-MESSAGE to SGSN at 0x05060708:32000, msg length 12
-02 00 81 01 01 82 01 01 04 82 01 00 
-
-PROCESSING RESET_ACK from 0x05060708:32000
-03 01 82 01 01 04 82 01 00 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-0a 
-
-result (RESET_ACK) = 0
-
-PROCESSING ALIVE_ACK from 0x05060708:32000
-0b 
+NS2 CALLBACK, prim 2, bvci 0x0000
 
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-06 
-
-result (ALIVE_ACK) = 0
-
-PROCESSING UNBLOCK_ACK from 0x05060708:32000
-07 
-
-==> got signal NS_UNBLOCK, NS-VC 0x0101/5.6.7.8:32000
-
-result (UNBLOCK_ACK) = 0
-
-PROCESSING ALIVE from 0x05060708:32000
-0a 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-0b 
-
-result (ALIVE) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+22 04 82 00 00 07 81 08 
 
 --- Initialise BSS 1 ---
 
-Setup NS-VC: remote 0x01020304:1111, NSVCI 0x1001(4097), NSEI 0x1000(4096)
-
-PROCESSING RESET from 0x01020304:1111
-02 00 81 01 01 82 10 01 04 82 10 00 
-
-==> got signal NS_RESET, NS-VC 0x1001/1.2.3.4:1111
-
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-03 01 82 10 01 04 82 10 00 
-
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0a 
-
-result (RESET) = 0
+Setup NS-VC: NSEI 0x1000(4096)
 
-PROCESSING ALIVE from 0x01020304:1111
-0a 
+NS2 CALLBACK, prim 2, bvci 0x0000
 
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0b 
+Setup BSSGP: BVCI 0x1002(4098)
 
-result (ALIVE) = 0
+PROCESSING BVC_RESET from NSEI 4096
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-PROCESSING UNBLOCK from 0x01020304:1111
-06 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-07 
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-result (UNBLOCK) = 0
+PROCESSING BVC_RESET_ACK from NSEI 256
+23 04 82 10 02 
 
-PROCESSING ALIVE_ACK from 0x01020304:1111
-0b 
+NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-result (ALIVE_ACK) = 0
+NS2 UD REQUEST, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-Setup BSSGP: remote 0x01020304:1111, BVCI 0x1002(4098)
-
-PROCESSING BVC_RESET from 0x01020304:1111
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
-
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
-
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 22
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
-
-result (BVC_RESET) = 0
-
-PROCESSING BVC_RESET_ACK from 0x05060708:32000
-00 00 00 00 23 04 82 10 02 
-
-CALLBACK, event 0, msg length 5, bvci 0x0000
-00 00 00 00 23 04 82 10 02 
-
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-00 00 00 00 23 04 82 10 02 
-
-result (BVC_RESET_ACK) = 0
-
-Current NS-VCIs:
-    VCI 0x1001, NSEI 0x1000, peer 0x01020304:1111
-         Packets at NS Level  ( In): 5
-         Packets at NS Level  (Out): 5
-         Bytes at NS Level    ( In): 37
-         Bytes at NS Level    (Out): 21
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 5
-         Packets at NS Level  (Out): 5
-         Bytes at NS Level    ( In): 21
-         Bytes at NS Level    (Out): 37
-         NS-VC Block count         : 1
+Message for BSS (NSEI=4096 BVCI=0):
+[L2]> [L3]> 23 04 82 10 02 
 
 Gbproxy global:
 Peers:
@@ -5739,17 +4356,17 @@ Peers:
     TLLI-Cache: 0
 --- Send message from BSS 1 to SGSN, BVCI 0x1002 ---
 
-PROCESSING ATTACH REQUEST from 0x01020304:1111
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
+PROCESSING ATTACH REQUEST from NSEI 4096
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 28
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
+NS2 UD REQUEST, prim 0, msg length 24, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
-result (ATTACH REQUEST) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L3]> 00 af e2 b7 00 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5757,17 +4374,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700 -> afe2b700, IMSI (none), AGE 0, STORED 1, IMSI acquisition in progress
-PROCESSING IDENT RESPONSE from 0x01020304:1111
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
+PROCESSING IDENT RESPONSE from NSEI 4096
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
 
-CALLBACK, event 0, msg length 40, bvci 0x1002
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
+NS2 CALLBACK, prim 0, msg length 40, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 05 08 16 08 11 12 13 14 15 16 17 f8 07 e1 ae 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 75 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 79
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
+NS2 UD REQUEST, prim 0, msg length 75, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
-result (IDENT RESPONSE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5775,17 +4392,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700 -> afe2b700, IMSI 12131415161718, AGE 0
-PROCESSING IDENT REQUEST from 0x05060708:32000
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
+PROCESSING IDENT REQUEST from NSEI 256
+00 af e2 b7 00 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-CALLBACK, event 0, msg length 23, bvci 0x1002
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
+NS2 CALLBACK, prim 0, msg length 23, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 23 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 27
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
+NS2 UD REQUEST, prim 0, msg length 23, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-result (IDENT REQUEST) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 af e2 b7 00 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5793,17 +4410,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700 -> afe2b700, IMSI 12131415161718, AGE 0
-PROCESSING IDENT RESPONSE from 0x01020304:1111
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
+PROCESSING IDENT RESPONSE from NSEI 4096
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
 
-CALLBACK, event 0, msg length 40, bvci 0x1002
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
+NS2 CALLBACK, prim 0, msg length 40, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 40 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 44
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
+NS2 UD REQUEST, prim 0, msg length 40, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
 
-result (IDENT RESPONSE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5811,17 +4428,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700 -> afe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH ACCEPT from 0x05060708:32000
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
+PROCESSING ATTACH ACCEPT from NSEI 256
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
 
-CALLBACK, event 0, msg length 88, bvci 0x1002
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
+NS2 CALLBACK, prim 0, msg length 88, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 88 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 92
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
+NS2 UD REQUEST, prim 0, msg length 88, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
 
-result (ATTACH ACCEPT) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 05 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 53 62 f1 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5830,17 +4447,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700/efe2b700 -> afe2b700/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH COMPLETE from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 0d 08 03 55 1c ea 
+PROCESSING ATTACH COMPLETE from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 0d 08 03 55 1c ea 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 0d 08 03 55 1c ea 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 0d 08 03 55 1c ea 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 0d 08 03 55 1c ea 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 0d 08 03 55 1c ea 
 
-result (ATTACH COMPLETE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 0d 08 03 55 1c ea 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5850,17 +4467,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700/efe2b700 -> afe2b700/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING GMM INFO from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
+PROCESSING GMM INFO from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
-CALLBACK, event 0, msg length 66, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
+NS2 CALLBACK, prim 0, msg length 66, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 66 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 70
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
+NS2 UD REQUEST, prim 0, msg length 66, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
-result (GMM INFO) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 09 08 21 04 ba 3d 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5870,17 +4487,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI efe2b700 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING DETACH REQ from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 11 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 6d b1 de 
+PROCESSING DETACH REQ from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 11 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 6d b1 de 
 
-CALLBACK, event 0, msg length 44, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 11 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 6d b1 de 
+NS2 CALLBACK, prim 0, msg length 44, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 11 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 6d b1 de 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 44 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 48
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 11 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 6d b1 de 
+NS2 UD REQUEST, prim 0, msg length 44, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 11 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 6d b1 de 
 
-result (DETACH REQ) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 11 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 6d b1 de 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5891,17 +4508,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI efe2b700 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING DETACH ACC from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 0d 08 06 00 aa ab ee 
+PROCESSING DETACH ACC from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 0d 08 06 00 aa ab ee 
 
-CALLBACK, event 0, msg length 67, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 0d 08 06 00 aa ab ee 
+NS2 CALLBACK, prim 0, msg length 67, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 0d 08 06 00 aa ab ee 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 67 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 71
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 0d 08 06 00 aa ab ee 
+NS2 UD REQUEST, prim 0, msg length 67, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 0d 08 06 00 aa ab ee 
 
-result (DETACH ACC) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 0d 08 06 00 aa ab ee 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5913,17 +4530,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 00000000, IMSI 12131415161718, AGE 0, DE-REGISTERED
-PROCESSING ATTACH REQUEST from 0x01020304:1111
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 15 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 e6 71 c7 
+PROCESSING ATTACH REQUEST from NSEI 4096
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 15 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 e6 71 c7 
 
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 15 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 e6 71 c7 
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 15 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 e6 71 c7 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 75 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 79
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 15 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 e6 71 c7 
+NS2 UD REQUEST, prim 0, msg length 75, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 15 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 e6 71 c7 
 
-result (ATTACH REQUEST) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 15 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 e6 71 c7 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5935,17 +4552,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700 -> afe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH ACCEPT from 0x05060708:32000
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 11 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 3a 6d d4 
+PROCESSING ATTACH ACCEPT from NSEI 256
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 11 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 3a 6d d4 
 
-CALLBACK, event 0, msg length 88, bvci 0x1002
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 11 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 3a 6d d4 
+NS2 CALLBACK, prim 0, msg length 88, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 11 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 3a 6d d4 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 88 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 92
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 11 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 3a 6d d4 
+NS2 UD REQUEST, prim 0, msg length 88, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 11 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 3a 6d d4 
 
-result (ATTACH ACCEPT) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 11 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 3a 6d d4 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5957,17 +4574,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700/efe2b700 -> afe2b700/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH COMPLETE from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 19 08 03 32 f1 bc 
+PROCESSING ATTACH COMPLETE from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 19 08 03 32 f1 bc 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 19 08 03 32 f1 bc 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 19 08 03 32 f1 bc 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 19 08 03 32 f1 bc 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 19 08 03 32 f1 bc 
 
-result (ATTACH COMPLETE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 19 08 03 32 f1 bc 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -5979,17 +4596,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700/efe2b700 -> afe2b700/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING DETACH REQ (re-attach) from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 15 08 05 01 25 0a 67 0e 96 
+PROCESSING DETACH REQ (re-attach) from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 15 08 05 01 25 0a 67 0e 96 
 
-CALLBACK, event 0, msg length 69, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 15 08 05 01 25 0a 67 0e 96 
+NS2 CALLBACK, prim 0, msg length 69, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 15 08 05 01 25 0a 67 0e 96 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 69 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 73
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 15 08 05 01 25 0a 67 0e 96 
+NS2 UD REQUEST, prim 0, msg length 69, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 15 08 05 01 25 0a 67 0e 96 
 
-result (DETACH REQ (re-attach)) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 15 08 05 01 25 0a 67 0e 96 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6001,17 +4618,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI efe2b700 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING DETACH ACC from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 1d 08 06 3d 1c 8b 
+PROCESSING DETACH ACC from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 1d 08 06 3d 1c 8b 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 1d 08 06 3d 1c 8b 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 1d 08 06 3d 1c 8b 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 1d 08 06 3d 1c 8b 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 1d 08 06 3d 1c 8b 
 
-result (DETACH ACC) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 1d 08 06 3d 1c 8b 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6023,17 +4640,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 00000000, IMSI 12131415161718, AGE 0, DE-REGISTERED
-PROCESSING ATTACH REQUEST from 0x01020304:1111
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 21 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 44 db cc 
+PROCESSING ATTACH REQUEST from NSEI 4096
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 21 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 44 db cc 
 
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 21 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 44 db cc 
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 21 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 44 db cc 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 75 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 79
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 21 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 44 db cc 
+NS2 UD REQUEST, prim 0, msg length 75, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 21 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 44 db cc 
 
-result (ATTACH REQUEST) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 21 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 44 db cc 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6045,17 +4662,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700 -> afe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH ACCEPT from 0x05060708:32000
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 19 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 27 3c 84 
+PROCESSING ATTACH ACCEPT from NSEI 256
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 19 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 27 3c 84 
 
-CALLBACK, event 0, msg length 88, bvci 0x1002
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 19 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 27 3c 84 
+NS2 CALLBACK, prim 0, msg length 88, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 19 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 27 3c 84 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 88 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 92
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 19 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 27 3c 84 
+NS2 UD REQUEST, prim 0, msg length 88, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 19 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 27 3c 84 
 
-result (ATTACH ACCEPT) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 19 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 27 3c 84 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6067,17 +4684,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700/efe2b700 -> afe2b700/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH COMPLETE from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 25 08 03 9b c6 47 
+PROCESSING ATTACH COMPLETE from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 25 08 03 9b c6 47 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 25 08 03 9b c6 47 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 25 08 03 9b c6 47 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 25 08 03 9b c6 47 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 25 08 03 9b c6 47 
 
-result (ATTACH COMPLETE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 25 08 03 9b c6 47 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6089,17 +4706,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700/efe2b700 -> afe2b700/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING DETACH REQ from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 1d 08 05 02 25 0a dd 56 6c 
+PROCESSING DETACH REQ from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 1d 08 05 02 25 0a dd 56 6c 
 
-CALLBACK, event 0, msg length 69, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 1d 08 05 02 25 0a dd 56 6c 
+NS2 CALLBACK, prim 0, msg length 69, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 1d 08 05 02 25 0a dd 56 6c 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 69 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 73
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 1d 08 05 02 25 0a dd 56 6c 
+NS2 UD REQUEST, prim 0, msg length 69, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 1d 08 05 02 25 0a dd 56 6c 
 
-result (DETACH REQ) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 1d 08 05 02 25 0a dd 56 6c 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6111,17 +4728,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI efe2b700 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING DETACH ACC from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 29 08 06 4c bd dd 
+PROCESSING DETACH ACC from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 29 08 06 4c bd dd 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 29 08 06 4c bd dd 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 29 08 06 4c bd dd 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 29 08 06 4c bd dd 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 29 08 06 4c bd dd 
 
-result (DETACH ACC) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 29 08 06 4c bd dd 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6133,17 +4750,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 00000000, IMSI 12131415161718, AGE 0, DE-REGISTERED
-PROCESSING ATTACH REQUEST (IMSI) from 0x01020304:1111
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 37 01 c0 2d 08 01 02 f5 e0 21 08 02 08 11 12 13 14 15 16 17 f8 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 f0 f7 35 
+PROCESSING ATTACH REQUEST (IMSI) from NSEI 4096
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 37 01 c0 2d 08 01 02 f5 e0 21 08 02 08 11 12 13 14 15 16 17 f8 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 f0 f7 35 
 
-CALLBACK, event 0, msg length 78, bvci 0x1002
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 37 01 c0 2d 08 01 02 f5 e0 21 08 02 08 11 12 13 14 15 16 17 f8 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 f0 f7 35 
+NS2 CALLBACK, prim 0, msg length 78, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 37 01 c0 2d 08 01 02 f5 e0 21 08 02 08 11 12 13 14 15 16 17 f8 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 f0 f7 35 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 78 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 82
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 37 01 c0 2d 08 01 02 f5 e0 21 08 02 08 11 12 13 14 15 16 17 f8 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 f0 f7 35 
+NS2 UD REQUEST, prim 0, msg length 78, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 37 01 c0 2d 08 01 02 f5 e0 21 08 02 08 11 12 13 14 15 16 17 f8 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 f0 f7 35 
 
-result (ATTACH REQUEST (IMSI)) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 37 01 c0 2d 08 01 02 f5 e0 21 08 02 08 11 12 13 14 15 16 17 f8 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 f0 f7 35 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6155,17 +4772,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700 -> afe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH ACCEPT from 0x05060708:32000
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 21 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 cf 80 6e 
+PROCESSING ATTACH ACCEPT from NSEI 256
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 21 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 cf 80 6e 
 
-CALLBACK, event 0, msg length 88, bvci 0x1002
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 21 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 cf 80 6e 
+NS2 CALLBACK, prim 0, msg length 88, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 21 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 cf 80 6e 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 88 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 92
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 21 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 cf 80 6e 
+NS2 UD REQUEST, prim 0, msg length 88, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 21 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 cf 80 6e 
 
-result (ATTACH ACCEPT) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 21 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 cf 80 6e 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6177,17 +4794,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700/efe2b700 -> afe2b700/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH COMPLETE from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 31 08 03 fc 2b 11 
+PROCESSING ATTACH COMPLETE from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 31 08 03 fc 2b 11 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 31 08 03 fc 2b 11 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 31 08 03 fc 2b 11 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 31 08 03 fc 2b 11 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 31 08 03 fc 2b 11 
 
-result (ATTACH COMPLETE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 31 08 03 fc 2b 11 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6199,17 +4816,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700/efe2b700 -> afe2b700/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING DETACH REQ from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 25 08 05 02 25 0a 8e ee 85 
+PROCESSING DETACH REQ from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 25 08 05 02 25 0a 8e ee 85 
 
-CALLBACK, event 0, msg length 69, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 25 08 05 02 25 0a 8e ee 85 
+NS2 CALLBACK, prim 0, msg length 69, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 25 08 05 02 25 0a 8e ee 85 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 69 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 73
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 25 08 05 02 25 0a 8e ee 85 
+NS2 UD REQUEST, prim 0, msg length 69, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 25 08 05 02 25 0a 8e ee 85 
 
-result (DETACH REQ) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 25 08 05 02 25 0a 8e ee 85 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6221,17 +4838,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI efe2b700 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING DETACH ACC from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 35 08 06 f3 c6 26 
+PROCESSING DETACH ACC from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 35 08 06 f3 c6 26 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 35 08 06 f3 c6 26 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 35 08 06 f3 c6 26 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 35 08 06 f3 c6 26 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 35 08 06 f3 c6 26 
 
-result (DETACH ACC) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 35 08 06 f3 c6 26 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6243,17 +4860,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 00000000, IMSI 12131415161718, AGE 0, DE-REGISTERED
-PROCESSING ATTACH REQUEST from 0x01020304:1111
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 39 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 e4 85 12 
+PROCESSING ATTACH REQUEST from NSEI 4096
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 39 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 e4 85 12 
 
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 39 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 e4 85 12 
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 39 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 e4 85 12 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 75 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 79
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 39 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 e4 85 12 
+NS2 UD REQUEST, prim 0, msg length 75, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 39 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 e4 85 12 
 
-result (ATTACH REQUEST) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 39 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 e4 85 12 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6265,17 +4882,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700 -> afe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH ACCEPT from 0x05060708:32000
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 29 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 d2 d1 3e 
+PROCESSING ATTACH ACCEPT from NSEI 256
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 29 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 d2 d1 3e 
 
-CALLBACK, event 0, msg length 88, bvci 0x1002
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 29 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 d2 d1 3e 
+NS2 CALLBACK, prim 0, msg length 88, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 29 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 d2 d1 3e 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 88 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 92
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 29 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 d2 d1 3e 
+NS2 UD REQUEST, prim 0, msg length 88, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 29 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 d2 d1 3e 
 
-result (ATTACH ACCEPT) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 29 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 d2 d1 3e 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6287,17 +4904,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700/efe2b700 -> afe2b700/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH COMPLETE from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 3d 08 03 48 76 ea 
+PROCESSING ATTACH COMPLETE from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 3d 08 03 48 76 ea 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 3d 08 03 48 76 ea 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 3d 08 03 48 76 ea 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 3d 08 03 48 76 ea 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 3d 08 03 48 76 ea 
 
-result (ATTACH COMPLETE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 3d 08 03 48 76 ea 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6309,29 +4926,29 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700/efe2b700 -> afe2b700/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING RA UPD REQ from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 3e 01 c0 41 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 30 73 32 
+PROCESSING RA UPD REQ from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 3e 01 c0 41 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 30 73 32 
 
-CALLBACK, event 0, msg length 85, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 3e 01 c0 41 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 30 73 32 
+NS2 CALLBACK, prim 0, msg length 85, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 3e 01 c0 41 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 30 73 32 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 85 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 89
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 3e 01 c0 41 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 30 73 32 
+NS2 UD REQUEST, prim 0, msg length 85, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 3e 01 c0 41 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 30 73 32 
 
-result (RA UPD REQ) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 70 80 00 80 0e 00 3e 01 c0 41 08 08 10 11 22 33 40 50 60 1d 19 13 42 33 57 2b f7 c8 48 02 13 48 50 c8 48 02 14 48 50 c8 48 02 17 49 10 c8 48 02 00 19 8b b2 92 17 16 27 07 04 31 02 e5 e0 32 02 20 00 30 73 32 
 
-PROCESSING RA UDP REJ from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8a 41 c0 2d 08 0b 0a 00 41 30 a7 
+PROCESSING RA UDP REJ from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8a 41 c0 2d 08 0b 0a 00 41 30 a7 
 
-CALLBACK, event 0, msg length 68, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8a 41 c0 2d 08 0b 0a 00 41 30 a7 
+NS2 CALLBACK, prim 0, msg length 68, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8a 41 c0 2d 08 0b 0a 00 41 30 a7 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 68 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 72
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8a 41 c0 2d 08 0b 0a 00 41 30 a7 
+NS2 UD REQUEST, prim 0, msg length 68, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8a 41 c0 2d 08 0b 0a 00 41 30 a7 
 
-result (RA UDP REJ) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8a 41 c0 2d 08 0b 0a 00 41 30 a7 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6345,17 +4962,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 00000000, IMSI 12131415161718, AGE 0, DE-REGISTERED
-PROCESSING ATTACH REQUEST from 0x01020304:1111
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 45 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 50 cc c3 
+PROCESSING ATTACH REQUEST from NSEI 4096
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 45 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 50 cc c3 
 
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 45 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 50 cc c3 
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 45 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 50 cc c3 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 28
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
+NS2 UD REQUEST, prim 0, msg length 24, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
-result (ATTACH REQUEST) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L3]> 00 af e2 b7 00 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6370,17 +4987,17 @@ Peers:
     TLLI-Cache: 2
       TLLI afe2b700 -> afe2b700, IMSI (none), AGE 0, STORED 1, IMSI acquisition in progress
       TLLI 00000000, IMSI 12131415161718, AGE 0, DE-REGISTERED
-PROCESSING IDENT RESPONSE from 0x01020304:1111
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 49 08 16 08 11 12 13 14 15 16 17 f8 2c 2e b9 
+PROCESSING IDENT RESPONSE from NSEI 4096
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 49 08 16 08 11 12 13 14 15 16 17 f8 2c 2e b9 
 
-CALLBACK, event 0, msg length 40, bvci 0x1002
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 49 08 16 08 11 12 13 14 15 16 17 f8 2c 2e b9 
+NS2 CALLBACK, prim 0, msg length 40, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 49 08 16 08 11 12 13 14 15 16 17 f8 2c 2e b9 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 75 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 79
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 45 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 50 cc c3 
+NS2 UD REQUEST, prim 0, msg length 75, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 45 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 50 cc c3 
 
-result (IDENT RESPONSE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 45 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 50 cc c3 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6394,17 +5011,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700 -> afe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH ACCEPT from 0x05060708:32000
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 31 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 f5 22 ce 
+PROCESSING ATTACH ACCEPT from NSEI 256
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 31 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 f5 22 ce 
 
-CALLBACK, event 0, msg length 88, bvci 0x1002
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 31 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 f5 22 ce 
+NS2 CALLBACK, prim 0, msg length 88, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 31 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 f5 22 ce 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 88 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 92
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 31 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 f5 22 ce 
+NS2 UD REQUEST, prim 0, msg length 88, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 31 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 f5 22 ce 
 
-result (ATTACH ACCEPT) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 31 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 f5 22 ce 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6418,17 +5035,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700/efe2b700 -> afe2b700/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH COMPLETE from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 4d 08 03 79 84 ea 
+PROCESSING ATTACH COMPLETE from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 4d 08 03 79 84 ea 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 4d 08 03 79 84 ea 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 4d 08 03 79 84 ea 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 4d 08 03 79 84 ea 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 4d 08 03 79 84 ea 
 
-result (ATTACH COMPLETE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 4d 08 03 79 84 ea 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6442,17 +5059,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700/efe2b700 -> afe2b700/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING DETACH REQ from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 35 08 05 02 25 0a 9b fa 57 
+PROCESSING DETACH REQ from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 35 08 05 02 25 0a 9b fa 57 
 
-CALLBACK, event 0, msg length 69, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 35 08 05 02 25 0a 9b fa 57 
+NS2 CALLBACK, prim 0, msg length 69, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 35 08 05 02 25 0a 9b fa 57 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 69 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 73
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 35 08 05 02 25 0a 9b fa 57 
+NS2 UD REQUEST, prim 0, msg length 69, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 35 08 05 02 25 0a 9b fa 57 
 
-result (DETACH REQ) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 35 08 05 02 25 0a 9b fa 57 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6466,17 +5083,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI efe2b700 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING DETACH ACC from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 51 08 06 a5 d9 70 
+PROCESSING DETACH ACC from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 51 08 06 a5 d9 70 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 51 08 06 a5 d9 70 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 51 08 06 a5 d9 70 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 51 08 06 a5 d9 70 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 51 08 06 a5 d9 70 
 
-result (DETACH ACC) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 51 08 06 a5 d9 70 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6490,17 +5107,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 00000000, IMSI 12131415161718, AGE 0, DE-REGISTERED
-PROCESSING ATTACH REQUEST (local TLLI) from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 55 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 f9 cc e9 
+PROCESSING ATTACH REQUEST (local TLLI) from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 55 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 f9 cc e9 
 
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 55 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 f9 cc e9 
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 55 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 f9 cc e9 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 75 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 79
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 55 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 f9 cc e9 
+NS2 UD REQUEST, prim 0, msg length 75, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 55 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 f9 cc e9 
 
-result (ATTACH REQUEST (local TLLI)) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 55 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 f9 cc e9 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6514,17 +5131,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI efe2b700 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH ACCEPT from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 39 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 e8 73 9e 
+PROCESSING ATTACH ACCEPT from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 39 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 e8 73 9e 
 
-CALLBACK, event 0, msg length 88, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 39 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 e8 73 9e 
+NS2 CALLBACK, prim 0, msg length 88, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 39 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 e8 73 9e 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 88 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 92
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 39 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 e8 73 9e 
+NS2 UD REQUEST, prim 0, msg length 88, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 39 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 e8 73 9e 
 
-result (ATTACH ACCEPT) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 39 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 e8 73 9e 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6538,17 +5155,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI efe2b700 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH COMPLETE from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 59 08 03 1e 69 bc 
+PROCESSING ATTACH COMPLETE from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 59 08 03 1e 69 bc 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 59 08 03 1e 69 bc 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 59 08 03 1e 69 bc 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 59 08 03 1e 69 bc 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 59 08 03 1e 69 bc 
 
-result (ATTACH COMPLETE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 59 08 03 1e 69 bc 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6562,17 +5179,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI efe2b700 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING DETACH REQ (re-attach) from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 3d 08 05 01 25 0a 21 a2 ad 
+PROCESSING DETACH REQ (re-attach) from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 3d 08 05 01 25 0a 21 a2 ad 
 
-CALLBACK, event 0, msg length 69, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 3d 08 05 01 25 0a 21 a2 ad 
+NS2 CALLBACK, prim 0, msg length 69, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 3d 08 05 01 25 0a 21 a2 ad 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 69 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 73
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 3d 08 05 01 25 0a 21 a2 ad 
+NS2 UD REQUEST, prim 0, msg length 69, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 3d 08 05 01 25 0a 21 a2 ad 
 
-result (DETACH REQ (re-attach)) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 3d 08 05 01 25 0a 21 a2 ad 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6586,17 +5203,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI efe2b700 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING DETACH ACC from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 5d 08 06 11 84 8b 
+PROCESSING DETACH ACC from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 5d 08 06 11 84 8b 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 5d 08 06 11 84 8b 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 5d 08 06 11 84 8b 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 5d 08 06 11 84 8b 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 5d 08 06 11 84 8b 
 
-result (DETACH ACC) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 5d 08 06 11 84 8b 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6610,17 +5227,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 00000000, IMSI 12131415161718, AGE 0, DE-REGISTERED
-PROCESSING ATTACH REQUEST from 0x01020304:1111
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 61 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 5b 66 e2 
+PROCESSING ATTACH REQUEST from NSEI 4096
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 61 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 5b 66 e2 
 
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 61 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 5b 66 e2 
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 61 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 5b 66 e2 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 75 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 79
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 61 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 5b 66 e2 
+NS2 UD REQUEST, prim 0, msg length 75, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 61 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 5b 66 e2 
 
-result (ATTACH REQUEST) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 61 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 5b 66 e2 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6634,17 +5251,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700 -> afe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH ACCEPT from 0x05060708:32000
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 41 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 9e 50 40 
+PROCESSING ATTACH ACCEPT from NSEI 256
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 41 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 9e 50 40 
 
-CALLBACK, event 0, msg length 88, bvci 0x1002
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 41 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 9e 50 40 
+NS2 CALLBACK, prim 0, msg length 88, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 41 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 9e 50 40 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 88 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 92
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 41 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 9e 50 40 
+NS2 UD REQUEST, prim 0, msg length 88, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 41 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 9e 50 40 
 
-result (ATTACH ACCEPT) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 41 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 9e 50 40 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6658,17 +5275,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700/efe2b700 -> afe2b700/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH COMPLETE from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 65 08 03 b7 5e 47 
+PROCESSING ATTACH COMPLETE from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 65 08 03 b7 5e 47 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 65 08 03 b7 5e 47 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 65 08 03 b7 5e 47 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 65 08 03 b7 5e 47 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 65 08 03 b7 5e 47 
 
-result (ATTACH COMPLETE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 65 08 03 b7 5e 47 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6682,17 +5299,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700/efe2b700 -> afe2b700/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING GMM INFO from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 45 08 21 9c 7f c6 
+PROCESSING GMM INFO from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 45 08 21 9c 7f c6 
 
-CALLBACK, event 0, msg length 66, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 45 08 21 9c 7f c6 
+NS2 CALLBACK, prim 0, msg length 66, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 45 08 21 9c 7f c6 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 66 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 70
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 45 08 21 9c 7f c6 
+NS2 UD REQUEST, prim 0, msg length 66, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 45 08 21 9c 7f c6 
 
-result (GMM INFO) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 45 08 21 9c 7f c6 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6706,17 +5323,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI efe2b700 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH REQUEST (unexpected, IMSI) from 0x01020304:1111
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 37 01 c0 69 08 01 02 f5 e0 21 08 02 08 11 12 13 14 15 16 17 f8 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 b4 63 cd 
+PROCESSING ATTACH REQUEST (unexpected, IMSI) from NSEI 4096
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 37 01 c0 69 08 01 02 f5 e0 21 08 02 08 11 12 13 14 15 16 17 f8 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 b4 63 cd 
 
-CALLBACK, event 0, msg length 78, bvci 0x1002
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 37 01 c0 69 08 01 02 f5 e0 21 08 02 08 11 12 13 14 15 16 17 f8 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 b4 63 cd 
+NS2 CALLBACK, prim 0, msg length 78, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 37 01 c0 69 08 01 02 f5 e0 21 08 02 08 11 12 13 14 15 16 17 f8 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 b4 63 cd 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 78 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 82
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 37 01 c0 69 08 01 02 f5 e0 21 08 02 08 11 12 13 14 15 16 17 f8 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 b4 63 cd 
+NS2 UD REQUEST, prim 0, msg length 78, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 37 01 c0 69 08 01 02 f5 e0 21 08 02 08 11 12 13 14 15 16 17 f8 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 b4 63 cd 
 
-result (ATTACH REQUEST (unexpected, IMSI)) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 37 01 c0 69 08 01 02 f5 e0 21 08 02 08 11 12 13 14 15 16 17 f8 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 b4 63 cd 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6730,17 +5347,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700 -> afe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH ACCEPT from 0x05060708:32000
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 49 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 83 01 10 
+PROCESSING ATTACH ACCEPT from NSEI 256
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 49 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 83 01 10 
 
-CALLBACK, event 0, msg length 88, bvci 0x1002
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 49 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 83 01 10 
+NS2 CALLBACK, prim 0, msg length 88, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 49 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 83 01 10 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 88 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 92
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 49 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 83 01 10 
+NS2 UD REQUEST, prim 0, msg length 88, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 49 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 83 01 10 
 
-result (ATTACH ACCEPT) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 49 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 83 01 10 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6754,17 +5371,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700/efe2b700 -> afe2b700/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH COMPLETE from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 6d 08 03 6f c8 ea 
+PROCESSING ATTACH COMPLETE from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 6d 08 03 6f c8 ea 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 6d 08 03 6f c8 ea 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 6d 08 03 6f c8 ea 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 6d 08 03 6f c8 ea 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 6d 08 03 6f c8 ea 
 
-result (ATTACH COMPLETE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 6d 08 03 6f c8 ea 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6778,17 +5395,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700/efe2b700 -> afe2b700/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING DETACH REQ from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 4d 08 05 02 25 0a 51 0e 1b 
+PROCESSING DETACH REQ from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 4d 08 05 02 25 0a 51 0e 1b 
 
-CALLBACK, event 0, msg length 69, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 4d 08 05 02 25 0a 51 0e 1b 
+NS2 CALLBACK, prim 0, msg length 69, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 4d 08 05 02 25 0a 51 0e 1b 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 69 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 73
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 4d 08 05 02 25 0a 51 0e 1b 
+NS2 UD REQUEST, prim 0, msg length 69, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 4d 08 05 02 25 0a 51 0e 1b 
 
-result (DETACH REQ) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 4d 08 05 02 25 0a 51 0e 1b 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6802,17 +5419,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI efe2b700 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING DETACH ACC from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 71 08 06 b3 95 70 
+PROCESSING DETACH ACC from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 71 08 06 b3 95 70 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 71 08 06 b3 95 70 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 71 08 06 b3 95 70 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 71 08 06 b3 95 70 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 71 08 06 b3 95 70 
 
-result (DETACH ACC) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 71 08 06 b3 95 70 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6826,17 +5443,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 00000000, IMSI 12131415161718, AGE 0, DE-REGISTERED
-PROCESSING ATTACH REQUEST from 0x01020304:1111
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 75 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 ab 17 53 
+PROCESSING ATTACH REQUEST from NSEI 4096
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 75 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 ab 17 53 
 
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 75 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 ab 17 53 
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 75 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 ab 17 53 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 75 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 79
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 75 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 ab 17 53 
+NS2 UD REQUEST, prim 0, msg length 75, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 75 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 ab 17 53 
 
-result (ATTACH REQUEST) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 75 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 ab 17 53 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6850,17 +5467,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700 -> afe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH ACCEPT from 0x05060708:32000
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 51 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 a4 f2 e0 
+PROCESSING ATTACH ACCEPT from NSEI 256
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 51 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 a4 f2 e0 
 
-CALLBACK, event 0, msg length 88, bvci 0x1002
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 51 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 a4 f2 e0 
+NS2 CALLBACK, prim 0, msg length 88, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 51 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 a4 f2 e0 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 88 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 92
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 51 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 a4 f2 e0 
+NS2 UD REQUEST, prim 0, msg length 88, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 51 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 a4 f2 e0 
 
-result (ATTACH ACCEPT) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 51 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 a4 f2 e0 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6874,17 +5491,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700/efe2b700 -> afe2b700/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH COMPLETE from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 79 08 03 08 25 bc 
+PROCESSING ATTACH COMPLETE from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 79 08 03 08 25 bc 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 79 08 03 08 25 bc 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 79 08 03 08 25 bc 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 79 08 03 08 25 bc 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 79 08 03 08 25 bc 
 
-result (ATTACH COMPLETE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 79 08 03 08 25 bc 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6898,17 +5515,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700/efe2b700 -> afe2b700/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING GMM INFO from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 55 08 21 97 59 c6 
+PROCESSING GMM INFO from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 55 08 21 97 59 c6 
 
-CALLBACK, event 0, msg length 66, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 55 08 21 97 59 c6 
+NS2 CALLBACK, prim 0, msg length 66, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 55 08 21 97 59 c6 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 66 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 70
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 55 08 21 97 59 c6 
+NS2 UD REQUEST, prim 0, msg length 66, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 55 08 21 97 59 c6 
 
-result (GMM INFO) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 88 41 c0 55 08 21 97 59 c6 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6922,17 +5539,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI efe2b700 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH REQUEST (unexpected) from 0x01020304:1111
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 7d 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 a2 24 d0 
+PROCESSING ATTACH REQUEST (unexpected) from NSEI 4096
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 7d 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 a2 24 d0 
 
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 7d 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 a2 24 d0 
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 7d 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 a2 24 d0 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 75 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 79
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 7d 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 a2 24 d0 
+NS2 UD REQUEST, prim 0, msg length 75, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 7d 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 a2 24 d0 
 
-result (ATTACH REQUEST (unexpected)) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 7d 08 01 02 f5 e0 21 08 02 05 f4 ef e2 b7 00 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 a2 24 d0 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6946,17 +5563,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700 -> afe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH ACCEPT from 0x05060708:32000
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 59 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 b9 a3 b0 
+PROCESSING ATTACH ACCEPT from NSEI 256
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 59 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 b9 a3 b0 
 
-CALLBACK, event 0, msg length 88, bvci 0x1002
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 59 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 b9 a3 b0 
+NS2 CALLBACK, prim 0, msg length 88, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 59 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 b9 a3 b0 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 88 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 92
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 59 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 b9 a3 b0 
+NS2 UD REQUEST, prim 0, msg length 88, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 59 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 b9 a3 b0 
 
-result (ATTACH ACCEPT) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 9e 41 c0 59 08 02 01 49 04 21 63 54 40 50 60 19 cd d7 08 17 16 18 05 f4 ef e2 b7 00 b9 a3 b0 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6970,17 +5587,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700/efe2b700 -> afe2b700/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH COMPLETE from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 81 08 03 b9 71 10 
+PROCESSING ATTACH COMPLETE from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 81 08 03 b9 71 10 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 81 08 03 b9 71 10 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 81 08 03 b9 71 10 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 81 08 03 b9 71 10 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 81 08 03 b9 71 10 
 
-result (ATTACH COMPLETE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 81 08 03 b9 71 10 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -6994,17 +5611,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700/efe2b700 -> afe2b700/efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING DETACH REQ from 0x05060708:32000
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 5d 08 05 02 25 0a 44 1a c9 
+PROCESSING DETACH REQ from NSEI 256
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 5d 08 05 02 25 0a 44 1a c9 
 
-CALLBACK, event 0, msg length 69, bvci 0x1002
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 5d 08 05 02 25 0a 44 1a c9 
+NS2 CALLBACK, prim 0, msg length 69, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 5d 08 05 02 25 0a 44 1a c9 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 69 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 73
-00 00 10 02 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 5d 08 05 02 25 0a 44 1a c9 
+NS2 UD REQUEST, prim 0, msg length 69, bvci 0x1002
+00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 5d 08 05 02 25 0a 44 1a c9 
 
-result (DETACH REQ) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 ef e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 5d 08 05 02 25 0a 44 1a c9 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -7018,17 +5635,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI efe2b700 -> efe2b700, IMSI 12131415161718, AGE 0
-PROCESSING DETACH ACC from 0x01020304:1111
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 85 08 06 b6 9c 27 
+PROCESSING DETACH ACC from NSEI 4096
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 85 08 06 b6 9c 27 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 85 08 06 b6 9c 27 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 85 08 06 b6 9c 27 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 85 08 06 b6 9c 27 
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 85 08 06 b6 9c 27 
 
-result (DETACH ACC) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 ef e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 85 08 06 b6 9c 27 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -7042,17 +5659,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 00000000, IMSI 12131415161718, AGE 0, DE-REGISTERED
-PROCESSING ATTACH REQUEST from 0x01020304:1111
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 89 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 21 24 df 
+PROCESSING ATTACH REQUEST from NSEI 4096
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 89 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 21 24 df 
 
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 89 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 21 24 df 
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 89 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 21 24 df 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 28
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
+NS2 UD REQUEST, prim 0, msg length 24, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
-result (ATTACH REQUEST) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L3]> 00 af e2 b7 00 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -7066,17 +5683,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700 -> afe2b700, IMSI (none), AGE 0, STORED 1, IMSI acquisition in progress
-PROCESSING IDENT RESPONSE from 0x01020304:1111
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 8d 08 16 08 11 12 13 14 15 16 17 f8 de 48 be 
+PROCESSING IDENT RESPONSE from NSEI 4096
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 8d 08 16 08 11 12 13 14 15 16 17 f8 de 48 be 
 
-CALLBACK, event 0, msg length 40, bvci 0x1002
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 8d 08 16 08 11 12 13 14 15 16 17 f8 de 48 be 
+NS2 CALLBACK, prim 0, msg length 40, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 8d 08 16 08 11 12 13 14 15 16 17 f8 de 48 be 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 75 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 79
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 89 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 21 24 df 
+NS2 UD REQUEST, prim 0, msg length 75, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 89 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 21 24 df 
 
-result (IDENT RESPONSE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 89 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 21 24 df 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -7090,17 +5707,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700 -> afe2b700, IMSI 12131415161718, AGE 0
-PROCESSING ATTACH REJECT from 0x05060708:32000
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 61 08 04 07 79 ba a5 
+PROCESSING ATTACH REJECT from NSEI 256
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 61 08 04 07 79 ba a5 
 
-CALLBACK, event 0, msg length 67, bvci 0x1002
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 61 08 04 07 79 ba a5 
+NS2 CALLBACK, prim 0, msg length 67, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 61 08 04 07 79 ba a5 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 67 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 71
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 61 08 04 07 79 ba a5 
+NS2 UD REQUEST, prim 0, msg length 67, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 61 08 04 07 79 ba a5 
 
-result (ATTACH REJECT) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 89 41 c0 61 08 04 07 79 ba a5 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -7115,17 +5732,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 00000000, IMSI 12131415161718, AGE 0, DE-REGISTERED
-PROCESSING ATTACH REQUEST from 0x01020304:1111
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 91 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 81 7a 01 
+PROCESSING ATTACH REQUEST from NSEI 4096
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 91 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 81 7a 01 
 
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 91 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 81 7a 01 
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 91 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 81 7a 01 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 28
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
+NS2 UD REQUEST, prim 0, msg length 24, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
-result (ATTACH REQUEST) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L3]> 00 af e2 b7 00 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -7140,17 +5757,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700 -> afe2b700, IMSI (none), AGE 0, STORED 1, IMSI acquisition in progress
-PROCESSING DETACH REQ (MO) from 0x01020304:1111
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 95 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 9c dc fc 
+PROCESSING DETACH REQ (MO) from NSEI 4096
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 95 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 9c dc fc 
 
-CALLBACK, event 0, msg length 44, bvci 0x1002
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 95 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 9c dc fc 
+NS2 CALLBACK, prim 0, msg length 44, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 15 01 c0 95 08 05 01 18 05 f4 ef e2 b7 00 19 03 b9 97 cb 9c dc fc 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 28
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 0e 00 09 41 c4 05 08 06 00 29 4a 68 
+NS2 UD REQUEST, prim 0, msg length 24, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 0e 00 09 41 c4 05 08 06 00 29 4a 68 
 
-result (DETACH REQ (MO)) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L3]> 00 af e2 b7 00 00 50 20 16 82 02 58 0e 00 09 41 c4 05 08 06 00 29 4a 68 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -7163,17 +5780,17 @@ Peers:
     Detach Request count            : 2
     Detach Accept count             : 1
     TLLI-Cache: 0
-PROCESSING ATTACH REQUEST from 0x01020304:1111
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 99 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 88 49 82 
+PROCESSING ATTACH REQUEST from NSEI 4096
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 99 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 88 49 82 
 
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 99 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 88 49 82 
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 99 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 88 49 82 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 28
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
+NS2 UD REQUEST, prim 0, msg length 24, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
-result (ATTACH REQUEST) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L3]> 00 af e2 b7 00 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -7188,17 +5805,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700 -> afe2b700, IMSI (none), AGE 0, STORED 1, IMSI acquisition in progress
-PROCESSING DETACH REQ (MT) from 0x05060708:32000
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 65 08 05 02 25 0a 17 a2 20 
+PROCESSING DETACH REQ (MT) from NSEI 256
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 65 08 05 02 25 0a 17 a2 20 
 
-CALLBACK, event 0, msg length 69, bvci 0x1002
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 65 08 05 02 25 0a 17 a2 20 
+NS2 CALLBACK, prim 0, msg length 69, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 65 08 05 02 25 0a 17 a2 20 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 69 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 73
-00 00 10 02 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 65 08 05 02 25 0a 17 a2 20 
+NS2 UD REQUEST, prim 0, msg length 69, bvci 0x1002
+00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 65 08 05 02 25 0a 17 a2 20 
 
-result (DETACH REQ (MT)) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 af e2 b7 00 00 50 20 16 82 02 58 13 99 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 0a 82 08 02 0d 88 11 12 13 14 15 16 17 f8 00 81 00 0e 8b 41 c0 65 08 05 02 25 0a 17 a2 20 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -7213,21 +5830,23 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI afe2b700 -> afe2b700, IMSI 12131415161718, AGE 0, STORED 1, IMSI acquisition in progress
-PROCESSING DETACH ACC from 0x01020304:1111
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 9d 08 06 65 2c 8a 
+PROCESSING DETACH ACC from NSEI 4096
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 9d 08 06 65 2c 8a 
 
-CALLBACK, event 0, msg length 31, bvci 0x1002
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 9d 08 06 65 2c 8a 
+NS2 CALLBACK, prim 0, msg length 31, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 9d 08 06 65 2c 8a 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 75 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 79
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 99 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 88 49 82 
+NS2 UD REQUEST, prim 0, msg length 75, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 99 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 88 49 82 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 31 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 35
-00 00 10 02 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 9d 08 06 65 2c 8a 
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 34 01 c0 99 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 88 49 82 
 
-result (DETACH ACC) = 0
+NS2 UD REQUEST, prim 0, msg length 31, bvci 0x1002
+01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 9d 08 06 65 2c 8a 
+
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 af e2 b7 00 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 08 01 c0 9d 08 06 65 2c 8a 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -7302,118 +5921,42 @@ Test TLLI expiry, max_len == 2, max_age == 1:
 === test_gbproxy_stored_messages ===
 --- Initialise SGSN ---
 
-MESSAGE to SGSN at 0x05060708:32000, msg length 12
-02 00 81 01 01 82 01 01 04 82 01 00 
-
-PROCESSING RESET_ACK from 0x05060708:32000
-03 01 82 01 01 04 82 01 00 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-0a 
+NS2 CALLBACK, prim 2, bvci 0x0000
 
-result (RESET_ACK) = 0
-
-PROCESSING ALIVE_ACK from 0x05060708:32000
-0b 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-06 
-
-result (ALIVE_ACK) = 0
-
-PROCESSING UNBLOCK_ACK from 0x05060708:32000
-07 
-
-==> got signal NS_UNBLOCK, NS-VC 0x0101/5.6.7.8:32000
-
-result (UNBLOCK_ACK) = 0
-
-PROCESSING ALIVE from 0x05060708:32000
-0a 
-
-MESSAGE to SGSN at 0x05060708:32000, msg length 1
-0b 
-
-result (ALIVE) = 0
+Message for SGSN (NSEI=256 BVCI=0):
+22 04 82 00 00 07 81 08 
 
 --- Initialise BSS 1 ---
 
-Setup NS-VC: remote 0x01020304:1111, NSVCI 0x1001(4097), NSEI 0x1000(4096)
-
-PROCESSING RESET from 0x01020304:1111
-02 00 81 01 01 82 10 01 04 82 10 00 
-
-==> got signal NS_RESET, NS-VC 0x1001/1.2.3.4:1111
-
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-03 01 82 10 01 04 82 10 00 
+Setup NS-VC: NSEI 0x1000(4096)
 
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0a 
+NS2 CALLBACK, prim 2, bvci 0x0000
 
-result (RESET) = 0
+Setup BSSGP: BVCI 0x1002(4098)
 
-PROCESSING ALIVE from 0x01020304:1111
-0a 
+PROCESSING BVC_RESET from NSEI 4096
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-0b 
+NS2 CALLBACK, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-result (ALIVE) = 0
+NS2 UD REQUEST, prim 0, msg length 18, bvci 0x0000
+22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-PROCESSING UNBLOCK from 0x01020304:1111
-06 
+Message for SGSN (NSEI=256 BVCI=0):
+[L2]> [L3]> 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
 
-MESSAGE to BSS at 0x01020304:1111, msg length 1
-07 
+PROCESSING BVC_RESET_ACK from NSEI 256
+23 04 82 10 02 
 
-==> got signal NS_UNBLOCK, NS-VC 0x1001/1.2.3.4:1111
+NS2 CALLBACK, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-result (UNBLOCK) = 0
+NS2 UD REQUEST, prim 0, msg length 5, bvci 0x0000
+23 04 82 10 02 
 
-PROCESSING ALIVE_ACK from 0x01020304:1111
-0b 
-
-result (ALIVE_ACK) = 0
-
-Setup BSSGP: remote 0x01020304:1111, BVCI 0x1002(4098)
-
-PROCESSING BVC_RESET from 0x01020304:1111
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
-
-CALLBACK, event 0, msg length 18, bvci 0x0000
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
-
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 18 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 22
-00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 
-
-result (BVC_RESET) = 0
-
-PROCESSING BVC_RESET_ACK from 0x05060708:32000
-00 00 00 00 23 04 82 10 02 
-
-CALLBACK, event 0, msg length 5, bvci 0x0000
-00 00 00 00 23 04 82 10 02 
-
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 9
-00 00 00 00 23 04 82 10 02 
-
-result (BVC_RESET_ACK) = 0
-
-Current NS-VCIs:
-    VCI 0x1001, NSEI 0x1000, peer 0x01020304:1111
-         Packets at NS Level  ( In): 5
-         Packets at NS Level  (Out): 5
-         Bytes at NS Level    ( In): 37
-         Bytes at NS Level    (Out): 21
-    VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000
-         Packets at NS Level  ( In): 5
-         Packets at NS Level  (Out): 5
-         Bytes at NS Level    ( In): 21
-         Bytes at NS Level    (Out): 37
-         NS-VC Block count         : 1
+Message for BSS (NSEI=4096 BVCI=0):
+[L2]> [L3]> 23 04 82 10 02 
 
 Gbproxy global:
 Peers:
@@ -7421,17 +5964,17 @@ Peers:
     TLLI-Cache: 0
 --- Establish first LLC connection ---
 
-PROCESSING ATTACH REQUEST from 0x01020304:1111
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
+PROCESSING ATTACH REQUEST from NSEI 4096
+01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
-CALLBACK, event 0, msg length 75, bvci 0x1002
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
+NS2 CALLBACK, prim 0, msg length 75, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 24 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 28
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
+NS2 UD REQUEST, prim 0, msg length 24, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
-result (ATTACH REQUEST) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L3]> 00 80 00 de ad 00 50 20 16 82 02 58 0e 00 09 41 c4 01 08 15 01 b7 f8 36 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -7439,17 +5982,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead -> 8000dead, IMSI (none), AGE 0, STORED 1, IMSI acquisition in progress
-PROCESSING IDENT REQUEST from 0x05060708:32000
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
+PROCESSING IDENT REQUEST from NSEI 256
+00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-CALLBACK, event 0, msg length 23, bvci 0x1002
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
+NS2 CALLBACK, prim 0, msg length 23, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 23 (gprs_ns_sendmsg)
-MESSAGE to BSS at 0x01020304:1111, msg length 27
-00 00 10 02 00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
+NS2 UD REQUEST, prim 0, msg length 23, bvci 0x1002
+00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
-result (IDENT REQUEST) = 0
+Message for BSS (NSEI=4096 BVCI=4098):
+[L2]> [L3]> 00 80 00 de ad 00 50 20 16 82 02 58 0e 89 41 c0 01 08 15 01 ff 6c ba 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -7457,13 +6000,11 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead -> 8000dead, IMSI (none), AGE 0, STORED 1, IMSI acquisition in progress
-PROCESSING DETACH ACCEPT from 0x01020304:1111
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 09 01 c0 05 08 06 00 f8 92 41 
-
-CALLBACK, event 0, msg length 32, bvci 0x1002
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 09 01 c0 05 08 06 00 f8 92 41 
+PROCESSING DETACH ACCEPT from NSEI 4096
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 09 01 c0 05 08 06 00 f8 92 41 
 
-result (DETACH ACCEPT) = 0
+NS2 CALLBACK, prim 0, msg length 32, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 09 01 c0 05 08 06 00 f8 92 41 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
@@ -7471,17 +6012,17 @@ Peers:
     TLLI cache size                 : 1
     TLLI-Cache: 1
       TLLI 8000dead -> 8000dead, IMSI (none), AGE 0, STORED 2, IMSI acquisition in progress
-PROCESSING IDENT RESPONSE from 0x01020304:1111
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
+PROCESSING IDENT RESPONSE from NSEI 4096
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
 
-CALLBACK, event 0, msg length 40, bvci 0x1002
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
+NS2 CALLBACK, prim 0, msg length 40, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 11 22 33 40 50 60 12 34 00 80 0e 00 11 01 c0 09 08 16 08 11 12 13 14 15 16 17 f8 10 f0 45 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 75 (gprs_ns_sendmsg)
-MESSAGE to SGSN at 0x05060708:32000, msg length 79
-00 00 10 02 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
+NS2 UD REQUEST, prim 0, msg length 75, bvci 0x1002
+01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
-result (IDENT RESPONSE) = 0
+Message for SGSN (NSEI=256 BVCI=4098):
+[L2]> [L3]> 01 80 00 de ad 00 00 04 08 88 00 f1 99 00 63 60 12 34 00 80 0e 00 34 01 c0 01 08 01 02 f5 e0 21 08 02 05 f4 fb c5 46 79 11 22 33 40 50 60 19 18 b3 43 2b 25 96 62 00 60 80 9a c2 c6 62 00 60 80 ba c8 c6 62 00 60 80 00 16 6d 01 
 
 Peers:
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py
index ed52d5f9b..beb0ee126 100755
--- a/tests/vty_test_runner.py
+++ b/tests/vty_test_runner.py
@@ -95,7 +95,7 @@ class TestVTYGbproxy(TestVTYBase):
 
     def testVtyShow(self):
         res = self.vty.command("show ns")
-        self.assertTrue(res.find('Encapsulation NS-UDP-IP') >= 0)
+        self.assertTrue(res.find('UDP bind') >= 0)
 
         res = self.vty.command("show gbproxy stats")
         self.assertTrue(res.find('GBProxy Global Statistics') >= 0)
@@ -105,16 +105,14 @@ class TestVTYGbproxy(TestVTYBase):
         self.assertTrue(self.vty.verify('delete-gbproxy-peer 9999 bvci 7777', ['BVC not found']))
         res = self.vty.command("delete-gbproxy-peer 9999 all dry-run")
         self.assertTrue(res.find('Not Deleted 0 BVC') >= 0)
-        self.assertTrue(res.find('Not Deleted 0 NS-VC') >= 0)
+        self.assertTrue(res.find('NSEI not found') >= 0)
         res = self.vty.command("delete-gbproxy-peer 9999 only-bvc dry-run")
         self.assertTrue(res.find('Not Deleted 0 BVC') >= 0)
-        self.assertTrue(res.find('Not Deleted 0 NS-VC') < 0)
         res = self.vty.command("delete-gbproxy-peer 9999 only-nsvc dry-run")
-        self.assertTrue(res.find('Not Deleted 0 BVC') < 0)
-        self.assertTrue(res.find('Not Deleted 0 NS-VC') >= 0)
+        self.assertTrue(res.find('NSEI not found') >= 0)
         res = self.vty.command("delete-gbproxy-peer 9999 all")
         self.assertTrue(res.find('Deleted 0 BVC') >= 0)
-        self.assertTrue(res.find('Deleted 0 NS-VC') >= 0)
+        self.assertTrue(res.find('NSEI not found') >= 0)
 
 class TestVTYSGSN(TestVTYBase):