osmo_pcap_client: Start with the framework for the pcap client
This is just the normal skeleton for the osmocom code.
diff --git a/src/Makefile.am b/src/Makefile.am
index 2b7eb13..3e014ae 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
-INCLUDES = $(all_includes) -I$(top_srcdir)/include
+INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/
AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(PCAP_CFLAGS)
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS)
bin_PROGRAMS = osmo_pcap_client
-osmo_pcap_client_SOURCES = osmo_client_main.c
+osmo_pcap_client_SOURCES = osmo_client_main.c osmo_common.c
osmo_pcap_client_LDADD = $(PCAP_LIBS)
diff --git a/src/osmo_client_main.c b/src/osmo_client_main.c
index 4725f1a..f00530e 100644
--- a/src/osmo_client_main.c
+++ b/src/osmo_client_main.c
@@ -20,10 +20,174 @@
*
*/
+#include <osmo-pcap/common.h>
+
+#include <osmocom/core/application.h>
+#include <osmocom/core/process.h>
+#include <osmocom/core/rate_ctr.h>
+#include <osmocom/core/select.h>
+#include <osmocom/core/talloc.h>
+
+#include <osmocom/vty/logging.h>
+#include <osmocom/vty/telnet_interface.h>
+
#include <pcap.h>
+#include <signal.h>
#include <stdio.h>
+#include <string.h>
+#include <time.h>
+
+#define _GNU_SOURCE
+#include <getopt.h>
+
+#include "osmopcapconfig.h"
+
+static const char *config_file = "osmo-pcap-client.cfg";
+static int daemonize = 0;
+
+void *tall_bsc_ctx;
+extern void *tall_msgb_ctx;
+extern void *tall_ctr_ctx;
+
+static struct vty_app_info vty_info = {
+ .name = "OsmoPCAPClient",
+ .version = PACKAGE_VERSION,
+ .go_parent_cb = osmopcap_go_parent,
+ .is_config_node = osmopcap_is_config_node,
+};
+
+static void print_usage()
+{
+ printf("Usage: osmo_pcap_client\n");
+}
+
+static void print_help()
+{
+ printf(" Some useful help...\n");
+ printf(" -h --help this text\n");
+ printf(" -D --daemonize Fork the process into a background daemon\n");
+ printf(" -d option --debug=DRLL:DCC:DMM:DRR:DRSL:DNM enable debugging\n");
+ printf(" -s --disable-color\n");
+ printf(" -T --timestamp. Print a timestamp in the debug output.\n");
+ printf(" -e --log-level number. Set a global loglevel.\n");
+ printf(" -c --config-file filename The config file to use.\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'},
+ {"daemonize", 0, 0, 'D'},
+ {"debug", 1, 0, 'd'},
+ {"disable-color", 0, 0, 's'},
+ {"timestamp", 0, 0, 'T'},
+ {"log-level", 1, 0, 'e'},
+ {"config-file", 1, 0, 'c'},
+ {0, 0, 0, 0}
+ };
+
+ c = getopt_long(argc, argv, "hd:DsTc:e:",
+ long_options, &option_index);
+ if (c == -1)
+ break;
+
+ switch (c) {
+ case 'h':
+ print_usage();
+ print_help();
+ exit(0);
+ case 'D':
+ daemonize = 1;
+ break;
+ case 'd':
+ log_parse_category_mask(osmo_stderr_target, optarg);
+ break;
+ case 's':
+ log_set_use_color(osmo_stderr_target, 0);
+ break;
+ case 'T':
+ log_set_print_timestamp(osmo_stderr_target, 1);
+ break;
+ case 'e':
+ log_set_log_level(osmo_stderr_target, atoi(optarg));
+ break;
+ case 'c':
+ config_file = strdup(optarg);
+ break;
+ default:
+ /* ignore */
+ break;
+ }
+ }
+}
+
+static void signal_handler(int signal)
+{
+ fprintf(stdout, "signal %u received\n", signal);
+
+ switch (signal) {
+ case SIGINT:
+ exit(0);
+ break;
+ case SIGABRT:
+ /* in case of abort, we want to obtain a talloc report
+ * and then return to the caller, who will abort the process */
+ case SIGUSR1:
+ talloc_report(tall_vty_ctx, stderr);
+ talloc_report_full(tall_bsc_ctx, stderr);
+ break;
+ default:
+ break;
+ }
+}
+
+static void talloc_init_ctx()
+{
+ tall_bsc_ctx = talloc_named_const(NULL, 0, "nat");
+ tall_msgb_ctx = talloc_named_const(tall_bsc_ctx, 0, "msgb");
+ tall_ctr_ctx = talloc_named_const(tall_bsc_ctx, 0, "counter");
+}
int main(int argc, char **argv)
{
+ int rc;
+
+ talloc_init_ctx();
+ osmo_init_logging(&log_info);
+
+ vty_info.copyright = osmopcap_copyright;
+ vty_init(&vty_info);
+ logging_vty_add_cmds(&log_info);
+
+ /* parse options */
+ handle_options(argc, argv);
+
+ rate_ctr_init(tall_bsc_ctx);
+
+ /* seed the PRNG */
+ srand(time(NULL));
+
+
+ signal(SIGINT, &signal_handler);
+ signal(SIGABRT, &signal_handler);
+ signal(SIGUSR1, &signal_handler);
+ osmo_init_ignore_signals();
+
+ telnet_init(tall_bsc_ctx, NULL, 4240);
+
+ if (daemonize) {
+ rc = osmo_daemonize();
+ if (rc < 0) {
+ perror("Error during daemonize");
+ exit(1);
+ }
+ }
+
+ while (1) {
+ osmo_select_main(0);
+ }
+
return(0);
}
diff --git a/src/osmo_client_vty.c b/src/osmo_client_vty.c
new file mode 100644
index 0000000..b262e8d
--- /dev/null
+++ b/src/osmo_client_vty.c
@@ -0,0 +1,23 @@
+/*
+ * osmo-pcap-client code
+ *
+ * (C) 2011 by Holger Hans Peter Freyther <zecke@selfish.org>
+ * (C) 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 <osmo-pcap/osmo_pcap_client.h>
diff --git a/src/osmo_common.c b/src/osmo_common.c
new file mode 100644
index 0000000..099cff2
--- /dev/null
+++ b/src/osmo_common.c
@@ -0,0 +1,90 @@
+/*
+ * osmo-pcap common code
+ *
+ * (C) 2011 by Holger Hans Peter Freyther <zecke@selfish.org>
+ * (C) 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 <osmo-pcap/common.h>
+
+#include <osmocom/core/utils.h>
+
+static const struct log_info_cat default_categories[] = {
+ [DPCAP] = {
+ .name = "DPCAP",
+ .description = "PCAP related functionality",
+ .color = "\033[1;31m",
+ .enabled = 1, .loglevel = LOGL_NOTICE,
+ },
+ [DCLIENT] = {
+ .name = "DCLIENT",
+ .description = "Client related functionality",
+ .color = "\033[1;32m",
+ .enabled = 1, .loglevel = LOGL_NOTICE,
+ },
+ [DSERVER] = {
+ .name = "DSERVER",
+ .description = "Server related functionality",
+ .color = "\033[1;33m",
+ .enabled = 1, .loglevel = LOGL_NOTICE,
+ },
+ [DVTY] = {
+ .name = "DVTY",
+ .description = "VTY code",
+ .color = "\033[1;34m",
+ .enabled = 1, .loglevel = LOGL_NOTICE,
+ },
+};
+
+const struct log_info log_info = {
+ .cat = default_categories,
+ .num_cat = ARRAY_SIZE(default_categories),
+};
+
+const char *osmopcap_copyright =
+ "Copyright (C) 2011 Holger Freyther\r\n"
+ "License AGPLv3+: GNU AGPL version 3 or later <http://gnu.org/licenses/agpl-3.0.html>\r\n"
+ "This is free software: you are free to change and redistribute it.\r\n"
+ "There is NO WARRANTY, to the extent permitted by law.\r\n";
+
+
+enum node_type osmopcap_go_parent(struct vty *vty)
+{
+ switch (vty->node) {
+ case CLIENT_NODE:
+ case SERVER_NODE:
+ vty->node = CONFIG_NODE;
+ vty->index = NULL;
+ break;
+ default:
+ LOGP(DVTY, LOGL_ERROR, "Unhandled node %d\n", vty->node);
+ break;
+ }
+
+ return vty->node;
+}
+
+int osmopcap_is_config_node(struct vty *vty, int node)
+{
+ switch (node) {
+ case CONFIG_NODE:
+ return 0;
+ default:
+ return 1;
+ }
+}