![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/client/sock.c b/src/client/sock.c
index f4f4c556e82012c99927c721fe98697933c939d0..0d734f3a9462ba74bb7405beb94c9fdeecb67d8a 100644 (file)
--- a/src/client/sock.c
+++ b/src/client/sock.c
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#include "client/sock.h"
+#include "utils/error.h"
#include "utils/strbuf.h"
#include "utils/proto.h"
+#include "utils/os.h"
#include <arpa/inet.h>
+#include <assert.h>
#include <errno.h>
#include <limits.h>
struct sdb_client {
char *address;
int fd;
+ bool eof;
};
/*
struct sockaddr_un sa;
client->fd = socket(AF_UNIX, SOCK_STREAM, /* protocol = */ 0);
- if (client->fd < 0)
+ if (client->fd < 0) {
+ char errbuf[1024];
+ sdb_log(SDB_LOG_ERR, "Failed to open socket: %s",
+ sdb_strerror(errno, errbuf, sizeof(errbuf)));
return -1;
+ }
sa.sun_family = AF_UNIX;
strncpy(sa.sun_path, address, sizeof(sa.sun_path));
sa.sun_path[sizeof(sa.sun_path) - 1] = '\0';
if (connect(client->fd, (struct sockaddr *)&sa, sizeof(sa))) {
+ char errbuf[1024];
sdb_client_close(client);
+ sdb_log(SDB_LOG_ERR, "Failed to connect to '%s': %s",
+ sa.sun_path, sdb_strerror(errno, errbuf, sizeof(errbuf)));
return -1;
}
return client->fd;
return NULL;
client = malloc(sizeof(*client));
- if (! client)
+ if (! client) {
+ sdb_log(SDB_LOG_ERR, "Out of memory");
return NULL;
+ }
memset(client, 0, sizeof(*client));
client->fd = -1;
+ client->eof = 1;
client->address = strdup(address);
if (! client->address) {
sdb_client_destroy(client);
+ sdb_log(SDB_LOG_ERR, "Out of memory");
return NULL;
}
} /* sdb_client_destroy */
int
-sdb_client_connect(sdb_client_t *client)
+sdb_client_connect(sdb_client_t *client, const char *username)
{
+ sdb_strbuf_t *buf;
+ ssize_t status;
+ uint32_t rstatus;
+
if ((! client) || (! client->address))
return -1;
connect_unixsock(client, client->address + strlen("unix:"));
else if (*client->address == '/')
connect_unixsock(client, client->address);
- else
+ else {
+ sdb_log(SDB_LOG_ERR, "Unknown address type: %s", client->address);
return -1;
+ }
if (client->fd < 0)
return -1;
- return 0;
+ client->eof = 0;
+
+ /* XXX */
+ if (! username)
+ username = "";
+
+ status = sdb_client_send(client, SDB_CONNECTION_STARTUP,
+ (uint32_t)strlen(username), username);
+ if (status < 0) {
+ char errbuf[1024];
+ sdb_client_close(client);
+ sdb_log(SDB_LOG_ERR, "Failed to send STARTUP message to server: %s",
+ sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ return (int)status;
+ }
+
+ buf = sdb_strbuf_create(64);
+ rstatus = 0;
+ status = sdb_client_recv(client, &rstatus, buf);
+ if ((status > 0) && (rstatus == SDB_CONNECTION_OK)) {
+ sdb_strbuf_destroy(buf);
+ return 0;
+ }
+
+ if (status < 0) {
+ char errbuf[1024];
+ sdb_log(SDB_LOG_ERR, "Failed to receive server response: %s",
+ sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ }
+ else if (client->eof)
+ sdb_log(SDB_LOG_ERR, "Encountered end-of-file while waiting "
+ "for server response");
+
+ if (rstatus == SDB_CONNECTION_ERROR) {
+ sdb_log(SDB_LOG_ERR, "Access denied for user '%s': %s",
+ username, sdb_strbuf_string(buf));
+ status = -((int)rstatus);
+ }
+ else if (rstatus != SDB_CONNECTION_OK) {
+ sdb_log(SDB_LOG_ERR, "Received unsupported authentication request "
+ "(status %d) during startup", (int)rstatus);
+ status = -((int)rstatus);
+ }
+
+ sdb_client_close(client);
+ sdb_strbuf_destroy(buf);
+ return (int)status;
} /* sdb_client_connect */
+int
+sdb_client_sockfd(sdb_client_t *client)
+{
+ if (! client)
+ return -1;
+ return client->fd;
+} /* sdb_client_sockfd */
+
+int
+sdb_client_shutdown(sdb_client_t *client, int how)
+{
+ if (! client) {
+ errno = ENOTSOCK;
+ return -1;
+ }
+
+ if (client->fd < 0) {
+ errno = EBADF;
+ return -1;
+ }
+
+ return shutdown(client->fd, how);
+} /* sdb_client_shutdown */
+
void
sdb_client_close(sdb_client_t *client)
{
close(client->fd);
client->fd = -1;
+ client->eof = 1;
} /* sdb_client_close */
ssize_t
sdb_client_send(sdb_client_t *client,
uint32_t cmd, uint32_t msg_len, const char *msg)
{
+ char buf[2 * sizeof(uint32_t) + msg_len];
+
if ((! client) || (! client->fd))
return -1;
+ if (sdb_proto_marshal(buf, sizeof(buf), cmd, msg_len, msg) < 0)
+ return -1;
- return sdb_proto_send_msg(client->fd, cmd, msg_len, msg);
+ return sdb_write(client->fd, sizeof(buf), buf);
} /* sdb_client_send */
ssize_t
size_t data_offset = sdb_strbuf_len(buf);
+ if (code)
+ *code = UINT32_MAX;
+
if ((! client) || (! client->fd) || (! buf)) {
errno = EBADF;
return -1;
}
- if (code)
- *code = UINT32_MAX;
-
while (42) {
ssize_t status;
+ if (sdb_select(client->fd, SDB_SELECTIN))
+ return -1;
+
errno = 0;
status = sdb_strbuf_read(buf, client->fd, req);
if (status < 0) {
if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
- break;
+ continue;
return status;
}
- else if (! status) /* EOF */
+ else if (! status) {
+ client->eof = 1;
break;
+ }
total += (size_t)status;
continue;
if (rstatus == UINT32_MAX) {
+ const char *str = sdb_strbuf_string(buf) + data_offset;
+ size_t len = sdb_strbuf_len(buf) - data_offset;
+ ssize_t n;
+
/* retrieve status and data len */
- rstatus = sdb_proto_get_int(buf, data_offset);
- rlen = sdb_proto_get_int(buf, data_offset + sizeof(rstatus));
+ assert(len >= 2 * sizeof(uint32_t));
+ n = sdb_proto_unmarshal_int32(str, len, &rstatus);
+ str += n; len -= (size_t)n;
+ sdb_proto_unmarshal_int32(str, len, &rlen);
if (! rlen)
break;
break;
}
+ if (total != req) {
+ /* unexpected EOF; clear partially read data */
+ sdb_strbuf_skip(buf, data_offset, sdb_strbuf_len(buf));
+ return 0;
+ }
+
if (rstatus != UINT32_MAX)
/* remove status,len */
sdb_strbuf_skip(buf, data_offset, 2 * sizeof(rstatus));
return (ssize_t)total;
} /* sdb_client_recv */
+bool
+sdb_client_eof(sdb_client_t *client)
+{
+ if ((! client) || (client->fd < 0))
+ return 1;
+ return client->eof;
+} /* sdb_client_eof */
+
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */