From 77be52422d8c28735f787b1c233b4cec73d4db56 Mon Sep 17 00:00:00 2001 From: Ivo Timmermans Date: Wed, 31 May 2000 18:23:06 +0000 Subject: [PATCH] Miscellaneous copyright updates. --- src/encr.c | 5 ++++- src/net.c | 25 +++++++++++-------------- src/netutl.c | 4 ++-- src/tincd.c | 27 ++++----------------------- 4 files changed, 21 insertions(+), 40 deletions(-) diff --git a/src/encr.c b/src/encr.c index cae34c43..5753de23 100644 --- a/src/encr.c +++ b/src/encr.c @@ -1,6 +1,7 @@ /* encr.c -- everything that deals with encryption - Copyright (C) 1998,1999,2000 Ivo Timmermans + Copyright (C) 1998,1999,2000 Ivo Timmermans + 2000 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,6 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + $Id: encr.c,v 1.12 2000/05/31 18:23:06 zarq Exp $ */ #include "config.h" diff --git a/src/net.c b/src/net.c index 0eb5ef38..54e13232 100644 --- a/src/net.c +++ b/src/net.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: net.c,v 1.34 2000/05/30 12:38:15 zarq Exp $ + $Id: net.c,v 1.35 2000/05/31 18:23:05 zarq Exp $ */ #include "config.h" @@ -848,24 +848,21 @@ cp /* Find all connections that were lost because they were behind cl (the connection that was dropped). */ for(p = conn_list; p != NULL; p = p->next) - { - if(p->nexthop == cl) - { - p->status.active = 0; - p->status.remove = 1; - } - } + if(p->nexthop == cl) + { + p->status.active = 0; + p->status.remove = 1; + } cp /* Then send a notification about all these connections to all hosts that are still connected to us. */ for(p = conn_list; p != NULL; p = p->next) - { - if(!p->status.remove && p->status.meta) - for(q = conn_list; q != NULL; q = q->next) - if(q->status.remove) - send_del_host(p, q); - } + if(!p->status.remove && p->status.meta) + for(q = conn_list; q != NULL; q = q->next) + if(q->status.remove) + send_del_host(p, q); + cp } diff --git a/src/netutl.c b/src/netutl.c index a61c9173..c75bea27 100644 --- a/src/netutl.c +++ b/src/netutl.c @@ -16,7 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: netutl.c,v 1.11 2000/05/30 11:18:12 zarq Exp $ + $Id: netutl.c,v 1.12 2000/05/31 18:23:06 zarq Exp $ */ #include "config.h" @@ -51,7 +51,7 @@ conn_list_t *lookup_conn(ip_t ip) cp /* Exact match suggested by James B. MacLean */ for(p = conn_list; p != NULL; p = p->next) - if((ip == p->vpn_ip) && p->status.active) + if((ip == p->vpn_ip) && p->status.active) return p; for(p = conn_list; p != NULL; p = p->next) if(((ip & p->vpn_mask) == (p->vpn_ip & p->vpn_mask)) && p->status.active) diff --git a/src/tincd.c b/src/tincd.c index 6575675c..2a7b63ef 100644 --- a/src/tincd.c +++ b/src/tincd.c @@ -1,6 +1,7 @@ /* tincd.c -- the main file for tincd - Copyright (C) 1998,1999,2000 Ivo Timmermans + Copyright (C) 1998,1999,2000 Ivo Timmermans + 2000 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,29 +16,9 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ -/* - * $Log: tincd.c,v $ - * Revision 1.9 2000/05/29 21:01:26 zarq - * Internationalization of tinc. - * - * Revision 1.8 2000/05/14 12:22:42 guus - * Cleanups. - * - * Revision 1.7 2000/04/27 13:47:51 zarq - * Default config file name is tinc.conf, and pidfile is tinc.pid. - * - * Revision 1.6 2000/04/18 16:04:10 zarq - * Address for bugreports changed to tinc@nl.linux.org. - * - * Revision 1.5 2000/04/17 16:23:29 zarq - * Pass the requested size from xmalloc() and xrealloc() on to xalloc_fail_func() - * - * Revision 1.4 2000/04/06 18:28:29 zarq - * New option -D, don't detach. - * - */ + $Id: tincd.c,v 1.10 2000/05/31 18:23:06 zarq Exp $ +*/ #include "config.h" -- 2.39.5