X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_subnet.c;h=e5927213e379f04096fc26d1c4806c0e63d543d8;hp=d40b3a33afe255f02439953769ec8a71fbe51342;hb=5a132550deb58473285e5f91705d286aef47be71;hpb=591c38eb38dbf0851bdebdd50b08d1bcbf6d7b0f diff --git a/src/protocol_subnet.c b/src/protocol_subnet.c index d40b3a33..e5927213 100644 --- a/src/protocol_subnet.c +++ b/src/protocol_subnet.c @@ -45,7 +45,7 @@ bool send_add_subnet(connection_t *c, const subnet_t *subnet) return send_request(c, "%d %lx %s %s", ADD_SUBNET, random(), 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]; @@ -54,7 +54,7 @@ bool add_subnet_h(connection_t *c) cp(); - 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; @@ -76,7 +76,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 */ @@ -147,7 +147,7 @@ bool add_subnet_h(connection_t *c) /* Tell the rest */ if(!tunnelserver) - forward_request(c); + forward_request(c, request); return true; } @@ -164,7 +164,7 @@ bool send_del_subnet(connection_t *c, const subnet_t *s) return send_request(c, "%d %lx %s %s", DEL_SUBNET, random(), 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]; @@ -173,7 +173,7 @@ bool del_subnet_h(connection_t *c) cp(); - 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; @@ -195,7 +195,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 */ @@ -239,7 +239,7 @@ bool del_subnet_h(connection_t *c) /* Tell the rest */ if(!tunnelserver) - forward_request(c); + forward_request(c, request); /* Finally, delete it. */