Releasing 1.0.22.

[tinc] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index 7dbee71..b385fbc 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-2009 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
@@ -68,7 +68,7 @@ bool check_id(const char *id) {
 bool send_request(connection_t *c, const char *format, ...) {
        va_list args;
        char buffer[MAXBUFSIZE];
-       int len, request;
+       int len, request = 0;
 
        /* Use vsnprintf instead of vxasprintf: faster, no memory
           fragmentation, cleanup is automatic, and there is a limit on the
@@ -125,6 +125,20 @@ void forward_request(connection_t *from) {
 bool receive_request(connection_t *c) {
        int request;
 
+       if(c->outgoing && proxytype == PROXY_HTTP && c->allow_request == ID) {
+               if(!c->buffer[0] || c->buffer[0] == '\r')
+                       return true;
+               if(!strncasecmp(c->buffer, "HTTP/1.1 ", 9)) {
+                       if(!strncmp(c->buffer + 9, "200", 3)) {
+                               logger(LOG_DEBUG, "Proxy request granted");
+                               return true;
+                       } else {
+                               logger(LOG_DEBUG, "Proxy request rejected: %s", c->buffer + 9);
+                               return false;
+                       }
+               }
+       }
+
        if(sscanf(c->buffer, "%d", &request) == 1) {
                if((request < 0) || (request >= LAST) || !request_handlers[request]) {
                        ifdebug(META)