commit 88ad9643c0ef03d086f830b6f30d0aad21111137
author Didier Brachet <dbrachet.wr@gmail.com> Mon Oct 24 17:07:02 2016 +0200
committer Didier Brachet <dbrachet.wr@gmail.com> Mon Oct 24 17:07:02 2016 +0200
tree 58db6c9874b5c038e617054abd5e9ee168575ab4
parent 5cf1d324560283383a929e64ad11fa59c4fb417d

TCF Agent: Fixed WebSocket channel after commit 134b8b47b7b0b57f48b52296300b8c7403fec72c

agent/tcf/framework/channel_lws.c

diff --git a/agent/tcf/framework/channel_lws.c b/agent/tcf/framework/channel_lws.c
index e11750f..85bc640 100644
--- a/agent/tcf/framework/channel_lws.c
+++ b/agent/tcf/framework/channel_lws.c
@@ -286,7 +286,7 @@
              * call to trigger the deletion of the channel. The original
              * lock was done when the channel was established
              */
-            post_event((EventCallBack *)lws_unlock, c);
+            post_event((EventCallBack *)lws_unlock, c->chan);
         }
     }
     pthread_mutex_unlock(&buf->data->mutex);
@@ -1564,17 +1564,17 @@
     trace(LOG_PROTOCOL, line);
 }
 
-void channel_lws_get_properties(Channel * c, char *** prop_names, char *** prop_values, unsigned * prop_cnt) {
-    ChannelWS * c1 = (ChannelWS *)c;
+void channel_lws_get_properties(Channel * channel, char *** prop_names, char *** prop_values, unsigned * prop_cnt) {
+    ChannelWS * c = channel2ws(channel);
     assert(is_dispatch_thread());
-    if(c1->magic != CHANNEL_MAGIC) {
+    if(c->magic != CHANNEL_MAGIC) {
         *prop_cnt = 0;
         return;
     }
-    assert(c1->lock_cnt > 0);
-    *prop_names = ((ChannelWS *)c1)->data->prop_names;
-    *prop_values = ((ChannelWS *)c1)->data->prop_values;
-    *prop_cnt = ((ChannelWS *)c1)->data->prop_cnt;
+    assert(c->lock_cnt > 0);
+    *prop_names = c->data->prop_names;
+    *prop_values = c->data->prop_values;
+    *prop_cnt = c->data->prop_cnt;
 }
 
 void ini_channel_lws() {

agent/tcf/framework/channel_lws.h

diff --git a/agent/tcf/framework/channel_lws.h b/agent/tcf/framework/channel_lws.h
index d1fa6c7..6fbbaed 100644
--- a/agent/tcf/framework/channel_lws.h
+++ b/agent/tcf/framework/channel_lws.h
@@ -25,7 +25,7 @@
 #if ENABLE_LibWebSockets
 #include <tcf/framework/channel.h>
 
-extern void channel_lws_get_properties(Channel * c, char *** prop_names, char *** prop_values, unsigned * prop_cnt);
+extern void channel_lws_get_properties(Channel * channel, char *** prop_names, char *** prop_values, unsigned * prop_cnt);
 extern void ini_channel_lws(void);
 
 #endif /* ENABLE_LibWebSockets */