Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 376562 via svnmerge from

Browse Source 
file:///srv/subversion/repos/asterisk/trunk

................
  r376562 | dlee | 2012-11-20 16:06:05 -0600 (Tue, 20 Nov 2012) | 8 lines
  
  Added missing newlines to websocket ast_logs.
  
  Without these newlines, log messages just continue tacking onto the same
  line, and do not flush immediately.
  ........
  
  Merged revisions 376561 from http://svn.asterisk.org/svn/asterisk/branches/11
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@376567 65c4cc65-6c06-0410-ace0-fbb531ad65f3
changes/78/78/1
Automerge script 13 years ago
parent 86f1378ea0
commit b362853a32
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

12
res/res_http_websocket.c
Unescape View File

@ -503,12 +503,12 @@ static int websocket_callback(struct ast_tcptls_session_instance *ser, const str
/* If this is not a websocket upgrade abort */ /* If this is not a websocket upgrade abort */
if (!upgrade || strcasecmp(upgrade, "websocket")) { if (!upgrade || strcasecmp(upgrade, "websocket")) {
ast_log(LOG_WARNING, "WebSocket connection from '%s' could not be accepted - did not request WebSocket", ast_log(LOG_WARNING, "WebSocket connection from '%s' could not be accepted - did not request WebSocket\n",
ast_sockaddr_stringify(&ser->remote_address)); ast_sockaddr_stringify(&ser->remote_address));
ast_http_error(ser, 426, "Upgrade Required", NULL); ast_http_error(ser, 426, "Upgrade Required", NULL);
return -1; return -1;
} else if (ast_strlen_zero(requested_protocols)) { } else if (ast_strlen_zero(requested_protocols)) {
ast_log(LOG_WARNING, "WebSocket connection from '%s' could not be accepted - no protocols requested", ast_log(LOG_WARNING, "WebSocket connection from '%s' could not be accepted - no protocols requested\n",
ast_sockaddr_stringify(&ser->remote_address)); ast_sockaddr_stringify(&ser->remote_address));
fputs("HTTP/1.1 400 Bad Request\r\n" fputs("HTTP/1.1 400 Bad Request\r\n"
"Sec-WebSocket-Version: 7, 8, 13\r\n\r\n", ser->f); "Sec-WebSocket-Version: 7, 8, 13\r\n\r\n", ser->f);
@ -516,7 +516,7 @@ static int websocket_callback(struct ast_tcptls_session_instance *ser, const str
} else if (key1 && key2) { } else if (key1 && key2) {
/* Specification defined in http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-76 and /* Specification defined in http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-76 and
* http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-00 -- not currently supported*/ * http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-00 -- not currently supported*/
ast_log(LOG_WARNING, "WebSocket connection from '%s' could not be accepted - unsupported version '00/76' chosen", ast_log(LOG_WARNING, "WebSocket connection from '%s' could not be accepted - unsupported version '00/76' chosen\n",
ast_sockaddr_stringify(&ser->remote_address)); ast_sockaddr_stringify(&ser->remote_address));
fputs("HTTP/1.1 400 Bad Request\r\n" fputs("HTTP/1.1 400 Bad Request\r\n"
"Sec-WebSocket-Version: 7, 8, 13\r\n\r\n", ser->f); "Sec-WebSocket-Version: 7, 8, 13\r\n\r\n", ser->f);
@ -548,7 +548,7 @@ static int websocket_callback(struct ast_tcptls_session_instance *ser, const str
uint8_t sha[20]; uint8_t sha[20];
if (!(session = ao2_alloc(sizeof(*session), session_destroy_fn))) { if (!(session = ao2_alloc(sizeof(*session), session_destroy_fn))) {
ast_log(LOG_WARNING, "WebSocket connection from '%s' could not be accepted", ast_log(LOG_WARNING, "WebSocket connection from '%s' could not be accepted\n",
ast_sockaddr_stringify(&ser->remote_address)); ast_sockaddr_stringify(&ser->remote_address));
fputs("HTTP/1.1 400 Bad Request\r\n" fputs("HTTP/1.1 400 Bad Request\r\n"
"Sec-WebSocket-Version: 7, 8, 13\r\n\r\n", ser->f); "Sec-WebSocket-Version: 7, 8, 13\r\n\r\n", ser->f);
@ -571,7 +571,7 @@ static int websocket_callback(struct ast_tcptls_session_instance *ser, const str
} else { } else {
/* Specification defined in http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-75 or completely unknown */ /* Specification defined in http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-75 or completely unknown */
ast_log(LOG_WARNING, "WebSocket connection from '%s' could not be accepted - unsupported version '%d' chosen", ast_log(LOG_WARNING, "WebSocket connection from '%s' could not be accepted - unsupported version '%d' chosen\n",
ast_sockaddr_stringify(&ser->remote_address), version ? version : 75); ast_sockaddr_stringify(&ser->remote_address), version ? version : 75);
fputs("HTTP/1.1 400 Bad Request\r\n" fputs("HTTP/1.1 400 Bad Request\r\n"
"Sec-WebSocket-Version: 7, 8, 13\r\n\r\n", ser->f); "Sec-WebSocket-Version: 7, 8, 13\r\n\r\n", ser->f);
@ -581,7 +581,7 @@ static int websocket_callback(struct ast_tcptls_session_instance *ser, const str
/* Enable keepalive on all sessions so the underlying user does not have to */ /* Enable keepalive on all sessions so the underlying user does not have to */
if (setsockopt(ser->fd, SOL_SOCKET, SO_KEEPALIVE, &flags, sizeof(flags))) { if (setsockopt(ser->fd, SOL_SOCKET, SO_KEEPALIVE, &flags, sizeof(flags))) {
ast_log(LOG_WARNING, "WebSocket connection from '%s' could not be accepted - failed to enable keepalive", ast_log(LOG_WARNING, "WebSocket connection from '%s' could not be accepted - failed to enable keepalive\n",
ast_sockaddr_stringify(&ser->remote_address)); ast_sockaddr_stringify(&ser->remote_address));
fputs("HTTP/1.1 400 Bad Request\r\n" fputs("HTTP/1.1 400 Bad Request\r\n"
"Sec-WebSocket-Version: 7, 8, 13\r\n\r\n", ser->f); "Sec-WebSocket-Version: 7, 8, 13\r\n\r\n", ser->f);

Write Preview
Loading…
Cancel
Save