/*
- * $Id: cnid_dbd.c,v 1.10 2009-10-19 11:00:28 didg Exp $
+ * $Id: cnid_dbd.c,v 1.17 2010/03/31 09:47:32 franklahm Exp $
*
* Copyright (C) Joerg Lenneis 2003
* All Rights Reserved. See COPYING.
}
/* ----------- */
-extern char Cnid_srv[MAXHOSTNAMELEN + 1];
-extern int Cnid_port;
-
-#define MAX_DELAY 40
+#define MAX_DELAY 10
/* *MUST* be < afp tickle or it's never triggered (got EINTR first) */
#define SOCK_DELAY 11
select(0, NULL, NULL, NULL, &tv);
}
-static int tsock_getfd(char *host, int port)
+static int tsock_getfd(const char *host, const char *port)
{
- int sock;
- struct sockaddr_in server;
- struct hostent* hp;
+ int sock = -1;
struct timeval tv;
int attr;
int err;
+ struct addrinfo hints, *servinfo, *p;
+
+ /* Prepare hint for getaddrinfo */
+ memset(&hints, 0, sizeof hints);
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_flags = AI_NUMERICSERV;
- server.sin_family=AF_INET;
- server.sin_port=htons((unsigned short)port);
- if (!host) {
- LOG(log_error, logtype_cnid, "getfd: -cnidserver not defined");
+ if ((err = getaddrinfo(host, port, &hints, &servinfo)) != 0) {
+ LOG(log_error, logtype_default, "tsock_getfd: getaddrinfo: CNID server %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);
-
- if (!hp) {
- LOG(log_error, logtype_cnid, "getfd: Could not resolve host %s", host);
- return(-1);
+ /* 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 CNID server %s:: %s", host, strerror(errno));
+ 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);
- }
- 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);
- return(-1);
- }
+ attr = 1;
+ if (setsockopt(sock, SOL_TCP, TCP_NODELAY, &attr, sizeof(attr)) == -1) {
+ LOG(log_error, logtype_cnid, "getfd: set TCP_NODELAY CNID server %s: %s", host, strerror(errno));
+ close(sock);
+ continue;
+ }
+
+ 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 CNID server %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);
- return(-1);
- }
-
- if(connect(sock ,(struct sockaddr*)&server,sizeof(server))==-1) {
- err = errno;
- close(sock);
- sock=-1;
- LOG(log_error, logtype_cnid, "getfd: connect %s: %s", host, strerror(err));
- switch (err) {
- case ENETUNREACH:
- case ECONNREFUSED:
- delay(5);
- break;
+ 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 CNID server %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 CNID server %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 CNID server %s:%s", host, port);
+ return -1;
+ }
return(sock);
}
ssize_t len;
size_t len1;
- LOG(log_maxdebug, logtype_cnid, "write_vec: request to write %d bytes", towrite);
-
len1 = iov[1].iov_len;
while (towrite > 0) {
if (((len = writev(fd, iov, 2)) == -1 && errno == EINTR) || !len)
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, db->cnidserver, db->cnidport);
- if ((fd = tsock_getfd(Cnid_srv, Cnid_port)) < 0)
+ if ((fd = tsock_getfd(db->cnidserver, db->cnidport)) < 0)
return -1;
len = strlen(db->db_dir);
struct iovec iov[2];
size_t towrite;
- LOG(log_maxdebug, logtype_cnid, "send_packet: BEGIN");
-
if (!rqst->namelen) {
if (write(db->fd, rqst, sizeof(struct cnid_dbd_rqst)) != sizeof(struct cnid_dbd_rqst)) {
LOG(log_warning, logtype_cnid, "send_packet: Error/short write rqst (db_dir %s): %s",
return -1;
}
- LOG(log_maxdebug, logtype_cnid, "send_packet: OK");
+ LOG(log_maxdebug, logtype_cnid, "send_packet: {done}");
return 0;
}
char *nametmp;
size_t len;
- LOG(log_maxdebug, logtype_cnid, "dbd_rpc: BEGIN");
-
if (send_packet(db, rqst) < 0) {
return -1;
}
return -1;
}
- LOG(log_maxdebug, logtype_cnid, "dbd_rpc: END");
+ LOG(log_maxdebug, logtype_cnid, "dbd_rpc: {done}");
return 0;
}
time_t orig, t;
int clean = 1; /* no errors so far - to prevent sleep on first try */
- LOG(log_debug7, logtype_cnid, "transmit: BEGIN");
-
if (db->changed) {
/* volume and db don't have the same timestamp
*/
struct cnid_dbd_rply rply_stamp;
char stamp[ADEDLEN_PRIVSYN];
- if (clean)
- time(&orig);
-
- LOG(log_debug, logtype_cnid, "transmit: connecting to cnid_dbd ...");
+ LOG(log_maxdebug, 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);
memcpy(db->client_stamp, stamp, ADEDLEN_PRIVSYN);
memcpy(db->stamp, stamp, ADEDLEN_PRIVSYN);
}
- LOG(log_debug, logtype_cnid, "transmit: succesfully attached to cnid_dbd for volume '%s' with stamp '%08lx'.",
+ LOG(log_debug, logtype_cnid, "transmit: attached to '%s', stamp: '%08lx'.",
db->db_dir, *(uint64_t *)stamp);
}
if (!dbd_rpc(db, rqst, rply)) {
- LOG(log_debug7, logtype_cnid, "transmit: END OK");
+ LOG(log_maxdebug, logtype_cnid, "transmit: {done}");
return 0;
}
transmit_fail:
return -1;
}
/* sleep a little before retry */
- delay(5);
+ delay(2);
} else {
clean = 0; /* false... next time sleep */
time(&orig);
}
/* ---------------------- */
-struct _cnid_db *cnid_dbd_open(const char *dir, mode_t mask _U_)
+struct _cnid_db *cnid_dbd_open(struct cnid_open_args *args)
{
CNID_private *db = NULL;
struct _cnid_db *cdb = NULL;
- if (!dir) {
+ if (!args->dir) {
return NULL;
}
- if ((cdb = cnid_dbd_new(dir)) == NULL) {
+ if ((cdb = cnid_dbd_new(args->dir)) == NULL) {
LOG(log_error, logtype_cnid, "cnid_open: Unable to allocate memory for database");
return NULL;
}
/* We keep a copy of the directory in the db structure so that we can
transparently reconnect later. */
- strcpy(db->db_dir, dir);
+ strcpy(db->db_dir, args->dir);
db->magic = CNID_DB_MAGIC;
db->fd = -1;
+ db->cnidserver = strdup(args->cnidserver);
+ db->cnidport = strdup(args->cnidport);
LOG(log_debug, logtype_cnid, "cnid_dbd_open: Finished initializing cnid dbd module for volume '%s'", db->db_dir);
}
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;