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.28.4.16 2000/06/29 17:09:06 guus Exp $
+ $Id: protocol.c,v 1.28.4.19 2000/06/30 21:03:51 guus Exp $
*/
#include "config.h"
int basic_info_h(conn_list_t *cl)
{
+ conn_list_t *old;
cp
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Got BASIC_INFO from %s"), cl->real_hostname);
}
if(cl->status.outgoing)
- {
- if(setup_vpn_connection(cl) < 0)
- return -1;
- send_basic_info(cl);
- }
- else
{
/* First check if the host we connected to is already in our
connection list. If so, we are probably making a loop, which
- is not desirable. It should not happen though.
+ is not desirable.
*/
- if(lookup_conn(cl->vpn_ip))
+ if(old=lookup_conn(cl->vpn_ip))
{
if(debug_lvl>0)
- syslog(LOG_NOTICE, _("Uplink %s (%s) is already in our connection list, aborting connect"),
+ syslog(LOG_NOTICE, _("Uplink %s (%s) is already in our connection list"),
cl->vpn_hostname, cl->real_hostname);
- return -1;
+ cl->status.outgoing = 0;
+ old->status.outgoing = 1;
+ terminate_connection(cl);
+ return 0;
}
+
+ if(setup_vpn_connection(cl) < 0)
+ return -1;
+ send_basic_info(cl);
+ }
+ else
+ {
if(setup_vpn_connection(cl) < 0)
return -1;
while(old = lookup_conn(cl->vpn_ip))
{
- syslog(LOG_NOTICE, _("Removing old entry for %s at %s in favour of new connection from %s"),
+ if(debug_lvl > 1)
+ syslog(LOG_NOTICE, _("Removing old entry for %s at %s in favour of new connection from %s"),
cl->vpn_hostname, old->real_hostname, cl->real_hostname);
old->status.active = 0;
terminate_connection(old);
cl->status.active = 1;
- syslog(LOG_NOTICE, _("Connection with %s (%s) activated"),
+ if(debug_lvl > 0)
+ syslog(LOG_NOTICE, _("Connection with %s (%s) activated"),
cl->vpn_hostname, cl->real_hostname);
notify_others(cl, NULL, send_add_host);
return 0;
}
+ /* Connections lists are really messed up if this happens */
+ if(vpn_ip == myself->vpn_ip)
+ {
+ syslog(LOG_ERR, _("Warning: got DEL_HOST from %s (%s) for ourself, restarting"),
+ cl->vpn_hostname, cl->real_hostname);
+ sighup = 1;
+ return 0;
+ }
+
if(debug_lvl > 1)
syslog(LOG_DEBUG, _("Got DEL_HOST for %s (%s) from %s (%s)"),
fw->vpn_hostname, fw->real_hostname, cl->vpn_hostname, cl->real_hostname);
terminate_connection(old);
}
}
+
+ /* Connections lists are really messed up if this happens */
+ if(vpn_ip == myself->vpn_ip)
+ {
+ syslog(LOG_ERR, _("Warning: got ADD_HOST from %s (%s) for ourself, restarting"),
+ cl->vpn_hostname, cl->real_hostname);
+ sighup = 1;
+ return 0;
+ }
ncn = new_conn_list();
ncn->real_ip = real_ip;