K&R style braces.

[tinc] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index 4e37bf5..78781a6 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -1,7 +1,7 @@
 /*
     protocol.c -- handle the meta-protocol, basic functions
-    Copyright (C) 1999-2001 Ivo Timmermans <ivo@o2w.nl>,
-                  2000,2001 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1999-2005 Ivo Timmermans,
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -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: protocol.c,v 1.28.4.147 2003/08/28 21:05:10 guus Exp $
+    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"
@@ -30,6 +28,8 @@
 #include "utils.h"
 #include "xalloc.h"
 
+bool tunnelserver = false;
+
 /* Jumptable for the request handlers */
 
 static bool (*request_handlers[])(connection_t *) = {
@@ -53,8 +53,7 @@ static char (*request_name[]) = {
 
 static avl_tree_t *past_request_tree;
 
-bool check_id(const char *id)
-{
+bool check_id(const char *id) {
        for(; *id; id++)
                if(!isalnum(*id) && *id != '_')
                        return false;
@@ -65,15 +64,14 @@ bool check_id(const char *id)
 /* Generic request routines - takes care of logging and error
    detection as well */
 
-bool send_request(connection_t *c, const char *format, ...)
-{
+bool send_request(connection_t *c, const char *format, ...) {
        va_list args;
        char buffer[MAXBUFSIZE];
        int len, request;
 
        cp();
 
-       /* Use vsnprintf instead of vasprintf: faster, no memory
+       /* Use vsnprintf instead of vxasprintf: faster, no memory
           fragmentation, cleanup is automatic, and there is a limit on the
           input buffer anyway */
 
@@ -106,8 +104,7 @@ bool send_request(connection_t *c, const char *format, ...)
                return send_meta(c, buffer, len);
 }
 
-void forward_request(connection_t *from)
-{
+void forward_request(connection_t *from) {
        int request;
 
        cp();
@@ -128,8 +125,7 @@ void forward_request(connection_t *from)
        broadcast_meta(from, from->buffer, from->reqlen);
 }
 
-bool receive_request(connection_t *c)
-{
+bool receive_request(connection_t *c) {
        int request;
 
        cp();
@@ -178,13 +174,11 @@ bool receive_request(connection_t *c)
        return true;
 }
 
-static int past_request_compare(const past_request_t *a, const past_request_t *b)
-{
+static int past_request_compare(const past_request_t *a, const past_request_t *b) {
        return strcmp(a->request, b->request);
 }
 
-static void free_past_request(past_request_t *r)
-{
+static void free_past_request(past_request_t *r) {
        cp();
 
        if(r->request)
@@ -193,22 +187,19 @@ static void free_past_request(past_request_t *r)
        free(r);
 }
 
-void init_requests(void)
-{
+void init_requests(void) {
        cp();
 
        past_request_tree = avl_alloc_tree((avl_compare_t) past_request_compare, (avl_action_t) free_past_request);
 }
 
-void exit_requests(void)
-{
+void exit_requests(void) {
        cp();
 
        avl_delete_tree(past_request_tree);
 }
 
-bool seen_request(char *request)
-{
+bool seen_request(char *request) {
        past_request_t *new, p = {0};
 
        cp();
@@ -227,8 +218,7 @@ bool seen_request(char *request)
        }
 }
 
-void age_past_requests(void)
-{
+void age_past_requests(void) {
        avl_node_t *node, *next;
        past_request_t *p;
        int left = 0, deleted = 0;
@@ -239,7 +229,7 @@ void age_past_requests(void)
                next = node->next;
                p = node->data;
 
-               if(p->firstseen + pingtimeout < now)
+               if(p->firstseen + pinginterval < now)
                        avl_delete_node(past_request_tree, node), deleted++;
                else
                        left++;