aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-07-13 02:57:42 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-07-13 02:57:42 +0200
commit2739d28ac8884c0e0085f357b578f8ed8e9443c0 (patch)
tree79cb07807d3390dd0ed21cd3c9d7eaa3cd3d9951
parent27badcf1b6c9a571eb4eaa7e4724e1b69feee286 (diff)
apply
-rw-r--r--include/openbsc/signal.h4
-rw-r--r--include/openbsc/vty.h51
-rw-r--r--src/gprs/Makefile.am3
-rw-r--r--src/gprs/gb_proxy_main.c3
-rw-r--r--src/gprs/gb_proxy_patch.c3
-rw-r--r--src/gprs/gb_proxy_peer.c5
-rw-r--r--src/gprs/gprs_gmm.c6
-rw-r--r--src/gprs/gprs_llc_parse.c1
-rw-r--r--src/gprs/gprs_sgsn.c2
-rw-r--r--src/gprs/gprs_sndcp.c1
10 files changed, 15 insertions, 64 deletions
diff --git a/include/openbsc/signal.h b/include/openbsc/signal.h
index 2f9bfe64..4b6ba56f 100644
--- a/include/openbsc/signal.h
+++ b/include/openbsc/signal.h
@@ -27,6 +27,10 @@
#include <osmocom/core/signal.h>
+enum signal_subsystems {
+ SS_SGSN,
+};
+
/* GPRS SGSN signals SS_SGSN */
enum signal_sgsn {
S_SGSN_ATTACH,
diff --git a/include/openbsc/vty.h b/include/openbsc/vty.h
index f7056016..f0495b84 100644
--- a/include/openbsc/vty.h
+++ b/include/openbsc/vty.h
@@ -1,54 +1,7 @@
-#ifndef OPENBSC_VTY_H
-#define OPENBSC_VTY_H
-
-#include <osmocom/vty/vty.h>
-#include <osmocom/vty/buffer.h>
-#include <osmocom/vty/command.h>
-
-struct gsm_network;
-struct vty;
-
-void openbsc_vty_print_statistics(struct vty *vty, struct gsm_network *);
-
-struct buffer *vty_argv_to_buffer(int argc, const char *argv[], int base);
-
-extern struct cmd_element cfg_description_cmd;
-extern struct cmd_element cfg_no_description_cmd;
+#pragma once
enum bsc_vty_node {
- GSMNET_NODE = _LAST_OSMOVTY_NODE + 1,
- BTS_NODE,
- TRX_NODE,
- TS_NODE,
- SUBSCR_NODE,
- MGCP_NODE,
- GBPROXY_NODE,
+ GBPROXY_NODE = _LAST_OSMOVTY_NODE + 1,
SGSN_NODE,
- OML_NODE,
- NAT_NODE,
- NAT_BSC_NODE,
- MSC_NODE,
- OM2K_NODE,
- OM2K_CON_GROUP_NODE,
- TRUNK_NODE,
- PGROUP_NODE,
- MNCC_INT_NODE,
- NITB_NODE,
- BSC_NODE,
- SMPP_NODE,
- SMPP_ESME_NODE,
GTPHUB_NODE,
- HLR_NODE,
};
-
-extern int bsc_vty_is_config_node(struct vty *vty, int node);
-
-struct log_info;
-int bsc_vty_init(struct gsm_network *network);
-int bsc_vty_init_extra(void);
-
-void msc_vty_init(struct gsm_network *msc_network);
-
-struct gsm_network *gsmnet_from_vty(struct vty *vty);
-
-#endif
diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am
index 39a4c12a..82323fd5 100644
--- a/src/gprs/Makefile.am
+++ b/src/gprs/Makefile.am
@@ -62,7 +62,6 @@ osmo_gbproxy_SOURCES = \
gprs_utils.c \
$(NULL)
osmo_gbproxy_LDADD = \
- $(top_builddir)/src/libcommon/libcommon.a \
$(OSMO_LIBS) \
$(LIBCRYPTO_LIBS) \
-lrt \
@@ -95,7 +94,6 @@ osmo_sgsn_SOURCES = \
v42bis.c \
$(NULL)
osmo_sgsn_LDADD = \
- $(top_builddir)/src/libcommon/libcommon.a \
$(OSMO_LIBS) \
$(LIBOSMOABIS_LIBS) \
$(LIBCARES_LIBS) \
@@ -122,7 +120,6 @@ osmo_gtphub_SOURCES = \
gprs_utils.c \
$(NULL)
osmo_gtphub_LDADD = \
- $(top_builddir)/src/libcommon/libcommon.a \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
$(LIBOSMOVTY_LIBS) \
diff --git a/src/gprs/gb_proxy_main.c b/src/gprs/gb_proxy_main.c
index 27aae6ae..70f6c7db 100644
--- a/src/gprs/gb_proxy_main.c
+++ b/src/gprs/gb_proxy_main.c
@@ -252,7 +252,6 @@ static const struct log_info gprs_log_info = {
int main(int argc, char **argv)
{
- struct gsm_network dummy_network;
int rc;
tall_bsc_ctx = talloc_named_const(NULL, 0, "nsip_proxy");
@@ -296,7 +295,7 @@ int main(int argc, char **argv)
}
/* start telnet after reading config for vty_get_bind_addr() */
- rc = telnet_init_dynif(tall_bsc_ctx, &dummy_network,
+ rc = telnet_init_dynif(tall_bsc_ctx, NULL,
vty_get_bind_addr(), OSMO_VTY_PORT_GBPROXY);
if (rc < 0)
exit(1);
diff --git a/src/gprs/gb_proxy_patch.c b/src/gprs/gb_proxy_patch.c
index 7bddc449..229e2dfe 100644
--- a/src/gprs/gb_proxy_patch.c
+++ b/src/gprs/gb_proxy_patch.c
@@ -23,12 +23,13 @@
#include <openbsc/gprs_utils.h>
#include <openbsc/gprs_gb_parse.h>
-#include <openbsc/gsm_data.h>
#include <openbsc/debug.h>
#include <osmocom/gprs/protocol/gsm_08_18.h>
#include <osmocom/core/rate_ctr.h>
+extern void *tall_bsc_ctx;
+
/* patch RA identifier in place */
static void gbproxy_patch_raid(uint8_t *raid_enc, struct gbproxy_peer *peer,
int to_bss, const char *log_text)
diff --git a/src/gprs/gb_proxy_peer.c b/src/gprs/gb_proxy_peer.c
index 5365ff0f..c4552ea7 100644
--- a/src/gprs/gb_proxy_peer.c
+++ b/src/gprs/gb_proxy_peer.c
@@ -22,17 +22,18 @@
#include <openbsc/gb_proxy.h>
-#include <openbsc/gsm_data.h>
-#include <openbsc/gsm_data_shared.h>
#include <openbsc/debug.h>
#include <osmocom/gprs/protocol/gsm_08_18.h>
#include <osmocom/core/rate_ctr.h>
#include <osmocom/core/stats.h>
#include <osmocom/core/talloc.h>
+#include <osmocom/gsm/tlv.h>
#include <string.h>
+extern void *tall_bsc_ctx;
+
static const struct rate_ctr_desc peer_ctr_description[] = {
{ "blocked", "BVC Block " },
{ "unblocked", "BVC Unblock " },
diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c
index a07f7ea7..2133df04 100644
--- a/src/gprs/gprs_gmm.c
+++ b/src/gprs/gprs_gmm.c
@@ -35,7 +35,6 @@
#include "bscconfig.h"
-#include <openbsc/db.h>
#include <osmocom/core/msgb.h>
#include <osmocom/gsm/tlv.h>
#include <osmocom/gsm/gsm_utils.h>
@@ -56,11 +55,7 @@
#endif
#include <openbsc/debug.h>
-#include <openbsc/gsm_data.h>
-#include <openbsc/gsm_subscriber.h>
#include <openbsc/gsm_04_08.h>
-#include <openbsc/paging.h>
-#include <openbsc/transaction.h>
#include <openbsc/gprs_llc.h>
#include <openbsc/gprs_sgsn.h>
#include <openbsc/gprs_gmm.h>
@@ -75,6 +70,7 @@
#define PTMSI_ALLOC
extern struct sgsn_instance *sgsn;
+extern void *tall_bsc_ctx;
static const struct tlv_definition gsm48_gmm_att_tlvdef = {
.def = {
diff --git a/src/gprs/gprs_llc_parse.c b/src/gprs/gprs_llc_parse.c
index a5a7a712..be634974 100644
--- a/src/gprs/gprs_llc_parse.c
+++ b/src/gprs/gprs_llc_parse.c
@@ -28,7 +28,6 @@
#include <osmocom/core/talloc.h>
#include <osmocom/gprs/gprs_bssgp.h>
-#include <openbsc/gsm_data.h>
#include <openbsc/debug.h>
#include <openbsc/gprs_sgsn.h>
#include <openbsc/gprs_gmm.h>
diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c
index 340fcb08..bdfb68aa 100644
--- a/src/gprs/gprs_sgsn.c
+++ b/src/gprs/gprs_sgsn.c
@@ -30,6 +30,7 @@
#include <osmocom/gprs/gprs_ns.h>
#include <osmocom/gprs/gprs_bssgp.h>
#include <osmocom/gsm/protocol/gsm_04_08_gprs.h>
+#include <osmocom/gsm/gsm_utils.h>
#include <osmocom/ranap/iu_client.h>
#include <openbsc/gprs_subscriber.h>
@@ -50,6 +51,7 @@
#define GPRS_LLME_CHECK_TICK 30
extern struct sgsn_instance *sgsn;
+extern void *tall_bsc_ctx;
LLIST_HEAD(sgsn_mm_ctxts);
LLIST_HEAD(sgsn_ggsn_ctxts);
diff --git a/src/gprs/gprs_sndcp.c b/src/gprs/gprs_sndcp.c
index a18998f9..05dad660 100644
--- a/src/gprs/gprs_sndcp.c
+++ b/src/gprs/gprs_sndcp.c
@@ -30,7 +30,6 @@
#include <osmocom/core/talloc.h>
#include <osmocom/gprs/gprs_bssgp.h>
-#include <openbsc/gsm_data.h>
#include <openbsc/debug.h>
#include <openbsc/gprs_llc.h>
#include <openbsc/sgsn.h>