osmo-pcap-server: Start with the skeleton of the pcap server
diff --git a/.gitignore b/.gitignore
index ad0cbb1..7b12006 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,4 +26,4 @@
# apps
src/osmo_pcap_client
-
+src/osmo_pcap_server
diff --git a/include/osmo-pcap/osmo_pcap_server.h b/include/osmo-pcap/osmo_pcap_server.h
new file mode 100644
index 0000000..a3f70dc
--- /dev/null
+++ b/include/osmo-pcap/osmo_pcap_server.h
@@ -0,0 +1,67 @@
+/*
+ * osmo-pcap-server 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/>.
+ *
+ */
+
+#ifndef OSMO_PCAP_SERVER_H
+#define OSMO_PCAP_SERVER_H
+
+#include <osmocom/core/select.h>
+#include <osmocom/core/linuxlist.h>
+
+#include <pcap.h>
+
+#include <time.h>
+
+struct osmo_pcap_conn {
+ /* list of connections */
+ struct llist_head entry;
+
+ /* name */
+ char *name;
+ char *remote_host;
+
+ /* Remote connection */
+ struct osmo_fd rem_fd;
+ int local_fd;
+
+ /* pcap stuff */
+ struct pcap_file_header file_hdr;
+
+ /* last time */
+ struct tm last_write;
+};
+
+struct osmo_pcap_server {
+ struct llist_head conn;
+
+ struct osmo_fd listen_fd;
+
+ char *base_path;
+};
+
+extern struct osmo_pcap_server *pcap_server;
+
+int osmo_pcap_server_listen(struct osmo_pcap_server *server);
+struct osmo_pcap_conn *osmo_pcap_server_find(struct osmo_pcap_server *ser,
+ const char *name);
+void vty_server_init(struct osmo_pcap_server *server);
+
+#endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 206b167..402da22 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,9 +2,12 @@
AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(PCAP_CFLAGS)
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS)
-bin_PROGRAMS = osmo_pcap_client
+bin_PROGRAMS = osmo_pcap_client osmo_pcap_server
osmo_pcap_client_SOURCES = osmo_client_main.c osmo_common.c \
osmo_client_core.c osmo_client_vty.c \
osmo_client_network.c
osmo_pcap_client_LDADD = $(PCAP_LIBS)
+
+osmo_pcap_server_SOURCES = osmo_server_main.c osmo_common.c \
+ osmo_server_vty.c osmo_server_network.c
diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c
new file mode 100644
index 0000000..04c84a0
--- /dev/null
+++ b/src/osmo_server_main.c
@@ -0,0 +1,215 @@
+/*
+ * osmo-pcap-server 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 <osmo-pcap/osmo_pcap_server.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-server.cfg";
+static int daemonize = 0;
+
+void *tall_bsc_ctx;
+struct osmo_pcap_server *pcap_server;
+extern void *tall_msgb_ctx;
+extern void *tall_ctr_ctx;
+
+static struct vty_app_info vty_info = {
+ .name = "OsmoPCAPServer",
+ .version = PACKAGE_VERSION,
+ .go_parent_cb = osmopcap_go_parent,
+ .is_config_node = osmopcap_is_config_node,
+};
+
+static void print_usage()
+{
+ printf("Usage: osmo_pcap_server\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, "server");
+ 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, 4241);
+
+ pcap_server = talloc_zero(tall_bsc_ctx, struct osmo_pcap_server);
+ if (!pcap_server) {
+ LOGP(DSERVER, LOGL_ERROR, "Failed to allocate osmo_pcap_server.\n");
+ exit(1);
+ }
+ vty_server_init(pcap_server);
+
+ if (vty_read_config_file(config_file, NULL) < 0) {
+ LOGP(DSERVER, LOGL_ERROR,
+ "Failed to parse the config file: %s\n", config_file);
+ exit(1);
+ }
+
+ /* attempt to connect to the remote */
+ if (osmo_pcap_server_listen(pcap_server) != 0) {
+ LOGP(DSERVER, LOGL_ERROR,
+ "Failed to listen for incoming data\n");
+ exit(1);
+ }
+
+ 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_server_network.c b/src/osmo_server_network.c
new file mode 100644
index 0000000..5523974
--- /dev/null
+++ b/src/osmo_server_network.c
@@ -0,0 +1,28 @@
+/*
+ * osmo-pcap-server 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_server.h>
+
+int osmo_pcap_server_listen(struct osmo_pcap_server *server)
+{
+ return -1;
+}
diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c
new file mode 100644
index 0000000..fcd4b09
--- /dev/null
+++ b/src/osmo_server_vty.c
@@ -0,0 +1,28 @@
+/*
+ * osmo-pcap-server 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_server.h>
+
+
+void vty_server_init(struct osmo_pcap_server *server)
+{
+}