Don't assume sa.sa_family is a short int.

[tinc] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index ad0fa8d..f533a93 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -1,7 +1,7 @@
 /*
     protocol.c -- handle the meta-protocol, basic functions
     Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -30,7 +30,7 @@
 
 bool tunnelserver = false;
 bool strictsubnets = false;
-bool experimental = false;
+bool experimental = true;
 
 /* Jumptable for the request handlers */
 
@@ -41,6 +41,9 @@ static bool (*request_handlers[])(connection_t *, const char *) = {
                add_subnet_h, del_subnet_h,
                add_edge_h, del_edge_h,
                key_changed_h, req_key_h, ans_key_h, tcppacket_h, control_h,
+               NULL, NULL, /* Not "real" requests (yet) */
+               sptps_tcppacket_h,
+               udp_info_h, mtu_info_h,
 };
 
 /* Request names */
@@ -51,21 +54,11 @@ static char (*request_name[]) = {
                "PING", "PONG",
                "ADD_SUBNET", "DEL_SUBNET",
                "ADD_EDGE", "DEL_EDGE", "KEY_CHANGED", "REQ_KEY", "ANS_KEY", "PACKET", "CONTROL",
+               "REQ_PUBKEY", "ANS_PUBKEY", "SPTPS_PACKET", "UDP_INFO", "MTU_INFO",
 };
 
 static splay_tree_t *past_request_tree;
 
-bool check_id(const char *id) {
-       if(!id || !*id)
-               return false;
-
-       for(; *id; id++)
-               if(!isalnum(*id) && *id != '_')
-                       return false;
-
-       return true;
-}
-
 /* Generic request routines - takes care of logging and error
    detection as well */
 
@@ -143,7 +136,8 @@ bool receive_request(connection_t *c, const char *request) {
                if(!request_handlers[reqno](c, request)) {
                        /* Something went wrong. Probably scriptkiddies. Terminate. */
 
-                       logger(DEBUG_ALWAYS, LOG_ERR, "Error while processing %s from %s (%s)", request_name[reqno], c->name, c->hostname);
+                       if(reqno != TERMREQ)
+                               logger(DEBUG_ALWAYS, LOG_ERR, "Error while processing %s from %s (%s)", request_name[reqno], c->name, c->hostname);
                        return false;
                }
        } else {