Remove off_t from what will eventually be a public API

Since the size of off_t may vary depending on whether the LFS defines
have been set, it is not a good idea to expose that, as the recently
fixed bug has shown. As long as we use nbdsrv.h internally only this
doesn't matter, but since the long-term goal is to make libnbdsrv a
public library, we'd better avoid such an issue.

We'll still use off_t internally, but that won't be exposed anymore.

diff --git a/nbdsrv.c b/nbdsrv.c
index 72d536a..90908ba 100644 (file)
--- a/nbdsrv.c
+++ b/nbdsrv.c
@@ -246,7 +246,7 @@ int append_serve(const SERVER *const s, GArray *const a) {
        return ret;
 }
 
-off_t size_autodetect(int fhandle) {
+uint64_t size_autodetect(int fhandle) {
        off_t es;
        u64 bytes __attribute__((unused));
        struct stat stat_buf;
@@ -257,7 +257,7 @@ off_t size_autodetect(int fhandle) {
 #ifdef BLKGETSIZE64
        DEBUG("looking for export size with ioctl BLKGETSIZE64\n");
        if (!ioctl(fhandle, BLKGETSIZE64, &bytes) && bytes) {
-               return (off_t)bytes;
+               return bytes;
        }
 #endif /* BLKGETSIZE64 */
 #endif /* HAVE_SYS_IOCTL_H */
@@ -270,7 +270,7 @@ off_t size_autodetect(int fhandle) {
                /* always believe stat if a regular file as it might really
                 * be zero length */
                if (S_ISREG(stat_buf.st_mode) || (stat_buf.st_size > 0))
-                       return (off_t)stat_buf.st_size;
+                       return (uint64_t)stat_buf.st_size;
         } else {
                 err("fstat failed: %m");
         }
@@ -278,7 +278,7 @@ off_t size_autodetect(int fhandle) {
        DEBUG("looking for fhandle size with lseek SEEK_END\n");
        es = lseek(fhandle, (off_t)0, SEEK_END);
        if (es > ((off_t)0)) {
-               return es;
+               return (uint64_t)es;
         } else {
                 DEBUG("lseek failed: %d", errno==EBADF?1:(errno==ESPIPE?2:(errno==EINVAL?3:4)));
         }

diff --git a/nbdsrv.h b/nbdsrv.h
index 919d434..12235a0 100644 (file)
--- a/nbdsrv.h
+++ b/nbdsrv.h
@@ -28,7 +28,7 @@ typedef enum {
  **/
 typedef struct {
        gchar* exportname;    /**< (unprocessed) filename of the file we're exporting */
-       off_t expected_size; /**< size of the exported file as it was told to
+       uint64_t expected_size; /**< size of the exported file as it was told to
                               us through configuration */
        gchar* listenaddr;   /**< The IP address we're listening on */
        unsigned int port;   /**< port we're exporting this file at */
@@ -52,7 +52,7 @@ typedef struct {
   * Variables associated with a client connection
   */
 typedef struct {
-       off_t exportsize;    /**< size of the file we're exporting */
+       uint64_t exportsize;    /**< size of the file we're exporting */
        char *clientname;    /**< peer, in human-readable format */
        struct sockaddr_storage clientaddr; /**< peer, in binary format, network byte order */
        char *exportname;    /**< (processed) filename of the file we're exporting */
@@ -170,8 +170,8 @@ int append_serve(const SERVER *const s, GArray *const a);
  * Detect the size of a file.
  *
  * @param fhandle An open filedescriptor
- * @return the size of the file, or OFFT_MAX if detection was
+ * @return the size of the file, or UINT64_MAX if detection was
  * impossible.
  **/
-off_t size_autodetect(int fhandle);
+uint64_t size_autodetect(int fhandle);
 #endif //NBDSRV_H