Replace Opaque and Strict options with a TunnelServer option.

[tinc] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index dad7ccb..e6c13f4 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.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: protocol.c,v 1.28.4.143 2003/07/24 12:08:15 guus Exp $
+    $Id: protocol.c,v 1.28.4.148 2003/11/17 15:30:17 guus Exp $
 */
 
 #include "system.h"
@@ -30,6 +30,8 @@
 #include "utils.h"
 #include "xalloc.h"
 
+bool tunnelserver = false;
+
 /* Jumptable for the request handlers */
 
 static bool (*request_handlers[])(connection_t *) = {
@@ -207,20 +209,19 @@ void exit_requests(void)
        avl_delete_tree(past_request_tree);
 }
 
-bool seen_request(const char *request)
+bool seen_request(char *request)
 {
-       past_request_t p = {
-               .request = request,
-       };
-       past_request_t *new;
+       past_request_t *new, p = {0};
 
        cp();
 
+       p.request = request;
+
        if(avl_search(past_request_tree, &p)) {
                ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Already seen request"));
                return true;
        } else {
-               new = (past_request_t *) xmalloc(sizeof(*new));
+               new = xmalloc(sizeof(*new));
                new->request = xstrdup(request);
                new->firstseen = now;
                avl_insert(past_request_tree, new);
@@ -238,7 +239,7 @@ void age_past_requests(void)
 
        for(node = past_request_tree->head; node; node = next) {
                next = node->next;
-               p = (past_request_t *) node->data;
+               p = node->data;
 
                if(p->firstseen + pingtimeout < now)
                        avl_delete_node(past_request_tree, node), deleted++;
@@ -247,6 +248,6 @@ void age_past_requests(void)
        }
 
        if(left || deleted)
-               ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Aging past requests: deleted %d, left %d\n"),
+               ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Aging past requests: deleted %d, left %d"),
                           deleted, left);
 }