X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=ebcaeb3652f98db1024229ed81692c4ad8b7ad6d;hp=7ee41b827c22e4ac3b882647cf553309751b38ec;hb=89610e3fbada1dee79769b8146a500c8357fd81d;hpb=ca6abd41ea0cdf2ca6491c3945fb3c62fd40ab98 diff --git a/src/net.c b/src/net.c index 7ee41b82..ebcaeb36 100644 --- a/src/net.c +++ b/src/net.c @@ -956,19 +956,19 @@ cp for(;;) { - p=0; + cl->reqlen = 0; for(i = oldlen; i < cl->buflen; i++) { if(cl->buffer[i] == '\n') { - cl->buffer[i] = 0; /* turn end-of-line into end-of-string */ - p = i + 1; + cl->buffer[i] = 0; /* replace end-of-line by end-of-string so we can use sscanf */ + cl->reqlen = i + 1; break; } } - if(p) + if(cl->reqlen) { if(sscanf(cl->buffer, "%d", &request) == 1) { @@ -988,8 +988,8 @@ cp syslog(LOG_ERR, "Bogus data received: %s", cl->buffer); } - cl->buflen -= p; - memmove(cl->buffer, cl->buffer + p, cl->buflen); + cl->buflen -= cl->reqlen; + memmove(cl->buffer, cl->buffer + cl->reqlen, cl->buflen); oldlen = 0; } else