Rename methods to protocols; fix some command line parse bugs; implement most of the config file parser

1 files changed, 0 insertions, 144 deletions

diff --git a/src/method_null.c b/src/method_null.c
deleted file mode 100644
index 70c5a09..0000000
--- a/src/method_null.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-  Copyright (c) 2012, Matthias Schiffer <mschiffer@universe-factory.net>
-  Partly based on QuickTun Copyright (c) 2010, Ivo Smits <Ivo@UCIS.nl>.
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#define _GNU_SOURCE
-
-#include "fastd.h"
-#include "task.h"
-#include "peer.h"
-
-#include <arpa/inet.h>
-
-
-static bool method_handle_config(fastd_context *ctx, const fastd_config *conf, const char *option) {
-	return false;
-}
-
-static bool method_check_config(fastd_context *ctx, const fastd_config *conf) {
-	if (conf->n_floating > 1) {
-		pr_error(ctx, "with method `null' use can't define more than one floating peer");
-		return false;
-	}
-
-	return true;
-}
-
-static size_t method_max_packet_size(fastd_context *ctx) {
-	return fastd_max_packet_size(ctx);
-}
-
-static char* method_peer_str(const fastd_context *ctx, const fastd_peer *peer) {
-	char addr_buf[INET6_ADDRSTRLEN] = "";
-	char *ret;
-
-	const char *temp = fastd_peer_is_temporary(peer) ? " (temporary)" : "";
-
-	switch (peer->address.sa.sa_family) {
-	case AF_UNSPEC:
-		if (asprintf(&ret, "<floating>%s", temp) > 0)
-			return ret;
-		break;
-
-	case AF_INET:
-		if (inet_ntop(AF_INET, &peer->address.in.sin_addr, addr_buf, sizeof(addr_buf))) {
-			if (asprintf(&ret, "%s:%u%s", addr_buf, ntohs(peer->address.in.sin_port), temp) > 0)
-				return ret;
-		}
-		break;
-
-	case AF_INET6:
-		if (inet_ntop(AF_INET6, &peer->address.in6.sin6_addr, addr_buf, sizeof(addr_buf))) {
-			if (asprintf(&ret, "[%s]:%u%s", addr_buf, ntohs(peer->address.in6.sin6_port), temp) > 0)
-				return ret;
-		}
-		break;
-
-	default:
-		exit_bug(ctx, "unsupported address family");
-	}
-
-	return NULL;
-}
-
-static void method_init(fastd_context *ctx, fastd_peer *peer) {
-	pr_info(ctx, "Connection with %P established.", peer);
-
-	fastd_task_put_send(ctx, peer, fastd_buffer_alloc(0, 0, 0));
-}
-
-static void method_handle_recv(fastd_context *ctx, fastd_peer *peer, fastd_buffer buffer) {
-	if (!fastd_peer_is_established(peer)) {
-		pr_info(ctx, "Connection with %P established.", peer);
-
-		fastd_peer_set_established(ctx, peer);
-	}
-
-	if (fastd_peer_is_temporary(peer)) {
-		fastd_peer *perm_peer;
-		for (perm_peer = ctx->peers; perm_peer; perm_peer = perm_peer->next) {
-			if (fastd_peer_is_floating(perm_peer))
-				break;
-		}
-
-		if (!perm_peer) {
-			fastd_buffer_free(buffer);
-			return;
-		}
-
-		peer = fastd_peer_merge(ctx, perm_peer, peer);
-	}
-	
-	if (buffer.len)
-		fastd_task_put_handle_recv(ctx, peer, buffer);
-	else
-		fastd_buffer_free(buffer);
-}
-
-static void method_send(fastd_context *ctx, fastd_peer *peer, fastd_buffer buffer) {
-	fastd_task_put_send(ctx, peer, buffer);
-}
-
-static void method_free_peer_private(fastd_context *ctx, fastd_peer *peer) {
-}
-
-
-const fastd_method fastd_method_null = {
-	.name = "null",
-
-	.handle_config = method_handle_config,
-	.check_config = method_check_config,
-
-	.max_packet_size = method_max_packet_size,
-
-	.peer_str = method_peer_str,
-
-	.init = method_init,
-	.handle_recv = method_handle_recv,
-	.send = method_send,
-
-	.free_peer_private = method_free_peer_private,
-};