X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=include%2Fatalk%2Futil.h;h=6d92e15d3815d1270f212dcbd112863e69526fb6;hp=1c16e06f86d3cb1a6a1233b1057a68ef427dc91c;hb=e9391ff790167e35ff92adc20d4779f1d9d651aa;hpb=14874ef66d68c5200a9a42a7408d022d58211898 diff --git a/include/atalk/util.h b/include/atalk/util.h index 1c16e06f..6d92e15d 100644 --- a/include/atalk/util.h +++ b/include/atalk/util.h @@ -15,14 +15,18 @@ #include #include #include +#include +#include #include #include +#include /* exit error codes */ #define EXITERR_CLNT 1 /* client related error */ #define EXITERR_CONF 2 /* error in config files/cmd line parameters */ #define EXITERR_SYS 3 /* local system error */ +#define EXITERR_CLOSED 4 /* connection was immediately closed after TCP handshake */ /* Print a SBT and exit */ #define AFP_PANIC(why) \ @@ -54,15 +58,25 @@ #define STRCMP(a,b,c) (strcmp(a,c) b 0) #define ZERO_STRUCT(a) memset(&(a), 0, sizeof(a)) #define ZERO_STRUCTP(a) memset((a), 0, sizeof(a)) +#ifndef MAX +#define MAX(a,b) ((a) > (b) ? a : b) +#endif +#ifndef MIN +#define MIN(a,b) ((a) < (b) ? a : b) +#endif -#if BYTE_ORDER == BIG_ENDIAN +#ifdef WORDS_BIGENDIAN #define hton64(x) (x) #define ntoh64(x) (x) -#else /* BYTE_ORDER == BIG_ENDIAN */ +#else #define hton64(x) ((uint64_t) (htonl(((x) >> 32) & 0xffffffffLL)) | \ (uint64_t) ((htonl(x) & 0xffffffffLL) << 32)) #define ntoh64(x) (hton64(x)) -#endif /* BYTE_ORDER == BIG_ENDIAN */ +#endif + +#ifndef SAFE_FREE +#define SAFE_FREE(x) do { if ((x) != NULL) {free(x); x=NULL;} } while(0) +#endif #ifdef WITH_SENDFILE extern ssize_t sys_sendfile (int __out_fd, int __in_fd, off_t *__offset,size_t __count); @@ -79,6 +93,8 @@ extern void bprint (char *, int); extern int strdiacasecmp (const char *, const char *); extern int strndiacasecmp (const char *, const char *, size_t); extern pid_t server_lock (char * /*program*/, char * /*file*/, int /*debug*/); +extern int check_lockfile (const char *program, const char *pidfile); +extern int create_lockfile(const char *program, const char *pidfile); extern void fault_setup (void (*fn)(void *)); extern void netatalk_panic(const char *why); #define server_unlock(x) (unlink(x)) @@ -138,28 +154,35 @@ extern const char *getip_string(const struct sockaddr *sa); extern unsigned int getip_port(const struct sockaddr *sa); extern void apply_ip_mask(struct sockaddr *ai, int maskbits); extern int compare_ip(const struct sockaddr *sa1, const struct sockaddr *sa2); +extern int tokenize_ip_port(const char *ipurl, char **address, char **port); /* Structures and functions dealing with dynamic pollfd arrays */ -enum fdtype {IPC_FD, LISTEN_FD, DISASOCIATED_IPC_FD}; -struct polldata { - enum fdtype fdtype; /* IPC fd or listening socket fd */ - void *data; /* pointer to AFPconfig for listening socket and * - * pointer to afp_child_t for IPC fd */ + +enum asev_fdtype {IPC_FD, LISTEN_FD}; + +/** + * atalk socket event data + **/ +struct asev_data { + enum asev_fdtype fdtype; /* IPC fd or listening socket fd */ + void *private; /* pointer to AFPconfig for listening socket and * + * pointer to afp_child_t for IPC fd */ }; -extern void fdset_add_fd(int maxconns, - struct pollfd **fdsetp, - struct polldata **polldatap, - int *fdset_usedp, - int *fdset_sizep, - int fd, - enum fdtype fdtype, - void *data); -extern void fdset_del_fd(struct pollfd **fdsetp, - struct polldata **polldatap, - int *fdset_usedp, - int *fdset_sizep, - int fd); +/** + * atalk socket event + **/ +struct asev { + struct pollfd *fdset; /* struct pollfd array for poll() */ + struct asev_data *data; /* associated array of data */ + int max; + int used; +}; + +extern struct asev *asev_init(int max); +extern bool asev_add_fd(struct asev *sev, int fd, enum asev_fdtype fdtype, void *private); +extern bool asev_del_fd(struct asev *sev, int fd); + extern int send_fd(int socket, int fd); extern int recv_fd(int fd, int nonblocking); @@ -167,15 +190,34 @@ extern int recv_fd(int fd, int nonblocking); * unix.c *****************************************************************/ -extern const char *abspath(const char *name); extern const char *getcwdpath(void); +extern const char *fullpathname(const char *); extern char *stripped_slashes_basename(char *p); -extern int lchdir(const char *dir); extern void randombytes(void *buf, int n); -#endif /* _ATALK_UTIL_H */ +extern int daemonize(int nochdir, int noclose); +extern int run_cmd(const char *cmd, char **cmd_argv); +extern char *realpath_safe(const char *path); +extern const char *basename_safe(const char *path); +extern char *strtok_quote (char *s, const char *delim); + +extern int ochdir(const char *dir, int options); +extern int ostat(const char *path, struct stat *buf, int options); +extern int ostatat(int dirfd, const char *path, struct stat *st, int options); +extern int ochown(const char *path, uid_t owner, gid_t group, int options); +extern int ochmod(char *path, mode_t mode, const struct stat *st, int options); /****************************************************************** * cnid.c *****************************************************************/ extern bstring rel_path_in_vol(const char *path, const char *volpath); +extern cnid_t cnid_for_path(struct _cnid_db *cdb, const char *volpath, const char *path, cnid_t *did); + +/****************************************************************** + * cnid.c + *****************************************************************/ + +extern void initline (int, char *); +extern int parseline (int, char *); + +#endif /* _ATALK_UTIL_H */