X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fvolume.c;h=3404048a520e0c1400bd6a8646ebb6f6f474f50a;hb=465246e257d9aff9855e3e35d8fd5983db932b45;hp=228e187bf4e217bae3d9121a8bcd43cbd03c7c7b;hpb=954f1435c53be3c861e662d9a6699227c612de57;p=netatalk.git diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c index 228e187b..3404048a 100644 --- a/etc/afpd/volume.c +++ b/etc/afpd/volume.c @@ -35,6 +35,8 @@ char *strchr (), *strrchr (); #include #include #include +#include +#include #include #include @@ -47,13 +49,13 @@ char *strchr (), *strrchr (); #include #include #include - +#include +#include #ifdef CNID_DB #include #endif /* CNID_DB*/ -#include "globals.h" #include "directory.h" #include "file.h" #include "volume.h" @@ -167,6 +169,8 @@ static void handle_special_folders (const struct vol *); static void deletevol(struct vol *vol); static void volume_free(struct vol *vol); static void check_ea_sys_support(struct vol *vol); +static char *get_vol_uuid(const AFPObj *obj, const char *volname); +static int readvolfile(AFPObj *obj, struct afp_volume_name *p1,char *p2, int user, struct passwd *pwent); static void volfree(struct vol_option *options, const struct vol_option *save) { @@ -509,11 +513,8 @@ static void volset(struct vol_option *options, struct vol_option *save, options[VOLOPT_FLAGS].i_value |= AFPVOL_TM; else if (strcasecmp(p, "searchdb") == 0) options[VOLOPT_FLAGS].i_value |= AFPVOL_SEARCHDB; -/* Found this in branch dir-rewrite, maybe we want to use it sometimes */ -#if 0 - else if (strcasecmp(p, "cdrom") == 0) - options[VOLOPT_FLAGS].i_value |= AFPVOL_CDROM | AFPVOL_RO; -#endif + else if (strcasecmp(p, "nonetids") == 0) + options[VOLOPT_FLAGS].i_value |= AFPVOL_NONETIDS; p = strtok(NULL, ","); } @@ -672,7 +673,14 @@ static int creatvol(AFPObj *obj, struct passwd *pwd, if ( (flags & CONV_REQMANGLE) || (tmpvlen > AFPVOL_MACNAMELEN)) { if (tmpvlen + suffixlen > AFPVOL_MACNAMELEN) { flags = CONV_FORCE; - tmpvlen = convert_charset(obj->options.unixcharset, obj->options.maccharset, 0, name, vlen, tmpname, AFPVOL_MACNAMELEN - suffixlen, &flags); + tmpvlen = convert_charset(obj->options.unixcharset, + obj->options.maccharset, + 0, + name, + vlen, + tmpname, + AFPVOL_MACNAMELEN - suffixlen, + &flags); tmpname[tmpvlen >= 0 ? tmpvlen : 0] = 0; } strcat(tmpname, suffix); @@ -680,14 +688,24 @@ static int creatvol(AFPObj *obj, struct passwd *pwd, } /* Secondly convert name from maccharset to UCS2 */ - if ( 0 >= ( macvlen = convert_string(obj->options.maccharset, CH_UCS2, tmpname, tmpvlen, mactmpname, AFPVOL_U8MNAMELEN*2)) ) + if ( 0 >= ( macvlen = convert_string(obj->options.maccharset, + CH_UCS2, + tmpname, + tmpvlen, + mactmpname, + AFPVOL_U8MNAMELEN*2)) ) return -1; LOG(log_maxdebug, logtype_afpd, "createvol: Volume '%s' -> Longname: '%s'", name, tmpname); /* check duplicate */ for ( volume = Volumes; volume; volume = volume->v_next ) { - if (( strcasecmp_w( volume->v_u8mname, u8mtmpname ) == 0 ) || ( strcasecmp_w( volume->v_macname, mactmpname ) == 0 )){ + if ((utf8_encoding() && (strcasecmp_w(volume->v_u8mname, u8mtmpname) == 0)) + || + (!utf8_encoding() && (strcasecmp_w(volume->v_macname, mactmpname) == 0))) { + LOG (log_error, logtype_afpd, + "Duplicate volume name, check AppleVolumes files: previous: \"%s\", new: \"%s\"", + volume->v_localname, name); if (volume->v_deleted) { volume->v_new = hide = 1; } @@ -867,9 +885,9 @@ static int creatvol(AFPObj *obj, struct passwd *pwd, check_ea_sys_support(volume); initvol_vfs(volume); - /* get/store uuid from file */ - if (volume->v_flags & AFPVOL_TM) { - char *uuid = get_uuid(obj, volume->v_localname); + /* get/store uuid from file in afpd master*/ + if ((parent_or_child == 0) && (volume->v_flags & AFPVOL_TM)) { + char *uuid = get_vol_uuid(obj, volume->v_localname); if (!uuid) { LOG(log_error, logtype_afpd, "Volume '%s': couldn't get UUID", volume->v_localname); @@ -1160,7 +1178,7 @@ static int volfile_changed(struct afp_volume_name *p) * TYPE [CREATOR] * */ -int readvolfile(AFPObj *obj, struct afp_volume_name *p1, char *p2, int user, struct passwd *pwent) +static int readvolfile(AFPObj *obj, struct afp_volume_name *p1, char *p2, int user, struct passwd *pwent) { FILE *fp; char path[MAXPATHLEN + 1]; @@ -1197,6 +1215,24 @@ int readvolfile(AFPObj *obj, struct afp_volume_name *p1, char *p2, int user, str p1->mtime = st.st_mtime; } + /* try putting a read lock on the volume file twice, sleep 1 second if first attempt fails */ + int retries = 2; + while (1) { + if ((read_lock(fd, 0, SEEK_SET, 0)) != 0) { + retries--; + if (!retries) { + LOG(log_error, logtype_afpd, "readvolfile: can't lock volume file \"%s\"", path); + if ( fclose( fp ) != 0 ) { + LOG(log_error, logtype_afpd, "readvolfile: fclose: %s", strerror(errno) ); + } + return -1; + } + sleep(1); + continue; + } + break; + } + memset(save_options, 0, sizeof(save_options)); /* Enable some default options for all volumes */ @@ -1404,12 +1440,69 @@ static void volume_unlink(struct vol *volume) } } +static off_t getused_size; /* result of getused() */ + +/*! + nftw callback for getused() + */ +static int getused_stat(const char *path, + const struct stat *statp, + int tflag, + struct FTW *ftw) +{ + off_t low, high; + + if (tflag == FTW_F || tflag == FTW_D) { + getused_size += statp->st_blocks * 512; + } + + return 0; +} + +#define GETUSED_CACHETIME 5 +/*! + * Calculate used size of a volume with nftw + * + * The result is cached, we're try to avoid frequently calling nftw() + * + * 1) Call nftw an refresh if: + * 1a) - we're called the first time + * 1b) - volume modification date is not yet set and the last time we've been called is + * longer then 30 sec ago + * 1c) - the last volume modification is less then 30 sec old + * + * @param vol (r) volume to calculate + */ +static int getused(const struct vol *vol) +{ + static time_t vol_mtime = 0; + int ret = 0; + time_t now = time(NULL); + + if (!vol_mtime + || (!vol->v_mtime && ((vol_mtime + GETUSED_CACHETIME) < now)) + || (vol->v_mtime && ((vol_mtime + GETUSED_CACHETIME) < vol->v_mtime)) + ) { + vol_mtime = now; + getused_size = 0; + ret = nftw(vol->v_path, getused_stat, NULL, 20, FTW_PHYS); /* 2 */ + LOG(log_debug, logtype_afpd, "volparams: from nftw: %" PRIu64 " bytes", + getused_size); + } else { + LOG(log_debug, logtype_afpd, "volparams: cached used: %" PRIu64 " bytes", + getused_size); + } + + return ret; +} + static int getvolspace(struct vol *vol, u_int32_t *bfree, u_int32_t *btotal, VolSpace *xbfree, VolSpace *xbtotal, u_int32_t *bsize) { int spaceflag, rc; u_int32_t maxsize; + VolSpace used; #ifndef NO_QUOTA_SUPPORT VolSpace qfree, qtotal; #endif @@ -1448,45 +1541,13 @@ static int getvolspace(struct vol *vol, getvolspace_done: if (vol->v_limitsize) { - bstring cmdstr; - if ((cmdstr = bformat("du -sh \"%s\" 2> /dev/null | cut -f1", vol->v_path)) == NULL) - return AFPERR_MISC; - - FILE *cmd = popen(cfrombstr(cmdstr), "r"); - bdestroy(cmdstr); - if (cmd == NULL) + if (getused(vol) != 0) return AFPERR_MISC; - - char buf[100]; - fgets(buf, 100, cmd); - - if (pclose(cmd) == -1) - return AFPERR_MISC; - - size_t multi = 0; - if (buf[strlen(buf) - 2] == 'G' || buf[strlen(buf) - 2] == 'g') - /* GB */ - multi = 1024 * 1024 * 1024; - else if (buf[strlen(buf) - 2] == 'M' || buf[strlen(buf) - 2] == 'm') - /* MB */ - multi = 1024 * 1024; - else if (buf[strlen(buf) - 2] == 'K' || buf[strlen(buf) - 2] == 'k') - /* MB */ - multi = 1024; - - char *p; - if (p = strchr(buf, ',')) - /* ignore fraction */ - *p = 0; - else - /* remove G|M|K char */ - buf[strlen(buf) - 2] = 0; - /* now buf contains only digits */ - long long used = atoll(buf) * multi; - LOG(log_debug, logtype_afpd, "volparams: used on volume: %llu bytes", used); + LOG(log_debug, logtype_afpd, "volparams: used on volume: %" PRIu64 " bytes", + getused_size); *xbtotal = min(*xbtotal, (vol->v_limitsize * 1024 * 1024)); - *xbfree = min(*xbfree, *xbtotal < used ? 0 : *xbtotal - used); + *xbfree = min(*xbfree, *xbtotal < getused_size ? 0 : *xbtotal - getused_size); } *bfree = min( *xbfree, maxsize); @@ -1604,7 +1665,8 @@ static int getvolparams( u_int16_t bitmap, struct vol *vol, struct stat *st, cha ashort |= VOLPBIT_ATTR_UNIXPRIV; if (vol->v_flags & AFPVOL_TM) ashort |= VOLPBIT_ATTR_TM; - + if (vol->v_flags & AFPVOL_NONETIDS) + ashort |= VOLPBIT_ATTR_NONETIDS; if (afp_version >= 32) { if (vol->v_vfs_ea) ashort |= VOLPBIT_ATTR_EXT_ATTRS; @@ -2022,7 +2084,7 @@ static void check_ea_sys_support(struct vol *vol) if (vol->v_vfs_ea == AFPVOL_EA_AUTO) { if ((vol->v_flags & AFPVOL_RO) == AFPVOL_RO) { - LOG(log_info, logtype_logger, "read-only volume '%s', can't test for EA support, disabling EAs", vol->v_localname); + LOG(log_info, logtype_afpd, "read-only volume '%s', can't test for EA support, disabling EAs", vol->v_localname); vol->v_vfs_ea = AFPVOL_EA_NONE; return; } @@ -2032,7 +2094,7 @@ static void check_ea_sys_support(struct vol *vol) process_uid = geteuid(); if (process_uid) if (seteuid(0) == -1) { - LOG(log_error, logtype_logger, "check_ea_sys_support: can't seteuid(0): %s", strerror(errno)); + LOG(log_error, logtype_afpd, "check_ea_sys_support: can't seteuid(0): %s", strerror(errno)); exit(EXITERR_SYS); } @@ -2047,7 +2109,7 @@ static void check_ea_sys_support(struct vol *vol) if (process_uid) { if (seteuid(process_uid) == -1) { - LOG(log_error, logtype_logger, "can't seteuid back %s", strerror(errno)); + LOG(log_error, logtype_afpd, "can't seteuid back %s", strerror(errno)); exit(EXITERR_SYS); } } @@ -2220,7 +2282,7 @@ int afp_openvol(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t DIRDID_ROOT_PARENT, DIRDID_ROOT, bfromcstr(volume->v_path), - st.st_ctime) + &st) ) == NULL) { free(vol_mname); LOG(log_error, logtype_afpd, "afp_openvol(%s): malloc: %s", volume->v_path, strerror(errno) ); @@ -2468,12 +2530,6 @@ void setvoltime(AFPObj *obj, struct vol *vol) { struct timeval tv; - /* just looking at vol->v_mtime is broken seriously since updates - * from other users afpd processes never are seen. - * This is not the most elegant solution (a shared memory between - * the afpd processes would come closer) - * [RS] */ - if ( gettimeofday( &tv, NULL ) < 0 ) { LOG(log_error, logtype_afpd, "setvoltime(%s): gettimeofday: %s", vol->v_path, strerror(errno) ); return; @@ -2698,7 +2754,7 @@ void unload_volumes_and_extmap(void) * * Returns pointer to allocated storage on success, NULL on error. */ -char *get_uuid(const AFPObj *obj, const char *volname) +static char *get_vol_uuid(const AFPObj *obj, const char *volname) { char *volname_conf; char buf[1024], uuid[UUID_PRINTABLE_STRING_LENGTH], *p; @@ -2750,12 +2806,12 @@ char *get_uuid(const AFPObj *obj, const char *volname) if (stat(obj->options.uuidconf, &tmpstat)) { /* no file */ if (( fd = creat(obj->options.uuidconf, 0644 )) < 0 ) { - LOG(log_error, logtype_atalkd, "ERROR: Cannot create %s (%s).", + LOG(log_error, logtype_afpd, "ERROR: Cannot create %s (%s).", obj->options.uuidconf, strerror(errno)); return NULL; } if (( fp = fdopen( fd, "w" )) == NULL ) { - LOG(log_error, logtype_atalkd, "ERROR: Cannot fdopen %s (%s).", + LOG(log_error, logtype_afpd, "ERROR: Cannot fdopen %s (%s).", obj->options.uuidconf, strerror(errno)); close(fd); return NULL; @@ -2786,5 +2842,5 @@ char *get_uuid(const AFPObj *obj, const char *volname) fprintf(fp, "\"%s\"\t%36s\n", volname, cp); fclose(fp); - return strdup(uuid); + return strdup(cp); }