Fix up WebSocketExtensions.h as proper header

src/WebSocketExtensions.h

@@ -31,17 +31,6 @@ enum Options : unsigned int {
     SLIDING_DEFLATE_WINDOW = 16
 };
 
-template <bool isServer>
-class ExtensionsNegotiator {
-protected:
-    int options;
-public:
-    ExtensionsNegotiator(int wantedOptions);
-    std::string generateOffer();
-    void readOffer(std::string_view offer);
-    int getNegotiatedOptions();
-};
-
 enum ExtensionTokens {
     TOK_PERMESSAGE_DEFLATE = 1838,
     TOK_SERVER_NO_CONTEXT_TAKEOVER = 2807,
@@ -50,6 +39,61 @@ enum ExtensionTokens {
     TOK_CLIENT_MAX_WINDOW_BITS = 2348
 };
 
+template <bool isServer>
+class ExtensionsNegotiator {
+protected:
+    int options;
+
+public:
+    ExtensionsNegotiator(int wantedOptions) {
+        options = wantedOptions;
+    }
+
+    std::string generateOffer() {
+        std::string extensionsOffer;
+        if (options & Options::PERMESSAGE_DEFLATE) {
+            extensionsOffer += "permessage-deflate";
+
+            if (options & Options::CLIENT_NO_CONTEXT_TAKEOVER) {
+                extensionsOffer += "; client_no_context_takeover";
+            }
+
+            /* It is questionable sending this improves anything */
+            /*if (options & Options::SERVER_NO_CONTEXT_TAKEOVER) {
+                extensionsOffer += "; server_no_context_takeover";
+            }*/
+        }
+
+        return extensionsOffer;
+    }
+
+    void readOffer(std::string_view offer) {
+        if (isServer) {
+            ExtensionsParser extensionsParser(offer.data(), offer.length());
+            if ((options & PERMESSAGE_DEFLATE) && extensionsParser.perMessageDeflate) {
+                if (extensionsParser.clientNoContextTakeover || (options & CLIENT_NO_CONTEXT_TAKEOVER)) {
+                    options |= CLIENT_NO_CONTEXT_TAKEOVER;
+                }
+
+                /* We leave this option for us to read even if the client did not send it */
+                if (extensionsParser.serverNoContextTakeover) {
+                    options |= SERVER_NO_CONTEXT_TAKEOVER;
+                }/* else {
+                    options &= ~SERVER_NO_CONTEXT_TAKEOVER;
+                }*/
+            } else {
+                options &= ~PERMESSAGE_DEFLATE;
+            }
+        } else {
+            // todo!
+        }
+    }
+
+    int getNegotiatedOptions() {
+        return options;
+    }
+};
+
 class ExtensionsParser {
 private:
     int *lastInteger = nullptr;
@@ -61,11 +105,7 @@ public:
     int serverMaxWindowBits = 0;
     int clientMaxWindowBits = 0;
 
-    int getToken(const char *&in, const char *stop);
+    int getToken(const char *&in, const char *stop) {
-    ExtensionsParser(const char *data, size_t length);
-};
-
-int ExtensionsParser::getToken(const char *&in, const char *stop) {
         while (!isalnum(*in) && in != stop) {
             in++;
         }
@@ -80,9 +120,9 @@ int ExtensionsParser::getToken(const char *&in, const char *stop) {
             in++;
         }
         return hashedToken;
-}
+    }
 
-ExtensionsParser::ExtensionsParser(const char *data, size_t length) {
+    ExtensionsParser(const char *data, size_t length) {
         const char *stop = data + length;
         int token = 1;
         for (; token && token != TOK_PERMESSAGE_DEFLATE; token = getToken(data, stop));
@@ -113,59 +153,8 @@ ExtensionsParser::ExtensionsParser(const char *data, size_t length) {
                 break;
             }
         }
-}
-
-template <bool isServer>
-ExtensionsNegotiator<isServer>::ExtensionsNegotiator(int wantedOptions) {
-    options = wantedOptions;
-}
-
-template <bool isServer>
-std::string ExtensionsNegotiator<isServer>::generateOffer() {
-    std::string extensionsOffer;
-    if (options & Options::PERMESSAGE_DEFLATE) {
-        extensionsOffer += "permessage-deflate";
-
-        if (options & Options::CLIENT_NO_CONTEXT_TAKEOVER) {
-            extensionsOffer += "; client_no_context_takeover";
     }
-
+};
-        /* It is questionable sending this improves anything */
-        /*if (options & Options::SERVER_NO_CONTEXT_TAKEOVER) {
-            extensionsOffer += "; server_no_context_takeover";
-        }*/
-    }
-
-    return extensionsOffer;
-}
-
-template <bool isServer>
-void ExtensionsNegotiator<isServer>::readOffer(std::string_view offer) {
-    if (isServer) {
-        ExtensionsParser extensionsParser(offer.data(), offer.length());
-        if ((options & PERMESSAGE_DEFLATE) && extensionsParser.perMessageDeflate) {
-            if (extensionsParser.clientNoContextTakeover || (options & CLIENT_NO_CONTEXT_TAKEOVER)) {
-                options |= CLIENT_NO_CONTEXT_TAKEOVER;
-            }
-
-            /* We leave this option for us to read even if the client did not send it */
-            if (extensionsParser.serverNoContextTakeover) {
-                options |= SERVER_NO_CONTEXT_TAKEOVER;
-            }/* else {
-                options &= ~SERVER_NO_CONTEXT_TAKEOVER;
-            }*/
-        } else {
-            options &= ~PERMESSAGE_DEFLATE;
-        }
-    } else {
-        // todo!
-    }
-}
-
-template <bool isServer>
-int ExtensionsNegotiator<isServer>::getNegotiatedOptions() {
-    return options;
-}
 
 }