kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-8761

This commit is contained in:
Anthony Minessale 2016-08-08 16:39:44 -05:00
parent 1e7b4a1301
commit 8abc16f501
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Sat Aug 6 11:48:53 CDT 2016
Mon Aug 8 16:39:35 CDT 2016

30
libs/sofia-sip/libsofia-sip-ua/tport/tport_type_ws.c
View File

@ -494,6 +494,8 @@ int tport_ws_init_secondary(tport_t *self, int socket, int accepted,
return *return_reason = "WS_INIT", -1;
}
wstp->connected = time(NULL);
wstp->ws_initialized = 1;
self->tp_pre_framed = 1;
@ -594,19 +596,31 @@ int tport_ws_next_timer(tport_t *self,
char const **return_why)
{
tport_ws_t *wstp = (tport_ws_t *)self;
int ll = establish_logical_layer(&wstp->ws);
int punt = 0;
if (establish_logical_layer(&wstp->ws) < 0) {
if (wstp->tos++ == 1) {
tport_close(self);
SU_DEBUG_7(("%s(%p): %s to " TPN_FORMAT "%s\n",
__func__, (void *)self,
"timeout establishing connection\n", TPN_ARGS(self->tp_name), ""));
return -1;
if (ll == -1) {
punt = 1;
} else if (ll < 0) {
time_t now = time(NULL);
if (now - wstp->connected > 5) {
punt = 2;
}
} else {
self->tp_params->tpp_keepalive = 30000;
self->tp_params->tpp_keepalive = 0;
}
if (punt) {
tport_close(self);
SU_DEBUG_7(("%s(%p): %s to " TPN_FORMAT "%s\n",
__func__, (void *)self,
(punt == 2 ? "Timeout establishing SSL" : "Error establishing SSL"), TPN_ARGS(self->tp_name), ""));
return -1;
}
return
tport_next_recv_timeout(self, return_target, return_why) |
tport_next_keepalive(self, return_target, return_why);

2
libs/sofia-sip/libsofia-sip-ua/tport/tport_ws.h
View File

@ -59,7 +59,7 @@ typedef struct tport_ws_s {
char wstp_buffer[65536];
size_t wstp_buflen;
SU_S8_T ws_initialized;
unsigned char tos;
time_t connected;
unsigned ws_secure:1;
unsigned:0;
} tport_ws_t;