Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop

[netatalk.git] / include / atalk / util.h

diff --git a/include/atalk/util.h b/include/atalk/util.h
index e278872b3ed0668c582982c35dd7e950379b175e..386b6c28c9b1c1ddfb8560752e66480595788627 100644 (file)
--- a/include/atalk/util.h
+++ b/include/atalk/util.h
@@ -19,6 +19,7 @@
 
 #include <atalk/unicode.h>
 #include <atalk/bstrlib.h>
+#include <atalk/cnid.h>
 
 /* exit error codes */
 #define EXITERR_CLNT 1  /* client related error */
@@ -147,9 +148,10 @@ 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};
+enum fdtype {IPC_FD, LISTEN_FD};
 struct polldata {
     enum fdtype fdtype; /* IPC fd or listening socket fd                 */
     void *data;         /* pointer to AFPconfig for listening socket and *
@@ -190,13 +192,14 @@ 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(const char *path, mode_t mode, const struct stat *st, 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