projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Key forwarding, write one byte extra.
[tinc]
/
src
/
protocol.c
diff --git
a/src/protocol.c
b/src/protocol.c
index
44f012f
..
13a5793
100644
(file)
--- a/
src/protocol.c
+++ b/
src/protocol.c
@@
-335,20
+335,14
@@
cp
tmp->len = strlen(my_public_key_base36);
strcpy(&(tmp->key), my_public_key_base36);
tmp->len = strlen(my_public_key_base36);
strcpy(&(tmp->key), my_public_key_base36);
-cp
- syslog(LOG_DEBUG, "key sent = %s", my_public_key_base36);
-cp
- fw = lookup_conn(to);
+ fw = lookup_conn(to);
-cp
if(!fw)
{
syslog(LOG_ERR, "Attempting to send key answer to " IP_ADDR_S ", which does not exist?",
IP_ADDR_V(to));
return -1;
}
if(!fw)
{
syslog(LOG_ERR, "Attempting to send key answer to " IP_ADDR_S ", which does not exist?",
IP_ADDR_V(to));
return -1;
}
-cp
- syslog(LOG_DEBUG, "key sent = %s", &(tmp->key));
cp
if(debug_lvl > 2)
cp
if(debug_lvl > 2)
@@
-744,21
+738,20
@@
int ans_key_h(conn_list_t *cl)
conn_list_t *fw, *gk;
char *key;
cp
conn_list_t *fw, *gk;
char *key;
cp
- if(read(cl->meta_socket, &((char*)(&tmp))[1], sizeof(tmp)
-2
) <= 0)
+ if(read(cl->meta_socket, &((char*)(&tmp))[1], sizeof(tmp)
- 3
) <= 0)
{
syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
return -1;
}
key = xmalloc(tmp.len);
{
syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
return -1;
}
key = xmalloc(tmp.len);
-
- if(read(cl->meta_socket, key, tmp.len +
1
) <= 0)
+
+ if(read(cl->meta_socket, key, tmp.len +
2
) <= 0)
{
syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
return -1;
}
{
syslog(LOG_ERR, "%d: Receive failed: %m", __LINE__);
return -1;
}
-
- syslog(LOG_DEBUG, "key = %s", key);
+ syslog(LOG_DEBUG, "%s", key);
if(debug_lvl > 3)
syslog(LOG_DEBUG, "got ANS_KEY from " IP_ADDR_S " for " IP_ADDR_S,
if(debug_lvl > 3)
syslog(LOG_DEBUG, "got ANS_KEY from " IP_ADDR_S " for " IP_ADDR_S,
@@
-797,12
+790,12
@@
cp
syslog(LOG_DEBUG, "Forwarding public key to " IP_ADDR_S,
IP_ADDR_V(fw->nexthop->vpn_ip));
tmp.type = ANS_KEY;
syslog(LOG_DEBUG, "Forwarding public key to " IP_ADDR_S,
IP_ADDR_V(fw->nexthop->vpn_ip));
tmp.type = ANS_KEY;
- if(write(fw->nexthop->meta_socket, &tmp, sizeof(tmp) -
1
) < 0)
+ if(write(fw->nexthop->meta_socket, &tmp, sizeof(tmp) -
2
) < 0)
{
syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
return -1;
}
{
syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
return -1;
}
- if(write(fw->nexthop->meta_socket, key, tmp.len +
1
) < 0)
+ if(write(fw->nexthop->meta_socket, key, tmp.len +
2
) < 0)
{
syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
return -1;
{
syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
return -1;