/*
* ws protocol handler plugin for messageboard "generic sessions" demo
*
- * Copyright (C) 2010-201
6 Andy Green <andy@warmcat.com>
+ * Copyright (C) 2010-201
9 Andy Green <andy@warmcat.com>
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation:
* version 2.1 of the License.
*
#define LWS_DLL
#define LWS_INTERNAL
-#include "../lib/libwebsockets.h"
+#include <libwebsockets.h>
#include <sqlite3.h>
#include <string.h>
+#include <stdlib.h>
struct per_vhost_data__gs_mb {
struct lws_vhost *vh;
struct lws_spa *spa;
unsigned long last_idx;
unsigned int our_form:1;
+ char second_http_part;
};
static const char * const param_names[] = {
continue;
}
if (!strcmp(col_name[n], "username")) {
- strncpy(m->username, col_val[n], sizeof(m->username) - 1);
- m->username[sizeof(m->username) - 1] = '\0';
+ lws_strncpy(m->username, col_val[n], sizeof(m->username));
continue;
}
if (!strcmp(col_name[n], "email")) {
- strncpy(m->email, col_val[n], sizeof(m->email) - 1);
- m->email[sizeof(m->email) - 1] = '\0';
+ lws_strncpy(m->email, col_val[n], sizeof(m->email));
continue;
}
if (!strcmp(col_name[n], "ip")) {
- strncpy(m->ip, col_val[n], sizeof(m->ip) - 1);
- m->ip[sizeof(m->ip) - 1] = '\0';
+ lws_strncpy(m->ip, col_val[n], sizeof(m->ip));
continue;
}
if (!strcmp(col_name[n], "content")) {
- strncpy(m->content, col_val[n], sizeof(m->content) - 1);
- m->content[sizeof(m->content) - 1] = '\0';
+ lws_strncpy(m->content, col_val[n], sizeof(m->content));
continue;
}
}
vhd->gsp->callback(wsi, LWS_CALLBACK_SESSION_INFO,
pss->pss_gs, &sinfo, 0);
- snprintf((char *)s, sizeof(s) - 1,
+ lws_snprintf((char *)s, sizeof(s) - 1,
"insert into msg(time, username, email, ip, content)"
" values (%lu, '%s', '%s', '%s', '%s');",
(unsigned long)lws_now_secs(), sinfo.username, sinfo.email, sinfo.ip,
const struct lws_protocol_vhost_options *pvo;
struct per_vhost_data__gs_mb *vhd = (struct per_vhost_data__gs_mb *)
lws_protocol_vh_priv_get(lws_get_vhost(wsi), lws_get_protocol(wsi));
- unsigned char *p, *start, *end, buffer[LWS_PRE + 256];
+ unsigned char *p, *start, *end, buffer[LWS_PRE + 4096];
char s[512];
int n;
switch (reason) {
case LWS_CALLBACK_PROTOCOL_INIT: /* per vhost */
+
vhd = lws_protocol_vh_priv_zalloc(lws_get_vhost(wsi),
lws_get_protocol(wsi), sizeof(struct per_vhost_data__gs_mb));
if (!vhd)
return 1;
}
- if (sqlite3_open_v2(vhd->message_db, &vhd->pdb,
- SQLITE_OPEN_READWRITE |
- SQLITE_OPEN_CREATE, NULL) != SQLITE_OK) {
+ if (lws_struct_sq3_open(lws_get_context(wsi),
+ vhd->message_db, &vhd->pdb)) {
lwsl_err("Unable to open message db %s: %s\n",
vhd->message_db, sqlite3_errmsg(vhd->pdb));
break;
case LWS_CALLBACK_PROTOCOL_DESTROY:
- if (vhd->pdb)
+ if (vhd && vhd->pdb)
sqlite3_close(vhd->pdb);
goto passthru;
lws_callback_on_writable(wsi);
break;
+ case LWS_CALLBACK_CLOSED:
+ lwsl_debug("%s: LWS_CALLBACK_CLOSED\n", __func__);
+ if (pss && pss->pss_gs) {
+ free(pss->pss_gs);
+ pss->pss_gs = NULL;
+ }
+ break;
+
case LWS_CALLBACK_SERVER_WRITEABLE:
{
struct message m;
}
/* format in JSON */
- p += snprintf(p, end - p,
+ p += lws_snprintf(p, end - p,
"{\"idx\":\"%lu\",\"time\":\"%lu\",",
m.idx, m.time);
- p += snprintf(p, end - p, " \"username\":\"%s\",",
+ p += lws_snprintf(p, end - p, " \"username\":\"%s\",",
lws_json_purify(e, m.username, sizeof(e)));
- p += snprintf(p, end - p, " \"email\":\"%s\",",
+ p += lws_snprintf(p, end - p, " \"email\":\"%s\",",
lws_json_purify(e, m.email, sizeof(e)));
- p += snprintf(p, end - p, " \"ip\":\"%s\",",
+ p += lws_snprintf(p, end - p, " \"ip\":\"%s\",",
lws_json_purify(e, m.ip, sizeof(e)));
- p += snprintf(p, end - p, " \"content\":\"%s\"}",
+ p += lws_snprintf(p, end - p, " \"content\":\"%s\"}",
lws_json_purify(e, m.content, sizeof(e)));
if (lws_write(wsi, (unsigned char *)start, p - start,
pss->our_form = 0;
/* ie, it's our messageboard new message form */
- if (!strcmp((const char *)in, "/msg")) {
+ if (!strcmp((const char *)in, "/msg") ||
+ !strcmp((const char *)in, "msg")) {
pss->our_form = 1;
break;
}
break;
if (!pss->spa) {
pss->spa = lws_spa_create(wsi, param_names,
- ARRAY_SIZE(param_names),
+ LWS_ARRAY_SIZE(param_names),
MAX_MSG_LEN + 1024, NULL, NULL);
if (!pss->spa)
return -1;
}
break;
+ case LWS_CALLBACK_HTTP_WRITEABLE:
+ if (!pss->second_http_part)
+ goto passthru;
+
+ s[0] = '0';
+ n = lws_write(wsi, (unsigned char *)s, 1, LWS_WRITE_HTTP|
+ LWS_WRITE_H2_STREAM_END);
+ if (n != 1)
+ return -1;
+
+ goto try_to_reuse;
+
case LWS_CALLBACK_HTTP_BODY_COMPLETION:
if (!pss->our_form)
goto passthru;
start = p;
end = p + sizeof(buffer) - LWS_PRE;
- if (lws_add_http_header_status(wsi, 200, &p, end))
+ if (lws_add_http_header_status(wsi, HTTP_STATUS_OK, &p, end))
return -1;
if (lws_add_http_header_by_token(wsi, WSI_TOKEN_HTTP_CONTENT_TYPE,
(unsigned char *)"text/plain", 10, &p, end))
return -1;
if (lws_finalize_http_header(wsi, &p, end))
return -1;
+
n = lws_write(wsi, start, p - start, LWS_WRITE_HTTP_HEADERS);
if (n != (p - start)) {
- lwsl_err("_write returned %d from %d\n", n, (p - start));
+ lwsl_err("_write returned %d from %ld\n", n, (long)(p - start));
return -1;
}
- s[0] = '0';
- n = lws_write(wsi, (unsigned char *)s, 1, LWS_WRITE_HTTP);
- if (n != 1)
- return -1;
-
- goto try_to_reuse;
+ pss->second_http_part = 1;
+ lws_callback_on_writable(wsi);
+ break;
case LWS_CALLBACK_HTTP_BIND_PROTOCOL:
- if (!pss || pss->pss_gs)
+ if (!pss || !vhd || pss->pss_gs)
break;
pss->pss_gs = malloc(vhd->gsp->per_session_data_size);
default:
passthru:
- return vhd->gsp->callback(wsi, reason, pss ? pss->pss_gs : NULL, in, len);
+ if (!pss || !vhd)
+ break;
+
+ return vhd->gsp->callback(wsi, reason, pss->pss_gs, in, len);
}
return 0;
}
c->protocols = protocols;
- c->count_protocols = ARRAY_SIZE(protocols);
+ c->count_protocols = LWS_ARRAY_SIZE(protocols);
c->extensions = NULL;
c->count_extensions = 0;
projects / platform / upstream / libwebsockets.git / blobdiff