#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
-static unsigned long fce_ev_enabled = 0;\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
LOG(log_error, logtype_afpd, "fce_init_udp: no socket for %s:%s",\r
udp_entry->addr, udp_entry->port);\r
}\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
\r
strncpy(packet->magic, FCE_PACKET_MAGIC, sizeof(packet->magic) );\r
packet->version = FCE_PACKET_VERSION;\r
packet->mode = mode;\r
- packet->event_id = htonl( event_id );\r
+ packet->event_id = event_id;\r
\r
pathlen = strlen(path) + 1; /* include string terminator */\r
\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
+ data_len = FCE_PACKET_HEADER_SIZE + pathlen;\r
+ packet->datalen = pathlen;\r
\r
switch (mode) {\r
case FCE_TM_SIZE:\r
- packet->len = htons(pathlen) + sizeof(tm_used);\r
tm_used = hton64(tm_used);\r
memcpy(packet->data, &tm_used, sizeof(tm_used));\r
-\r
strncpy(packet->data + sizeof(tm_used), path, pathlen);\r
- data_len = sizeof(struct fce_packet) + pathlen + sizeof(tm_used);\r
+\r
+ packet->datalen += sizeof(tm_used);\r
+ data_len += sizeof(tm_used);\r
break;\r
default:\r
- packet->len = htons(pathlen);\r
strncpy(packet->data, path, pathlen);\r
- data_len = sizeof(struct fce_packet) + pathlen;\r
break;\r
}\r
\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
* Send the fce information to all (connected) listeners\r
* We dont give return code because all errors are handled internally (I hope..)\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
ssize_t data_len = build_fce_packet( &packet, path, mode, ++event_id );\r
-\r
+ pack_fce_packet(&packet, iobuf);\r
\r
for (int i = 0; i < udp_sockets; i++)\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,\r
- data,\r
+ iobuf,\r
data_len,\r
0,\r
- udp_entry->addrinfo.ai_addr,\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,\r
- data,\r
+ iobuf,\r
data_len,\r
0,\r
- udp_entry->addrinfo.ai_addr,\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
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].addrinfo, 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
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
- 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
\r
-\r
/* handle files which should not cause events (.DS_Store atc. ) */\r
for (int i = 0; skip_files[i] != NULL; i++)\r
{\r
char full_path_buffer[MAXPATHLEN + 1] = {""};\r
const char *cwd = getcwdpath();\r
\r
- if (mode & FCE_TM_SIZE) {\r
- strncpy(full_path_buffer, u_name, MAXPATHLEN);\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
e = strdup(events);\r
+\r
fce_ev_enabled = 0;\r
\r
for (p = strtok(e, ","); p; p = strtok(NULL, ",")) {\r
- if (strcmp(e, "fmod") == 0) {\r
- fce_ev_enabled |= FCE_FILE_MODIFY;\r
- } else if (strcmp(e, "fdel") == 0) {\r
- fce_ev_enabled |= FCE_FILE_DELETE;\r
- } else if (strcmp(e, "ddel") == 0) {\r
- fce_ev_enabled |= FCE_DIR_DELETE;\r
- } else if (strcmp(e, "fcre") == 0) {\r
- fce_ev_enabled |= FCE_FILE_CREATE;\r
- } else if (strcmp(e, "dcre") == 0) {\r
- fce_ev_enabled |= FCE_DIR_CREATE;\r
- } else if (strcmp(e, "tmsz") == 0) {\r
- fce_ev_enabled |= FCE_TM_SIZE;\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
projects / netatalk.git / blobdiff