index 62e5f9de6cb717c6e5e8807771fae01d040f7de1..ebc3b99332d92d0e929f51467edbc549f0088630 100644 (file)
conn->read = conn_read;
conn->write = conn_write;
conn->finish = NULL;
conn->read = conn_read;
conn->write = conn_write;
conn->finish = NULL;
- conn->session = NULL;
+ conn->ssl_session = NULL;
sock_fl = fcntl(conn->fd, F_GETFL);
if (fcntl(conn->fd, F_SETFL, sock_fl | O_NONBLOCK)) {
sock_fl = fcntl(conn->fd, F_GETFL);
if (fcntl(conn->fd, F_SETFL, sock_fl | O_NONBLOCK)) {
"(%zu byte%s left in buffer)", len, len == 1 ? "" : "s");
}
"(%zu byte%s left in buffer)", len, len == 1 ? "" : "s");
}
- sdb_log(SDB_LOG_DEBUG, "frontend: Closing connection %s", obj->name);
+ if (conn->client_addr.ss_family == AF_UNIX) {
+ sdb_log(SDB_LOG_DEBUG, "frontend: Closing connection %s from peer %s",
+ obj->name, conn->username);
+ }
+ else {
+ char host[1024] = "<unknown>", port[32] = "";
+ getnameinfo((struct sockaddr *)&conn->client_addr,
+ conn->client_addr_len, host, sizeof(host), port, sizeof(port),
+ NI_NUMERICHOST | NI_NUMERICSERV);
+ sdb_log(SDB_LOG_DEBUG, "frontend: Closing connection %s from peer %s "
+ "at %s:%s", obj->name, conn->username, host, port);
+ }
sdb_connection_close(conn);
if (conn->username)
sdb_connection_close(conn);
if (conn->username)
assert(conn && (conn->cmd != SDB_CONNECTION_IDLE));
assert(! conn->skip_len);
assert(conn && (conn->cmd != SDB_CONNECTION_IDLE));
assert(! conn->skip_len);
- sdb_log(SDB_LOG_DEBUG, "frontend: Handling command %u (len: %u)",
- conn->cmd, conn->cmd_len);
-
if (conn->cmd == SDB_CONNECTION_PING)
status = sdb_connection_ping(conn);
else if (conn->cmd == SDB_CONNECTION_STARTUP)
status = sdb_fe_session_start(conn);
if (conn->cmd == SDB_CONNECTION_PING)
status = sdb_connection_ping(conn);
else if (conn->cmd == SDB_CONNECTION_STARTUP)
status = sdb_fe_session_start(conn);
+
else if (conn->cmd == SDB_CONNECTION_QUERY)
status = sdb_fe_query(conn);
else if (conn->cmd == SDB_CONNECTION_FETCH)
else if (conn->cmd == SDB_CONNECTION_QUERY)
status = sdb_fe_query(conn);
else if (conn->cmd == SDB_CONNECTION_FETCH)
status = sdb_fe_lookup(conn);
else if (conn->cmd == SDB_CONNECTION_STORE)
status = sdb_fe_store(conn);
status = sdb_fe_lookup(conn);
else if (conn->cmd == SDB_CONNECTION_STORE)
status = sdb_fe_store(conn);
+
+ else if (conn->cmd == SDB_CONNECTION_SERVER_VERSION)
+ status = sdb_connection_server_version(conn);
+
else {
sdb_log(SDB_LOG_WARNING, "frontend: Ignoring invalid command %#x",
conn->cmd);
else {
sdb_log(SDB_LOG_WARNING, "frontend: Ignoring invalid command %#x",
conn->cmd);
return 0;
} /* sdb_connection_ping */
return 0;
} /* sdb_connection_ping */
+int
+sdb_connection_server_version(sdb_conn_t *conn)
+{
+ char msg[sizeof(uint32_t) + strlen(SDB_VERSION_EXTRA) + 1];
+
+ if ((! conn) || (conn->cmd != SDB_CONNECTION_SERVER_VERSION))
+ return -1;
+
+ sdb_proto_marshal_int32(msg, sizeof(msg), (uint32_t)SDB_VERSION);
+ strncpy(msg + sizeof(uint32_t), SDB_VERSION_EXTRA,
+ sizeof(msg) - sizeof(uint32_t));
+ sdb_connection_send(conn, SDB_CONNECTION_OK, (uint32_t)sizeof(msg), msg);
+ return 0;
+} /* sdb_connection_server_version */
+
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */