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

lws status fix LWS_PRE

Browse source 
Signed-off-by: Andy Green <andy.green@linaro.org>
This commit is contained in:
Andy Green 2016-02-25 09:27:02 +08:00
parent ee2f1ea667
commit 7bb600f0c7
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test-server/test-server-status.c
View file

@ -34,7 +34,7 @@ update_status(struct lws *wsi, struct per_session_data__lws_status *pss)
{ {
struct per_session_data__lws_status **pp = &list; struct per_session_data__lws_status **pp = &list;
int subsequent = 0; int subsequent = 0;
char *p = cache; char *p = cache + LWS_PRE, *start = p;
char date[128]; char date[128];
time_t t; time_t t;
struct tm *ptm; struct tm *ptm;
@ -58,12 +58,12 @@ update_status(struct lws *wsi, struct per_session_data__lws_status *pss)
strcpy(date, "unknown"); strcpy(date, "unknown");
else else
strftime(date, sizeof(date), "%F %H:%M %Z", ptm); strftime(date, sizeof(date), "%F %H:%M %Z", ptm);
if ((p - cache) > (sizeof(cache) - 512)) if ((p - start) > (sizeof(cache) - 512))
break; break;
if (subsequent) if (subsequent)
*p++ = ','; *p++ = ',';
subsequent = 1; subsequent = 1;
p += snprintf(p, sizeof(cache) - (p - cache) - 1, p += snprintf(p, sizeof(cache) - (p - start) - 1,
"{\"peer\":\"%s\",\"time\":\"%s\"," "{\"peer\":\"%s\",\"time\":\"%s\","
"\"ua\":\"%s\"}", "\"ua\":\"%s\"}",
(*pp)->ip, date, (*pp)->user_agent); (*pp)->ip, date, (*pp)->user_agent);
@ -71,9 +71,9 @@ update_status(struct lws *wsi, struct per_session_data__lws_status *pss)
} }
p += sprintf(p, "]}"); p += sprintf(p, "]}");
cache_len = p - cache; cache_len = p - start;
lwsl_err("cache_len %d\n", cache_len); lwsl_err("cache_len %d\n", cache_len);
cache[cache_len] = '\0'; *p = '\0';
/* since we changed the list, increment the 'version' */ /* since we changed the list, increment the 'version' */
current++; current++;
@ -128,7 +128,7 @@ callback_lws_status(struct lws *wsi, enum lws_callback_reasons reason,
break; break;
case LWS_CALLBACK_SERVER_WRITEABLE: case LWS_CALLBACK_SERVER_WRITEABLE:
m = lws_write(wsi, (unsigned char *)cache, cache_len, m = lws_write(wsi, (unsigned char *)cache + LWS_PRE, cache_len,
LWS_WRITE_TEXT); LWS_WRITE_TEXT);
if (m < server_info_len) { if (m < server_info_len) {
lwsl_err("ERROR %d writing to di socket\n", m); lwsl_err("ERROR %d writing to di socket\n", m);