Skip to content

F
freeswitch
提交 a2921e26 authored 作者: Anthony Minessale's avatar Anthony Minessale
浏览文件
操作

update verto with some fixes and enhancements with reconnection

上级 52435978
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 407 行增加 和 107 行删除
configure.ac
浏览文件 @ a2921e26
......@@ -787,7 +787,7 @@ AC_PROG_GCC_TRADITIONAL
AC_FUNC_MALLOC
AC_TYPE_SIGNAL
AC_FUNC_STRFTIME
AC_CHECK_FUNCS([gethostname vasprintf mmap mlock mlockall usleep getifaddrs timerfd_create getdtablesize posix_openpt])
AC_CHECK_FUNCS([gethostname vasprintf mmap mlock mlockall usleep getifaddrs timerfd_create getdtablesize posix_openpt poll])
AC_CHECK_FUNCS([sched_setscheduler setpriority setrlimit setgroups initgroups])
AC_CHECK_FUNCS([wcsncmp setgroups asprintf setenv pselect gettimeofday localtime_r gmtime_r strcasecmp stricmp _stricmp])
......
html5/verto/demo/index.html
浏览文件 @ a2921e26
......@@ -2,7 +2,7 @@
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="css/jquery.mobile-1.3.2.min.css" />
<link rel="stylesheet" href="//ajax.googleapis.com/ajax/libs/jquerymobile/1.4.3/jquery.mobile.min.css"/>
<link rel="stylesheet" type="text/css" href="css/jsontable.css" />
<link rel="shortcut icon" href="favicon.ico" />
<meta charset="utf-8" />
......@@ -143,7 +143,7 @@
<div id="errordisplay" style="font-weight:bold;font-size:18px;color:#ae0000"></div>
</div>
<div id="online" align="center">
<div id="online" align="center" style="width:600px">
<div id="text"></div>
<div data-role="fieldcontain">
<input type="text" id="ext"/><br>
......@@ -267,11 +267,11 @@
</div>
<script type="text/javascript" src="js/jquery-2.0.3.min.js"></script>
<script type="text/javascript" src="js/jquery.mobile-1.3.2.min.js"></script>
<script type="text/javascript" src="//code.jquery.com/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquerymobile/1.4.3/jquery.mobile.min.js"></script>
<script type="text/javascript" src="js/jquery.json-2.4.min.js"></script>
<script type="text/javascript" src="js/jquery.cookie.js"></script>
<script type="text/javascript" src="js/jquery.dataTables.js"></script>
<script type="text/javascript" src="//cdn.datatables.net/1.10.1/js/jquery.dataTables.min.js"></script>
<script type="text/javascript" src="js/verto-min.js"></script>
<script type="text/javascript" src="verto.js"></script>
......
html5/verto/demo/js/verto-min.js
浏览文件 @ a2921e26
This diff was suppressed by a .gitattributes entry.
html5/verto/demo/verto.js
浏览文件 @ a2921e26
......@@ -4,6 +4,9 @@ var confMan = null;
var $display = $("#display");
var verto;
var ringing = false;
var autocall = false;
$( ".selector" ).pagecontainer({ "theme": "a" });
function display(msg) {
$("#calltitle").html(msg);
......@@ -19,13 +22,11 @@ function clearConfMan() {
}
function goto_dialog(where) {
$.mobile.changePage("#dialog-" + where, {
role: "dialog"
});
$( ":mobile-pagecontainer" ).pagecontainer( "change", "#dialog-" + where, { role: "dialog" } );
}
function goto_page(where) {
$.mobile.changePage("#page-" + where);
function goto_page(where, force) {
$( ":mobile-pagecontainer" ).pagecontainer( "change", "#page-" + where);
}
var first_login = false;
......@@ -58,7 +59,7 @@ var callbacks = {
switch (msg) {
case $.verto.enum.message.pvtEvent:
console.error("pvtEvent", data.pvtData.action);
//console.error("pvtEvent", data.pvtData.action);
if (data.pvtData) {
switch (data.pvtData.action) {
......@@ -139,6 +140,10 @@ var callbacks = {
break;
case $.verto.enum.state.trying:
display("Calling: " + d.cidString());
goto_page("incall");
break;
case $.verto.enum.state.early:
case $.verto.enum.state.active:
display("Talking to: " + d.cidString());
......@@ -168,14 +173,22 @@ var callbacks = {
if (success) {
online(true);
/*
verto.subscribe("presence", {
handler: function(v, e) {
console.error("PRESENCE:", e);
}
});
});
*/
if (!window.location.hash) {
goto_page("main");
}
if (autocall) {
autocall = false;
docall();
}
} else {
goto_page("login");
goto_dialog("login-error");
......@@ -193,7 +206,7 @@ var callbacks = {
},
onEvent: function(v, e) {
console.debug("w00t", e);
console.debug("GOT EVENT", e);
},
};
......@@ -246,7 +259,7 @@ $("#webcam").click(function() {
check_vid();
});
$("#callbtn").click(function() {
function docall() {
$('#ext').trigger('change');
if (cur_call) {
......@@ -262,6 +275,10 @@ $("#callbtn").click(function() {
useVideo: check_vid(),
useStereo: $("#use_stereo").is(':checked')
});
}
$("#callbtn").click(function() {
docall();
});
function pop(id, cname, dft) {
......@@ -366,58 +383,43 @@ function init() {
}
$(document).ready(function() {
var autocall = false;
var hash = window.location.hash.substring(1);
if (hash && hash.indexOf("page-") == -1) {
window.location.hash = "";
$("#ext").val(hash);
autocall = true;
}
init();
$("#page-incall").on("pagebeforechange", function(event) {});
});
if (autocall) {
$("#ext").val(hash);
$("#callbtn").trigger("click");
}
var lastTo = 0;
});
$(document).bind("pagecontainerchange", function(e, data) {
$(document).bind("pagebeforechange", function(e, data) {
if (typeof(data.toPage) !== "string") {
return;
if (lastTo) {
clearTimeout(lastTo);
}
switch (window.location.hash) {
case "#page-incall":
console.error(e, data);
setTimeout(function() {
lastTo = setTimeout(function() {
if (!cur_call) {
goto_page("main");
}
},
10000);
break;
}, 1000);
case "#page-main":
console.error(e, data);
setTimeout(function() {
if (cur_call && !ringing) {
goto_page("incall");
}
},
2000);
break;
case "#page-main":
break;
case "#page-login":
setTimeout(function() {
lastTo = setTimeout(function() {
if (online_visible) {
goto_page("main");
}
......@@ -426,3 +428,4 @@ $(document).bind("pagebeforechange", function(e, data) {
break;
}
});
html5/verto/js/src/jquery.jsonrpcclient.js
浏览文件 @ a2921e26
......@@ -74,6 +74,8 @@
getSocket : function(onmessage_cb) { return self._getSocket(onmessage_cb); }
}, options);
self.ws_cnt = 0;
// Declare an instance version of the onmessage callback to wrap 'this'.
this.wsOnMessage = function(event) { self._wsOnMessage(event); };
};
......@@ -261,42 +263,53 @@
$.JsonRpcClient.prototype.connectSocket = function(onmessage_cb) {
var self = this;
if (self.to) {
clearTimeout(self.to);
}
if (!self.socketReady()) {
self.authing = false;
if (self._ws_socket) {
delete self._ws_socket;
}
// No socket, or dying socket, let's get a new one.
this._ws_socket = new WebSocket(this.options.socketUrl);
self._ws_socket = new WebSocket(self.options.socketUrl);
if (this._ws_socket) {
if (self._ws_socket) {
// Set up onmessage handler.
this._ws_socket.onmessage = onmessage_cb;
this._ws_socket.onclose = function (w) {
self._ws_socket.onmessage = onmessage_cb;
self._ws_socket.onclose = function (w) {
if (!self.ws_sleep) {
self.ws_sleep = 2;
self.ws_sleep = 500;
}
self.ws_cnt = 0;
if (self.options.onWSClose) {
self.options.onWSClose(self);
}
console.error("Websocket Lost sleep: " + self.ws_sleep + "sec");
setTimeout(function() {
console.error("Websocket Lost " + self.ws_cnt + " sleep: " + self.ws_sleep + "msec");
self.to = setTimeout(function() {
console.log("Attempting Reconnection....");
self.connectSocket(onmessage_cb);
}, self.ws_sleep * 1000);
}, self.ws_sleep);
self.ws_cnt++;
if (++self.ws_cnt >= 150) {
self.ws_sleep = 30;
if (self.ws_sleep < 3000 && (self.ws_cnt % 100) == 0) {
self.ws_sleep += 500;
}
}
// Set up sending of message for when the socket is open.
this._ws_socket.onopen = function() {
this.ws_sleep = 2;
this.ws_cnt = 0;
self._ws_socket.onopen = function() {
if (self.to) {
clearTimeout(self.to);
}
self.ws_sleep = 500;
self.ws_cnt = 0;
if (self.options.onWSConnect) {
self.options.onWSConnect(self);
}
......@@ -310,7 +323,7 @@
}
}
return this._ws_socket ? true : false;
return self._ws_socket ? true : false;
}
$.JsonRpcClient.prototype._getSocket = function(onmessage_cb) {
......
html5/verto/js/src/jquery.verto.js
浏览文件 @ a2921e26
......@@ -165,7 +165,7 @@
var verto = this;
var i;
console.log("Response: " + method, success, e);
//console.log("Response: " + method, success, e);
switch (method) {
case "verto.subscribe":
......@@ -864,7 +864,7 @@
var eventHandler = function(v, e, la) {
var packet = e.data;
console.error("READ:", packet);
//console.error("READ:", packet);
if (packet.name != la.name) {
return;
......@@ -1079,7 +1079,7 @@
if (!args.data) {
return;
}
console.debug(args, index);
//console.debug(args, index);
dt.fnUpdate(args.data, index);
dt.fnAdjustColumnSizing();
break;
......@@ -1539,7 +1539,7 @@
return false;
}
console.error("Dialog " + dialog.callID + ": state change from " + dialog.state.name + " to " + state.name);
console.info("Dialog " + dialog.callID + ": state change from " + dialog.state.name + " to " + state.name);
dialog.lastState = dialog.state;
dialog.state = state;
......@@ -1580,7 +1580,7 @@
$.verto.dialog.prototype.processReply = function(method, success, e) {
var dialog = this;
console.log("Response: " + method + " State:" + dialog.state.name, success, e);
//console.log("Response: " + method + " State:" + dialog.state.name, success, e);
switch (method) {
......
src/include/switch_types.h
浏览文件 @ a2921e26
......@@ -2024,8 +2024,10 @@ typedef enum {
#ifdef WIN32
typedef SOCKET switch_os_socket_t;
#define SWITCH_SOCK_INVALID INVALID_SOCKET
#else
typedef int switch_os_socket_t;
#define SWITCH_SOCK_INVALID -1
#endif
typedef struct apr_pool_t switch_memory_pool_t;
......@@ -2385,7 +2387,16 @@ typedef enum {
ICE_CONTROLLED = (1 << 2)
} switch_core_media_ice_type_t;
typedef enum {
SWITCH_POLL_READ = (1 << 0),
SWITCH_POLL_WRITE = (1 << 1),
SWITCH_POLL_ERROR = (1 << 2),
SWITCH_POLL_HUP = (1 << 3),
SWITCH_POLL_RDNORM = (1 << 4),
SWITCH_POLL_RDBAND = (1 << 5),
SWITCH_POLL_PRI = (1 << 6),
SWITCH_POLL_INVALID = (1 << 7)
} switch_poll_t;
SWITCH_END_EXTERN_C
#endif
......
src/include/switch_utils.h
浏览文件 @ a2921e26
......@@ -1066,7 +1066,7 @@ SWITCH_DECLARE(unsigned long) switch_atoul(const char *nptr);
* \return Pointer to message buffer, returning error message or "Unknown error xxx" if none found
*/
SWITCH_DECLARE(char *) switch_strerror_r(int errnum, char *buf, switch_size_t buflen);
SWITCH_DECLARE(int) switch_wait_sock(switch_os_socket_t sock, uint32_t ms, switch_poll_t flags);
SWITCH_END_EXTERN_C
#endif
/* For Emacs:
......
src/mod/endpoints/mod_verto/mcast/mcast.c
浏览文件 @ a2921e26
......@@ -44,6 +44,7 @@
#include <unistd.h>
#include "mcast.h"
#include <poll.h>
#include <switch_utils.h>
int mcast_socket_create(const char *host, int16_t port, mcast_handle_t *handle, mcast_flag_t flags)
{
......@@ -151,7 +152,6 @@ ssize_t mcast_socket_send(mcast_handle_t *handle, void *data, size_t datalen)
ssize_t mcast_socket_recv(mcast_handle_t *handle, void *data, size_t datalen, int ms)
{
socklen_t addrlen = sizeof(handle->recv_addr);
int r;
if (data == NULL || datalen == 0) {
data = handle->buffer;
......@@ -159,16 +159,9 @@ ssize_t mcast_socket_recv(mcast_handle_t *handle, void *data, size_t datalen, in
}
if (ms > 0) {
struct pollfd pfds[1];
pfds[0].fd = handle->sock;
pfds[0].events = POLLIN|POLLERR;
if ((r = poll(pfds, 1, ms)) <= 0) {
return r;
}
int pflags = switch_wait_sock(handle->sock, ms, SWITCH_POLL_READ | SWITCH_POLL_ERROR | SWITCH_POLL_HUP);
if (pfds[0].revents & POLLERR) {
if ((pflags & SWITCH_POLL_ERROR) || (pflags & SWITCH_POLL_HUP)) {
return -1;
}
}
......
src/mod/endpoints/mod_verto/mod_verto.h
浏览文件 @ a2921e26
......@@ -51,6 +51,9 @@
#include <openssl/ssl.h>
#include "mcast.h"
#define MAX_QUEUE_LEN 100000
#define MAX_MISSED 500
#define MAXPENDING 10000
#define STACK_SIZE 80 * 1024
......@@ -73,7 +76,10 @@ typedef enum {
typedef enum {
JPFLAG_INIT = (1 << 0),
JPFLAG_AUTHED = (1 << 1),
JPFLAG_CHECK_ATTACH = (1 << 2)
JPFLAG_CHECK_ATTACH = (1 << 2),
JPFLAG_EVENTS = (1 << 3),
JPFLAG_AUTH_EVENTS = (1 << 4),
JPFLAG_ALL_EVENTS_AUTHED = (1 << 5)
} jpflag_t;
struct verto_profile_s;
......@@ -114,10 +120,14 @@ struct jsock_s {
switch_thread_rwlock_t *rwlock;
switch_mutex_t *write_mutex;
switch_mutex_t *filter_mutex;
switch_event_t *params;
switch_event_t *vars;
switch_queue_t *event_queue;
int lost_events;
struct jsock_s *next;
};
......@@ -231,6 +241,7 @@ struct globals_s {
int ready;
int profile_threads;
int enable_presence;
int enable_fs_events;
switch_hash_t *jsock_hash;
switch_mutex_t *jsock_mutex;
......
src/switch_utils.c
浏览文件 @ a2921e26
......@@ -2491,6 +2491,178 @@ SWITCH_DECLARE(char *) switch_util_quote_shell_arg_pool(const char *string, swit
return dest;
}
#ifdef HAVE_POLL
#include <poll.h>
SWITCH_DECLARE(int) switch_wait_sock(switch_os_socket_t sock, uint32_t ms, switch_poll_t flags)
{
struct pollfd pfds[2] = { { 0 } };
int s = 0, r = 0;
if (sock == SWITCH_SOCK_INVALID) {
return SWITCH_SOCK_INVALID;
}
pfds[0].fd = sock;
if ((flags & SWITCH_POLL_READ)) {
pfds[0].events |= POLLIN;
}
if ((flags & SWITCH_POLL_WRITE)) {
pfds[0].events |= POLLOUT;
}
if ((flags & SWITCH_POLL_ERROR)) {
pfds[0].events |= POLLERR;
}
if ((flags & SWITCH_POLL_HUP)) {
pfds[0].events |= POLLHUP;
}
if ((flags & SWITCH_POLL_RDNORM)) {
pfds[0].events |= POLLRDNORM;
}
if ((flags & SWITCH_POLL_RDBAND)) {
pfds[0].events |= POLLRDBAND;
}
if ((flags & SWITCH_POLL_PRI)) {
pfds[0].events |= POLLPRI;
}
s = poll(pfds, 1, ms);
if (s < 0) {
r = s;
} else if (s > 0) {
if ((pfds[0].revents & POLLIN)) {
r |= SWITCH_POLL_READ;
}
if ((pfds[0].revents & POLLOUT)) {
r |= SWITCH_POLL_WRITE;
}
if ((pfds[0].revents & POLLERR)) {
r |= SWITCH_POLL_ERROR;
}
if ((pfds[0].revents & POLLHUP)) {
r |= SWITCH_POLL_HUP;
}
if ((pfds[0].revents & POLLRDNORM)) {
r |= SWITCH_POLL_RDNORM;
}
if ((pfds[0].revents & POLLRDBAND)) {
r |= SWITCH_POLL_RDBAND;
}
if ((pfds[0].revents & POLLPRI)) {
r |= SWITCH_POLL_PRI;
}
if ((pfds[0].revents & POLLNVAL)) {
r |= SWITCH_POLL_INVALID;
}
}
return r;
}
#else
/* use select instead of poll */
SWITCH_DECLARE(int) switch_wait_sock(switch_os_socket_t sock, uint32_t ms, switch_poll_t flags)
{
int s = 0, r = 0;
fd_set *rfds;
fd_set *wfds;
fd_set *efds;
struct timeval tv;
if (sock == SWITCH_SOCK_INVALID) {
return SWITCH_SOCK_INVALID;
}
rfds = malloc(sizeof(fd_set));
wfds = malloc(sizeof(fd_set));
efds = malloc(sizeof(fd_set));
FD_ZERO(rfds);
FD_ZERO(wfds);
FD_ZERO(efds);
#ifndef WIN32
/* Wouldn't you rather know?? */
assert(sock <= FD_SETSIZE);
#endif
if ((flags & SWITCH_POLL_READ)) {
#ifdef WIN32
#pragma warning( push )
#pragma warning( disable : 4127 )
FD_SET(sock, rfds);
#pragma warning( pop )
#else
FD_SET(sock, rfds);
#endif
}
if ((flags & SWITCH_POLL_WRITE)) {
#ifdef WIN32
#pragma warning( push )
#pragma warning( disable : 4127 )
FD_SET(sock, wfds);
#pragma warning( pop )
#else
FD_SET(sock, wfds);
#endif
}
if ((flags & SWITCH_POLL_ERROR)) {
#ifdef WIN32
#pragma warning( push )
#pragma warning( disable : 4127 )
FD_SET(sock, efds);
#pragma warning( pop )
#else
FD_SET(sock, efds);
#endif
}
tv.tv_sec = ms / 1000;
tv.tv_usec = (ms % 1000) * ms;
s = select(sock + 1, (flags & SWITCH_POLL_READ) ? rfds : NULL, (flags & SWITCH_POLL_WRITE) ? wfds : NULL, (flags & SWITCH_POLL_ERROR) ? efds : NULL, &tv);
if (s < 0) {
r = s;
} else if (s > 0) {
if ((flags & SWITCH_POLL_READ) && FD_ISSET(sock, rfds)) {
r |= SWITCH_POLL_READ;
}
if ((flags & SWITCH_POLL_WRITE) && FD_ISSET(sock, wfds)) {
r |= SWITCH_POLL_WRITE;
}
if ((flags & SWITCH_POLL_ERROR) && FD_ISSET(sock, efds)) {
r |= SWITCH_POLL_ERROR;
}
}
free(rfds);
free(wfds);
free(efds);
return r;
}
#endif
SWITCH_DECLARE(int) switch_socket_waitfor(switch_pollfd_t *poll, int ms)
{
int nsds = 0;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论