X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=7c8cd0ba83e3c326a47505f8f8cd175403926bfe;hp=6d77cb560aba0497f9f32fc3012e7d42307cdf23;hb=a227843b739d279b63adcf3736ebb03d856080c4;hpb=c23fcf555ee4b69f03b76a0ffb731c3a475a77e7

diff --git a/src/connection.c b/src/connection.c
index 6d77cb56..7c8cd0ba 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -13,11 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    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$
+    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.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
@@ -35,35 +33,25 @@
 avl_tree_t *connection_tree;	/* Meta connections */
 connection_t *broadcast;
 
-static int connection_compare(const connection_t *a, const connection_t *b)
-{
+static int connection_compare(const connection_t *a, const connection_t *b) {
 	return a < b ? -1 : a == b ? 0 : 1;
 }
 
-void init_connections(void)
-{
-	cp();
-
+void init_connections(void) {
 	connection_tree = avl_alloc_tree((avl_compare_t) connection_compare, (avl_action_t) free_connection);
 	broadcast = new_connection();
 	broadcast->name = xstrdup(_("everyone"));
 	broadcast->hostname = xstrdup(_("BROADCAST"));
 }
 
-void exit_connections(void)
-{
-	cp();
-
+void exit_connections(void) {
 	avl_delete_tree(connection_tree);
 	free_connection(broadcast);
 }
 
-connection_t *new_connection(void)
-{
+connection_t *new_connection(void) {
 	connection_t *c;
 
-	cp();
-
 	c = xmalloc_and_zero(sizeof(connection_t));
 
 	if(!c)
@@ -74,10 +62,7 @@ connection_t *new_connection(void)
 	return c;
 }
 
-void free_connection(connection_t *c)
-{
-	cp();
-
+void free_connection(connection_t *c) {
 	if(c->name)
 		free(c->name);
 
@@ -118,27 +103,18 @@ void free_connection(connection_t *c)
 	free(c);
 }
 
-void connection_add(connection_t *c)
-{
-	cp();
-
+void connection_add(connection_t *c) {
 	avl_insert(connection_tree, c);
 }
 
-void connection_del(connection_t *c)
-{
-	cp();
-
+void connection_del(connection_t *c) {
 	avl_delete(connection_tree, c);
 }
 
-void dump_connections(void)
-{
+void dump_connections(void) {
 	avl_node_t *node;
 	connection_t *c;
 
-	cp();
-
 	logger(LOG_DEBUG, _("Connections:"));
 
 	for(node = connection_tree->head; node; node = node->next) {
@@ -151,13 +127,10 @@ void dump_connections(void)
 	logger(LOG_DEBUG, _("End of connections."));
 }
 
-bool read_connection_config(connection_t *c)
-{
+bool read_connection_config(connection_t *c) {
 	char *fname;
 	int x;
 
-	cp();
-
 	xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
 	x = read_config_file(c->config_tree, fname);
 	free(fname);