diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-02-16 23:08:29 +0100 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-02-17 19:34:28 +0100 |
commit | 289436f8b69934a9df9ccb83d7e4bfdcea3c6e42 (patch) | |
tree | 97d82f6bc5c99f1c30dee0691fe70f3f5f3fbfca | |
parent | 64b7d56dc0f5a7b03bad2f9d9fb147f7da0f53a1 (diff) |
bsc: Cleanup some fields and names
-rw-r--r-- | include/bsc_data.h | 10 | ||||
-rw-r--r-- | src/bsc.c | 1 | ||||
-rw-r--r-- | src/bsc_ussd.c | 1 | ||||
-rw-r--r-- | src/main.c | 3 | ||||
-rw-r--r-- | src/main_stp.c | 5 |
5 files changed, 5 insertions, 15 deletions
diff --git a/include/bsc_data.h b/include/bsc_data.h index fc1dcdf..c09d922 100644 --- a/include/bsc_data.h +++ b/include/bsc_data.h @@ -29,11 +29,6 @@ #include <osmocore/timer.h> #include <osmocore/write_queue.h> -#include <osmocore/protocol/gsm_04_08.h> - -#include <osmocom/sccp/sccp.h> - - #include <netinet/in.h> #include <arpa/inet.h> @@ -68,10 +63,6 @@ struct mtp_udp_link { }; struct bsc_data { - int app; - - struct timer_list start_timer; - int setup; int pcap_fd; int udp_reset_timeout; @@ -102,7 +93,6 @@ struct bsc_data { /* inject */ int allow_inject; struct bsc_fd inject_fd; - struct llist_head inject_list; /* m2ua code */ struct sctp_m2ua_transport *m2ua_trans; @@ -49,7 +49,6 @@ struct bsc_data *bsc_data_create() bsc->src_port = 1313; bsc->ni_ni = MTP_NI_NATION_NET; bsc->ni_spare = 0; - bsc->setup = 0; bsc->pcap_fd = -1; bsc->udp_reset_timeout = 180; diff --git a/src/bsc_ussd.c b/src/bsc_ussd.c index ca16759..ccb6c6f 100644 --- a/src/bsc_ussd.c +++ b/src/bsc_ussd.c @@ -20,6 +20,7 @@ */ #include <bsc_data.h> +#include <bsc_sccp.h> /* * Check the msg and identify a Location Updating Request and see if the @@ -86,7 +86,7 @@ static void sigint() printf("Terminating.\n"); handled = 1; - if (bsc && bsc->setup) { + if (bsc) { llist_for_each_entry(set, &bsc->linksets, entry) link_shutdown_all(set); } @@ -197,7 +197,6 @@ int main(int argc, char **argv) bsc = bsc_data_create(); if (!bsc) return -1; - bsc->app = APP_CELLMGR; /* msc data */ msc = msc_connection_create(bsc, 1); diff --git a/src/main_stp.c b/src/main_stp.c index a9fc618..e6d049c 100644 --- a/src/main_stp.c +++ b/src/main_stp.c @@ -34,6 +34,8 @@ #include <osmocore/talloc.h> +#include <osmocom/sccp/sccp.h> + #include <osmocom/vty/vty.h> #include <osmocom/vty/telnet_interface.h> @@ -90,7 +92,7 @@ static void sigint() printf("Terminating.\n"); handled = 1; - if (bsc && bsc->setup) { + if (bsc) { llist_for_each_entry(set, &bsc->linksets, entry) link_shutdown_all(set); } @@ -308,7 +310,6 @@ int main(int argc, char **argv) bsc = bsc_data_create(); if (!bsc) return -1; - bsc->app = APP_STP; handle_options(argc, argv); |