Make it compile

uNetworking · Feb 10, 2019 · 3e4e70d · 3e4e70d
1 parent a419221
commit 3e4e70d
Showing 1 changed file with 55 additions and 55 deletions.
diff --git a/src/WebSocketExtensions.h b/src/WebSocketExtensions.h
@@ -39,61 +39,6 @@ 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;
@@ -156,6 +101,61 @@ class ExtensionsParser {
     }
 };
 
+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;
+    }
+};
+
 }
 
 #endif // WEBSOCKETEXTENSIONS_H