Fix get_basename() -- rewrite

[bacula/bacula] / bacula / src / lib / bsock.h

diff --git a/bacula/src/lib/bsock.h b/bacula/src/lib/bsock.h
index 4776d0daa2c8f7b7c8d3bf04a17b3972e5be9a26..fa2ad2a1ec8eaed8751e7461354fef0810001dad 100644 (file)
--- a/bacula/src/lib/bsock.h
+++ b/bacula/src/lib/bsock.h
@@ -86,16 +86,13 @@ private:
    int m_port;                        /* desired port */
    btimer_t *m_tid;                   /* timer id */
    boffset_t m_data_end;              /* offset of last valid data written */
+   int32_t m_FileIndex;               /* last valid attr spool FI */
    volatile bool m_timed_out: 1;      /* timed out in read/write */
    volatile bool m_terminated: 1;     /* set when BNET_TERMINATE arrives */
    bool m_duped: 1;                   /* set if duped BSOCK */
    bool m_spool: 1;                   /* set for spooling */
    bool m_use_locking: 1;             /* set to use locking */
 
-   int64_t m_bwlimit;                 /* set to limit bandwidth */
-   int64_t m_nb_bytes;                /* bytes sent/recv since the last tick */
-   btime_t m_last_tick;               /* last tick used by bwlimit */
-
    void fin_init(JCR * jcr, int sockfd, const char *who, const char *host, int port,
                struct sockaddr *lclient_addr);
    bool open(JCR *jcr, const char *name, char *host, char *service,
@@ -122,14 +119,14 @@ public:
    int set_nonblocking();
    int set_blocking();
    void restore_blocking(int flags);
+   void set_killable(bool killable);
    int wait_data(int sec, int usec=0);
    int wait_data_intr(int sec, int usec=0);
    bool authenticate_director(const char *name, const char *password,
-                  TLS_CONTEXT *tls_ctx, char *msg, int msglen);
+                  TLS_CONTEXT *tls_ctx, char *response, int response_len);
    bool set_locking();                /* in bsock.c */
    void clear_locking();              /* in bsock.c */
    void set_source_address(dlist *src_addr_list);
-   void control_bwlimit(int bytes);   /* in bsock.c */
 
    /* Inline functions */
    void set_jcr(JCR *jcr) { m_jcr = jcr; };
@@ -147,9 +144,14 @@ public:
    bool is_timed_out() { return m_timed_out; };
    bool is_stop() { return errors || is_terminated(); }
    bool is_error() { errno = b_errno; return errors; }
-   void set_data_end() { if (m_spool) m_data_end = ftello(m_spool_fd); };
-   void set_bwlimit(int64_t maxspeed) { m_bwlimit = maxspeed; };
-   bool use_bwlimit() { return m_bwlimit > 0;};
+   void set_data_end(int32_t FileIndex) { 
+          if (m_spool && FileIndex > m_FileIndex) {
+              m_FileIndex = FileIndex - 1;
+              m_data_end = ftello(m_spool_fd);
+           }
+        };
+   boffset_t get_data_end() { return m_data_end; };
+   int32_t get_FileIndex() { return m_FileIndex; };
    void set_spooling() { m_spool = true; };
    void clear_spooling() { m_spool = false; };
    void set_duped() { m_duped = true; };