diff --git a/openbsc/tests/gbproxy/gbproxy_test.c b/openbsc/tests/gbproxy/gbproxy_test.c
index 6bee41c..c458733 100644
--- a/openbsc/tests/gbproxy/gbproxy_test.c
+++ b/openbsc/tests/gbproxy/gbproxy_test.c
@@ -335,7 +335,7 @@
 {
 	printf("CALLBACK, event %d, msg length %d, bvci 0x%04x\n%s\n\n",
 			event, msgb_bssgp_len(msg), bvci,
-			osmo_hexdump(msgb_bssgph(msg), msgb_bssgp_len(msg)));
+			osmo_hexdump(msgb_l2(msg), msgb_l2len(msg)));
 
 	switch (event) {
 	case GPRS_NS_EVT_UNIT_DATA:
@@ -381,18 +381,19 @@
 	uint16_t bvci = msgb_bvci(msg);
 	uint16_t nsei = msgb_nsei(msg);
 
-	unsigned char *buf = msg->data;
-	size_t len = msg->len;
+	size_t len = msgb_length(msg);
 
 	if (!real_gprs_ns_sendmsg)
 		real_gprs_ns_sendmsg = dlsym(RTLD_NEXT, "gprs_ns_sendmsg");
 
 	if (nsei == SGSN_NSEI)
-		printf("NS UNITDATA MESSAGE to SGSN, BVCI 0x%04x, msg length %d\n%s\n\n",
-		       bvci, len, osmo_hexdump(buf, len));
+		printf("NS UNITDATA MESSAGE to SGSN, BVCI 0x%04x, "
+		       "msg length %d (%s)\n",
+		       bvci, len, __func__);
 	else
-		printf("NS UNITDATA MESSAGE to BSS, BVCI 0x%04x, msg length %d\n%s\n\n",
-		       bvci, len, osmo_hexdump(buf, len));
+		printf("NS UNITDATA MESSAGE to BSS, BVCI 0x%04x, "
+		       "msg length %d (%s)\n",
+		       bvci, len, __func__);
 
 	return real_gprs_ns_sendmsg(nsi, msg);
 }
@@ -525,6 +526,7 @@
 	configure_sgsn_peer(&sgsn_peer);
 	configure_bss_peers(bss_peer, ARRAY_SIZE(bss_peer));
 
+	printf("=== %s ===\n", __func__);
 	printf("--- Initialise SGSN ---\n\n");
 
 	connect_sgsn(nsi, &sgsn_peer);
@@ -677,6 +679,7 @@
 	configure_sgsn_peer(&sgsn_peer);
 	configure_bss_peers(bss_peer, ARRAY_SIZE(bss_peer));
 
+	printf("=== %s ===\n", __func__);
 	printf("--- Initialise SGSN ---\n\n");
 
 	connect_sgsn(nsi, &sgsn_peer);
@@ -811,6 +814,7 @@
 	configure_sgsn_peer(&sgsn_peer);
 	configure_bss_peers(bss_peer, ARRAY_SIZE(bss_peer));
 
+	printf("=== %s ===\n", __func__);
 	printf("--- Initialise SGSN ---\n\n");
 
 	connect_sgsn(nsi, &sgsn_peer);
@@ -833,26 +837,28 @@
 
 	printf("--- Send message from BSS 1 to SGSN, BVCI 0x1002 ---\n\n");
 
-	send_ns_unitdata(nsi, NULL, &bss_peer[0], 0x1002,
+	send_ns_unitdata(nsi, "ATTACH REQUEST", &bss_peer[0], 0x1002,
 			 bssgp_attach_req, sizeof(bssgp_attach_req));
 
-	send_ns_unitdata(nsi, NULL, &sgsn_peer, 0x1002,
+	send_ns_unitdata(nsi, "ATTACH ACCEPT", &sgsn_peer, 0x1002,
 			 bssgp_attach_acc, sizeof(bssgp_attach_acc));
 
-	send_ns_unitdata(nsi, NULL, &bss_peer[0], 0x1002,
+	send_ns_unitdata(nsi, "UPDATE REQ", &bss_peer[0], 0x1002,
 			 bssgp_ra_upd_req, sizeof(bssgp_ra_upd_req));
 
-	send_ns_unitdata(nsi, NULL, &sgsn_peer, 0x1002,
+	send_ns_unitdata(nsi, "RA UPD ACC", &sgsn_peer, 0x1002,
 			 bssgp_ra_upd_acc, sizeof(bssgp_ra_upd_acc));
 
 	/* Replace APN */
-	send_ns_unitdata(nsi, NULL, &bss_peer[0], 0x1002,
+	send_ns_unitdata(nsi, "ACT PDP CTX REQ (REPLACE APN)",
+			 &bss_peer[0], 0x1002,
 			 bssgp_act_pdp_ctx_req, sizeof(bssgp_act_pdp_ctx_req));
 
 	/* TODO: Re-configure to test APN IE removal */
 
 	/* Remove APN */
-	send_ns_unitdata(nsi, NULL, &bss_peer[0], 0x1002,
+	send_ns_unitdata(nsi, "ACT PDP CTX REQ (REMOVE APN)",
+			 &bss_peer[0], 0x1002,
 			 bssgp_act_pdp_ctx_req, sizeof(bssgp_act_pdp_ctx_req));
 
 	gbprox_dump_global(stdout, 0);
diff --git a/openbsc/tests/gbproxy/gbproxy_test.ok b/openbsc/tests/gbproxy/gbproxy_test.ok
index 58add97..5f186c2 100644
--- a/openbsc/tests/gbproxy/gbproxy_test.ok
+++ b/openbsc/tests/gbproxy/gbproxy_test.ok
@@ -1,4 +1,5 @@
 ===== GbProxy test START
+=== test_gbproxy ===
 --- Initialise SGSN ---
 
 MESSAGE to SGSN at 0x05060708:32000, msg length 12
@@ -85,11 +86,9 @@
 00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
 CALLBACK, event 0, msg length 22, bvci 0x0000
-22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
+00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22
-22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
-
+NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22 (gprs_ns_sendmsg)
 MESSAGE to SGSN at 0x05060708:32000, msg length 26
 00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
@@ -106,11 +105,9 @@
 00 00 00 00 23 04 82 10 02 
 
 CALLBACK, event 0, msg length 5, bvci 0x0000
-23 04 82 10 02 
+00 00 00 00 23 04 82 10 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5
-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 
 
@@ -162,11 +159,9 @@
 00 00 00 00 22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
 CALLBACK, event 0, msg length 22, bvci 0x0000
-22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
+00 00 00 00 22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22
-22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
-
+NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22 (gprs_ns_sendmsg)
 MESSAGE to SGSN at 0x05060708:32000, msg length 26
 00 00 00 00 22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
@@ -185,11 +180,9 @@
 00 00 00 00 23 04 82 20 02 
 
 CALLBACK, event 0, msg length 5, bvci 0x0000
-23 04 82 20 02 
+00 00 00 00 23 04 82 20 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5
-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 
 
@@ -501,11 +494,9 @@
 00 00 00 00 22 04 82 10 12 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
 CALLBACK, event 0, msg length 22, bvci 0x0000
-22 04 82 10 12 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
+00 00 00 00 22 04 82 10 12 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22
-22 04 82 10 12 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
-
+NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22 (gprs_ns_sendmsg)
 MESSAGE to SGSN at 0x05060708:32000, msg length 26
 00 00 00 00 22 04 82 10 12 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
@@ -526,11 +517,9 @@
 00 00 00 00 23 04 82 10 12 
 
 CALLBACK, event 0, msg length 5, bvci 0x0000
-23 04 82 10 12 
+00 00 00 00 23 04 82 10 12 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5
-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 
 
@@ -544,11 +533,9 @@
 00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
 CALLBACK, event 0, msg length 22, bvci 0x0000
-22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
+00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22
-22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
-
+NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22 (gprs_ns_sendmsg)
 MESSAGE to SGSN at 0x05060708:32000, msg length 26
 00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
@@ -569,11 +556,9 @@
 00 00 00 00 23 04 82 10 02 
 
 CALLBACK, event 0, msg length 5, bvci 0x0000
-23 04 82 10 02 
+00 00 00 00 23 04 82 10 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5
-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 
 
@@ -587,11 +572,9 @@
 00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
 CALLBACK, event 0, msg length 22, bvci 0x0000
-22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
+00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22
-22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
-
+NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22 (gprs_ns_sendmsg)
 MESSAGE to SGSN at 0x05060708:32000, msg length 26
 00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
@@ -612,11 +595,9 @@
 00 00 00 00 23 04 82 10 02 
 
 CALLBACK, event 0, msg length 5, bvci 0x0000
-23 04 82 10 02 
+00 00 00 00 23 04 82 10 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5
-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 
 
@@ -628,11 +609,9 @@
 00 00 10 12 
 
 CALLBACK, event 0, msg length 0, bvci 0x1012
+00 00 10 12 
 
-
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1012, msg length 0
-
-
+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 
 
@@ -644,11 +623,9 @@
 00 00 10 12 
 
 CALLBACK, event 0, msg length 0, bvci 0x1012
+00 00 10 12 
 
-
-NS UNITDATA MESSAGE to BSS, BVCI 0x1012, msg length 0
-
-
+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 
 
@@ -660,11 +637,9 @@
 00 00 10 12 
 
 CALLBACK, event 0, msg length 0, bvci 0x1012
+00 00 10 12 
 
-
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1012, msg length 0
-
-
+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 
 
@@ -676,11 +651,9 @@
 00 00 10 12 
 
 CALLBACK, event 0, msg length 0, bvci 0x1012
+00 00 10 12 
 
-
-NS UNITDATA MESSAGE to BSS, BVCI 0x1012, msg length 0
-
-
+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 
 
@@ -692,11 +665,9 @@
 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
-
-
+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 
 
@@ -708,11 +679,9 @@
 00 00 20 02 
 
 CALLBACK, event 0, msg length 0, bvci 0x2002
+00 00 20 02 
 
-
-NS UNITDATA MESSAGE to BSS, BVCI 0x2002, msg length 0
-
-
+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 
 
@@ -726,11 +695,9 @@
 00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
 CALLBACK, event 0, msg length 22, bvci 0x0000
-22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
+00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22
-22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
-
+NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22 (gprs_ns_sendmsg)
 MESSAGE to SGSN at 0x05060708:32000, msg length 26
 00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
@@ -754,11 +721,9 @@
 00 00 00 00 23 04 82 10 02 
 
 CALLBACK, event 0, msg length 5, bvci 0x0000
-23 04 82 10 02 
+00 00 00 00 23 04 82 10 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5
-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 
 
@@ -770,11 +735,9 @@
 00 00 10 12 
 
 CALLBACK, event 0, msg length 0, bvci 0x1012
+00 00 10 12 
 
-
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1012, msg length 0
-
-
+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 
 
@@ -786,11 +749,9 @@
 00 00 10 12 
 
 CALLBACK, event 0, msg length 0, bvci 0x1012
+00 00 10 12 
 
-
-NS UNITDATA MESSAGE to BSS, BVCI 0x1012, msg length 0
-
-
+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 
 
@@ -802,11 +763,9 @@
 00 00 10 ff 
 
 CALLBACK, event 0, msg length 0, bvci 0x10ff
+00 00 10 ff 
 
-
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 10
-41 07 81 05 04 82 10 ff 15 80 
-
+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 
 
@@ -814,6 +773,7 @@
 
 Gbproxy global:
     Invalid BVC Identifier          : 1
+=== test_gbproxy_ident_changes ===
 --- Initialise SGSN ---
 
 MESSAGE to SGSN at 0x05060708:32000, msg length 12
@@ -907,11 +867,9 @@
 00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
 CALLBACK, event 0, msg length 22, bvci 0x0000
-22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
+00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22
-22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
-
+NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22 (gprs_ns_sendmsg)
 MESSAGE to SGSN at 0x05060708:32000, msg length 26
 00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
@@ -921,11 +879,9 @@
 00 00 00 00 23 04 82 10 02 
 
 CALLBACK, event 0, msg length 5, bvci 0x0000
-23 04 82 10 02 
+00 00 00 00 23 04 82 10 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5
-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 
 
@@ -941,11 +897,9 @@
 00 00 00 00 22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
 CALLBACK, event 0, msg length 22, bvci 0x0000
-22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
+00 00 00 00 22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22
-22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
-
+NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22 (gprs_ns_sendmsg)
 MESSAGE to SGSN at 0x05060708:32000, msg length 26
 00 00 00 00 22 04 82 20 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
@@ -955,11 +909,9 @@
 00 00 00 00 23 04 82 20 02 
 
 CALLBACK, event 0, msg length 5, bvci 0x0000
-23 04 82 20 02 
+00 00 00 00 23 04 82 20 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5
-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 
 
@@ -974,11 +926,9 @@
 00 00 10 02 
 
 CALLBACK, event 0, msg length 0, bvci 0x1002
+00 00 10 02 
 
-
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 0
-
-
+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 
 
@@ -988,11 +938,9 @@
 00 00 10 02 
 
 CALLBACK, event 0, msg length 0, bvci 0x1002
+00 00 10 02 
 
-
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 0
-
-
+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 
 
@@ -1004,11 +952,9 @@
 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
-
-
+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 
 
@@ -1018,11 +964,9 @@
 00 00 20 02 
 
 CALLBACK, event 0, msg length 0, bvci 0x2002
+00 00 20 02 
 
-
-NS UNITDATA MESSAGE to BSS, BVCI 0x2002, msg length 0
-
-
+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 
 
@@ -1082,11 +1026,9 @@
 00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
 CALLBACK, event 0, msg length 22, bvci 0x0000
-22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
+00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22
-22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
-
+NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22 (gprs_ns_sendmsg)
 MESSAGE to SGSN at 0x05060708:32000, msg length 26
 00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
@@ -1096,11 +1038,9 @@
 00 00 00 00 23 04 82 10 02 
 
 CALLBACK, event 0, msg length 5, bvci 0x0000
-23 04 82 10 02 
+00 00 00 00 23 04 82 10 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5
-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 
 
@@ -1118,11 +1058,9 @@
 00 00 00 00 22 04 82 30 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
 CALLBACK, event 0, msg length 22, bvci 0x0000
-22 04 82 30 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
+00 00 00 00 22 04 82 30 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22
-22 04 82 30 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
-
+NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22 (gprs_ns_sendmsg)
 MESSAGE to SGSN at 0x05060708:32000, msg length 26
 00 00 00 00 22 04 82 30 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
@@ -1132,11 +1070,9 @@
 00 00 00 00 23 04 82 30 02 
 
 CALLBACK, event 0, msg length 5, bvci 0x0000
-23 04 82 30 02 
+00 00 00 00 23 04 82 30 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5
-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 
 
@@ -1153,11 +1089,9 @@
 00 00 10 02 
 
 CALLBACK, event 0, msg length 0, bvci 0x1002
+00 00 10 02 
 
-
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 0
-
-
+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 
 
@@ -1167,11 +1101,9 @@
 00 00 10 02 
 
 CALLBACK, event 0, msg length 0, bvci 0x1002
+00 00 10 02 
 
-
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 0
-
-
+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 
 
@@ -1183,11 +1115,9 @@
 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
-
-
+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 
 
@@ -1203,11 +1133,9 @@
 00 00 20 02 
 
 CALLBACK, event 0, msg length 0, bvci 0x2002
+00 00 20 02 
 
-
-NS UNITDATA MESSAGE to BSS, BVCI 0x2002, msg length 0
-
-
+NS UNITDATA MESSAGE to BSS, BVCI 0x2002, msg length 0 (gprs_ns_sendmsg)
 result (UNITDATA) = -22
 
 Peers:
@@ -1223,11 +1151,9 @@
 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
-
-
+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 
 
@@ -1237,11 +1163,9 @@
 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
-
-
+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 
 
@@ -1305,11 +1229,9 @@
 00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
 CALLBACK, event 0, msg length 22, bvci 0x0000
-22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
+00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22
-22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
-
+NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22 (gprs_ns_sendmsg)
 MESSAGE to SGSN at 0x05060708:32000, msg length 26
 00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
@@ -1319,11 +1241,9 @@
 00 00 00 00 23 04 82 10 02 
 
 CALLBACK, event 0, msg length 5, bvci 0x0000
-23 04 82 10 02 
+00 00 00 00 23 04 82 10 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5
-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 
 
@@ -1344,11 +1264,9 @@
 00 00 00 00 22 04 82 40 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
 CALLBACK, event 0, msg length 22, bvci 0x0000
-22 04 82 40 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
+00 00 00 00 22 04 82 40 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22
-22 04 82 40 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
-
+NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22 (gprs_ns_sendmsg)
 MESSAGE to SGSN at 0x05060708:32000, msg length 26
 00 00 00 00 22 04 82 40 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
@@ -1358,11 +1276,9 @@
 00 00 00 00 23 04 82 40 02 
 
 CALLBACK, event 0, msg length 5, bvci 0x0000
-23 04 82 40 02 
+00 00 00 00 23 04 82 40 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5
-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 
 
@@ -1382,11 +1298,9 @@
 00 00 10 02 
 
 CALLBACK, event 0, msg length 0, bvci 0x1002
+00 00 10 02 
 
-
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 0
-
-
+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 
 
@@ -1396,11 +1310,9 @@
 00 00 10 02 
 
 CALLBACK, event 0, msg length 0, bvci 0x1002
+00 00 10 02 
 
-
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 0
-
-
+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 
 
@@ -1412,11 +1324,9 @@
 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
-
-
+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 
 
@@ -1434,11 +1344,9 @@
 00 00 20 02 
 
 CALLBACK, event 0, msg length 0, bvci 0x2002
+00 00 20 02 
 
-
-NS UNITDATA MESSAGE to BSS, BVCI 0x2002, msg length 0
-
-
+NS UNITDATA MESSAGE to BSS, BVCI 0x2002, msg length 0 (gprs_ns_sendmsg)
 result (UNITDATA) = -22
 
 Peers:
@@ -1455,11 +1363,9 @@
 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
-
-
+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 
 
@@ -1469,11 +1375,9 @@
 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
-
-
+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 
 
@@ -1485,11 +1389,9 @@
 00 00 40 02 
 
 CALLBACK, event 0, msg length 0, bvci 0x4002
+00 00 40 02 
 
-
-NS UNITDATA MESSAGE to SGSN, BVCI 0x4002, msg length 0
-
-
+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 
 
@@ -1499,11 +1401,9 @@
 00 00 40 02 
 
 CALLBACK, event 0, msg length 0, bvci 0x4002
+00 00 40 02 
 
-
-NS UNITDATA MESSAGE to BSS, BVCI 0x4002, msg length 0
-
-
+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 
 
@@ -1518,6 +1418,7 @@
     NS Transmission error           : 2
   NSEI 8192, BVCI 4098, not blocked, RAI 112-332-16464-96
     NSEI mismatch                   : 1
+=== test_gbproxy_ra_patching ===
 --- Initialise SGSN ---
 
 MESSAGE to SGSN at 0x05060708:32000, msg length 12
@@ -1604,11 +1505,9 @@
 00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
 CALLBACK, event 0, msg length 22, bvci 0x0000
-22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
+00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22
-22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
-
+NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 22 (gprs_ns_sendmsg)
 MESSAGE to SGSN at 0x05060708:32000, msg length 26
 00 00 00 00 22 04 82 10 02 07 81 08 08 88 11 22 33 40 50 60 10 00 00 00 00 00 
 
@@ -1625,11 +1524,9 @@
 00 00 00 00 23 04 82 10 02 
 
 CALLBACK, event 0, msg length 5, bvci 0x0000
-23 04 82 10 02 
+00 00 00 00 23 04 82 10 02 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x0000, msg length 5
-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 
 
@@ -1639,11 +1536,9 @@
 00 00 00 00 0b 1f 84 cc d1 75 8b 1b 86 11 22 33 40 50 60 
 
 CALLBACK, event 0, msg length 15, bvci 0x0000
-0b 1f 84 cc d1 75 8b 1b 86 11 22 33 40 50 60 
+00 00 00 00 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
-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 11 22 33 40 50 60 
 
@@ -1653,11 +1548,9 @@
 00 00 00 00 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
-0c 1f 84 cc d1 75 8b 1b 86 21 63 54 40 50 60 1d 81 01 
+00 00 00 00 0c 1f 84 cc d1 75 8b 1b 86 21 63 54 40 50 60 1d 81 01 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x0000, msg length 24
-41 07 81 05 15 92 0c 1f 84 cc d1 75 8b 1b 86 21 63 54 40 50 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 05 15 92 0c 1f 84 cc d1 75 8b 1b 86 21 63 54 40 50 60 1d 81 01 
 
@@ -1669,89 +1562,77 @@
   NSEI 4096, BVCI 4098, not blocked, RAI 112-332-16464-96
 --- Send message from BSS 1 to SGSN, BVCI 0x1002 ---
 
-PROCESSING UNITDATA from 0x01020304:1111
+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 
 
 CALLBACK, event 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 
+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 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 75
-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 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 
 
-result (UNITDATA) = 79
+result (ATTACH REQUEST) = 79
 
-PROCESSING UNITDATA from 0x05060708:32000
+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 18 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 fb c5 47 22 42 67 9a 
 
 CALLBACK, event 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 18 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 fb c5 47 22 42 67 9a 
+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 18 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 fb c5 47 22 42 67 9a 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 88
-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 18 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 fb c5 47 22 42 67 9a 
-
+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 18 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 fb c5 47 22 42 67 9a 
 
-result (UNITDATA) = 92
+result (ATTACH ACCEPT) = 92
 
-PROCESSING UNITDATA from 0x01020304:1111
+PROCESSING UPDATE REQ from 0x01020304:1111
 00 00 10 02 01 af e2 80 6e 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
-01 af e2 80 6e 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 
+00 00 10 02 01 af e2 80 6e 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
-01 af e2 80 6e 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 af e2 80 6e 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 
 
-result (UNITDATA) = 89
+result (UPDATE REQ) = 89
 
-PROCESSING UNITDATA from 0x05060708:32000
+PROCESSING RA UPD ACC from 0x05060708:32000
 00 00 10 02 00 af e2 80 6e 00 50 20 16 82 02 58 13 9d 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 0a 82 07 04 0d 88 11 12 13 14 15 16 17 18 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 81 17 17 16 c3 bf cc 
 
 CALLBACK, event 0, msg length 91, bvci 0x1002
-00 af e2 80 6e 00 50 20 16 82 02 58 13 9d 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 0a 82 07 04 0d 88 11 12 13 14 15 16 17 18 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 81 17 17 16 c3 bf cc 
+00 00 10 02 00 af e2 80 6e 00 50 20 16 82 02 58 13 9d 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 0a 82 07 04 0d 88 11 12 13 14 15 16 17 18 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 81 17 17 16 c3 bf cc 
 
-NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 91
-00 af e2 80 6e 00 50 20 16 82 02 58 13 9d 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 0a 82 07 04 0d 88 11 12 13 14 15 16 17 18 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 81 17 17 16 c3 bf cc 
-
+NS UNITDATA MESSAGE to BSS, BVCI 0x1002, msg length 91 (gprs_ns_sendmsg)
 MESSAGE to BSS at 0x01020304:1111, msg length 95
 00 00 10 02 00 af e2 80 6e 00 50 20 16 82 02 58 13 9d 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 0a 82 07 04 0d 88 11 12 13 14 15 16 17 18 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 81 17 17 16 c3 bf cc 
 
-result (UNITDATA) = 95
+result (RA UPD ACC) = 95
 
-PROCESSING UNITDATA from 0x01020304:1111
+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 
 
 CALLBACK, event 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 
+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 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 76
-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 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 
 
-result (UNITDATA) = 80
+result (ACT PDP CTX REQ (REPLACE APN)) = 80
 
-PROCESSING UNITDATA from 0x01020304:1111
+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 
 
 CALLBACK, event 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 
+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 
 
-NS UNITDATA MESSAGE to SGSN, BVCI 0x1002, msg length 76
-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 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 
 
-result (UNITDATA) = 80
+result (ACT PDP CTX REQ (REMOVE APN)) = 80
 
 Gbproxy global:
     Invalid Routing Area Identifier : 1
@@ -1763,7 +1644,7 @@
 00 00 00 00 23 04 82 1e ee 
 
 CALLBACK, event 0, msg length 5, bvci 0x0000
-23 04 82 1e ee 
+00 00 00 00 23 04 82 1e ee 
 
 result (BVC_RESET_ACK) = -2
 
@@ -1771,11 +1652,9 @@
 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
-0c 1f 84 cc d1 75 8b 1b 86 00 f1 99 00 63 60 1d 81 01 
+00 00 00 00 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
-41 07 81 05 15 92 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 05 15 92 0c 1f 84 cc d1 75 8b 1b 86 00 f1 99 00 63 60 1d 81 01