Remove checkpoint tracing.

[tinc] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index a32d413..9c38fef 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -1,6 +1,6 @@
 /*
     meta.c -- handle the meta communication
-    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2009 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -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"
@@ -34,12 +32,14 @@
 #include "utils.h"
 #include "xalloc.h"
 
-bool send_meta(connection_t *c, const char *buffer, int length)
-{
+bool send_meta(connection_t *c, const char *buffer, int length) {
        int outlen;
        int result;
 
-       cp();
+       if(!c) {
+               logger(LOG_ERR, _("send_meta() called with NULL pointer!"));
+               abort();
+       }
 
        ifdebug(META) logger(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length,
                           c->name, c->hostname);
@@ -79,8 +79,7 @@ bool send_meta(connection_t *c, const char *buffer, int length)
        return true;
 }
 
-bool flush_meta(connection_t *c)
-{
+bool flush_meta(connection_t *c) {
        int result;
        
        ifdebug(META) logger(LOG_DEBUG, _("Flushing %d bytes to %s (%s)"),
@@ -116,13 +115,10 @@ bool flush_meta(connection_t *c)
        return true;
 }
 
-void broadcast_meta(connection_t *from, const char *buffer, int length)
-{
+void broadcast_meta(connection_t *from, const char *buffer, int length) {
        avl_node_t *node;
        connection_t *c;
 
-       cp();
-
        for(node = connection_tree->head; node; node = node->next) {
                c = node->data;
 
@@ -131,15 +127,12 @@ void broadcast_meta(connection_t *from, const char *buffer, int length)
        }
 }
 
-bool receive_meta(connection_t *c)
-{
+bool receive_meta(connection_t *c) {
        int oldlen, i, result;
        int lenin, lenout, reqlen;
        bool decrypted = false;
        char inbuf[MAXBUFSIZE];
 
-       cp();
-
        /* Strategy:
           - Read as much as possible from the TCP socket in one go.
           - Decrypt it.