#include <atalk/cnid.h>\r
#include <atalk/unix.h>\r
#include <atalk/fce_api.h>\r
+#include <atalk/globals.h>\r
\r
#include "fork.h"\r
#include "file.h"\r
-#include "globals.h"\r
#include "directory.h"\r
#include "desktop.h"\r
#include "volume.h"\r
static struct udp_entry udp_socket_list[FCE_MAX_UDP_SOCKS];\r
static int udp_sockets = 0;\r
static int udp_initialized = FCE_FALSE;\r
-\r
-\r
+static unsigned long fce_ev_enabled =\r
+ (1 << FCE_FILE_MODIFY) |\r
+ (1 << FCE_FILE_DELETE) |\r
+ (1 << FCE_DIR_DELETE) |\r
+ (1 << FCE_FILE_CREATE) |\r
+ (1 << FCE_DIR_CREATE);\r
+\r
+static uint64_t tm_used; /* used for passing to event handler */\r
+#define MAXIOBUF 1024\r
+static char iobuf[MAXIOBUF];\r
static const char *skip_files[] = \r
{\r
".DS_Store",\r
* */\r
void fce_init_udp()\r
{\r
+ int rv;\r
+ struct addrinfo hints, *servinfo, *p;\r
+\r
if (udp_initialized == FCE_TRUE)\r
return;\r
\r
+ memset(&hints, 0, sizeof hints);\r
+ hints.ai_family = AF_UNSPEC;\r
+ hints.ai_socktype = SOCK_DGRAM;\r
\r
- for (int i = 0; i < udp_sockets; i++)\r
- {\r
+ for (int i = 0; i < udp_sockets; i++) {\r
struct udp_entry *udp_entry = udp_socket_list + i;\r
\r
/* Close any pending sockets */\r
if (udp_entry->sock != -1)\r
- {\r
- close( udp_entry->sock );\r
+ close(udp_entry->sock);\r
+\r
+ if ((rv = getaddrinfo(udp_entry->addr, udp_entry->port, &hints, &servinfo)) != 0) {\r
+ LOG(log_error, logtype_afpd, "fce_init_udp: getaddrinfo(%s:%s): %s",\r
+ udp_entry->addr, udp_entry->port, gai_strerror(rv));\r
+ continue;\r
}\r
\r
- /* resolve IP to network address */\r
- if (inet_aton( udp_entry->ip, &udp_entry->addr.sin_addr ) ==0 )\r
- {\r
- /* Hmm, failed try to resolve host */\r
- struct hostent *hp = gethostbyname( udp_entry->ip );\r
- if (hp == NULL)\r
- {\r
- LOG(log_error, logtype_afpd, "Cannot resolve host name for fce UDP connection: %s (errno %d)", udp_entry->ip, errno );\r
+ /* loop through all the results and make a socket */\r
+ for (p = servinfo; p != NULL; p = p->ai_next) {\r
+ if ((udp_entry->sock = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) == -1) {\r
+ LOG(log_error, logtype_afpd, "fce_init_udp: socket(%s:%s): %s",\r
+ udp_entry->addr, udp_entry->port, strerror(errno));\r
continue;\r
}\r
- memcpy( &udp_entry->addr.sin_addr, &hp->h_addr, sizeof(udp_entry->addr.sin_addr) );\r
+ break;\r
}\r
\r
- /* Create UDP socket */\r
- udp_entry->sock = socket( AF_INET, SOCK_DGRAM, 0 );\r
- if (udp_entry->sock == -1)\r
- {\r
- LOG(log_error, logtype_afpd, "Cannot create socket for fce UDP connection: errno %d", errno );\r
- continue;\r
+ if (p == NULL) {\r
+ LOG(log_error, logtype_afpd, "fce_init_udp: no socket for %s:%s",\r
+ udp_entry->addr, udp_entry->port);\r
}\r
-\r
- /* Set socket address params */\r
- udp_entry->addr.sin_family = AF_INET;\r
- udp_entry->addr.sin_port = htons(udp_entry->port);\r
+ udp_entry->addrinfo = *p;\r
+ memcpy(&udp_entry->addrinfo, p, sizeof(struct addrinfo));\r
+ memcpy(&udp_entry->sockaddr, p->ai_addr, sizeof(struct sockaddr_storage));\r
+ freeaddrinfo(servinfo);\r
}\r
- udp_initialized = FCE_TRUE;\r
\r
+ udp_initialized = FCE_TRUE;\r
}\r
+\r
void fce_cleanup()\r
{\r
if (udp_initialized == FCE_FALSE )\r
/*\r
* Construct a UDP packet for our listeners and return packet size\r
* */\r
-static unsigned short build_fce_packet( struct fce_packet *packet, char *path, int mode, uint32_t event_id )\r
+static ssize_t build_fce_packet( struct fce_packet *packet, char *path, int mode, uint32_t event_id )\r
{\r
- unsigned short data_len = 0;\r
+ size_t pathlen;\r
+ ssize_t data_len = 0;\r
\r
strncpy(packet->magic, FCE_PACKET_MAGIC, sizeof(packet->magic) );\r
packet->version = FCE_PACKET_VERSION;\r
packet->mode = mode;\r
+ packet->event_id = event_id;\r
\r
- data_len = strlen( path );\r
+ pathlen = strlen(path) + 1; /* include string terminator */\r
\r
/* This should never happen, but before we bust this server, we send nonsense, fce listener has to cope */\r
- if (data_len >= FCE_MAX_PATH_LEN)\r
- {\r
- data_len = FCE_MAX_PATH_LEN - 1;\r
- }\r
+ if (pathlen >= MAXPATHLEN)\r
+ pathlen = MAXPATHLEN - 1;\r
\r
/* This is the payload len. Means: the stream has len bytes more until packet is finished */\r
/* A server should read the first 16 byte, decode them and then fetch the rest */\r
- packet->len = htons( data_len);\r
- packet->event_id = htonl( event_id );\r
-\r
- strncpy( packet->data, path, data_len );\r
+ data_len = FCE_PACKET_HEADER_SIZE + pathlen;\r
+ packet->datalen = pathlen;\r
+\r
+ switch (mode) {\r
+ case FCE_TM_SIZE:\r
+ tm_used = hton64(tm_used);\r
+ memcpy(packet->data, &tm_used, sizeof(tm_used));\r
+ strncpy(packet->data + sizeof(tm_used), path, pathlen);\r
+\r
+ packet->datalen += sizeof(tm_used);\r
+ data_len += sizeof(tm_used);\r
+ break;\r
+ default:\r
+ strncpy(packet->data, path, pathlen);\r
+ break;\r
+ }\r
\r
/* return the packet len */\r
- return sizeof(struct fce_packet) - FCE_MAX_PATH_LEN + data_len;\r
+ return data_len;\r
+}\r
+\r
+static int pack_fce_packet(struct fce_packet *packet, unsigned char *buf)\r
+{\r
+ unsigned char *p = buf;\r
+\r
+ memcpy(p, &packet->magic[0], sizeof(packet->magic));\r
+ p += sizeof(packet->magic);\r
+\r
+ *p = packet->version;\r
+ p++;\r
+ \r
+ *p = packet->mode;\r
+ p++;\r
+ \r
+ uint32_t id = htonl(packet->event_id);\r
+ memcpy(p, &id, sizeof(id));\r
+ p += sizeof(packet->event_id);\r
+\r
+ uint16_t l = htons(packet->datalen);\r
+ memcpy(p, &l, sizeof(l));\r
+ p += sizeof(l);\r
+\r
+ memcpy(p, &packet->data[0], packet->datalen);\r
+ p += packet->datalen;\r
+\r
+ return 0;\r
}\r
\r
/*\r
void *data = &packet;\r
static uint32_t event_id = 0; /* the unique packet couter to detect packet/data loss. Going from 0xFFFFFFFF to 0x0 is a valid increment */\r
\r
+ LOG(log_debug, logtype_afpd, "send_fce_event: start");\r
+\r
time_t now = time(NULL);\r
\r
/* build our data packet */\r
- int data_len = build_fce_packet( &packet, path, mode, ++event_id );\r
-\r
+ ssize_t data_len = build_fce_packet( &packet, path, mode, ++event_id );\r
+ pack_fce_packet(&packet, iobuf);\r
\r
for (int i = 0; i < udp_sockets; i++)\r
{\r
continue;\r
\r
/* Reopen socket */\r
- udp_entry->sock = socket( AF_INET, SOCK_DGRAM, 0 );\r
-\r
- if (udp_entry->sock == -1)\r
- {\r
+ udp_entry->sock = socket(udp_entry->addrinfo.ai_family,\r
+ udp_entry->addrinfo.ai_socktype,\r
+ udp_entry->addrinfo.ai_protocol);\r
+ \r
+ if (udp_entry->sock == -1) {\r
/* failed again, so go to rest again */\r
LOG(log_error, logtype_afpd, "Cannot recreate socket for fce UDP connection: errno %d", errno );\r
\r
\r
/* Okay, we have a running socket again, send server that we had a problem on our side*/\r
data_len = build_fce_packet( &packet, "", FCE_CONN_BROKEN, 0 );\r
+ pack_fce_packet(&packet, iobuf);\r
\r
- sendto( udp_entry->sock, data, data_len, 0, &udp_entry->addr, sizeof(udp_entry->addr) );\r
+ sendto(udp_entry->sock,\r
+ iobuf,\r
+ data_len,\r
+ 0,\r
+ (struct sockaddr *)&udp_entry->sockaddr,\r
+ udp_entry->addrinfo.ai_addrlen);\r
\r
/* Rebuild our original data packet */\r
data_len = build_fce_packet( &packet, path, mode, event_id );\r
+ pack_fce_packet(&packet, iobuf);\r
}\r
\r
- sent_data = sendto( udp_entry->sock, data, data_len, 0, &udp_entry->addr, sizeof(udp_entry->addr) );\r
+ sent_data = sendto(udp_entry->sock,\r
+ iobuf,\r
+ data_len,\r
+ 0,\r
+ (struct sockaddr *)&udp_entry->sockaddr,\r
+ udp_entry->addrinfo.ai_addrlen);\r
\r
/* Problems ? */\r
- if (sent_data != data_len)\r
- {\r
+ if (sent_data != data_len) {\r
/* Argh, socket broke, we close and retry later */\r
- LOG(log_error, logtype_afpd, "Error while sending packet to %s for fce UDP connection: transfered: %d of %d errno %d",\r
- udp_entry->port, sent_data, data_len, errno );\r
+ LOG(log_error, logtype_afpd, "send_fce_event: error sending packet to %s:%s, transfered %d of %d: %s",\r
+ udp_entry->addr, udp_entry->port, sent_data, data_len, strerror(errno));\r
\r
close( udp_entry->sock );\r
udp_entry->sock = -1;\r
}\r
}\r
\r
-static int add_udp_socket( char *target_ip, int target_port )\r
+static int add_udp_socket(const char *target_ip, const char *target_port )\r
{\r
- if (target_port == 0)\r
- target_port = FCE_DEFAULT_PORT;\r
+ if (target_port == NULL)\r
+ target_port = FCE_DEFAULT_PORT_STRING;\r
\r
- if (udp_sockets >= FCE_MAX_UDP_SOCKS)\r
- {\r
+ if (udp_sockets >= FCE_MAX_UDP_SOCKS) {\r
LOG(log_error, logtype_afpd, "Too many file change api UDP connections (max %d allowed)", FCE_MAX_UDP_SOCKS );\r
return AFPERR_PARAM;\r
}\r
\r
- strncpy( udp_socket_list[udp_sockets].ip, target_ip, FCE_MAX_IP_LEN - 1);\r
- udp_socket_list[udp_sockets].port = target_port;\r
+ udp_socket_list[udp_sockets].addr = strdup(target_ip);\r
+ udp_socket_list[udp_sockets].port = strdup(target_port);\r
udp_socket_list[udp_sockets].sock = -1;\r
- memset( &udp_socket_list[udp_sockets].addr, 0, sizeof(struct sockaddr_in) );\r
+ memset(&udp_socket_list[udp_sockets].addrinfo, 0, sizeof(struct addrinfo));\r
+ memset(&udp_socket_list[udp_sockets].sockaddr, 0, sizeof(struct sockaddr_storage));\r
udp_socket_list[udp_sockets].next_try_on_error = 0;\r
\r
udp_sockets++;\r
* Dispatcher for all incoming file change events\r
*\r
* */\r
-static int register_fce( char *u_name, int is_dir, int mode )\r
+static int register_fce(const char *u_name, int is_dir, int mode)\r
{\r
if (udp_sockets == 0)\r
/* No listeners configured */\r
static int first_event = FCE_TRUE;\r
\r
/* do some initialization on the fly the first time */\r
- if (first_event)\r
- {\r
+ if (first_event) {\r
fce_initialize_history();\r
}\r
\r
-\r
/* handle files which should not cause events (.DS_Store atc. ) */\r
for (int i = 0; skip_files[i] != NULL; i++)\r
{\r
}\r
\r
\r
- char full_path_buffer[FCE_MAX_PATH_LEN + 1] = {""};\r
+ char full_path_buffer[MAXPATHLEN + 1] = {""};\r
const char *cwd = getcwdpath();\r
\r
- if (!is_dir || mode == FCE_DIR_DELETE)\r
- {\r
- if (strlen( cwd ) + strlen( u_name) + 1 >= FCE_MAX_PATH_LEN)\r
- {\r
+ if (mode == FCE_TM_SIZE) {\r
+ strlcpy(full_path_buffer, u_name, MAXPATHLEN);\r
+ } else if (!is_dir || mode == FCE_DIR_DELETE) {\r
+ if (strlen( cwd ) + strlen( u_name) + 1 >= MAXPATHLEN) {\r
LOG(log_error, logtype_afpd, "FCE file name too long: %s/%s", cwd, u_name );\r
return AFPERR_PARAM;\r
}\r
sprintf( full_path_buffer, "%s/%s", cwd, u_name );\r
- }\r
- else\r
- {\r
- if (strlen( cwd ) >= FCE_MAX_PATH_LEN)\r
- {\r
+ } else {\r
+ if (strlen( cwd ) >= MAXPATHLEN) {\r
LOG(log_error, logtype_afpd, "FCE directory name too long: %s", cwd);\r
return AFPERR_PARAM;\r
}\r
}\r
\r
/* Can we ignore this event based on type or history? */\r
- if (fce_handle_coalescation( full_path_buffer, is_dir, mode ))\r
+ if (!(mode & FCE_TM_SIZE) && fce_handle_coalescation( full_path_buffer, is_dir, mode ))\r
{\r
LOG(log_debug9, logtype_afpd, "Coalesced fc event <%d> for <%s>", mode, full_path_buffer );\r
return AFP_OK;\r
* */\r
#ifndef FCE_TEST_MAIN\r
\r
-\r
int fce_register_delete_file( struct path *path )\r
{\r
int ret = AFP_OK;\r
if (path == NULL)\r
return AFPERR_PARAM;\r
\r
+ if (!(fce_ev_enabled & (1 << FCE_FILE_DELETE)))\r
+ return ret;\r
\r
ret = register_fce( path->u_name, FALSE, FCE_FILE_DELETE );\r
\r
if (name == NULL)\r
return AFPERR_PARAM;\r
\r
+ if (!(fce_ev_enabled & (1 << FCE_DIR_DELETE)))\r
+ return ret;\r
\r
ret = register_fce( name, TRUE, FCE_DIR_DELETE);\r
\r
if (path == NULL)\r
return AFPERR_PARAM;\r
\r
+ if (!(fce_ev_enabled & (1 << FCE_DIR_CREATE)))\r
+ return ret;\r
+\r
ret = register_fce( path->u_name, TRUE, FCE_DIR_CREATE );\r
\r
return ret;\r
if (path == NULL)\r
return AFPERR_PARAM;\r
\r
+ if (!(fce_ev_enabled & (1 << FCE_FILE_CREATE)))\r
+ return ret;\r
+\r
ret = register_fce( path->u_name, FALSE, FCE_FILE_CREATE );\r
\r
return ret;\r
}\r
\r
-\r
int fce_register_file_modification( struct ofork *ofork )\r
{\r
char *u_name = NULL;\r
if (ofork == NULL || ofork->of_vol == NULL)\r
return AFPERR_PARAM;\r
\r
+ if (!(fce_ev_enabled & (1 << FCE_FILE_MODIFY)))\r
+ return ret;\r
+\r
vol = ofork->of_vol;\r
\r
if (NULL == (u_name = mtoupath(vol, of_name(ofork), ofork->of_did, utf8_encoding()))) \r
\r
return ret; \r
}\r
+\r
+int fce_register_tm_size(const char *vol, size_t used)\r
+{\r
+ int ret = AFP_OK;\r
+\r
+ if (vol == NULL)\r
+ return AFPERR_PARAM;\r
+\r
+ if (!(fce_ev_enabled & (1 << FCE_TM_SIZE)))\r
+ return ret;\r
+\r
+ tm_used = used; /* oh what a hack */\r
+ ret = register_fce(vol, FALSE, FCE_TM_SIZE);\r
+\r
+ return ret;\r
+}\r
#endif\r
\r
/*\r
* Extern connect to afpd parameter, can be called multiple times for multiple listeners (up to MAX_UDP_SOCKS times)\r
*\r
* */\r
-int fce_add_udp_socket( char *target )\r
+int fce_add_udp_socket(const char *target)\r
{\r
- int port = FCE_DEFAULT_PORT;\r
+ const char *port = FCE_DEFAULT_PORT_STRING;\r
char target_ip[256] = {""};\r
\r
- strncpy( target_ip, target, sizeof(target_ip) -1);\r
+ strncpy(target_ip, target, sizeof(target_ip) -1);\r
+\r
char *port_delim = strchr( target_ip, ':' );\r
- if (port_delim)\r
- {\r
+ if (port_delim) {\r
*port_delim = 0;\r
- port = atoi( port_delim + 1);\r
+ port = port_delim + 1;\r
}\r
- return add_udp_socket( target_ip, port );\r
+ return add_udp_socket(target_ip, port);\r
}\r
\r
+int fce_set_events(const char *events)\r
+{\r
+ char *e;\r
+ char *p;\r
+ \r
+ if (events == NULL)\r
+ return AFPERR_PARAM;\r
+\r
+ e = strdup(events);\r
+\r
+ fce_ev_enabled = 0;\r
+\r
+ for (p = strtok(e, ","); p; p = strtok(NULL, ",")) {\r
+ if (strcmp(p, "fmod") == 0) {\r
+ fce_ev_enabled |= (1 << FCE_FILE_MODIFY);\r
+ } else if (strcmp(p, "fdel") == 0) {\r
+ fce_ev_enabled |= (1 << FCE_FILE_DELETE);\r
+ } else if (strcmp(p, "ddel") == 0) {\r
+ fce_ev_enabled |= (1 << FCE_DIR_DELETE);\r
+ } else if (strcmp(p, "fcre") == 0) {\r
+ fce_ev_enabled |= (1 << FCE_FILE_CREATE);\r
+ } else if (strcmp(p, "dcre") == 0) {\r
+ fce_ev_enabled |= (1 << FCE_DIR_CREATE);\r
+ } else if (strcmp(p, "tmsz") == 0) {\r
+ fce_ev_enabled |= (1 << FCE_TM_SIZE);\r
+ }\r
+ }\r
\r
+ free(e);\r
+}\r
\r
#ifdef FCE_TEST_MAIN\r
\r
projects / netatalk.git / blobdiff