fixed crash on lws_callback()

list of reactor was empty because of static modifier

Author: fx-lange

libs/ofxLibwebsockets/include/ofxLibwebsockets/Reactor.h

@@ -78,5 +78,5 @@ namespace ofxLibwebsockets {
 
     };
 
-    static vector<Reactor *> reactors;
+    extern vector<Reactor *> reactors;
 };

libs/ofxLibwebsockets/include/ofxLibwebsockets/Server.h

@@ -40,19 +40,7 @@ namespace ofxLibwebsockets {
         int     ka_interval;    // how long to wait between probes, in seconds; ignored if ka_time == 0
     };
 
-    static ServerOptions defaultServerOptions(){
-        ServerOptions opts;
-        opts.port           = 80;
-        opts.protocol       = "NULL"; // NULL == no protocol. most websockets behave this way.
-        opts.bUseSSL        = false;
-        opts.sslCertPath    = ofToDataPath("ssl/libwebsockets-test-server.pem", true);
-        opts.sslKeyPath     = ofToDataPath("ssl/libwebsockets-test-server.key.pem", true);
-        opts.documentRoot   = ofToDataPath("web", true);
-        opts.ka_time        = 0;
-        opts.ka_probes      = 0;
-        opts.ka_interval    = 0;
-        return opts;
-    }
+    extern ServerOptions defaultServerOptions();
 
     class Server : public Reactor {
         friend class Protocol;
@@ -131,4 +119,4 @@ namespace ofxLibwebsockets {
         Protocol serverProtocol;
         void threadedFunction();  
     };
-};
+};

libs/ofxLibwebsockets/src/Reactor.cpp

@@ -9,6 +9,8 @@
 
 namespace ofxLibwebsockets { 
 
+	vector<Reactor *> reactors = vector<Reactor *>();
+
     //--------------------------------------------------------------
     Reactor::Reactor()
     : context(NULL), waitMillis(50){

libs/ofxLibwebsockets/src/Server.cpp

@@ -13,6 +13,20 @@
 
 namespace ofxLibwebsockets {
 
+	ServerOptions defaultServerOptions(){
+        ServerOptions opts;
+        opts.port           = 80;
+        opts.protocol       = "NULL"; // NULL == no protocol. most websockets behave this way.
+        opts.bUseSSL        = false;
+        opts.sslCertPath    = ofToDataPath("ssl/libwebsockets-test-server.pem", true);
+        opts.sslKeyPath     = ofToDataPath("ssl/libwebsockets-test-server.key.pem", true);
+        opts.documentRoot   = ofToDataPath("web", true);
+        opts.ka_time        = 0;
+        opts.ka_probes      = 0;
+        opts.ka_interval    = 0;
+        return opts;
+    }
+
     //--------------------------------------------------------------
     Server::Server(){
         context = NULL;