static int udp_sockets = 0;\r
static int udp_initialized = FCE_FALSE;\r
static unsigned long fce_ev_enabled = 0;\r
-static size_t tm_used; /* used for passing to event handler */\r
+static uint64_t tm_used; /* used for passing to event handler */\r
static const char *skip_files[] = \r
{\r
".DS_Store",\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 = htonl( 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
+ 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
+ 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 the packet len */\r
- return sizeof(struct fce_packet) - FCE_MAX_PATH_LEN + data_len;\r
+ return data_len;\r
}\r
\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
+ ssize_t data_len = build_fce_packet( &packet, path, mode, ++event_id );\r
\r
\r
for (int i = 0; i < udp_sockets; i++)\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
\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 (mode & FCE_TM_SIZE) {\r
- strncpy(full_path_buffer, u_name, FCE_MAX_PATH_LEN);\r
+ strncpy(full_path_buffer, u_name, MAXPATHLEN);\r
} else if (!is_dir || mode == FCE_DIR_DELETE) {\r
- if (strlen( cwd ) + strlen( u_name) + 1 >= FCE_MAX_PATH_LEN) {\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
} else {\r
- if (strlen( cwd ) >= FCE_MAX_PATH_LEN) {\r
+ if (strlen( cwd ) >= MAXPATHLEN) {\r
LOG(log_error, logtype_afpd, "FCE directory name too long: %s", cwd);\r
return AFPERR_PARAM;\r
}\r