X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_subnet.c;h=90c89af9d1428bce18d3679b403ac486a960917b;hp=3e5dadd18ece0176d819474ea1c3d326c9b6434c;hb=ab7c61b06f6c6e991225f2fcc32d02b8e1084aee;hpb=3759aa5f7745709c43f81faa36510ff650b4bf99

diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c
index 3e5dadd1..90c89af9 100644
--- a/src/protocol_subnet.c
+++ b/src/protocol_subnet.c
@@ -2,6 +2,7 @@
     protocol_subnet.c -- handle the meta-protocol, subnets
     Copyright (C) 1999-2005 Ivo Timmermans,
                   2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2009      Michael Tokarev <mjt@tls.msk.ru>
 
     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
@@ -13,11 +14,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
@@ -42,7 +41,7 @@ bool send_add_subnet(connection_t *c, const subnet_t *subnet)
 	if(!net2str(netstr, sizeof netstr, subnet))
 		return false;
 
-	return send_request(c, "%d %lx %s %s", ADD_SUBNET, random(), subnet->owner->name, netstr);
+	return send_request(c, "%d %x %s %s", ADD_SUBNET, rand(), subnet->owner->name, netstr);
 }
 
 bool add_subnet_h(connection_t *c)
@@ -127,8 +126,11 @@ bool add_subnet_h(connection_t *c)
 			free_subnet(allowed);
 		}
 
-		if(!cfg)
+		if(!cfg) {
+			logger(LOG_WARNING, _("Unauthorized %s from %s (%s) for %s"),
+				"ADD_SUBNET", c->name, c->hostname, subnetstr);
 			return false;
+		}
 
 		free_subnet(allowed);
 	}
@@ -158,7 +160,7 @@ bool send_del_subnet(connection_t *c, const subnet_t *s)
 	if(!net2str(netstr, sizeof netstr, s))
 		return false;
 
-	return send_request(c, "%d %lx %s %s", DEL_SUBNET, random(), s->owner->name, netstr);
+	return send_request(c, "%d %x %s %s", DEL_SUBNET, rand(), s->owner->name, netstr);
 }
 
 bool del_subnet_h(connection_t *c)