projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Proxymode removed.
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
7ee41b8
..
7b9133e
100644
(file)
--- a/
src/net.c
+++ b/
src/net.c
@@
-93,12
+93,14
@@
int xsend(conn_list_t *cl, void *packet)
real_packet_t rp;
cp
do_encrypt((vpn_packet_t*)packet, &rp, cl->key);
real_packet_t rp;
cp
do_encrypt((vpn_packet_t*)packet, &rp, cl->key);
- rp.from = myself->vpn_ip;
+ rp.from = htonl(myself->vpn_ip);
+ rp.data.len = htons(rp.data.len);
+ rp.len = htons(rp.len);
if(debug_lvl > 3)
if(debug_lvl > 3)
- syslog(LOG_ERR, "Sent %d bytes to %lx",
rp.len
, cl->vpn_ip);
+ syslog(LOG_ERR, "Sent %d bytes to %lx",
ntohs(rp.len)
, cl->vpn_ip);
- if((r = send(cl->socket, (char*)&rp,
rp.len
, 0)) < 0)
+ if((r = send(cl->socket, (char*)&rp,
ntohs(rp.len)
, 0)) < 0)
{
syslog(LOG_ERR, "Error sending data: %m");
return -1;
{
syslog(LOG_ERR, "Error sending data: %m");
return -1;
@@
-771,6
+773,11
@@
cp
return -1;
}
total_socket_in += lenin;
return -1;
}
total_socket_in += lenin;
+
+ rp.data.len = ntohs(rp.data.len);
+ rp.len = ntohs(rp.len);
+ rp.from = ntohl(rp.from);
+
if(rp.len >= 0)
{
f = lookup_conn(rp.from);
if(rp.len >= 0)
{
f = lookup_conn(rp.from);
@@
-923,7
+930,7
@@
cp
int handle_incoming_meta_data(conn_list_t *cl)
{
int x, l = sizeof(x);
int handle_incoming_meta_data(conn_list_t *cl)
{
int x, l = sizeof(x);
- int request, oldlen,
p,
i;
+ int request, oldlen, i;
int lenin = 0;
cp
if(getsockopt(cl->meta_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
int lenin = 0;
cp
if(getsockopt(cl->meta_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
@@
-956,19
+963,19
@@
cp
for(;;)
{
for(;;)
{
-
p=
0;
+
cl->reqlen =
0;
for(i = oldlen; i < cl->buflen; i++)
{
if(cl->buffer[i] == '\n')
{
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;
}
}
break;
}
}
- if(
p
)
+ if(
cl->reqlen
)
{
if(sscanf(cl->buffer, "%d", &request) == 1)
{
{
if(sscanf(cl->buffer, "%d", &request) == 1)
{
@@
-988,8
+995,8
@@
cp
syslog(LOG_ERR, "Bogus data received: %s", cl->buffer);
}
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
oldlen = 0;
}
else