aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAlexander Couzens <lynxis@fe80.eu>2020-09-22 13:21:46 +0200
committerDaniel Willmann <dwillmann@sysmocom.de>2020-11-06 18:45:05 +0100
commit82182d09c73be2f6f53cd87824cc3c34a342a372 (patch)
treef741a1de6418e38098962f5d183a698236e0b967 /include
parent08395b3369a085250a2179837ab98379753c3b6e (diff)
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
Diffstat (limited to 'include')
-rw-r--r--include/osmocom/sgsn/gb_proxy.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h
index 1e8fb253c..4466f155a 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 @@ struct gbproxy_config {
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 gb_ctrl_cmds_install(void);
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);