index 6b785392a1255311d5fae116a1bfb334186534db..2fdc5e9222d33449cb10709d090106f66c866e08 100644 (file)
conn->cmd = CONNECTION_IDLE;
conn->cmd_len = 0;
+ conn->skip_len = 0;
/* update the object name */
snprintf(obj->name + strlen(CONN_FD_PREFIX),
int status = -1;
assert(conn && (conn->cmd != CONNECTION_IDLE));
+ assert(! conn->skip_len);
sdb_log(SDB_LOG_DEBUG, "frontend: Handling command %u (len: %u)",
conn->cmd, conn->cmd_len);
- if ((! conn->username) && (conn->cmd != CONNECTION_STARTUP)) {
- const char *errmsg = "Authentication required";
- sdb_connection_send(conn, CONNECTION_ERROR,
- (uint32_t)strlen(errmsg), errmsg);
-
- /* remove the command from the buffer */
- if (conn->cmd_len)
- sdb_strbuf_skip(conn->buf, 0, conn->cmd_len);
- return -1;
- }
-
- /* reset */
- sdb_strbuf_sprintf(conn->errbuf, "");
-
switch (conn->cmd) {
case CONNECTION_PING:
status = sdb_connection_ping(conn);
parsetree = sdb_fe_parse(sdb_strbuf_string(conn->buf),
(int)conn->cmd_len);
if (! parsetree) {
+ char query[conn->cmd_len + 1];
+ strncpy(query, sdb_strbuf_string(conn->buf), conn->cmd_len);
+ query[sizeof(query) - 1] = '\0';
sdb_log(SDB_LOG_ERR, "frontend: Failed to parse query '%s'",
- sdb_strbuf_string(conn->buf));
+ query);
status = -1;
break;
}
break;
default:
+ {
+ char query[conn->cmd_len + 1];
+ strncpy(query, sdb_strbuf_string(conn->buf), conn->cmd_len);
+ query[sizeof(query) - 1] = '\0';
sdb_log(SDB_LOG_WARNING, "frontend: Ignoring %d command%s "
"in multi-statement query '%s'",
sdb_llist_len(parsetree) - 1,
sdb_llist_len(parsetree) == 2 ? "" : "s",
- sdb_strbuf_string(conn->buf));
+ query);
node = SDB_CONN_NODE(sdb_llist_get(parsetree, 0));
+ }
}
if (node) {
}
case CONNECTION_FETCH:
- status = sdb_fe_fetch(conn, sdb_strbuf_string(conn->buf));
+ {
+ char hostname[conn->cmd_len + 1];
+ strncpy(hostname, sdb_strbuf_string(conn->buf), conn->cmd_len);
+ hostname[sizeof(hostname) - 1] = '\0';
+ status = sdb_fe_exec_fetch(conn, hostname, /* filter = */ NULL);
break;
+ }
case CONNECTION_LIST:
- status = sdb_fe_list(conn);
+ status = sdb_fe_exec_list(conn, /* filter = */ NULL);
break;
case CONNECTION_LOOKUP:
{
m = sdb_fe_parse_matcher(sdb_strbuf_string(conn->buf),
(int)conn->cmd_len);
if (! m) {
- sdb_log(SDB_LOG_ERR, "frontend: Failed to parse expression '%s'",
- sdb_strbuf_string(conn->buf));
+ char expr[conn->cmd_len + 1];
+ strncpy(expr, sdb_strbuf_string(conn->buf), conn->cmd_len);
+ expr[sizeof(expr) - 1] = '\0';
+ sdb_log(SDB_LOG_ERR, "frontend: Failed to parse "
+ "lookup condition '%s'", expr);
status = -1;
break;
}
- status = sdb_fe_lookup(conn, m);
+ status = sdb_fe_exec_lookup(conn, m, /* filter = */ NULL);
sdb_object_deref(SDB_OBJ(m));
break;
}
sdb_connection_send(conn, CONNECTION_ERROR,
(uint32_t)sdb_strbuf_len(conn->errbuf),
sdb_strbuf_string(conn->errbuf));
-
- /* remove the command from the buffer */
- if (conn->cmd_len)
- sdb_strbuf_skip(conn->buf, 0, conn->cmd_len);
- conn->cmd = CONNECTION_IDLE;
- conn->cmd_len = 0;
return status;
} /* command_handle */
static int
command_init(sdb_conn_t *conn)
{
- size_t len;
+ const char *errmsg = NULL;
assert(conn && (conn->cmd == CONNECTION_IDLE) && (! conn->cmd_len));
+ if (conn->skip_len)
+ return -1;
+
+ /* reset */
+ sdb_strbuf_sprintf(conn->errbuf, "");
+
conn->cmd = connection_get_int32(conn, 0);
conn->cmd_len = connection_get_int32(conn, sizeof(uint32_t));
- len = 2 * sizeof(uint32_t);
- if (conn->cmd == CONNECTION_IDLE)
- len += conn->cmd_len;
- sdb_strbuf_skip(conn->buf, 0, len);
+ sdb_strbuf_skip(conn->buf, 0, 2 * sizeof(uint32_t));
+
+ if ((! conn->username) && (conn->cmd != CONNECTION_STARTUP))
+ errmsg = "Authentication required";
+ else if (conn->cmd == CONNECTION_IDLE)
+ errmsg = "Invalid command 0";
+
+ if (errmsg) {
+ size_t len = sdb_strbuf_len(conn->buf);
+
+ sdb_strbuf_sprintf(conn->errbuf, errmsg);
+ sdb_connection_send(conn, CONNECTION_ERROR,
+ (uint32_t)strlen(errmsg), errmsg);
+ conn->skip_len += conn->cmd_len;
+ conn->cmd = CONNECTION_IDLE;
+ conn->cmd_len = 0;
+
+ if (len > conn->skip_len)
+ len = conn->skip_len;
+ sdb_strbuf_skip(conn->buf, 0, len);
+ conn->skip_len -= len;
+ /* connection_read will handle anything else */
+ }
return 0;
} /* command_init */
else if (! status) /* EOF */
break;
+ if (conn->skip_len) {
+ size_t len = (size_t)status < conn->skip_len
+ ? (size_t)status : conn->skip_len;
+ sdb_strbuf_skip(conn->buf, 0, len);
+ conn->skip_len -= len;
+ }
+
n += status;
+
+ /* give the main loop a chance to execute commands (and free up buffer
+ * space) on large amounts of incoming traffic */
+ if (n > 1024 * 1024)
+ break;
}
return n;
&& (sdb_strbuf_len(conn->buf) >= 2 * sizeof(int32_t)))
command_init(conn);
if ((conn->cmd != CONNECTION_IDLE)
- && (sdb_strbuf_len(conn->buf) >= conn->cmd_len))
+ && (sdb_strbuf_len(conn->buf) >= conn->cmd_len)) {
command_handle(conn);
+ /* remove the command from the buffer */
+ if (conn->cmd_len)
+ sdb_strbuf_skip(conn->buf, 0, conn->cmd_len);
+ conn->cmd = CONNECTION_IDLE;
+ conn->cmd_len = 0;
+ }
+
if (status <= 0)
break;