Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

clean http2 passphrase code

Browse source 
Signed-off-by: Andy Green <andy.green@linaro.org>
This commit is contained in:
Andy Green 2014-11-05 15:32:58 +08:00
parent 97ee57fa35
commit 5db6c0fa01
2 changed files with 34 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/ssl.c
View file

@ -214,21 +214,14 @@ libwebsockets_decode_ssl_error(void)
}
#ifndef LWS_NO_CLIENT
static int lws_context_init_client_ssl_pem_passwd_cb(char * buf, int size, int rwflag, void * userdata)
static int lws_context_init_client_ssl_pem_passwd_cb(char * buf, int size, int rwflag, void *userdata)
{
struct lws_context_creation_info * info = (struct lws_context_creation_info *)userdata;
const int passLen = (int)strlen(info->ssl_private_key_password);
const int minimumLen = passLen < size ? passLen : size;
strncpy(buf, info->ssl_private_key_password, minimumLen);
if (minimumLen < size)
{
buf[minimumLen] = '\0';
return minimumLen;
}
return minimumLen;
strncpy(buf, info->ssl_private_key_password, size);
buf[size - 1] = '\0';
return strlen(buf);
}
int lws_context_init_client_ssl(struct lws_context_creation_info *info,

40
test-server/test-server.c
View file

@ -299,7 +299,10 @@ static int callback_http(struct libwebsocket_context *context,
p = (unsigned char *)leaf_path;
if (lws_add_http_header_by_name(context, wsi, (unsigned char *)"set-cookie:", (unsigned char *)b64, n, &p, (unsigned char *)leaf_path + sizeof(leaf_path)))
if (lws_add_http_header_by_name(context, wsi,
(unsigned char *)"set-cookie:",
(unsigned char *)b64, n, &p,
(unsigned char *)leaf_path + sizeof(leaf_path)))
return 1;
n = (char *)p - leaf_path;
other_headers = leaf_path;
@ -345,21 +348,36 @@ static int callback_http(struct libwebsocket_context *context,
/*
* we can send more of whatever it is we were sending
*/
lwsl_info("LWS_CALLBACK_HTTP_WRITEABLE\n");
do {
lwsl_info("a\n");
/* we'd like the send this much */
n = sizeof(buffer) - LWS_SEND_BUFFER_PRE_PADDING;
/* but if the peer told us he wants less, we can adapt */
m = lws_get_peer_write_allowance(wsi);
/* -1 means not using a protocol that has this info */
if (m == 0)
/* right now, peer can't handle anything */
goto later;
if (m != -1 && m < n)
/* he couldn't handle that much */
n = m;
n = read(pss->fd, buffer + LWS_SEND_BUFFER_PRE_PADDING,
sizeof (buffer) - LWS_SEND_BUFFER_PRE_PADDING);
n);
/* problem reading, close conn */
if (n < 0)
goto bail;
/* sent it all, close conn */
if (n == 0)
goto flush_bail;
lwsl_info("b\n");
/*
* To support HTTP2, must take care about preamble space
* and identify when we send the last frame
*
* identification of when we send the last payload frame
* is handled by the library itself if you sent a
* content-length header
*/
m = libwebsocket_write(wsi,
buffer + LWS_SEND_BUFFER_PRE_PADDING,
@ -367,26 +385,26 @@ lwsl_info("LWS_CALLBACK_HTTP_WRITEABLE\n");
if (m < 0)
/* write failed, close conn */
goto bail;
lwsl_info("c\n");
/*
* http2 won't do this
*/
if (m != n)
/* partial write, adjust */
lseek(pss->fd, m - n, SEEK_CUR);
lwsl_info("d\n");
if (m) /* while still active, extend timeout */
libwebsocket_set_timeout(wsi,
PENDING_TIMEOUT_HTTP_CONTENT, 5);
/* if he has indigestion, let him clear it before eating more */
/* if we have indigestion, let him clear it before eating more */
if (lws_partial_buffered(wsi))
break;
} while (!lws_send_pipe_choked(wsi));
lwsl_info("e\n");
later:
libwebsocket_callback_on_writable(context, wsi);
lwsl_info("f\n");
break;
flush_bail:
/* true if still partial pending */