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 0ba5c0a..f533a93 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -41,8 +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, NULL, /* Not "real" requests (yet) */
-               udp_info_h,
+               NULL, NULL, /* Not "real" requests (yet) */
+               sptps_tcppacket_h,
+               udp_info_h, mtu_info_h,
 };
 
 /* Request names */
@@ -53,7 +54,7 @@ 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", "REQ_SPTPS", "UDP_INFO",
+               "REQ_PUBKEY", "ANS_PUBKEY", "SPTPS_PACKET", "UDP_INFO", "MTU_INFO",
 };
 
 static splay_tree_t *past_request_tree;
@@ -135,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 {