buflen = snprintf(buffer, MAXBUFSIZE, "%d %lx\n", TERMREQ, myself->vpn_ip);
- if((write(cl->meta_socket, buffer, buflen)) < 0)
+ if(write(cl->meta_socket, buffer, buflen) < 0)
{
- syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
+ if(debug_lvl > 1)
+ syslog(LOG_ERR, "send failed: %s:%d: %m", __FILE__, __LINE__);
return -1;
}
cp
conn_list_t *p;
cp
for(p = conn_list; p != NULL; p = p->next)
- if(p->status.meta && p->protocol_version > PROT_3)
+ if(p->status.meta && p->status.active)
send_key_changed(p, myself);
cp
}
conn_list_t *p;
cp
for(p = conn_list; p != NULL; p = p->next)
- if(p != new && p != source && p->status.meta)
+ if(p != new && p != source && p->status.meta && p->status.active)
function(p, new);
cp
return 0;
conn_list_t *p;
cp
for(p = conn_list; p != NULL; p = p->next)
- if(p != new && p->protocol_version > PROT_3)
+ if(p != new && p->status.active)
send_add_host(new, p);
cp
return 0;
return -1;
send_passphrase(cl);
}
-
- cl->status.active = 0;
cp
return 0;
}
int passphrase_h(conn_list_t *cl)
{
cp
- cl->pp=xmalloc(sizeof(*(cl->pp)));
+ cl->pp = xmalloc(sizeof(*(cl->pp)));
+
if(sscanf(cl->buffer, "%*d %as", &(cl->pp->phrase)) != 1)
{
syslog(LOG_ERR, "got bad PASSPHRASE request: %s", cl->buffer);
int public_key_h(conn_list_t *cl)
{
char *g_n;
+ conn_list_t *old;
cp
if(sscanf(cl->buffer, "%*d %as", &g_n) != 1)
{
else
send_ack(cl);
+ /* Okay, before we active the connection, we check if there is another entry
+ in the connection list with the same vpn_ip. If so, it presumably is an
+ old connection that has timed out but we don't know it yet. Because our
+ conn_list entry is not active, lookup_conn will skip ourself. */
+
+ while(old=lookup_conn(cl->vpn_ip))
+ terminate_connection(old);
+
cl->status.active = 1;
notify_others(cl, NULL, send_add_host);
notify_one(cl);