msc: The udt_relay could be implemented with the normal cellmgr now

Simplify the code and remove the standalone udt_relay application,
the job can be done with cellmgr_ng. This will happen after we have
settled for a new config file format.

3 files changed, 7 insertions, 318 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index caf6f04..8071b72 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include
 AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(LIBOSMOVTY_CFLAGS) \
 		$(NEXUSWARE_C7_CFLAGS) $(NEXUSWARE_UNIPORTE_CFLAGS) $(UNIPORTE)
 
-sbin_PROGRAMS = cellmgr_ng udt_relay osmo_stp mgcp_mgw
+sbin_PROGRAMS = cellmgr_ng osmo_stp mgcp_mgw
 
 mgcp_mgw_SOURCES = mgcp_ss7.c thread.c debug.c \
 		   mgcp/mgcp_protocol.c mgcp/mgcp_network.c mgcp/mgcp_vty.c
@@ -16,12 +16,6 @@ cellmgr_ng_SOURCES = main.c mtp_layer3.c thread.c input/ipaccess.c pcap.c \
 cellmgr_ng_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) $(NEXUSWARE_C7_LIBS) \
 		   -lpthread -lnetsnmp -lcrypto
 
-udt_relay_SOURCES = main_udt.c mtp_layer3.c thread.c input/ipaccess.c pcap.c \
-		     msc_conn.c link_udp.c snmp_mtp.c debug.c vty_interface.c \
-		     bss_patch.c isup.c links.c sctp_m2ua.c mtp_link.c counter.c
-udt_relay_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOSCCP_LIBS) $(LIBOSMOVTY_LIBS) $(NEXUSWARE_C7_LIBS) \
-		   -lpthread -lnetsnmp -lcrypto -lm2ua -lsctp
-
 osmo_stp_SOURCES = main_stp.c mtp_layer3.c thread.c pcap.c link_udp.c snmp_mtp.c \
 		   debug.c vty_interface.c links.c isup.c sctp_m2ua.c \
 		   mtp_link.c counter.c
diff --git a/src/main_udt.c b/src/main_udt.c
deleted file mode 100644
index fd7791a..0000000
--- a/src/main_udt.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/* Relay UDT/all SCCP messages */
-/*
- * (C) 2010-2011 by Holger Hans Peter Freyther <zecke@selfish.org>
- * (C) 2010-2011 by On-Waves
- * All Rights Reserved
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <mtp_data.h>
-#include <mtp_level3.h>
-#include <mtp_pcap.h>
-#include <thread.h>
-#include <bsc_data.h>
-#include <snmp_mtp.h>
-#include <cellmgr_debug.h>
-
-#include <osmocom/m2ua/m2ua_msg.h>
-
-#include <osmocore/talloc.h>
-
-#include <osmocom/vty/vty.h>
-#include <osmocom/vty/telnet_interface.h>
-
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <fcntl.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <unistd.h>
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-#include <getopt.h>
-
-#undef PACKAGE_NAME
-#undef PACKAGE_VERSION
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_TARNAME
-#undef PACKAGE_STRING
-#include <cellmgr_config.h>
-
-static struct log_target *stderr_target;
-
-static char *config = "udt_relay.cfg";
-
-struct bsc_data bsc;
-extern void cell_vty_init(void);
-
-/*
- * methods called from the MTP Level3 part
- */
-void mtp_link_set_forward_sccp(struct mtp_link_set *link, struct msgb *_msg, int sls)
-{
-	msc_send_direct(link->fw, _msg);
-}
-
-void mtp_link_set_forward_isup(struct mtp_link_set *set, struct msgb *msg, int sls)
-{
-	LOGP(DINP, LOGL_ERROR, "ISUP is not handled.\n");
-}
-
-void mtp_linkset_down(struct mtp_link_set *set)
-{
-	set->available = 0;
-	mtp_link_set_stop(set);
-
-	/* If we have an A link send a reset to the MSC */
-	msc_send_reset(set->fw);
-}
-
-void mtp_linkset_up(struct mtp_link_set *set)
-{
-	set->available = 1;
-	mtp_link_set_reset(set);
-}
-
-static void print_usage()
-{
-	printf("Usage: cellmgr_ng\n");
-}
-
-static void sigint()
-{
-	static pthread_mutex_t exit_mutex = PTHREAD_MUTEX_INITIALIZER;
-	static int handled = 0;
-
-	struct mtp_link_set *set;
-
-	/* failed to lock */
-	if (pthread_mutex_trylock(&exit_mutex) != 0)
-		return;
-	if (handled)
-		goto out;
-
-	printf("Terminating.\n");
-	handled = 1;
-	if (bsc.setup) {
-		llist_for_each_entry(set, &bsc.links, entry)
-			link_shutdown_all(set);
-	}
-	exit(0);
-
-out:
-	pthread_mutex_unlock(&exit_mutex);
-}
-
-static void sigusr2()
-{
-	printf("Closing the MSC connection on demand.\n");
-	msc_close_connection(&bsc.msc_forward);
-}
-
-static void print_help()
-{
-	printf("  Some useful help...\n");
-	printf("  -h --help this text\n");
-	printf("  -c --config=CFG The config file to use.\n");
-	printf("  -p --pcap=FILE. Write MSUs to the PCAP file.\n");
-	printf("  -c --once. Send the SLTM msg only once.\n");
-	printf("  -v --version. Print the version number\n");
-}
-
-static void handle_options(int argc, char **argv)
-{
-	while (1) {
-		int option_index = 0, c;
-		static struct option long_options[] = {
-			{"help", 0, 0, 'h'},
-			{"config", 1, 0, 'c'},
-			{"pcap", 1, 0, 'p'},
-			{"version", 0, 0, 0},
-			{0, 0, 0, 0},
-		};
-
-		c = getopt_long(argc, argv, "hc:p:v",
-				long_options, &option_index);
-		if (c == -1)
-			break;
-
-		switch (c) {
-		case 'h':
-			print_usage();
-			print_help();
-			exit(0);
-		case 'p':
-			if (bsc.pcap_fd >= 0)
-				close(bsc.pcap_fd);
-			bsc.pcap_fd = open(optarg, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP| S_IROTH);
-			if (bsc.pcap_fd < 0) {
-				fprintf(stderr, "Failed to open PCAP file.\n");
-				exit(0);
-			}
-			mtp_pcap_write_header(bsc.pcap_fd);
-			break;
-		case 'c':
-			config = optarg;
-			break;
-		case 'v':
-			printf("This is %s version %s.\n", PACKAGE, VERSION);
-			exit(0);
-			break;
-		default:
-			fprintf(stderr, "Unknown option.\n");
-			break;
-		}
-	}
-}
-
-static void bsc_msc_forward_init(struct bsc_data *bsc,
-				 struct bsc_msc_forward *msc)
-{
-	INIT_LLIST_HEAD(&msc->sccp_connections);
-
-	msc->bsc_data = bsc;
-	msc->msc_address = "127.0.0.1";
-	msc->ping_time = 20;
-	msc->pong_time = 5;
-	msc->msc_time = 20;
-}
-
-int main(int argc, char **argv)
-{
-	int rc;
-	struct mtp_link_set *set;
-	INIT_LLIST_HEAD(&bsc.links);
-
-	bsc.app = APP_RELAY;
-	bsc.dpc = 1;
-	bsc.opc = 0;
-	bsc.sccp_opc = -1;
-	bsc.isup_opc = -1;
-	bsc.udp_port = 3456;
-	bsc.udp_ip = NULL;
-	bsc.src_port = 1313;
-	bsc.ni_ni = MTP_NI_NATION_NET;
-	bsc.ni_spare = 0;
-	bsc.udp_nr_links = 1;
-	bsc.setup = 0;
-	bsc.pcap_fd = -1;
-	bsc.udp_reset_timeout = 180;
-
-	mtp_link_set_init();
-	thread_init();
-
-	log_init(&log_info);
-	stderr_target = log_target_create_stderr();
-	log_add_target(stderr_target);
-
-	/* enable filters */
-	log_set_all_filter(stderr_target, 1);
-	log_set_category_filter(stderr_target, DINP, 1, LOGL_INFO);
-	log_set_category_filter(stderr_target, DSCCP, 1, LOGL_INFO);
-	log_set_category_filter(stderr_target, DMSC, 1, LOGL_INFO);
-	log_set_category_filter(stderr_target, DMGCP, 1, LOGL_INFO);
-	log_set_print_timestamp(stderr_target, 1);
-	log_set_use_color(stderr_target, 0);
-
-	sccp_set_log_area(DSCCP);
-	m2ua_set_log_area(DM2UA);
-
-	/* msc data */
-	bsc_msc_forward_init(&bsc, &bsc.msc_forward);
-
-	handle_options(argc, argv);
-
-	signal(SIGPIPE, SIG_IGN);
-	signal(SIGINT, sigint);
-	signal(SIGUSR2, sigusr2);
-	srand(time(NULL));
-
-	cell_vty_init();
-	if (vty_read_config_file(config, NULL) < 0) {
-		fprintf(stderr, "Failed to read the VTY config.\n");
-		return -1;
-	}
-
-	rc = telnet_init(NULL, NULL, 4242);
-	if (rc < 0)
-		return rc;
-
-	set = link_init(&bsc);
-	if (!set)
-		return -1;
-
-	llist_add(&set->entry, &bsc.links);
-	set->fw = &bsc.msc_forward;
-	bsc.msc_forward.bsc = set;
-
-        while (1) {
-		bsc_select_main(0);
-        }
-
-	return 0;
-}
-
-void release_bsc_resources(struct bsc_msc_forward *fw)
-{
-}
-
-struct msgb *create_sccp_rlc(struct bsc_msc_forward *fw,
-			     struct sccp_source_reference *src_ref,
-			     struct sccp_source_reference *dst)
-{
-	LOGP(DMSC, LOGL_NOTICE, "Refusing to create connection handling.\n");
-	return NULL;
-}
-
-struct msgb *create_reset()
-{
-	LOGP(DMSC, LOGL_NOTICE, "Refusing to create a GSM0808 reset message.\n");
-	return NULL;
-}
-
-void update_con_state(struct bsc_msc_forward *fw, int rc, struct sccp_parse_result *res, struct msgb *msg, int from_msc, int sls)
-{
-	LOGP(DMSC, LOGL_ERROR, "Should not be called.\n");
-	return;
-}
-
-unsigned int sls_for_src_ref(struct bsc_msc_forward *fw, struct sccp_source_reference *ref)
-{
-	return 13;
-}
-
-int bsc_ussd_handle_in_msg(struct bsc_data *bsc, struct sccp_parse_result *res, struct msgb *msg)
-{
-	return 0;
-}
-
-int bsc_ussd_handle_out_msg(struct bsc_data *bsc, struct sccp_parse_result *res, struct msgb *msg)
-{
-	return 0;
-}
diff --git a/src/sccp_state.c b/src/sccp_state.c
index 3f89521..2c79bd4 100644
--- a/src/sccp_state.c
+++ b/src/sccp_state.c
@@ -68,6 +68,12 @@ void mtp_link_set_forward_sccp(struct mtp_link_set *link, struct msgb *_msg, int
 	struct sccp_parse_result result;
 	struct bsc_msc_forward *fw = link->fw;
 
+	if (fw->forward_only) {
+		msc_send_direct(fw, _msg);
+		return;
+	}
+
+
 	rc = bss_patch_filter_msg(_msg, &result);
 	if (rc == BSS_FILTER_RESET) {
 		LOGP(DMSC, LOGL_NOTICE, "Filtering BSS Reset from the BSC\n");