FS-7132 #resolve

html5/verto/demo/verto.js

@@ -308,10 +308,8 @@ var callbacks = {
 
     },
     onWSClose: function(v, success) {
-        if ($('#online').is(':visible')) {
-            display("");
-            online(false);
-        }
+        display("");
+        online(false);
         var today = new Date();
         $("#errordisplay").html("Connection Error.<br>Last Attempt: " + today);
         goto_page("main");

html5/verto/js/src/jquery.verto.js

@@ -132,6 +132,9 @@
     $.verto.prototype.logout = function(msg) {
         var verto = this;
         verto.rpcClient.closeSocket();
+        if (verto.callbacks.onWSClose) {
+            verto.callbacks.onWSClose(verto, false);
+        }
         verto.purge();
     };
 
@@ -490,6 +493,10 @@
             };
         } else {
             switch (data.method) {
+            case 'verto.punt':
+                verto.purge();
+		verto.logout();
+		break;
             case 'verto.event':
                 var list = null;
                 var key = null;

src/mod/endpoints/mod_verto/mod_verto.c

@@ -305,6 +305,8 @@ static uint32_t jsock_unsub_head(jsock_t *jsock, jsock_sub_node_head_t *head)
 	return x;
 }
 
+static void detach_calls(jsock_t *jsock);
+
 static void unsub_all_jsock(void)
 {
 	switch_hash_index_t *hi;
@@ -1059,8 +1061,30 @@ static jsock_t *get_jsock(const char *uuid)
 
 static void attach_jsock(jsock_t *jsock)
 {
+	jsock_t *jp;
+	int proceed = 1;
+
 	switch_mutex_lock(globals.jsock_mutex);
-	switch_core_hash_insert(globals.jsock_hash, jsock->uuid_str, jsock);
+
+	if ((jp = switch_core_hash_find(globals.jsock_hash, jsock->uuid_str))) {
+		if (jp == jsock) {
+			proceed = 0;
+		} else {
+			cJSON *params = NULL;
+			cJSON *msg = NULL;
+			msg = jrpc_new_req("verto.punt", NULL, &params);
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "New connection for session %s dropping previous connection.\n", jsock->uuid_str);
+			switch_core_hash_delete(globals.jsock_hash, jsock->uuid_str);
+			ws_write_json(jp, &msg, SWITCH_TRUE);
+			cJSON_Delete(msg);
+			jp->drop = 1;
+		}
+	}
+
+	if (proceed) {
+		switch_core_hash_insert(globals.jsock_hash, jsock->uuid_str, jsock);
+	}
+
 	switch_mutex_unlock(globals.jsock_mutex);
 }