X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_subnet.c;h=6ec505487a46847939dce5207e3230a9743e3444;hp=e7ab8b24e8edd20a4a8ebe4a21eb2d0c752b3d8d;hb=7ea85043ac1fb2096baea44f6b0af27ac0d0b2cf;hpb=9a2b0f88a9cae753ebc81c939d01403178b18a35 diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c index e7ab8b24..6ec50548 100644 --- a/src/protocol_subnet.c +++ b/src/protocol_subnet.c @@ -41,13 +41,13 @@ 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) { + 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; @@ -69,7 +69,7 @@ bool add_subnet_h(connection_t *c) { 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 */ @@ -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,13 +154,13 @@ 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) { + 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; @@ -182,7 +182,7 @@ bool del_subnet_h(connection_t *c) { 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 */ @@ -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. */