bsc: Cleanup some fields and names

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;

src/bsc.c

@@ -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;
 

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

src/main.c

@@ -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);

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);