j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Added extra checks for desynchronized connection lists. Hopefully this will

Browse source 
fix those strange segmentation faults.
This commit is contained in:
Guus Sliepen 2000-04-24 08:32:57 +00:00
parent 1074917912
commit f6802d349d
1 changed files with 40 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/protocol.c
View file

@ -323,6 +323,14 @@ int send_key_answer(conn_list_t *cl, ip_t to)
strcpy(&tmp->key, my_public_key_base36); strcpy(&tmp->key, my_public_key_base36);
fw = lookup_conn(to); fw = lookup_conn(to);
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(debug_lvl > 2) if(debug_lvl > 2)
syslog(LOG_DEBUG, "Sending public key to " IP_ADDR_S, syslog(LOG_DEBUG, "Sending public key to " IP_ADDR_S,
IP_ADDR_V(fw->nexthop->vpn_ip)); IP_ADDR_V(fw->nexthop->vpn_ip));
@ -617,6 +625,14 @@ int req_key_h(conn_list_t *cl, unsigned char *d, int len)
} }
fw = lookup_conn(tmp->to); fw = lookup_conn(tmp->to);
if(!fw)
{
syslog(LOG_ERR, "Attempting to forward key request to " IP_ADDR_S ", which does not exist?",
IP_ADDR_V(tmp->to));
return -1;
}
if(debug_lvl > 3) if(debug_lvl > 3)
syslog(LOG_DEBUG, "Forwarding request for public key to " IP_ADDR_S, syslog(LOG_DEBUG, "Forwarding request for public key to " IP_ADDR_S,
IP_ADDR_V(fw->nexthop->vpn_ip)); IP_ADDR_V(fw->nexthop->vpn_ip));
@ -673,6 +689,14 @@ int ans_key_h(conn_list_t *cl, unsigned char *d, int len)
if(debug_lvl > 2) if(debug_lvl > 2)
syslog(LOG_DEBUG, "Yeah! key arrived. Now do something with it."); syslog(LOG_DEBUG, "Yeah! key arrived. Now do something with it.");
gk = lookup_conn(tmp->from); gk = lookup_conn(tmp->from);
if(!gk)
{
syslog(LOG_ERR, "Receiving key from " IP_ADDR_S ", which does not exist?",
IP_ADDR_V(tmp->from));
return -1;
}
set_keys(gk, tmp); set_keys(gk, tmp);
gk->status.validkey = 1; gk->status.validkey = 1;
gk->status.waitingforkey = 0; gk->status.waitingforkey = 0;
@ -681,6 +705,14 @@ int ans_key_h(conn_list_t *cl, unsigned char *d, int len)
} }
fw = lookup_conn(tmp->to); fw = lookup_conn(tmp->to);
if(!fw)
{
syslog(LOG_ERR, "Attempting to forward key to " IP_ADDR_S ", which does not exist?",
IP_ADDR_V(tmp->to));
return -1;
}
if(debug_lvl > 2) if(debug_lvl > 2)
syslog(LOG_DEBUG, "Forwarding public key to " IP_ADDR_S, syslog(LOG_DEBUG, "Forwarding public key to " IP_ADDR_S,
IP_ADDR_V(fw->nexthop->vpn_ip)); IP_ADDR_V(fw->nexthop->vpn_ip));
@ -703,6 +735,14 @@ int key_changed_h(conn_list_t *cl, unsigned char *d, int len)
IP_ADDR_V(tmp->from)); IP_ADDR_V(tmp->from));
ik = lookup_conn(tmp->from); ik = lookup_conn(tmp->from);
if(!ik)
{
syslog(LOG_ERR, "Got changed key from " IP_ADDR_S ", which does not exist?",
IP_ADDR_V(tmp->from));
return -1;
}
ik->status.validkey = 0; ik->status.validkey = 0;
ik->status.waitingforkey = 0; ik->status.waitingforkey = 0;