Sending TM used size

diff --git a/etc/afpd/fce_api.c b/etc/afpd/fce_api.c
index 0240b547eb29221488a4392abb816abcd8a0ff49..6c6bf4edda02c4d71f38e220523ffe670e075607 100755 (executable)
--- a/etc/afpd/fce_api.c
+++ b/etc/afpd/fce_api.c
@@ -66,7 +66,7 @@ static struct udp_entry udp_socket_list[FCE_MAX_UDP_SOCKS];
 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
@@ -148,31 +148,43 @@ void fce_cleanup()
 /*\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
@@ -188,7 +200,7 @@ static void send_fce_event( char *path, int mode )
     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
@@ -204,10 +216,11 @@ static void send_fce_event( char *path, int mode )
                 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
@@ -310,19 +323,19 @@ static int register_fce(const char *u_name, int is_dir, int mode)
        }\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

diff --git a/etc/afpd/fce_api_internal.h b/etc/afpd/fce_api_internal.h
index 37988e89b53c4c4ad546ad9d93ad7ff6d5760b51..f405cabfa08faab959ee9eb9fbe973b0ffda269f 100755 (executable)
--- a/etc/afpd/fce_api_internal.h
+++ b/etc/afpd/fce_api_internal.h
@@ -8,7 +8,6 @@
 #ifndef _FCE_API_INTERNAL_H\r
 #define        _FCE_API_INTERNAL_H\r
 \r
-#define FCE_MAX_PATH_LEN 1024\r
 #define FCE_MAX_UDP_SOCKS 5     /* Allow a maximum of udp listeners for file change events */\r
 #define FCE_SOCKET_RETRY_DELAY_S 600 /* Pause this time in s after socket was broken */\r
 #define FCE_PACKET_VERSION  1\r

diff --git a/etc/afpd/fce_util.c b/etc/afpd/fce_util.c
index c1377ee68ae68be95e9fbfdfb9b5fccf40cf1736..6340110eeb3f3363c885703ee06b70d48e33e567 100755 (executable)
--- a/etc/afpd/fce_util.c
+++ b/etc/afpd/fce_util.c
@@ -199,15 +199,12 @@ int fce_handle_coalescation( char *path, int is_dir, int mode )
        fce_history_list[oldest_entry_idx].tv = tv;\r
        fce_history_list[oldest_entry_idx].mode = mode;\r
        fce_history_list[oldest_entry_idx].is_dir = is_dir;\r
-       strncpy( fce_history_list[oldest_entry_idx].path, path, FCE_MAX_PATH_LEN );\r
+       strncpy( fce_history_list[oldest_entry_idx].path, path, MAXPATHLEN);\r
 \r
        /* we have to handle this event */\r
        return FALSE;\r
-\r
 }\r
 \r
-\r
-\r
 /*\r
  *\r
  * Set event coalescation to reduce number of events sent over UDP \r

diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c
index cc98e09a908e3db9a4cacfbea1426b1231b80e10..9d74b92f9781056b2772cc6d1651b6c17ff51a05 100644 (file)
--- a/etc/afpd/volume.c
+++ b/etc/afpd/volume.c
@@ -70,17 +70,6 @@ extern int afprun(int root, char *cmd, int *outfd);
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 #endif /* ! MIN */
 
-#ifndef NO_LARGE_VOL_SUPPORT
-#if BYTE_ORDER == BIG_ENDIAN
-#define hton64(x)       (x)
-#define ntoh64(x)       (x)
-#else /* BYTE_ORDER == BIG_ENDIAN */
-#define hton64(x)       ((u_int64_t) (htonl(((x) >> 32) & 0xffffffffLL)) | \
-                         (u_int64_t) ((htonl(x) & 0xffffffffLL) << 32))
-#define ntoh64(x)       (hton64(x))
-#endif /* BYTE_ORDER == BIG_ENDIAN */
-#endif /* ! NO_LARGE_VOL_SUPPORT */
-
 #ifndef UUID_PRINTABLE_STRING_LENGTH
 #define UUID_PRINTABLE_STRING_LENGTH 37
 #endif

diff --git a/include/atalk/fce_api.h b/include/atalk/fce_api.h
index 969b9d5f4deaff2abe1f2bf46e7c37f4df2e8a57..2e23a81d2005723cdc61f53e5951305b2652cbf3 100755 (executable)
--- a/include/atalk/fce_api.h
+++ b/include/atalk/fce_api.h
@@ -25,15 +25,16 @@
 #define FCE_PACKET_MAGIC  "at_fcapi"
 
 /* This packet goes over the network, so we want to
- *  be shure about datastructs and type sizes between platforms
+ * be shure about datastructs and type sizes between platforms.
+ * Format is network byte order.
  */
 struct fce_packet
 {
     char magic[8];
     unsigned char version;
     unsigned char mode;
-    uint16_t len;  /* network byte order */
     uint32_t event_id; /* network byte order */
+    uint16_t len;  /* network byte order */
     char data[MAXPATHLEN];
 };
 

diff --git a/include/atalk/util.h b/include/atalk/util.h
index 999f14daac86349e508be888df10e0a40a987123..79f6db2b50805e7e45724c4852d130158ea674a1 100644 (file)
--- a/include/atalk/util.h
+++ b/include/atalk/util.h
@@ -48,6 +48,15 @@
 
 #define STRCMP(a,b,c) (strcmp(a,c) b 0)
 
+#if BYTE_ORDER == BIG_ENDIAN
+#define hton64(x)       (x)
+#define ntoh64(x)       (x)
+#else /* BYTE_ORDER == BIG_ENDIAN */
+#define hton64(x)       ((u_int64_t) (htonl(((x) >> 32) & 0xffffffffLL)) | \
+                         (u_int64_t) ((htonl(x) & 0xffffffffLL) << 32))
+#define ntoh64(x)       (hton64(x))
+#endif /* BYTE_ORDER == BIG_ENDIAN */
+
 #ifdef WITH_SENDFILE
 extern ssize_t sys_sendfile (int __out_fd, int __in_fd, off_t *__offset,size_t __count);
 #endif