From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 21 Aug 2009 11:26:17 +0000 (+0200)
Subject: Rework the bsock.h class to put public structures last
X-Git-Tag: Release-7.0.0~2649^2~8^2~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0d87ab1cb6fc2d7a224982f03fd2c82897926775;p=bacula%2Fbacula

Rework the bsock.h class to put public structures last
---

diff --git a/bacula/src/lib/bsock.h b/bacula/src/lib/bsock.h
index dc814a72f3..8c04a6e9cf 100644
--- a/bacula/src/lib/bsock.h
+++ b/bacula/src/lib/bsock.h
@@ -68,14 +68,15 @@ public:
    int32_t msglen;                    /* message length */
    volatile time_t timer_start;       /* time started read/write */
    volatile time_t timeout;           /* timeout BSOCK after this interval */
-   struct sockaddr client_addr;       /* client's IP address */
-   struct sockaddr_in peer_addr;      /* peer's IP address */
    int m_fd;                          /* socket file descriptor */
    int b_errno;                       /* bsock errno */
    int m_blocking;                    /* blocking state (0 = nonblocking, 1 = blocking) */
    volatile int errors;               /* incremented for each error on socket */
    volatile bool m_suppress_error_msgs; /* set to suppress error messages */
 
+   struct sockaddr client_addr;       /* client's IP address */
+   struct sockaddr_in peer_addr;      /* peer's IP address */
+
 private:
    BSOCK *m_next;                     /* next BSOCK if duped */
    JCR *m_jcr;                        /* jcr or NULL for error msgs */
diff --git a/bacula/technotes b/bacula/technotes
index 047d39520b..9a09b81241 100644
--- a/bacula/technotes
+++ b/bacula/technotes
@@ -3,6 +3,8 @@
 General:
 
 21Aug09
+kes  Rework the bsock.h class to put public structures last
+20Aug09
 kes  Integrate patch for building dmg on OSX from Lorenz Schori <lo@znerol.ch>
 kes  Add commas in num files for estimate command
 19Aug09