diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2017-07-09 21:43:56 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2017-07-25 01:06:59 +0200 |
| commit | df57e9f52f748c47c2140c233c0a85274524c7c0 (patch) | |
| tree | 8e04de443ee059a99c39dcc5739964364638df42 | |
| parent | 14d289ef8cd93b004bad37da1d3d1bad8262d4a9 (diff) | |
apply changes of removed files
Change-Id: Ie8ffddc9aee3dd250c2af7120643d289eb1fcfe6
| -rw-r--r-- | src/libmsc/vty_interface_layer3.c | 1 | ||||
| -rw-r--r-- | src/libvlr/vlr.c | 16 | ||||
| -rw-r--r-- | src/osmo-msc/Makefile.am | 1 | ||||
| -rw-r--r-- | src/utils/Makefile.am | 20 | ||||
| -rw-r--r-- | tests/gsm0408/Makefile.am | 2 |
5 files changed, 14 insertions, 26 deletions
diff --git a/src/libmsc/vty_interface_layer3.c b/src/libmsc/vty_interface_layer3.c index d1bf6b36d..09ca67885 100644 --- a/src/libmsc/vty_interface_layer3.c +++ b/src/libmsc/vty_interface_layer3.c @@ -33,7 +33,6 @@ #include <osmocom/core/linuxlist.h> #include <openbsc/gsm_data.h> #include <openbsc/gsm_subscriber.h> -#include <openbsc/bsc_subscriber.h> #include <openbsc/silent_call.h> #include <openbsc/gsm_04_11.h> #include <osmocom/abis/e1_input.h> diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index d95d1b7ec..a5ea0f6d1 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -28,8 +28,6 @@ #include <openbsc/gsm_subscriber.h> #include <openbsc/gsup_client.h> #include <openbsc/vlr.h> -#include <openbsc/gprs_sgsn.h> -#include <openbsc/gprs_utils.h> #include <openbsc/debug.h> #include <openssl/rand.h> @@ -438,6 +436,20 @@ int vlr_subscr_changed(struct vlr_subscr *vsub) * PDP context data ***********************************************************************/ +#define GSM_APN_LENGTH 102 + +/* see GSM 09.02, 17.7.1, PDP-Context and GPRSSubscriptionData */ +/* see GSM 09.02, B.1, gprsSubscriptionData */ +struct sgsn_subscriber_pdp_data { + struct llist_head list; + + unsigned int context_id; + uint16_t pdp_type; + char apn_str[GSM_APN_LENGTH]; + uint8_t qos_subscribed[20]; + size_t qos_subscribed_len; +}; + struct sgsn_subscriber_pdp_data * vlr_subscr_pdp_data_alloc(struct vlr_subscr *vsub) { diff --git a/src/osmo-msc/Makefile.am b/src/osmo-msc/Makefile.am index 97bd999cf..3a7b45050 100644 --- a/src/osmo-msc/Makefile.am +++ b/src/osmo-msc/Makefile.am @@ -35,7 +35,6 @@ osmo_msc_LDADD = \ $(top_builddir)/src/libmsc/libmsc.a \ $(top_builddir)/src/libvlr/libvlr.a \ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ - $(top_builddir)/src/libtrau/libtrau.a \ $(top_builddir)/src/libcommon/libcommon.a \ $(top_builddir)/src/libmgcp/libmgcp.a \ $(LIBOSMOGSM_LIBS) \ diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 26494e13d..07b30d983 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -23,8 +23,6 @@ noinst_HEADERS = \ $(NULL) bin_PROGRAMS = \ - bs11_config \ - isdnsync \ meas_json \ $(NULL) if HAVE_SQLITE3 @@ -49,24 +47,6 @@ noinst_PROGRAMS = \ $(NULL) endif -bs11_config_SOURCES = \ - bs11_config.c \ - $(NULL) - -bs11_config_LDADD = \ - $(top_builddir)/src/libbsc/libbsc.a \ - $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ - $(top_builddir)/src/libtrau/libtrau.a \ - $(top_builddir)/src/libcommon/libcommon.a \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(LIBOSMOABIS_LIBS) \ - $(NULL) - -isdnsync_SOURCES = \ - isdnsync.c \ - $(NULL) - smpp_mirror_SOURCES = \ smpp_mirror.c \ $(NULL) diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am index ae81c2c7c..521ef9501 100644 --- a/tests/gsm0408/Makefile.am +++ b/tests/gsm0408/Makefile.am @@ -23,9 +23,7 @@ gsm0408_test_SOURCES = \ $(NULL) gsm0408_test_LDADD = \ - $(top_builddir)/src/libbsc/libbsc.a \ $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ - $(top_builddir)/src/libtrau/libtrau.a \ $(top_builddir)/src/libcommon/libcommon.a \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ |