URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a3ce73… Merge: f64fda6 acb0ae8 Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jul 7 17:52:20 2012 +0100 Merge branch 'master' into websocket URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f64fda6… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jul 5 22:58:24 2012 +0100 pkg/kamailio/fedora/16: tidied up kamailio.spec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=380ab4c… Merge: a4db0a0 ef6da28 Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jul 5 22:55:44 2012 +0100 Merge branch 'master' into websocket Conflicts: pkg/kamailio/fedora/16/kamailio.spec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a4db0a0… Merge: 6af91d1 2b392e4 Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jul 5 21:15:22 2012 +0100 Merge branch 'master' into websocket Conflicts: Makefile pkg/kamailio/centos/6/kamailio-build.appl pkg/kamailio/centos/6/kamailio.appl pkg/kamailio/fedora/16/kamailio-build.appl pkg/kamailio/fedora/16/kamailio.appl pkg/kamailio/fedora/16/kamailio.spec pkg/kamailio/fedora/17/kamailio-build.appl pkg/kamailio/fedora/17/kamailio.appl URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6af91d1… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jul 5 15:23:19 2012 +0100 modules/websocket: More tidy-up of example configuration file URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=324e8f3… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jul 5 12:08:40 2012 +0100 modules/websocket: Tidied up example kamailio.cfg URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1792586… Merge: 86362e5 1382c30 Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Jul 4 18:08:02 2012 +0100 Merge branch 'master' into websocket * master: modules/lcr: Fixed to/from_gw tests when proto parameter is 0 (ANY) cdp_avp: added README file CDP: Fixed README CDP: A few fixes to docs and location of image files - cleaner organisation new modules: CDP (C Diameter Peer) and CDP_AVP - These modules were originally written by Fraunhofer and have been ported to Kamailio, with some minor additions and improvements. Examples on using the modules to come shortly - diameter_rx, diameter_ro, etc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=86362e5… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Jul 4 16:15:29 2012 +0100 modules/websocket: Fixes to WS and WSS message sending URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d1d9d63… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Jul 4 16:13:40 2012 +0100 modules_k/pv: Added missing break;s URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ccd1f6… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Jul 4 16:12:53 2012 +0100 core: Fixes for WSS (secure WebSocket) transport and Via:s URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c395809… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Jul 3 23:59:22 2012 +0100 modules/websocket and pkg/kamailio/fedora: Added websocket module documentation URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d75121… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Jul 3 16:57:50 2012 +0100 pkg/kamailio/(centos|fedora): Tweaked .spec and .appl files to add WebSocket support URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b7e7535… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Jul 3 16:57:00 2012 +0100 core: Added websocket module to Makefile URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eff18c9… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Jul 3 16:56:11 2012 +0100 modules/websocket: Updated example kamailio.cfg URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b66cd65… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jul 1 22:21:38 2012 +0100 modules/websockets: Added some extra debug/diagnostics URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ba0ff31… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jul 1 22:20:36 2012 +0100 core: Updated Via and Record-Route generation for WebSockets URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3d4a77d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 30 22:53:00 2012 +0100 core: Added more PROTO_WS and PROTO_WSS checks URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=56767ad… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 30 22:52:26 2012 +0100 modules/websocket: Removed SIPp script and HTML file from example directory URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd2a237… Merge: b66e815 8c789cd Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 30 21:13:58 2012 +0100 Merge branch 'master' into websocket Conflicts: pkg/kamailio/fedora/16/kamailio.spec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b66e815… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 30 20:36:00 2012 +0100 modules/websocket: Corrected output of ws.dump MI command URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6fe3e10… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 30 20:35:10 2012 +0100 core: Fixed segmentation fault - Tiny window for this... but I hit it when Google Chrome crashed during a WebSocket session URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5456e4e… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 30 00:46:20 2012 +0100 modules/websocket: Updated connection reuse and closing flags for WebSocket handshake. - Updated the sample kamailio.cfg to match too. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dc7fa93… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 30 00:02:29 2012 +0100 modules/websocket: improved sample kamailio.cfg for WebSockets URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e2f18d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 30 00:01:07 2012 +0100 everything: shotgun attempt to put PROTO_WS and PROTO_WSS across core and in modules I use - Bound to have missed something and lots of testing required. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9349870… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 29 23:11:15 2012 +0100 core: rolled back changes to receive.c - Not actually needed because the recent change to ws_frame.c covers it all (I think) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=636a6da… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 29 23:08:19 2012 +0100 modules/websocket: Make sure that all WebSocket messages are sent on connections that already exist - This is the same as using set_forward_no_connect() and set_reply_no_connect() in kamailio.cfg. But this means it will always happen automatically for WebSocket messages. - This is important as a WebSocket server cannot create connections - so we always have to use one that already exists. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=242920e… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 29 23:05:48 2012 +0100 core: Make sure that responses to requests received on a WebSocket are sent on existing connections - WebSocket servers cannot create connections to WebSocket clients - so this setting is essential. - It does exactly the same thing as using set_reply_no_connect() in kamailio.cfg - but this way it is always on (as it must be) for WebSockets. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=915894b… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 29 23:03:15 2012 +0100 modules_k/nathelper: Added nat_uac_test() check for WebSockets - At the moment (and until Kamailio and _all_ WebSocket clients support outbound) we want to treat WebSocket UAs as behind NATs (even when they are not). - This is so that the aliasing (which is good for TCP/TLS connection reuse as well as NAT traversal) can be used to make sure messages to WebSocket UAs are routed correctly. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=353ad95… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 29 17:47:22 2012 +0100 modules/websockets: Changes WS to be a protocol in its own right instead of a flag on TCP/TLS connections URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8c4d2e7… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 29 17:47:06 2012 +0100 modules_k/nathelper: Added PROTO_WS support URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d08c4dc… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 29 17:46:36 2012 +0100 modules/tm: Added PROTO_WS support URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8393eff… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 29 17:44:15 2012 +0100 core: Changed WS from being a flag on a TCP/TLS connection to a protocol in its own right - Also added ;transport=ws parameter parsing for URIs URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8c6f700… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jun 28 17:57:44 2012 +0100 core: added support for WS keyword for use in conditionals with proto and snd_proto URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d07a57f… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jun 28 17:55:53 2012 +0100 core: fixed an issue where big websocket requests (single WS frame but across multiple packets) weren't handled URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3269116… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jun 28 17:54:45 2012 +0100 core: Fix to msg_send() so that requests destined for a WebSocket connection go through the websocket module - responses already worked URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d6f8930… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jun 28 17:53:55 2012 +0100 modules/websockets: tidied up a bit of the code URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c270ac0… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jun 24 00:40:24 2012 +0100 modules/websocket: improvements to ws.dump MI command URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6dfd147… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 23 22:13:35 2012 +0100 pkg/kamailio/fedora: added WebSocket module to .spec file URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4611d05… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 23 21:57:37 2012 +0100 modules/websocket: now using libunistring:u8_check() to work out whether to send text or binary websocket frames - There is no straight-forward (or practical) way to be sure that a SIP request only contains UTF-8 characters and therefore should be sent as text instead of binary. However, you can sometimes tell whether the request definitely isn't UTF-8 by checking for invalid byte sequences - and when it is definitely not UTF-8 frames _MUST_ be sent as binary. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7cd2711… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 23 21:57:09 2012 +0100 parser: Update Via parsing state-machine to support WS and WSS URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=64406b2… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 23 21:55:34 2012 +0100 modules/websocket: updated example configuration and test scripts - Added options_rx.xml SIPp script - kamailio.cfg routes OPTIONS to SIPp - websocket_test.html now using WSS (WS over TLS) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=11a2ad1… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 23 21:52:15 2012 +0100 core: fixed segmentation fault I had added to forward.h URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1f13981… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 23 19:10:03 2012 +0100 core: added events and data-structures so that Kamailio core can transmit through the WebSocket module URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=50d20ec… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 23 19:08:38 2012 +0100 modules/websocket: added generic transmit functions to WebSocket module so Kamailio core can send WebSocket frames URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5c4133c… Author: Peter Dunkley <peter.dunkley(a)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 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ad7ea60… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 23 16:07:12 2012 +0100 modules/websocket: updated example/test kamailio.cfg to support TLS - Basic WebSocket working over TLS URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d8239f… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 23 15:03:48 2012 +0100 modules/websocket: finished off WebSocket connection management URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3a64dff… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 23 11:31:50 2012 +0100 modules/websocket: tidied up some of the WS connection code URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2f30521… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 22 00:34:24 2012 +0100 modules/websocket: Closing handshake now working - Also completed MI commands which allowed me to test Ping and Pong URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=76f15b9… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jun 21 17:37:08 2012 +0100 modules/websocket: More tidying up URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2af2b32… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jun 21 16:58:05 2012 +0100 modules/websocket: fixed typo URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=857b117… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jun 21 16:28:57 2012 +0100 modules/websockets: started adding WebSocket connection management to WebSocket module URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7d35945… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jun 21 13:50:53 2012 +0100 modules/websocket: Added connection close code and tidied up MI commands URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f457ec9… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jun 17 21:31:29 2012 +0100 modules/websocket: Filled in MI commands to dump WebSocket connection details and Close a WebSocket URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=69c264b… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jun 17 21:30:33 2012 +0100 core: Fixed a problem with receiving WebSocket frames - If two frames were pulled from the buffer at the same time the second wasn't being processed. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d3e7705… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jun 17 14:29:44 2012 +0100 modules/websocket: more work on WebSocket framing and base-protocol URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c04689c… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jun 17 14:28:20 2012 +0100 core: added clone buf support for WebSocket connections URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=68c60fd… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jun 17 00:44:14 2012 +0100 modules/websocket: received frame decoding URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=62691a5… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Jun 17 00:43:44 2012 +0100 core: tidied up websocket frame length code URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1718093… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 16 22:58:36 2012 +0100 core: improved de-buffering for websockets - This should handle the case that the full TCP packet hasn't been received when the read function is called. Not sure how to explicitly test this though. URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=74a32e9… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 16 22:58:00 2012 +0100 core: make it possible to retrieve TCP connection without updating connection liifetime URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6868661… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 16 22:57:34 2012 +0100 modules/websocket: small tidy up to handshake code URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3ec4696… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 16 17:06:33 2012 +0100 core: Added WS support/events to Kamailio core URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d93ce1… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 16 17:05:54 2012 +0100 modules/websocket: WS module registering for WS messages and basic handler implementation URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48e7ee7… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 16 14:38:22 2012 +0100 modules/websocket: more work on module boiler-plate and handshake - Handshake now works with Google Chrome URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4071305… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 15 10:17:06 2012 +0100 modules/websocket: Improvements to handshake handler URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48ba747… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 15 00:40:28 2012 +0100 modules/websocket: First attempt a module for websocket support - So far this is: - Module boiler-plate - WebSocket handshake - Example/test kamailio.cfg