C99 extravaganza.

[tinc] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index 1c5b6cf..3c08d72 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -56,6 +56,9 @@ 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;
@@ -183,15 +186,10 @@ bool seen_request(const char *request) {
 }
 
 static void age_past_requests(int fd, short events, void *data) {
-       splay_node_t *node, *next;
-       past_request_t *p;
        int left = 0, deleted = 0;
        time_t now = time(NULL);
 
-       for(node = past_request_tree->head; node; node = next) {
-               next = node->next;
-               p = node->data;
-
+       for splay_each(past_request_t, p, past_request_tree) {
                if(p->firstseen + pinginterval <= now)
                        splay_delete_node(past_request_tree, node), deleted++;
                else