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
diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h
index 1e8fb25..4466f15 100644
--- a/include/osmocom/sgsn/gb_proxy.h
+++ b/include/osmocom/sgsn/gb_proxy.h
@@ -3,9 +3,10 @@
 
 
 #include <osmocom/core/msgb.h>
+#include <osmocom/core/timer.h>
 #include <osmocom/gsm/gsm23003.h>
 
-#include <osmocom/gprs/gprs_ns.h>
+#include <osmocom/gprs/gprs_ns2.h>
 #include <osmocom/vty/command.h>
 
 #include <sys/types.h>
@@ -95,7 +96,7 @@
 	uint16_t nsip_sgsn_nsei;
 
 	/* NS instance of libosmogb */
-	struct gprs_ns_inst *nsi;
+	struct gprs_ns2_inst *nsi;
 
 	/* Linked list of all Gb peers (except SGSN) */
 	struct llist_head bts_peers;
@@ -236,13 +237,13 @@
 int gbproxy_init_config(struct gbproxy_config *cfg);
 
 /* Main input function for Gb proxy */
-int gbprox_rcvmsg(struct gbproxy_config *cfg, struct msgb *msg, uint16_t nsei, uint16_t ns_bvci, uint16_t nsvci);
+int gbprox_rcvmsg(void *ctx, struct msgb *msg);
 
 int gbprox_signal(unsigned int subsys, unsigned int signal,
 		  void *handler_data, void *signal_data);
 
-/* Reset all persistent NS-VC's */
-int gbprox_reset_persistent_nsvcs(struct gprs_ns_inst *nsi);
+
+int gprs_ns2_prim_cb(struct osmo_prim_hdr *oph, void *ctx);
 
 void gbprox_reset(struct gbproxy_config *cfg);