along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: protocol.c,v 1.26 2000/05/29 21:01:25 zarq Exp $
+ $Id: protocol.c,v 1.28 2000/05/30 21:36:16 zarq Exp $
*/
#include "config.h"
if(cl->status.outgoing)
send_public_key(cl);
else
- send_ack(cl);
+ {
+ 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. */
+ /* 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);
+ while(old=lookup_conn(cl->vpn_ip))
+ terminate_connection(old);
- cl->status.active = 1;
- notify_others(cl, NULL, send_add_host);
- notify_one(cl);
+ cl->status.active = 1;
+ notify_others(cl, NULL, send_add_host);
+ notify_one(cl);
+ }
cp
return 0;
}
unsigned short port;
conn_list_t *ncn, *fw;
cp
- if(!cl->status.active) return -1;
+ if(!cl->status.active)
+ return -1;
if(sscanf(cl->buffer, "%*d %lx %lx/%lx:%hx", &real_ip, &vpn_ip, &vpn_mask, &port) != 4)
{
syslog(LOG_ERR, _("got bad ADD_HOST request: %s"), cl->buffer);
*/
if((fw = lookup_conn(vpn_ip)))
{
- notify_others(fw, cl, send_add_host);
+ if(fw->nexthop == cl)
+ notify_others(fw, cl, send_add_host);
+ else
+ if(debug_lvl > 1)
+ syslog(LOG_DEBUG, _("Invalid add_host request from " IP_ADDR_S),
+ IP_ADDR_V(cl->vpn_ip));
return 0;
}