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

FS-6103 --resolve

This commit is contained in:
Jeff Lenk 2014-01-17 16:27:00 -06:00
parent 756ba1c8a8
commit a4dfb5463f
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c
View File

@ -594,7 +594,7 @@ abyss_bool websocket_hook(TSession *r)
wsh = ws_init(r); wsh = ws_init(r);
if (!wsh) { if (!wsh) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "websocket error %d\n", ret); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "websocket memory error\n");
return FALSE; return FALSE;
} }

33
src/mod/xml_int/mod_xml_rpc/ws.c
View File

@ -93,7 +93,7 @@ void init_ssl(void) {
/* verify private key */ /* verify private key */
if ( !SSL_CTX_check_private_key(globals.ssl_ctx) ) { if ( !SSL_CTX_check_private_key(globals.ssl_ctx) ) {
abort(); abort();
} }
SSL_CTX_set_cipher_list(globals.ssl_ctx, "HIGH:!DSS:!aNULL@STRENGTH"); SSL_CTX_set_cipher_list(globals.ssl_ctx, "HIGH:!DSS:!aNULL@STRENGTH");
@ -119,27 +119,27 @@ static int cheezy_get_var(char *data, char *name, char *buf, size_t buflen)
*/ */
do { do {
if(!strncmp(p,name,strlen(name)) && *(p+strlen(name))==':') break; if(!strncmp(p,name,strlen(name)) && *(p+strlen(name))==':') break;
} while((p = (strstr(p,"\n")+1))!=(char *)1); } while((p = (strstr(p,"\n")+1))!=(char *)1);
if (p != (char *)1 && *p!='\0') { if (p != (char *)1 && *p!='\0') {
char *v, *e = 0; char *v, *e = 0;
v = strchr(p, ':'); v = strchr(p, ':');
if (v) { if (v) {
v++; v++;
while(v && *v == ' ') { while(v && *v == ' ') {
v++; v++;
} }
if (v) { if (v) {
e = strchr(v, '\r'); e = strchr(v, '\r');
if (!e) { if (!e) {
e = strchr(v, '\n'); e = strchr(v, '\n');
} }
} }
if (v && e) { if (v && e) {
int cplen; int cplen;
size_t len = e - v; size_t len = e - v;
@ -152,9 +152,9 @@ static int cheezy_get_var(char *data, char *name, char *buf, size_t buflen)
strncpy(buf, v, cplen); strncpy(buf, v, cplen);
*(buf+cplen) = '\0'; *(buf+cplen) = '\0';
return 1; return 1;
} }
} }
} }
return 0; return 0;
} }
@ -267,7 +267,7 @@ issize_t ws_raw_read(wsh_t *wsh, void *data, size_t bytes)
{ {
issize_t r; issize_t r;
int x = 0; int x = 0;
TConn *conn = wsh->tsession->connP; TConn *conn = wsh->tsession->connP;
if (!wsh->handshake) { if (!wsh->handshake) {
r = wsh->tsession->connP->buffersize; r = wsh->tsession->connP->buffersize;
@ -311,7 +311,6 @@ issize_t ws_raw_read(wsh_t *wsh, void *data, size_t bytes)
} }
return r;
} }
issize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes) issize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
@ -331,13 +330,11 @@ issize_t ws_raw_write(wsh_t *wsh, void *data, size_t bytes)
} else { } else {
return 0; return 0;
} }
return r;
} }
wsh_t * ws_init(ws_tsession_t *tsession) wsh_t * ws_init(ws_tsession_t *tsession)
{ {
wsh_t *wsh = malloc(sizeof(*wsh)); wsh_t *wsh = (wsh_t *)malloc(sizeof(*wsh));
if (!wsh) return NULL; if (!wsh) return NULL;