X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=libatalk%2Fcnid%2Fdbd%2Fcnid_dbd.c;h=c96a22596163659fc87be4a6b3a60f3eafc6e321;hb=4d70a1cdf1cab29dde087f4224759a1a910524b4;hp=dadc4e127a57bf30d5351d28c865135cc7bda21c;hpb=f278187c469aab5cf7e931e55bee2bc7f03b42f6;p=netatalk.git diff --git a/libatalk/cnid/dbd/cnid_dbd.c b/libatalk/cnid/dbd/cnid_dbd.c index dadc4e12..c96a2259 100644 --- a/libatalk/cnid/dbd/cnid_dbd.c +++ b/libatalk/cnid/dbd/cnid_dbd.c @@ -11,15 +11,8 @@ #ifdef CNID_BACKEND_DBD #include -#ifdef HAVE_SYS_STAT_H #include -#endif /* HAVE_SYS_STAT_H */ -#ifdef HAVE_SYS_UIO_H #include -#endif /* HAVE_SYS_UIO_H */ -#ifdef HAVE_STRINGS_H -#include -#endif #include #include #include @@ -33,8 +26,8 @@ #include #include #include +#include -#include #include #include #include @@ -78,7 +71,9 @@ static int tsock_getfd(const char *host, const char *port) memset(&hints, 0, sizeof hints); hints.ai_family = AF_UNSPEC; hints.ai_socktype = SOCK_STREAM; +#ifdef AI_NUMERICSERV hints.ai_flags = AI_NUMERICSERV; +#endif if ((err = getaddrinfo(host, port, &hints, &servinfo)) != 0) { LOG(log_error, logtype_default, "tsock_getfd: getaddrinfo: CNID server %s:%s : %s\n", @@ -104,7 +99,7 @@ static int tsock_getfd(const char *host, const char *port) } if (setnonblock(sock, 1) != 0) { - LOG(log_error, logtype_cnid, "getfd: setnonblock: %s", strerror(err)); + LOG(log_error, logtype_cnid, "getfd: setnonblock: %s", strerror(errno)); close(sock); sock = -1; return -1; @@ -156,7 +151,7 @@ static int tsock_getfd(const char *host, const char *port) strerror(errno)); } close(sock); - sock=-1; + sock = -1; continue; } } else { @@ -273,7 +268,7 @@ static int send_packet(CNID_private *db, struct cnid_dbd_rqst *rqst) vecs = 1; if (rqst->namelen) { - iov[1].iov_base = rqst->name; + iov[1].iov_base = (char *)rqst->name; iov[1].iov_len = rqst->namelen; towrite += rqst->namelen; vecs++; @@ -332,7 +327,7 @@ static int dbd_rpc(CNID_private *db, struct cnid_dbd_rqst *rqst, struct cnid_dbd ret = readt(db->fd, rply, sizeof(struct cnid_dbd_rply), 0, ONE_DELAY); if (ret != sizeof(struct cnid_dbd_rply)) { - LOG(log_error, logtype_cnid, "dbd_rpc: Error reading header from fd (db_dir %s): %s", + LOG(log_debug, logtype_cnid, "dbd_rpc: Error reading header from fd (db_dir %s): %s", db->db_dir, ret == -1 ? strerror(errno) : "closed"); rply->name = nametmp; return -1; @@ -454,6 +449,7 @@ static struct _cnid_db *cnid_dbd_new(const char *volpath) cdb->cnid_delete = cnid_dbd_delete; cdb->cnid_get = cnid_dbd_get; cdb->cnid_lookup = cnid_dbd_lookup; + cdb->cnid_find = cnid_dbd_find; cdb->cnid_nextid = NULL; cdb->cnid_resolve = cnid_dbd_resolve; cdb->cnid_getstamp = cnid_dbd_getstamp; @@ -517,7 +513,7 @@ void cnid_dbd_close(struct _cnid_db *cdb) CNID_private *db; if (!cdb) { - LOG(log_error, logtype_cnid, "cnid_close called with NULL argument !"); + LOG(log_error, logtype_cnid, "cnid_close called with NULL argument!"); return; } @@ -537,8 +533,7 @@ void cnid_dbd_close(struct _cnid_db *cdb) /* ---------------------- */ 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) + cnid_t did, const char *name, size_t len, cnid_t hint) { CNID_private *db; struct cnid_dbd_rqst rqst; @@ -602,7 +597,7 @@ cnid_t cnid_dbd_add(struct _cnid_db *cdb, const struct stat *st, } /* ---------------------- */ -cnid_t cnid_dbd_get(struct _cnid_db *cdb, const cnid_t did, char *name, const size_t len) +cnid_t cnid_dbd_get(struct _cnid_db *cdb, cnid_t did, const char *name, size_t len) { CNID_private *db; struct cnid_dbd_rqst rqst; @@ -679,11 +674,9 @@ char *cnid_dbd_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, size_t le rqst.op = CNID_DBD_OP_RESOLVE; rqst.cnid = *id; - /* This mimicks the behaviour of the "regular" cnid_resolve. So far, - nobody uses the content of buffer. It only provides space for the - name in the caller. */ - rply.name = (char *)buffer + CNID_HEADER_LEN; - rply.namelen = len - CNID_HEADER_LEN; + /* Pass buffer to transmit so it can stuff the reply data there */ + rply.name = (char *)buffer; + rply.namelen = len; if (transmit(db, &rqst, &rply) < 0) { errno = CNID_ERR_DB; @@ -694,7 +687,7 @@ char *cnid_dbd_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, size_t le switch (rply.result) { case CNID_DBD_RES_OK: *id = rply.did; - name = rply.name; + name = rply.name + CNID_NAME_OFS; LOG(log_debug, logtype_cnid, "cnid_dbd_resolve: resolved did: %u, name: '%s'", ntohl(*id), name); break; case CNID_DBD_RES_NOTFOUND: @@ -730,8 +723,8 @@ int cnid_dbd_getstamp(struct _cnid_db *cdb, void *buffer, const size_t len) } /* ---------------------- */ -cnid_t cnid_dbd_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, - char *name, const size_t len) +cnid_t cnid_dbd_lookup(struct _cnid_db *cdb, const struct stat *st, cnid_t did, + const char *name, size_t len) { CNID_private *db; struct cnid_dbd_rqst rqst; @@ -792,8 +785,63 @@ cnid_t cnid_dbd_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t } /* ---------------------- */ -int cnid_dbd_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st, - const cnid_t did, char *name, const size_t len) +int cnid_dbd_find(struct _cnid_db *cdb, const char *name, size_t namelen, void *buffer, size_t buflen) +{ + CNID_private *db; + struct cnid_dbd_rqst rqst; + struct cnid_dbd_rply rply; + int count; + + if (!cdb || !(db = cdb->_private) || !name) { + LOG(log_error, logtype_cnid, "cnid_find: Parameter error"); + errno = CNID_ERR_PARAM; + return CNID_INVALID; + } + + if (namelen > MAXPATHLEN) { + LOG(log_error, logtype_cnid, "cnid_find: Path name is too long"); + errno = CNID_ERR_PATH; + return CNID_INVALID; + } + + LOG(log_debug, logtype_cnid, "cnid_find(\"%s\")", name); + + RQST_RESET(&rqst); + rqst.op = CNID_DBD_OP_SEARCH; + + rqst.name = name; + rqst.namelen = namelen; + + rply.name = buffer; + rply.namelen = buflen; + + if (transmit(db, &rqst, &rply) < 0) { + errno = CNID_ERR_DB; + return CNID_INVALID; + } + + switch (rply.result) { + case CNID_DBD_RES_OK: + count = rply.namelen / sizeof(cnid_t); + LOG(log_debug, logtype_cnid, "cnid_find: got %d matches", count); + break; + case CNID_DBD_RES_NOTFOUND: + count = 0; + break; + case CNID_DBD_RES_ERR_DB: + errno = CNID_ERR_DB; + count = -1; + break; + default: + abort(); + } + + return count; +} + +/* ---------------------- */ +int cnid_dbd_update(struct _cnid_db *cdb, cnid_t id, const struct stat *st, + cnid_t did, const char *name, size_t len) { CNID_private *db; struct cnid_dbd_rqst rqst; @@ -847,8 +895,7 @@ int cnid_dbd_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st /* ---------------------- */ cnid_t cnid_dbd_rebuild_add(struct _cnid_db *cdb, const struct stat *st, - const cnid_t did, char *name, const size_t len, - cnid_t hint) + cnid_t did, const char *name, size_t len, cnid_t hint) { CNID_private *db; struct cnid_dbd_rqst rqst;