![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/frontend/sock.c b/src/frontend/sock.c
index 414c90775657294c0408ffb1e8c1eaea78ae8f0d..d11fc421669ee3535b6762f5a09d8d3e4227936a 100644 (file)
--- a/src/frontend/sock.c
+++ b/src/frontend/sock.c
#include "sysdb.h"
#include "core/error.h"
#include "core/object.h"
+#include "frontend/connection.h"
#include "frontend/sock.h"
#include "utils/channel.h"
#include "utils/llist.h"
+#include "utils/strbuf.h"
#include <assert.h>
-
#include <errno.h>
#include <stdio.h>
*/
typedef struct {
- int fd;
+ sdb_object_t super;
+
+ /* connection and client information */
struct sockaddr_storage client_addr;
socklen_t client_addr_len;
-} connection_t;
-typedef struct {
- sdb_object_t super;
- connection_t conn;
+ sdb_conn_t conn;
} connection_obj_t;
#define CONN(obj) ((connection_obj_t *)(obj))
static int
connection_init(sdb_object_t *obj, va_list ap)
{
- connection_t *conn;
+ connection_obj_t *conn;
int sock_fd;
int sock_fl;
assert(obj);
- conn = &CONN(obj)->conn;
+ conn = CONN(obj);
sock_fd = va_arg(ap, int);
+ CONN(obj)->conn.buf = sdb_strbuf_create(/* size = */ 128);
+ if (! CONN(obj)->conn.buf) {
+ sdb_log(SDB_LOG_ERR, "frontend: Failed to allocate a read buffer "
+ "for a new remote connection");
+ return -1;
+ }
+
conn->client_addr_len = sizeof(conn->client_addr);
- conn->fd = accept(sock_fd, (struct sockaddr *)&conn->client_addr,
+ conn->conn.fd = accept(sock_fd, (struct sockaddr *)&conn->client_addr,
&conn->client_addr_len);
- if (conn->fd < 0) {
+ if (conn->conn.fd < 0) {
char buf[1024];
sdb_log(SDB_LOG_ERR, "frontend: Failed to accept remote "
"connection: %s", sdb_strerror(errno,
return -1;
}
- sock_fl = fcntl(conn->fd, F_GETFL);
- if (fcntl(conn->fd, F_SETFL, sock_fl | O_NONBLOCK)) {
+ sock_fl = fcntl(conn->conn.fd, F_GETFL);
+ if (fcntl(conn->conn.fd, F_SETFL, sock_fl | O_NONBLOCK)) {
char buf[1024];
sdb_log(SDB_LOG_ERR, "frontend: Failed to switch connection conn#%i "
- "to non-blocking mode: %s", conn->fd,
+ "to non-blocking mode: %s", conn->conn.fd,
sdb_strerror(errno, buf, sizeof(buf)));
return -1;
}
sdb_log(SDB_LOG_DEBUG, "frontend: Accepted connection on fd=%i",
- conn->fd);
+ conn->conn.fd);
/* update the object name */
snprintf(obj->name + strlen(CONN_FD_PREFIX),
- strlen(CONN_FD_PLACEHOLDER), "%i", conn->fd);
+ strlen(CONN_FD_PLACEHOLDER), "%i", conn->conn.fd);
return 0;
} /* connection_init */
static void
connection_destroy(sdb_object_t *obj)
{
- connection_t *conn;
+ connection_obj_t *conn;
+ size_t len;
assert(obj);
- conn = &CONN(obj)->conn;
+ conn = CONN(obj);
+
+ len = sdb_strbuf_len(conn->conn.buf);
+ if (len)
+ sdb_log(SDB_LOG_INFO, "frontend: Discarding incomplete command "
+ "(%zu bytes left in buffer)", len);
- sdb_log(SDB_LOG_DEBUG, "frontend: Closing connection on fd=%i", conn->fd);
- close(conn->fd);
- conn->fd = -1;
+ sdb_log(SDB_LOG_DEBUG, "frontend: Closing connection on fd=%i",
+ conn->conn.fd);
+ close(conn->conn.fd);
+ conn->conn.fd = -1;
+
+ sdb_strbuf_destroy(CONN(obj)->conn.buf);
} /* connection_destroy */
static sdb_type_t connection_type = {
* connection handler functions
*/
-/* returns negative value on error, 0 on EOF, number of packets else */
-static int
-connection_read(int fd)
-{
- int n = 0;
-
- while (42) {
- int32_t cmd;
- ssize_t status;
-
- errno = 0;
- status = read(fd, &cmd, sizeof(cmd));
- if (status < 0) {
- if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
- return n + 1;
- return (int)status;
- }
- else if (! status) /* EOF */
- return 0;
-
- /* XXX */
- sdb_log(SDB_LOG_DEBUG, "frontend: read command %i from fd=%i",
- cmd, fd);
- ++n;
- }
-
- return n + 1;
-} /* connection_read */
-
static void *
connection_handler(void *data)
{
continue;
}
- status = connection_read(conn->conn.fd);
+ status = (int)sdb_connection_read(&conn->conn);
if (status <= 0) {
/* error or EOF -> close connection */
sdb_object_deref(SDB_OBJ(conn));
+ continue;
}
- else {
- if (sdb_llist_append(sock->open_connections, SDB_OBJ(conn))) {
- sdb_log(SDB_LOG_ERR, "frontend: Failed to re-append "
- "connection %s to list of open connections",
- SDB_OBJ(conn)->name);
- }
-
- /* pass ownership back to list; or destroy in case of an error */
- sdb_object_deref(SDB_OBJ(conn));
+
+ /* return the connection to the main loop */
+ if (sdb_llist_append(sock->open_connections, SDB_OBJ(conn))) {
+ sdb_log(SDB_LOG_ERR, "frontend: Failed to re-append "
+ "connection %s to list of open connections",
+ SDB_OBJ(conn)->name);
}
+
+ /* pass ownership back to list; or destroy in case of an error */
+ sdb_object_deref(SDB_OBJ(conn));
}
return NULL;
} /* connection_handler */