X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.c;h=b9abccc3566e34bb0f3b3cb804921c4998e4e455;hb=e16ab7b89948c24a2c47652e8eb1a817a4b1424c;hp=1ec169a00d223a084f4d5deae951a2ec402bf865;hpb=04fc19112da5e7fcefefcf6e490987cdcfb6f620;p=tinc

diff --git a/src/protocol.c b/src/protocol.c
index 1ec169a0..b9abccc3 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -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,6 +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", "SPTPS_PACKET", "UDP_INFO", "MTU_INFO",
 };
 
 static splay_tree_t *past_request_tree;
@@ -68,10 +72,11 @@ bool send_request(connection_t *c, const char *format, ...) {
 	   input buffer anyway */
 
 	va_start(args, format);
-	len = vsnprintf(request, MAXBUFSIZE, format, args);
+	len = vsnprintf(request, sizeof request, format, args);
+	request[sizeof request - 1] = 0;
 	va_end(args);
 
-	if(len < 0 || len > MAXBUFSIZE - 1) {
+	if(len < 0 || len > sizeof request - 1) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Output buffer overflow while sending request to %s (%s)",
 			   c->name, c->hostname);
 		return false;
@@ -132,7 +137,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 {