git:pd/websocket: modules/websocket: Fixed a couple of connection issues and now dropping received SIP requests into receive_msg ()
Module: sip-router Branch: pd/websocket Commit: 5c4133c2ba036776a1ea3c1f73c51a7d9d518fbe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5c4133c2...
Author: Peter Dunkley peter.dunkley@crocodile-rcs.com Committer: Peter Dunkley peter.dunkley@crocodile-rcs.com Date: Sat Jun 23 17:37:25 2012 +0100
modules/websocket: Fixed a couple of connection issues and now dropping received SIP requests into receive_msg()
- SIP parser not updated for WS and WSS yet
---
modules/websocket/ws_conn.c | 23 ++++++---- modules/websocket/ws_frame.c | 88 +++++++++++++------------------------ modules/websocket/ws_handshake.c | 11 +++-- 3 files changed, 51 insertions(+), 71 deletions(-)
Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=5c41...
Hi,
We've come across a problem where URIs that are in the IP state (inactive - pinging) aren't being set to the 'active' state after a successful ping probe. We've sifted through the code and found that modules_k/dispatcher/dispatch.c has this code in the ds_option_callback() function, on line 2328: if (*ps->param == NULL) { LM_DBG("No parameter provided, OPTIONS-Request was finished" " with code %d\n", ps->code); return; }
When the group (ie *ps->param) is 0 then that statement evaluates to true and the function returns without executing the callback. For groups
0 the code works fine.
To fix this we've changed the statement to: if (ps->param == NULL)
If you have any questions, comments or feed back please let me know. If that change gets accepted please let me know as well so that we can remove the patch from our build systems.
Thanks for the great software!
*Avi Brender* *Elite Hosts*
Hello,
On 6/23/12 7:58 PM, Avi Brender wrote:
Hi,
We've come across a problem where URIs that are in the IP state (inactive - pinging) aren't being set to the 'active' state after a successful ping probe. We've sifted through the code and found that modules_k/dispatcher/dispatch.c has this code in the ds_option_callback() function, on line 2328: if (*ps->param == NULL) { LM_DBG("No parameter provided, OPTIONS-Request was finished" " with code %d\n", ps->code); return; }
When the group (ie *ps->param) is 0 then that statement evaluates to true and the function returns without executing the callback. For groups > 0 the code works fine.
To fix this we've changed the statement to: if (ps->param == NULL)
If you have any questions, comments or feed back please let me know. If that change gets accepted please let me know as well so that we can remove the patch from our build systems.
Thanks for the great software!
iirc, ps->param cannot be null as it is given as address of a field in an existing structure.
You are right regarding the group id 0 in this case. 0 should be avoided usually when expecting to get the value in cofing file, which means stop execution of the config file -- it happened with permissions where is a function returning the group, now there 0 is not allowed.
I will commit your fix for now, but might be better to disallow set id 0 to avoid possible troubles in the future.
Thanks, Daniel
-
Avi Brender -
Daniel-Constantin Mierla -
Peter Dunkley