X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_subnet.c;h=6ec505487a46847939dce5207e3230a9743e3444;hb=7ea85043ac1fb2096baea44f6b0af27ac0d0b2cf;hp=cdfcb6d0c33f95313d8847d20561af9e27747fab;hpb=a227843b739d279b63adcf3736ebb03d856080c4;p=tinc

diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c
index cdfcb6d0..6ec50548 100644
--- a/src/protocol_subnet.c
+++ b/src/protocol_subnet.c
@@ -41,14 +41,14 @@ bool send_add_subnet(connection_t *c, const subnet_t *subnet) {
 	return send_request(c, "%d %x %s %s", ADD_SUBNET, rand(), subnet->owner->name, netstr);
 }
 
-bool add_subnet_h(connection_t *c) {
+bool add_subnet_h(connection_t *c, char *request) {
 	char subnetstr[MAX_STRING_SIZE];
 	char name[MAX_STRING_SIZE];
 	node_t *owner;
 	subnet_t s = {0}, *new;
 
-	if(sscanf(c->buffer, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
-		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ADD_SUBNET", c->name,
+	if(sscanf(request, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
+		logger(LOG_ERR, "Got bad %s from %s (%s)", "ADD_SUBNET", c->name,
 			   c->hostname);
 		return false;
 	}
@@ -56,20 +56,20 @@ bool add_subnet_h(connection_t *c) {
 	/* Check if owner name is valid */
 
 	if(!check_id(name)) {
-		logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name,
-			   c->hostname, _("invalid name"));
+		logger(LOG_ERR, "Got bad %s from %s (%s): %s", "ADD_SUBNET", c->name,
+			   c->hostname, "invalid name");
 		return false;
 	}
 
 	/* Check if subnet string is valid */
 
 	if(!str2net(&s, subnetstr)) {
-		logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "ADD_SUBNET", c->name,
-			   c->hostname, _("invalid subnet string"));
+		logger(LOG_ERR, "Got bad %s from %s (%s): %s", "ADD_SUBNET", c->name,
+			   c->hostname, "invalid subnet string");
 		return false;
 	}
 
-	if(seen_request(c->buffer))
+	if(seen_request(request))
 		return true;
 
 	/* Check if the owner of the new subnet is in the connection list */
@@ -78,7 +78,7 @@ bool add_subnet_h(connection_t *c) {
 
 	if(tunnelserver && owner != myself && owner != c->node) {
 		/* in case of tunnelserver, ignore indirect subnet registrations */
-		ifdebug(PROTOCOL) logger(LOG_WARNING, _("Ignoring indirect %s from %s (%s) for %s"),
+		ifdebug(PROTOCOL) logger(LOG_WARNING, "Ignoring indirect %s from %s (%s) for %s",
 				   "ADD_SUBNET", c->name, c->hostname, subnetstr);
 		return true;
 	}
@@ -97,7 +97,7 @@ bool add_subnet_h(connection_t *c) {
 	/* If we don't know this subnet, but we are the owner, retaliate with a DEL_SUBNET */
 
 	if(owner == myself) {
-		ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for ourself"),
+		ifdebug(PROTOCOL) logger(LOG_WARNING, "Got %s from %s (%s) for ourself",
 				   "ADD_SUBNET", c->name, c->hostname);
 		s.owner = myself;
 		send_del_subnet(c, &s);
@@ -121,7 +121,7 @@ bool add_subnet_h(connection_t *c) {
 		}
 
 		if(!cfg) {
-			logger(LOG_WARNING, _("Unauthorized %s from %s (%s) for %s"),
+			logger(LOG_WARNING, "Unauthorized %s from %s (%s) for %s",
 				"ADD_SUBNET", c->name, c->hostname, subnetstr);
 			return false;
 		}
@@ -140,7 +140,7 @@ bool add_subnet_h(connection_t *c) {
 	/* Tell the rest */
 
 	if(!tunnelserver)
-		forward_request(c);
+		forward_request(c, request);
 
 	return true;
 }
@@ -154,14 +154,14 @@ bool send_del_subnet(connection_t *c, const subnet_t *s) {
 	return send_request(c, "%d %x %s %s", DEL_SUBNET, rand(), s->owner->name, netstr);
 }
 
-bool del_subnet_h(connection_t *c) {
+bool del_subnet_h(connection_t *c, char *request) {
 	char subnetstr[MAX_STRING_SIZE];
 	char name[MAX_STRING_SIZE];
 	node_t *owner;
 	subnet_t s = {0}, *find;
 
-	if(sscanf(c->buffer, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
-		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "DEL_SUBNET", c->name,
+	if(sscanf(request, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
+		logger(LOG_ERR, "Got bad %s from %s (%s)", "DEL_SUBNET", c->name,
 			   c->hostname);
 		return false;
 	}
@@ -169,20 +169,20 @@ bool del_subnet_h(connection_t *c) {
 	/* Check if owner name is valid */
 
 	if(!check_id(name)) {
-		logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name,
-			   c->hostname, _("invalid name"));
+		logger(LOG_ERR, "Got bad %s from %s (%s): %s", "DEL_SUBNET", c->name,
+			   c->hostname, "invalid name");
 		return false;
 	}
 
 	/* Check if subnet string is valid */
 
 	if(!str2net(&s, subnetstr)) {
-		logger(LOG_ERR, _("Got bad %s from %s (%s): %s"), "DEL_SUBNET", c->name,
-			   c->hostname, _("invalid subnet string"));
+		logger(LOG_ERR, "Got bad %s from %s (%s): %s", "DEL_SUBNET", c->name,
+			   c->hostname, "invalid subnet string");
 		return false;
 	}
 
-	if(seen_request(c->buffer))
+	if(seen_request(request))
 		return true;
 
 	/* Check if the owner of the subnet being deleted is in the connection list */
@@ -191,13 +191,13 @@ bool del_subnet_h(connection_t *c) {
 
 	if(tunnelserver && owner != myself && owner != c->node) {
 		/* in case of tunnelserver, ignore indirect subnet deletion */
-		ifdebug(PROTOCOL) logger(LOG_WARNING, _("Ignoring indirect %s from %s (%s) for %s"),
+		ifdebug(PROTOCOL) logger(LOG_WARNING, "Ignoring indirect %s from %s (%s) for %s",
                                   "DEL_SUBNET", c->name, c->hostname, subnetstr);
 		return true;
 	}
 
 	if(!owner) {
-		ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for %s which is not in our node tree"),
+		ifdebug(PROTOCOL) logger(LOG_WARNING, "Got %s from %s (%s) for %s which is not in our node tree",
 				   "DEL_SUBNET", c->name, c->hostname, name);
 		return true;
 	}
@@ -209,7 +209,7 @@ bool del_subnet_h(connection_t *c) {
 	find = lookup_subnet(owner, &s);
 
 	if(!find) {
-		ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for %s which does not appear in his subnet tree"),
+		ifdebug(PROTOCOL) logger(LOG_WARNING, "Got %s from %s (%s) for %s which does not appear in his subnet tree",
 				   "DEL_SUBNET", c->name, c->hostname, name);
 		return true;
 	}
@@ -217,7 +217,7 @@ bool del_subnet_h(connection_t *c) {
 	/* If we are the owner of this subnet, retaliate with an ADD_SUBNET */
 
 	if(owner == myself) {
-		ifdebug(PROTOCOL) logger(LOG_WARNING, _("Got %s from %s (%s) for ourself"),
+		ifdebug(PROTOCOL) logger(LOG_WARNING, "Got %s from %s (%s) for ourself",
 				   "DEL_SUBNET", c->name, c->hostname);
 		send_add_subnet(c, find);
 		return true;
@@ -226,7 +226,7 @@ bool del_subnet_h(connection_t *c) {
 	/* Tell the rest */
 
 	if(!tunnelserver)
-		forward_request(c);
+		forward_request(c, request);
 
 	/* Finally, delete it. */