/*
- * $Id: cnid_dbd.c,v 1.7 2009-04-21 08:55:44 franklahm Exp $
+ * $Id: cnid_dbd.c,v 1.16 2010-01-21 14:14:49 didg Exp $
*
* Copyright (C) Joerg Lenneis 2003
* All Rights Reserved. See COPYING.
}
/* ----------- */
-extern char Cnid_srv[MAXHOSTNAMELEN + 1];
-extern int Cnid_port;
+extern char *Cnid_srv;
+extern char *Cnid_port;
-static int tsock_getfd(char *host, int port)
+#define MAX_DELAY 40
+
+/* *MUST* be < afp tickle or it's never triggered (got EINTR first) */
+#define SOCK_DELAY 11
+
+static void delay(int sec)
{
- int sock;
- struct sockaddr_in server;
- struct hostent* hp;
+ struct timeval tv;
+
+ tv.tv_usec = 0;
+ tv.tv_sec = sec;
+ select(0, NULL, NULL, NULL, &tv);
+}
+
+static int tsock_getfd(const char *host, const char *port)
+{
+ int sock = -1;
+ struct timeval tv;
int attr;
int err;
+ struct addrinfo hints, *servinfo, *p;
- server.sin_family=AF_INET;
- server.sin_port=htons((unsigned short)port);
- if (!host) {
- LOG(log_error, logtype_cnid, "getfd: -cnidserver not defined");
+ /* Prepare hint for getaddrinfo */
+ memset(&hints, 0, sizeof hints);
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_flags = AI_NUMERICSERV;
+
+ if ((err = getaddrinfo(host, port, &hints, &servinfo)) != 0) {
+ LOG(log_error, logtype_default, "tsock_getfd: getaddrinfo: %s:%s : %s\n", host, port, gai_strerror(err));
return -1;
}
- hp=gethostbyname(host);
- if (!hp) {
- unsigned long int addr=inet_addr(host);
- LOG(log_warning, logtype_cnid, "getfd: Could not resolve host %s, trying numeric address instead", host);
- if (addr!= (unsigned)-1)
- hp=gethostbyaddr((char*)addr,sizeof(addr),AF_INET);
+ /* loop through all the results and bind to the first we can */
+ for (p = servinfo; p != NULL; p = p->ai_next) {
+ if ((sock = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) == -1) {
+ LOG(log_info, logtype_default, "tsock_getfd: socket %s:: %s", host, strerror(errno));
+ continue;
+ }
- if (!hp) {
- LOG(log_error, logtype_cnid, "getfd: Could not resolve host %s", host);
- return(-1);
+ attr = 1;
+ if (setsockopt(sock, SOL_TCP, TCP_NODELAY, &attr, sizeof(attr)) == -1) {
+ LOG(log_error, logtype_cnid, "getfd: set TCP_NODELAY %s: %s", host, strerror(errno));
+ close(sock);
+ continue;
}
- }
- memcpy((char*)&server.sin_addr,(char*)hp->h_addr,sizeof(server.sin_addr));
- sock=socket(PF_INET,SOCK_STREAM,0);
- if (sock==-1) {
- LOG(log_error, logtype_cnid, "getfd: socket %s: %s", host, strerror(errno));
- return(-1);
- }
- attr = 1;
- if (setsockopt(sock, SOL_TCP, TCP_NODELAY, &attr, sizeof(attr)) == -1) {
- LOG(log_error, logtype_cnid, "getfd: set TCP_NODELAY %s: %s", host, strerror(errno));
- close(sock);
- return(-1);
- }
- if(connect(sock ,(struct sockaddr*)&server,sizeof(server))==-1) {
- struct timeval tv;
- err = errno;
- close(sock);
- sock=-1;
- LOG(log_error, logtype_cnid, "getfd: connect %s: %s", host, strerror(err));
- switch (err) {
- case ENETUNREACH:
- case ECONNREFUSED:
-
- tv.tv_usec = 0;
- tv.tv_sec = 5;
- select(0, NULL, NULL, NULL, &tv);
- break;
+
+ tv.tv_sec = SOCK_DELAY;
+ tv.tv_usec = 0;
+ if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) < 0) {
+ LOG(log_error, logtype_cnid, "getfd: set SO_RCVTIMEO %s: %s", host, strerror(errno));
+ close(sock);
+ continue;
+ }
+
+ tv.tv_sec = SOCK_DELAY;
+ tv.tv_usec = 0;
+ if (setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)) < 0) {
+ LOG(log_error, logtype_cnid, "getfd: set SO_SNDTIMEO %s: %s", host, strerror(errno));
+ close(sock);
+ continue;
+ }
+
+ if (connect(sock, p->ai_addr, p->ai_addrlen) == -1) {
+ err = errno;
+ close(sock);
+ sock=-1;
+ LOG(log_error, logtype_cnid, "getfd: connect %s: %s", host, strerror(err));
+ continue;
}
+
+ /* We've got a socket */
+ break;
}
- LOG(log_debug7, logtype_cnid, "tsock_getfd: using sockfd %d for cnid server '%s:%d'", sock, host, port);
+ freeaddrinfo(servinfo);
+
+ if (p == NULL) {
+ LOG(log_error, logtype_cnid, "tsock_getfd: no suitable network config from %s:%s", host, port);
+ return -1;
+ }
return(sock);
}
int len;
struct iovec iov[2];
- LOG(log_debug, logtype_cnid, "init_tsock: BEGIN. Opening volume '%s'", db->db_dir);
+ LOG(log_debug, logtype_cnid, "init_tsock: BEGIN. Opening volume '%s', CNID Server: %s/%s", db->db_dir, Cnid_srv, Cnid_port);
if ((fd = tsock_getfd(Cnid_srv, Cnid_port)) < 0)
return -1;
return 0;
}
+/* ------------------- */
+static ssize_t dbd_read(int socket, void *data, const size_t length)
+{
+ size_t stored;
+ ssize_t len;
+
+ stored = 0;
+ while (stored < length) {
+ len = read(socket, (u_int8_t *) data + stored, length - stored);
+ if (len == -1) {
+ if (errno == EINTR)
+ continue;
+ return -1;
+ }
+ else if (len > 0)
+ stored += len;
+ else
+ break;
+ }
+ return stored;
+}
+
/* ---------------------
* send a request and get reply
* assume send is non blocking
* if no answer after sometime (at least MAX_DELAY secondes) return an error
*/
-#define MAX_DELAY 40
static int dbd_rpc(CNID_private *db, struct cnid_dbd_rqst *rqst, struct cnid_dbd_rply *rply)
{
ssize_t ret;
char *nametmp;
- struct timeval tv;
- fd_set readfds;
- int maxfd;
size_t len;
LOG(log_maxdebug, logtype_cnid, "dbd_rpc: BEGIN");
if (send_packet(db, rqst) < 0) {
return -1;
}
- FD_ZERO(&readfds);
- FD_SET(db->fd, &readfds);
- maxfd = db->fd +1;
-
- tv.tv_usec = 0;
- tv.tv_sec = MAX_DELAY;
- while ((ret = select(maxfd + 1, &readfds, NULL, NULL, &tv)) < 0 && errno == EINTR);
-
- if (ret < 0) {
- LOG(log_error, logtype_cnid, "dbd_rpc: Error in select (db_dir %s): %s",
- db->db_dir, strerror(errno));
- return ret;
- }
- /* signal ? */
- if (!ret) {
- /* no answer */
- LOG(log_error, logtype_cnid, "dbd_rpc: select timed out (db_dir %s)",
- db->db_dir);
- return -1;
- }
len = rply->namelen;
nametmp = rply->name;
- /* assume that if we have something then everything is there (doesn't sleep) */
- if ((ret = read(db->fd, rply, sizeof(struct cnid_dbd_rply))) != sizeof(struct cnid_dbd_rply)) {
+
+ ret = dbd_read(db->fd, rply, sizeof(struct cnid_dbd_rply));
+
+ if (ret != sizeof(struct cnid_dbd_rply)) {
LOG(log_error, logtype_cnid, "dbd_rpc: Error reading header from fd (db_dir %s): %s",
db->db_dir, ret == -1?strerror(errno):"closed");
rply->name = nametmp;
db->db_dir, rply->name, rply->namelen, len);
return -1;
}
- if (rply->namelen && (ret = read(db->fd, rply->name, rply->namelen)) != (ssize_t)rply->namelen) {
+ if (rply->namelen && (ret = dbd_read(db->fd, rply->name, rply->namelen)) != (ssize_t)rply->namelen) {
LOG(log_error, logtype_cnid, "dbd_rpc: Error reading name from fd (db_dir %s): %s",
db->db_dir, ret == -1?strerror(errno):"closed");
return -1;
/* -------------------- */
static int transmit(CNID_private *db, struct cnid_dbd_rqst *rqst, struct cnid_dbd_rply *rply)
{
- struct timeval tv;
time_t orig, t;
int clean = 1; /* no errors so far - to prevent sleep on first try */
*/
return -1;
}
- time(&orig);
while (1) {
if (db->fd == -1) {
- LOG(log_debug, logtype_cnid, "transmit: connecting to cnid_dbd ...");
struct cnid_dbd_rqst rqst_stamp;
struct cnid_dbd_rply rply_stamp;
char stamp[ADEDLEN_PRIVSYN];
+ LOG(log_debug, logtype_cnid, "transmit: connecting to cnid_dbd ...");
if ((db->fd = init_tsock(db)) < 0) {
- time(&t);
- if (t - orig > MAX_DELAY)
- return -1;
- continue;
+ goto transmit_fail;
}
dbd_initstamp(&rqst_stamp);
memset(stamp, 0, ADEDLEN_PRIVSYN);
return 0;
}
transmit_fail:
- LOG(log_error, logtype_cnid, "transmit: something went wrong");
if (db->fd != -1) {
close(db->fd);
db->fd = -1; /* FD not valid... will need to reconnect */
}
- time(&t);
- if (t - orig > MAX_DELAY) {
- LOG(log_error, logtype_cnid, "transmit: Request to dbd daemon (db_dir %s) timed out.", db->db_dir);
- return -1;
- }
if (!clean) { /* don't sleep if just got disconnected by cnid server */
+ time(&t);
+ if (t - orig > MAX_DELAY) {
+ LOG(log_error, logtype_cnid, "transmit: Request to dbd daemon (db_dir %s) timed out.", db->db_dir);
+ return -1;
+ }
/* sleep a little before retry */
- tv.tv_usec = 0;
- tv.tv_sec = 5;
- select(0, NULL, NULL, NULL, &tv); /* sleep for 5 seconds */
+ delay(5);
} else {
clean = 0; /* false... next time sleep */
+ time(&orig);
}
}
return -1;
}
/* ---------------------- */
-struct _cnid_db *cnid_dbd_open(const char *dir, mode_t mask _U_)
+struct _cnid_db *cnid_dbd_open(const char *dir, mode_t mask _U_, u_int32_t flags _U_)
{
CNID_private *db = NULL;
struct _cnid_db *cdb = NULL;
}
if ((db = cdb->_private) != NULL) {
- LOG(log_info, logtype_cnid, "closing database connection for volume '%s'", db->db_dir);
+ LOG(log_debug, logtype_cnid, "closing database connection for volume '%s'", db->db_dir);
if (db->fd >= 0)
close(db->fd);
/* ---------------------- */
cnid_t cnid_dbd_add(struct _cnid_db *cdb, const struct stat *st,
const cnid_t did, char *name, const size_t len,
- cnid_t hint _U_)
+ cnid_t hint)
{
CNID_private *db;
struct cnid_dbd_rqst rqst;
rqst.ino = st->st_ino;
rqst.type = S_ISDIR(st->st_mode)?1:0;
+ rqst.cnid = hint;
rqst.did = did;
rqst.name = name;
rqst.namelen = len;
case CNID_DBD_RES_OK:
*id = rply.did;
name = rply.name;
- LOG(log_debug, logtype_cnid, "cnid_dbd_resolve: resolved CNID: %u to '%s'", ntohl(*id), name);
+ LOG(log_debug, logtype_cnid, "cnid_dbd_resolve: resolved did: %u, name: '%s'", ntohl(*id), name);
break;
case CNID_DBD_RES_NOTFOUND:
*id = CNID_INVALID;
projects / netatalk.git / blobdiff