Clean-ups, bump copyright date

Makefile

@@ -8,7 +8,7 @@ prefix ?= /usr/local
 
 # WITH_PROXY enables PROXY Protocol v2 support
 ifeq ($(WITH_PROXY),1)
-	override CXXFLAGS += -DWITH_PROXY
+	override CXXFLAGS += -DUWS_WITH_PROXY
 endif
 
 # WITH_OPENSSL=1 enables OpenSSL 1.1+ support

examples/HelloWorld.cpp

@@ -1,5 +1,4 @@
 #include "App.h"
-#include <iostream>
 
 /* Note that uWS::SSLApp({options}) is the same as uWS::App() when compiled without SSL support */
 
@@ -10,8 +9,6 @@ int main() {
 	  .cert_file_name = "../misc/cert.pem",
 	  .passphrase = "1234"
 	}).get("/*", [](auto *res, auto *req) {
-		std::cout << res->getRemoteAddressAsText() << std::endl;
-		std::cout << res->getProxiedRemoteAddressAsText() << std::endl;
 	    res->end("Hello world!");
 	}).listen(3000, [](auto *token) {
 	    if (token) {

src/HttpContext.h

@@ -127,7 +127,7 @@ private:
             // how far did we read then? we need to know to continue with websocket parsing data? or?
 
             void *proxyParser = nullptr;
-#ifdef WITH_PROXY
+#ifdef UWS_WITH_PROXY
             proxyParser = &httpResponseData->proxyParser;
 #endif
 

src/HttpContextData.h

@@ -1,5 +1,5 @@
 /*
- * Authored by Alex Hultman, 2018-2019.
+ * Authored by Alex Hultman, 2018-2020.
  * Intellectual property of third-party.
 
  * Licensed under the Apache License, Version 2.0 (the "License");

src/HttpParser.h

@@ -183,7 +183,7 @@ private:
         /* How much data we CONSUMED (to throw away) */
         int consumedTotal = 0;
 
-#ifdef WITH_PROXY
+#ifdef UWS_WITH_PROXY
         /* ProxyParser is passed as reserved parameter */
         ProxyParser *pp = (ProxyParser *) reserved;
 

src/HttpResponse.h

@@ -168,7 +168,7 @@ private:
 
 public:
     /* If we have proxy support; returns the proxed source address as reported by the proxy. */
-#ifdef WITH_PROXY
+#ifdef UWS_WITH_PROXY
     std::string_view getProxiedRemoteAddress() {
         return getHttpResponseData()->proxyParser.getSourceAddress();
     }

src/HttpResponseData.h

@@ -22,11 +22,10 @@
 
 #include "HttpParser.h"
 #include "AsyncSocketData.h"
+#include "ProxyParser.h"
 
 #include "f2/function2.hpp"
 
-#include "ProxyParser.h"
-
 namespace uWS {
 
 template <bool SSL>
@@ -53,8 +52,7 @@ private:
     /* Current state (content-length sent, status sent, write called, etc */
     int state = 0;
 
-#ifdef WITH_PROXY
+#ifdef UWS_WITH_PROXY
-    // proxy protocol
     ProxyParser proxyParser;
 #endif
 };

src/HttpRouter.h

@@ -1,5 +1,5 @@
 /*
- * Authored by Alex Hultman, 2018-2019.
+ * Authored by Alex Hultman, 2018-2020.
  * Intellectual property of third-party.
 
  * Licensed under the Apache License, Version 2.0 (the "License");

src/Loop.h

@@ -1,5 +1,5 @@
 /*
- * Authored by Alex Hultman, 2018-2019.
+ * Authored by Alex Hultman, 2018-2020.
  * Intellectual property of third-party.
 
  * Licensed under the Apache License, Version 2.0 (the "License");

src/LoopData.h

@@ -1,5 +1,5 @@
 /*
- * Authored by Alex Hultman, 2018-2019.
+ * Authored by Alex Hultman, 2018-2020.
  * Intellectual property of third-party.
 
  * Licensed under the Apache License, Version 2.0 (the "License");

src/PerMessageDeflate.h

@@ -1,5 +1,5 @@
 /*
- * Authored by Alex Hultman, 2018-2019.
+ * Authored by Alex Hultman, 2018-2020.
  * Intellectual property of third-party.
 
  * Licensed under the Apache License, Version 2.0 (the "License");

src/ProxyParser.h

@@ -1,11 +1,28 @@
-//
+/*
+ * Authored by Alex Hultman, 2018-2020.
+ * Intellectual property of third-party.
 
-// implements PROXY v2 protocol
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
 
-#ifndef PROXY_PARSER
+ *     http://www.apache.org/licenses/LICENSE-2.0
-#define PROXY_PARSER
 
-#ifdef WITH_PROXY
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* This module implements The PROXY Protocol v2 */
+
+#ifndef UWS_PROXY_PARSER_H
+#define UWS_PROXY_PARSER_H
+
+#ifdef UWS_WITH_PROXY
+
+namespace uWS {
 
 struct proxy_hdr_v2 {
     uint8_t sig[12];  /* hex 0D 0A 0D 0A 00 0D 0A 51 55 49 54 0A */
@@ -30,6 +47,7 @@ union proxy_addr {
 };
 
 /* Byte swap for little-endian systems */
+/* Todo: This functions should be shared with the one in WebSocketProtocol.h! */
 template <typename T>
 T _cond_byte_swap(T value) {
     uint32_t endian_test = 1;
@@ -52,7 +70,7 @@ struct ProxyParser {
 private:
     union proxy_addr addr;
 
-    // we should have "unset" where the return value is "" from proxied ip!
+    /* Default family of 0 signals no proxy address */
     uint8_t family = 0;
 
 public:
@@ -94,6 +112,7 @@ public:
             return {false, 0};
         }
 
+        /* Header is 16 bytes */
         struct proxy_hdr_v2 header;
         memcpy(&header, data.data(), 16);
 
@@ -102,34 +121,43 @@ public:
             return {false, 0};
         }
 
-        /* If we have version 2 */
+        /* We only support version 2 */
+        if ((header.ver_cmd & 0xf0) >> 4 != 2) {
+            return {false, 0};
+        }
 
-        printf("Version: %d\n", (header.ver_cmd & 0xf0) >> 4);
+        //printf("Version: %d\n", (header.ver_cmd & 0xf0) >> 4);
-        printf("Command: %d\n", (header.ver_cmd & 0x0f));
+        //printf("Command: %d\n", (header.ver_cmd & 0x0f));
 
+        /* We get length in network byte order (todo: share this function with the rest) */
         uint16_t hostLength = _cond_byte_swap<uint16_t>(header.len);
 
+        /* We must have all the data available */
         if (data.length() < 16 + hostLength) {
             return {false, 0};
         }
 
-        printf("Length: %d\n", hostLength);
+        /* Payload cannot be more than sizeof proxy_addr */
+        if (sizeof(proxy_addr) < hostLength) {
+            return {false, 0};
+        }
 
-        printf("Family: %d\n", (header.fam & 0xf0) >> 4);
+        //printf("Family: %d\n", (header.fam & 0xf0) >> 4);
-        printf("Transport: %d\n", (header.fam & 0x0f));
+        //printf("Transport: %d\n", (header.fam & 0x0f));
 
+        /* We have 0 family by default, and UNSPEC is 0 as well */
         family = header.fam;
 
-        // copy source ip
+        /* Copy payload */
         memcpy(&addr, data.data() + 16, hostLength);
 
-
+        /* We consumed everything */
-
         return {true, 16 + hostLength};
     }
-
 };
 
-#endif
+}
 
 #endif
+
+#endif // UWS_PROXY_PARSER_H

src/Utilities.h

@@ -1,5 +1,5 @@
 /*
- * Authored by Alex Hultman, 2018-2019.
+ * Authored by Alex Hultman, 2018-2020.
  * Intellectual property of third-party.
 
  * Licensed under the Apache License, Version 2.0 (the "License");

src/WebSocket.h

@@ -1,5 +1,5 @@
 /*
- * Authored by Alex Hultman, 2018-2019.
+ * Authored by Alex Hultman, 2018-2020.
  * Intellectual property of third-party.
 
  * Licensed under the Apache License, Version 2.0 (the "License");

src/WebSocketContext.h

@@ -1,5 +1,5 @@
 /*
- * Authored by Alex Hultman, 2018-2019.
+ * Authored by Alex Hultman, 2018-2020.
  * Intellectual property of third-party.
 
  * Licensed under the Apache License, Version 2.0 (the "License");

src/WebSocketContextData.h

@@ -1,5 +1,5 @@
 /*
- * Authored by Alex Hultman, 2018-2019.
+ * Authored by Alex Hultman, 2018-2020.
  * Intellectual property of third-party.
 
  * Licensed under the Apache License, Version 2.0 (the "License");

src/WebSocketData.h

@@ -1,5 +1,5 @@
 /*
- * Authored by Alex Hultman, 2018-2019.
+ * Authored by Alex Hultman, 2018-2020.
  * Intellectual property of third-party.
 
  * Licensed under the Apache License, Version 2.0 (the "License");

src/WebSocketExtensions.h

@@ -1,5 +1,5 @@
 /*
- * Authored by Alex Hultman, 2018-2019.
+ * Authored by Alex Hultman, 2018-2020.
  * Intellectual property of third-party.
 
  * Licensed under the Apache License, Version 2.0 (the "License");

src/WebSocketHandshake.h

@@ -1,5 +1,5 @@
 /*
- * Authored by Alex Hultman, 2018-2019.
+ * Authored by Alex Hultman, 2018-2020.
  * Intellectual property of third-party.
 
  * Licensed under the Apache License, Version 2.0 (the "License");

src/WebSocketProtocol.h

@@ -1,5 +1,5 @@
 /*
- * Authored by Alex Hultman, 2018-2019.
+ * Authored by Alex Hultman, 2018-2020.
  * Intellectual property of third-party.
 
  * Licensed under the Apache License, Version 2.0 (the "License");