bsc: Cleanup some fields and names
This commit is contained in:
parent
64b7d56dc0
commit
289436f8b6
|
@ -29,11 +29,6 @@
|
||||||
#include <osmocore/timer.h>
|
#include <osmocore/timer.h>
|
||||||
#include <osmocore/write_queue.h>
|
#include <osmocore/write_queue.h>
|
||||||
|
|
||||||
#include <osmocore/protocol/gsm_04_08.h>
|
|
||||||
|
|
||||||
#include <osmocom/sccp/sccp.h>
|
|
||||||
|
|
||||||
|
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
|
@ -68,10 +63,6 @@ struct mtp_udp_link {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct bsc_data {
|
struct bsc_data {
|
||||||
int app;
|
|
||||||
|
|
||||||
struct timer_list start_timer;
|
|
||||||
int setup;
|
|
||||||
int pcap_fd;
|
int pcap_fd;
|
||||||
int udp_reset_timeout;
|
int udp_reset_timeout;
|
||||||
|
|
||||||
|
@ -102,7 +93,6 @@ struct bsc_data {
|
||||||
/* inject */
|
/* inject */
|
||||||
int allow_inject;
|
int allow_inject;
|
||||||
struct bsc_fd inject_fd;
|
struct bsc_fd inject_fd;
|
||||||
struct llist_head inject_list;
|
|
||||||
|
|
||||||
/* m2ua code */
|
/* m2ua code */
|
||||||
struct sctp_m2ua_transport *m2ua_trans;
|
struct sctp_m2ua_transport *m2ua_trans;
|
||||||
|
|
|
@ -49,7 +49,6 @@ struct bsc_data *bsc_data_create()
|
||||||
bsc->src_port = 1313;
|
bsc->src_port = 1313;
|
||||||
bsc->ni_ni = MTP_NI_NATION_NET;
|
bsc->ni_ni = MTP_NI_NATION_NET;
|
||||||
bsc->ni_spare = 0;
|
bsc->ni_spare = 0;
|
||||||
bsc->setup = 0;
|
|
||||||
bsc->pcap_fd = -1;
|
bsc->pcap_fd = -1;
|
||||||
bsc->udp_reset_timeout = 180;
|
bsc->udp_reset_timeout = 180;
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <bsc_data.h>
|
#include <bsc_data.h>
|
||||||
|
#include <bsc_sccp.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Check the msg and identify a Location Updating Request and see if the
|
* Check the msg and identify a Location Updating Request and see if the
|
||||||
|
|
|
@ -86,7 +86,7 @@ static void sigint()
|
||||||
|
|
||||||
printf("Terminating.\n");
|
printf("Terminating.\n");
|
||||||
handled = 1;
|
handled = 1;
|
||||||
if (bsc && bsc->setup) {
|
if (bsc) {
|
||||||
llist_for_each_entry(set, &bsc->linksets, entry)
|
llist_for_each_entry(set, &bsc->linksets, entry)
|
||||||
link_shutdown_all(set);
|
link_shutdown_all(set);
|
||||||
}
|
}
|
||||||
|
@ -197,7 +197,6 @@ int main(int argc, char **argv)
|
||||||
bsc = bsc_data_create();
|
bsc = bsc_data_create();
|
||||||
if (!bsc)
|
if (!bsc)
|
||||||
return -1;
|
return -1;
|
||||||
bsc->app = APP_CELLMGR;
|
|
||||||
|
|
||||||
/* msc data */
|
/* msc data */
|
||||||
msc = msc_connection_create(bsc, 1);
|
msc = msc_connection_create(bsc, 1);
|
||||||
|
|
|
@ -34,6 +34,8 @@
|
||||||
|
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocore/talloc.h>
|
||||||
|
|
||||||
|
#include <osmocom/sccp/sccp.h>
|
||||||
|
|
||||||
#include <osmocom/vty/vty.h>
|
#include <osmocom/vty/vty.h>
|
||||||
#include <osmocom/vty/telnet_interface.h>
|
#include <osmocom/vty/telnet_interface.h>
|
||||||
|
|
||||||
|
@ -90,7 +92,7 @@ static void sigint()
|
||||||
|
|
||||||
printf("Terminating.\n");
|
printf("Terminating.\n");
|
||||||
handled = 1;
|
handled = 1;
|
||||||
if (bsc && bsc->setup) {
|
if (bsc) {
|
||||||
llist_for_each_entry(set, &bsc->linksets, entry)
|
llist_for_each_entry(set, &bsc->linksets, entry)
|
||||||
link_shutdown_all(set);
|
link_shutdown_all(set);
|
||||||
}
|
}
|
||||||
|
@ -308,7 +310,6 @@ int main(int argc, char **argv)
|
||||||
bsc = bsc_data_create();
|
bsc = bsc_data_create();
|
||||||
if (!bsc)
|
if (!bsc)
|
||||||
return -1;
|
return -1;
|
||||||
bsc->app = APP_STP;
|
|
||||||
|
|
||||||
handle_options(argc, argv);
|
handle_options(argc, argv);
|
||||||
|
|
||||||
|
|
Reference in New Issue