Fixed one-to-many sending

Author: robotconscience

libs/ofxLibwebsockets/include/ofxLibwebsockets/Connection.h

@@ -70,6 +70,8 @@ namespace ofxLibwebsockets {
         // MUST be called from main thread (e.g. client or server)
         void update();
 
+        bool isIdle();
+        
     protected:
         std::string client_ip;
         std::string client_name;
@@ -84,6 +86,11 @@ namespace ofxLibwebsockets {
         // threading stuff
         std::deque<TextPacket> messages_text;
         std::deque<BinaryPacket> messages_binary;
+        
+        void setIdle( bool isIdle=true );
+        
+    private:
+        bool idle;
     };
 
 

libs/ofxLibwebsockets/include/ofxLibwebsockets/Protocol.h

@@ -37,8 +37,6 @@ namespace ofxLibwebsockets {
 
         void broadcast(const std::string& message);
 
-        bool isIdle();
-        
         unsigned int idx;
         unsigned int rx_buffer_size;
 

libs/ofxLibwebsockets/src/Connection.cpp

@@ -24,6 +24,7 @@ namespace ofxLibwebsockets {
             buf = (unsigned char*)calloc(LWS_SEND_BUFFER_PRE_PADDING+bufferSize+LWS_SEND_BUFFER_POST_PADDING, sizeof(unsigned char));
             binaryBuf = (unsigned char*)calloc(LWS_SEND_BUFFER_PRE_PADDING+bufferSize+LWS_SEND_BUFFER_POST_PADDING, sizeof(unsigned char));
         }
+        idle = false;
     }
 
     //--------------------------------------------------------------
@@ -109,7 +110,7 @@ namespace ofxLibwebsockets {
     //--------------------------------------------------------------
     void Connection::update(){
         // process standard ws messages
-        if ( messages_text.size() > 0 && protocol->idle ){
+        if ( messages_text.size() > 0 && idle ){
             // grab first packet
             TextPacket & packet = messages_text[0];
 
@@ -131,7 +132,7 @@ namespace ofxLibwebsockets {
 
             // actual write to libwebsockets
             memcpy(&buf[LWS_SEND_BUFFER_PRE_PADDING], packet.message.c_str() + packet.index, dataSize );
-            protocol->idle = false;
+            idle = false;
 
             int n = libwebsocket_write(ws, &buf[LWS_SEND_BUFFER_PRE_PADDING], dataSize, (libwebsocket_write_protocol) writeMode );
 
@@ -152,7 +153,7 @@ namespace ofxLibwebsockets {
         }
 
         // process binary messages
-        if ( messages_binary.size() > 0 && protocol->idle ){
+        if ( messages_binary.size() > 0 && idle ){
             if ( messages_binary.size() > 0 ){
                 BinaryPacket & packet = messages_binary[0];
 
@@ -170,7 +171,7 @@ namespace ofxLibwebsockets {
                 memcpy(&binaryBuf[LWS_SEND_BUFFER_PRE_PADDING], packet.data + packet.index, dataSize );
 
                 // this sets the protocol to wait until "idle"
-                protocol->idle = false; // todo: this should be automatic on write!
+                idle = false; // todo: this should be automatic on write!
 
                 int n = libwebsocket_write(ws, &binaryBuf[LWS_SEND_BUFFER_PRE_PADDING], dataSize, (libwebsocket_write_protocol) writeMode );
                 libwebsocket_callback_on_writable(context, ws);
@@ -189,6 +190,18 @@ namespace ofxLibwebsockets {
             libwebsocket_callback_on_writable(context, ws);
         }
     }
+    //--------------------------------------------------------------
+    void Connection::setIdle( bool isIdle ){
+        idle = isIdle;
+        static string dum ="";
+        Event args(*this, dum);
+        ofNotifyEvent(protocol->onidleEvent, args);
+    }
+    
+    //--------------------------------------------------------------
+    bool Connection::isIdle(){
+        return idle;
+    }
 
     //--------------------------------------------------------------
     bool Connection::operator==( const Connection &other ){

libs/ofxLibwebsockets/src/Protocol.cpp

@@ -80,11 +80,6 @@ namespace ofxLibwebsockets {
     void Protocol::_onerror(Event& args){ onerror(args); }
 
     void Protocol::onerror(Event&args){}
-
-    //--------------------------------------------------------------
-    bool Protocol::isIdle(){
-        return idle;
-    }
 
     void Protocol::_onidle(Event& args){
         idle = true;

libs/ofxLibwebsockets/src/Reactor.cpp

@@ -173,7 +173,7 @@ namespace ofxLibwebsockets {
             case LWS_CALLBACK_SERVER_WRITEABLE:
             case LWS_CALLBACK_CLIENT_WRITEABLE:
                 // idle is good! means you can write again
-                ofNotifyEvent(conn->protocol->onidleEvent, args);
+                conn->setIdle();
                 break;
 
             case LWS_CALLBACK_RECEIVE:              // server receive