C99 extravaganza.

[tinc] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index 1e63f2e..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;
@@ -108,6 +111,20 @@ void forward_request(connection_t *from, const char *request) {
 }
 
 bool receive_request(connection_t *c, const char *request) {
+       if(proxytype == PROXY_HTTP && c->allow_request == ID) {
+               if(!request[0] || request[0] == '\r')
+                       return true;
+               if(!strncasecmp(request, "HTTP/1.1 ", 9)) {
+                       if(!strncmp(request + 9, "200", 3)) {
+                               logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request granted");
+                               return true;
+                       } else {
+                               logger(DEBUG_ALWAYS, LOG_DEBUG, "Proxy request rejected: %s", request + 9);
+                               return false;
+                       }
+               }
+       }
+
        int reqno = atoi(request);
 
        if(reqno || *request == '0') {
@@ -169,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