Always call res_init() before getaddrinfo().

[tinc] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index fc16ffe..1ec169a 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-2005 Ivo Timmermans,
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 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
@@ -30,7 +30,7 @@
 
 bool tunnelserver = false;
 bool strictsubnets = false;
-bool experimental = false;
+bool experimental = true;
 
 /* Jumptable for the request handlers */
 
@@ -55,17 +55,6 @@ static char (*request_name[]) = {
 
 static splay_tree_t *past_request_tree;
 
-bool check_id(const char *id) {
-       if(!id || !*id)
-               return false;
-
-       for(; *id; id++)
-               if(!isalnum(*id) && *id != '_')
-                       return false;
-
-       return true;
-}
-
 /* Generic request routines - takes care of logging and error
    detection as well */
 
@@ -195,7 +184,7 @@ bool seen_request(const char *request) {
        } else {
                new = xmalloc(sizeof *new);
                new->request = xstrdup(request);
-               new->firstseen = time(NULL);
+               new->firstseen = now.tv_sec;
                splay_insert(past_request_tree, new);
                timeout_add(&past_request_timeout, age_past_requests, NULL, &(struct timeval){10, rand() % 100000});
                return false;