Remove everything GPL that is not copyright Guus Sliepen, update copyright statements.

[meshlink] / src / tincctl.c

diff --git a/src/tincctl.c b/src/tincctl.c
index c28c20ec8599fa4532ed3fb219ab92925c2fad31..394051e2d658092d19a1200c4657aef5a35800e2 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -1,6 +1,6 @@
 /*
     tincctl.c -- Controlling a running tincd
-    Copyright (C) 2007-2014 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -33,7 +33,6 @@
 #include "ecdsagen.h"
 #include "info.h"
 #include "invitation.h"
-#include "names.h"
 #include "rsagen.h"
 #include "utils.h"
 #include "tincctl.h"
@@ -144,7 +143,7 @@ static void usage(bool status) {
                                "  join INVITATION            Join a VPN using an INVITIATION\n"
                                "  network [NETNAME]          List all known networks, or switch to the one named NETNAME.\n"
                                "\n");
-               printf("Report bugs to tinc@tinc-vpn.org.\n");
+               printf("Report bugs to bugs@meshlink.io.\n");
        }
 }
 
@@ -358,7 +357,7 @@ static FILE *ask_and_open(const char *filename, const char *what, const char *mo
   Generate a public/private ECDSA keypair, and ask for a file to store
   them in.
 */
-bool ecdsa_keygen(bool ask) {
+static bool ecdsa_keygen(bool ask) {
        ecdsa_t *key;
        FILE *f;
        char *pubname, *privname;
@@ -412,7 +411,7 @@ bool ecdsa_keygen(bool ask) {
   Generate a public/private RSA keypair, and ask for a file to store
   them in.
 */
-bool rsa_keygen(int bits, bool ask) {
+static bool rsa_keygen(int bits, bool ask) {
        rsa_t *key;
        FILE *f;
        char *pubname, *privname;
@@ -1322,8 +1321,6 @@ const var_t variables[] = {
        {"ScriptsInterpreter", VAR_SERVER},
        {"StrictSubnets", VAR_SERVER},
        {"TunnelServer", VAR_SERVER},
-       {"UDPRcvBuf", VAR_SERVER},
-       {"UDPSndBuf", VAR_SERVER},
        {"VDEGroup", VAR_SERVER},
        {"VDEPort", VAR_SERVER},
        /* Host configuration */
@@ -2098,7 +2095,6 @@ static int switch_network(char *name) {
        free(netname);
        netname = strcmp(name, ".") ? xstrdup(name) : NULL;
 
-       make_names();
         xasprintf(&tinc_conf, "%s" SLASH "tinc.conf", confbase);
         xasprintf(&hosts_dir, "%s" SLASH "hosts", confbase);
        xasprintf(&prompt, "%s> ", identname);
@@ -2414,7 +2410,6 @@ int main(int argc, char *argv[]) {
        if(!parse_options(argc, argv))
                return 1;
 
-       make_names();
        xasprintf(&tinc_conf, "%s" SLASH "tinc.conf", confbase);
        xasprintf(&hosts_dir, "%s" SLASH "hosts", confbase);