Fix issue 150

git-svn-id: http://sipml5.googlecode.com/svn/trunk@214 63d8a0da-676c-2731-e3aa-b417aa27da68
samsonlarsson · Jan 27, 2014 · d91d1fb · d91d1fb
1 parent 2e2ea88
commit d91d1fb
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 10 deletions.
diff --git a/SIPml.js b/SIPml.js
@@ -367,7 +367,8 @@ Adds an event listener to the target object. <br /><br />
             m_early_media<br/> m_local_hold_ok<br/> m_local_hold_nok<br/> m_local_resume_ok<br/> m_local_resume_nok<br/> m_remote_hold<br/> m_remote_resume<br/>
             m_stream_video_local_added<br /> m_stream_video_local_removed<br/> m_stream_video_remote_added<br/> m_stream_video_remote_removed <br />
             m_stream_audio_local_added<br /> m_stream_audio_local_removed<br/> m_stream_audio_remote_added<br/> m_stream_audio_remote_removed <br />
-            i_ect_new_call<br/> o_ect_trying<br/> o_ect_accepted<br/> o_ect_completed<br/> i_ect_completed<br/> o_ect_failed<br/> i_ect_failed<br/> o_ect_notify<br/> i_ect_notify<br/> i_ect_requested
+            i_ect_new_call<br/> o_ect_trying<br/> o_ect_accepted<br/> o_ect_completed<br/> i_ect_completed<br/> o_ect_failed<br/> i_ect_failed<br/> o_ect_notify<br/> i_ect_notify<br/> i_ect_requested <br />
+            i_info
         </td>
         <td><a href="SIPml.Session.Event.html">SIPml.Session.Event</a></td>
         <td>borrows all events supported by <a href="SIPml.Session.html">SIPml.Session</a></td>
@@ -965,6 +966,13 @@ SIPml.Stack = function (o_conf) {
              case tsip_event_invite_type_e.O_ECT_NOTIFY: s_type = 'o_ect_notify'; break;
              case tsip_event_invite_type_e.I_ECT_NOTIFY: s_type = 'i_ect_notify'; break;
              case tsip_event_invite_type_e.I_ECT_REQUESTED: s_type = 'i_ect_requested'; break;
+             case tsip_event_invite_type_e.DIALOG_REQUEST_INCOMING:
+                 {
+                    if(e.o_message) {
+                        if(e.o_message.is_info()) { s_type = 'i_info'; }
+                    }
+                    break;
+                 }  
              default: break;
          }
 

diff --git a/call.htm b/call.htm
@@ -386,7 +386,7 @@
                     bandwidth: (window.localStorage ? tsk_string_to_object(window.localStorage.getItem('org.doubango.expert.bandwidth')) : null), // could be redefined a session-level
                     video_size: (window.localStorage ? tsk_string_to_object(window.localStorage.getItem('org.doubango.expert.video_size')) : null), // could be redefined a session-level
                     sip_headers: [
-                            { name: 'User-Agent', value: 'IM-client/OMA1.0 sipML5-v1.2013.08.10B' },
+                            { name: 'User-Agent', value: 'IM-client/OMA1.0 sipML5-v1.2014.01.27' },
                             { name: 'Organization', value: 'Doubango Telecom' }
                     ]
                 }

diff --git a/release.sh b/release.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
 #
-# Copyright (C) 2012 Doubango Telecom <http://www.doubango.org>
+# Copyright (C) 2012-2014 Doubango Telecom <http://www.doubango.org>
 # License: BSD
 # This file is part of Open Source sipML5 solution <http://www.sipml5.org>
 #
 
-API_VERSION=1.3.203
+API_VERSION=1.3.214
 API_FOLDER_NAME=release
 API_FILE_NAME=SIPml-api.js
 API_FILE_PATH=$API_FOLDER_NAME/$API_FILE_NAME

diff --git a/release/SIPml-api.js b/release/SIPml-api.js
diff --git a/release/call.htm b/release/call.htm
@@ -386,7 +386,7 @@
                     bandwidth: (window.localStorage ? tsk_string_to_object(window.localStorage.getItem('org.doubango.expert.bandwidth')) : null), // could be redefined a session-level
                     video_size: (window.localStorage ? tsk_string_to_object(window.localStorage.getItem('org.doubango.expert.video_size')) : null), // could be redefined a session-level
                     sip_headers: [
-                            { name: 'User-Agent', value: 'IM-client/OMA1.0 sipML5-v1.2013.08.10B' },
+                            { name: 'User-Agent', value: 'IM-client/OMA1.0 sipML5-v1.2014.01.27' },
                             { name: 'Organization', value: 'Doubango Telecom' }
                     ]
                 }

diff --git a/src/tinyMEDIA/src/tmedia_session_jsep.js b/src/tinyMEDIA/src/tmedia_session_jsep.js
@@ -308,7 +308,8 @@ tmedia_session_jsep.prototype.close = function () {
     }
     if (this.o_pc) {
         if (this.o_local_stream) {
-            this.o_pc.removeStream(this.o_local_stream);
+            // TODO: On Firefox 26: Error: "removeStream not implemented yet"
+            try { this.o_pc.removeStream(this.o_local_stream); } catch (e) { }
             if(!this.b_cache_stream || (this.e_type == tmedia_type_e.SCREEN_SHARE)) { // only stop if caching is disabled or screenshare
                 this.o_local_stream.stop();
             }

diff --git a/src/tinySIP/src/dialogs/tsip_dialog_invite.js b/src/tinySIP/src/dialogs/tsip_dialog_invite.js
@@ -1217,8 +1217,12 @@ function x0000_Any_2_Any_X_oINFO(ao_args) {
 }
 
 function x0000_Any_2_Any_X_iINFO(ao_args) {
-    tsk_utils_log_error("Not implemented");
-    return 0;
+    var o_dialog = ao_args[0];
+    var o_request = ao_args[1];
+
+    var i_ret = o_dialog.send_response(o_request, 200, "OK");
+    /*i_ret =*/ o_dialog.signal_invite(tsip_event_invite_type_e.DIALOG_REQUEST_INCOMING, tsip_event_code_e.DIALOG_REQUEST_INCOMING, "Incoming Request", o_request);
+    return i_ret;
 }
 
 function x0000_Any_2_Any_X_i401_407_INVITEorUPDATE(ao_args) {

diff --git a/tests/test_sip.html b/tests/test_sip.html
@@ -120,12 +120,33 @@
         var msg = tsip_message.prototype.Parse(o_ragel_state, true);
         tsk_utils_log_info(msg.toString());
     }
+
+    function test_connect() {
+        var i = 0;
+        var sockets = new Array(40);
+        /*var id = setInterval(function(){
+            console.info("Connecting ("+(i)+")...");
+            //sockets[i] = new WebSocket("ws://192.168.0.37:20060", 'sip');
+            sockets[i] = new WebSocket("ws://ns313841.ovh.net:50060", 'sip');
+            if (++i >= sockets.length) {
+                clearInterval(id);
+            }
+        },
+        1);*/
+        for (i = 0; i < sockets.length; ++i) {
+            console.info("Connecting ("+(i)+")...");
+            sockets[i] = new WebSocket("ws://ns313841.ovh.net:50060", 'sip');
+            //sockets[i] = new WebSocket("ws://192.168.0.37:20060", 'sip');
+        }
+    }
+
 </script>
 
 <!-- body -->
 <body>
     <form action=''>
     <input type="button" value="Parse" onclick='test_msg_parse();' />
+    <!--input type="button" value="Connect" onclick='test_connect();' /-->
     </form>
 </body>
 </html>