Important protocol change -- see kes29Oct02

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

diff --git a/bacula/src/lib/protos.h b/bacula/src/lib/protos.h
index 20f5f3095e4fab754c0684d948ab706baea43d83..14d2bf3a0807a69ef81eae04aa48683cc0483eff 100644 (file)
--- a/bacula/src/lib/protos.h
+++ b/bacula/src/lib/protos.h
@@ -27,8 +27,6 @@
 void     base64_init            (void);
 int      to_base64              (intmax_t value, char *where);
 int      from_base64            (intmax_t *value, char *where);
-void     encode_stat            (char *buf, struct stat *statp);
-void     decode_stat            (char *buf, struct stat *statp);
 int      bin_to_base64          (char *buf, char *bin, int len);
 
 /* bmisc.c */
@@ -44,9 +42,6 @@ int     bvsnprintf             (char *str, size_t size, const char  *format, va_list ap);
 int      pool_sprintf           (char *pool_buf, char *fmt, ...);
 void     create_pid_file        (char *dir, char *progname, int port);
 int      delete_pid_file        (char *dir, char *progname, int port);
-#ifndef HAVE_STRERROR_R
-int      strerror_r             (int errnum, char *buf, size_t bufsiz);
-#endif
 
 
 /* bnet.c */
@@ -60,13 +55,15 @@ BSOCK *    bnet_connect        (void *jcr, int retry_interval,
               int port, int verbose);
 int       bnet_wait_data         (BSOCK *bsock, int sec);
 void      bnet_close            (BSOCK *bsock);
-BSOCK *    init_bsock           (int sockfd, char *who, char *ip, int port);
+BSOCK *    init_bsock           (void *jcr, int sockfd, char *who, char *ip, int port);
 BSOCK *    dup_bsock            (BSOCK *bsock);
 void      term_bsock            (BSOCK *bsock);
 char *    bnet_strerror         (BSOCK *bsock);
 char *    bnet_sig_to_ascii     (BSOCK *bsock);
 int       bnet_wait_data        (BSOCK *bsock, int sec);
 int       bnet_despool          (BSOCK *bsock);
+int       is_bnet_stop          (BSOCK *bsock);
+int       is_bnet_error         (BSOCK *bsock);
 
 
 /* cram-md5.c */
@@ -75,13 +72,6 @@ int cram_md5_auth(BSOCK *bs, char *password);
 void hmac_md5(uint8_t* text, int text_len, uint8_t*  key,
              int key_len, uint8_t *hmac);
 
-/* create_file.c */
-int create_file(void *jcr, char *fname, char *ofile, char *lname,
-                      int type, struct stat *statp, int *ofd);
-int set_statp(void *jcr, char *fname, char *ofile, char *lname, int type, 
-                      struct stat *statp);
-
-
 /* crc32.c */
 uint32_t bcrc32(uint8_t *buf, int len);
 
@@ -96,18 +86,6 @@ void   lex_unget_char         (LEX *lf);
 char *   lex_tok_to_str         (int token);
 int      lex_get_token          (LEX *lf, int expect);
 
-/* makepath.c */
-int make_path(
-          void *jcr,
-          const char *argpath,
-          int mode,
-          int parent_mode,
-          uid_t owner,
-          gid_t group,
-          int preserve_existing,
-          char *verbose_fmt_string);
-
-
 /* message.c */
 void      my_name_is            (int argc, char *argv[], char *name);
 void      init_msg              (void *jcr, MSGS *msg);
@@ -124,7 +102,7 @@ int    close_spool_file      (void *vjcr, BSOCK *bs);
 
 
 /* bnet_server.c */
-void      bnet_thread_server(int port, int max_clients, workq_t *client_wq, 
+void      bnet_thread_server(char *bind_addr, int port, int max_clients, workq_t *client_wq, 
                   void handle_client_request(void *bsock));
 void            bnet_server             (int port, void handle_client_request(BSOCK *bsock));
 int             net_connect             (int port);
@@ -151,19 +129,19 @@ char *             add_commas              (char *val, char *buf);
 char *          edit_uint64             (uint64_t val, char *buf);
 int             do_shell_expansion      (char *name);
 int             is_a_number             (const char *num);
+int             is_buf_zero             (char *buf, int len);
 int             string_to_btime         (char *str, btime_t *value);
 char            *edit_btime             (btime_t val, char *buf);
 void            jobstatus_to_ascii      (int JobStatus, char *msg, int maxlen);
-void            add_str_to_pool_mem     (POOLMEM **base, char **msg, char *str);
+void            pm_strcat               (POOLMEM **pm, char *str);
+void            pm_strcpy               (POOLMEM **pm, char *str);
 int             run_program             (char *prog, int wait, POOLMEM *results);
 char *          job_type_to_str         (int type);
 char *          job_status_to_str       (int stat);
 char *          job_level_to_str        (int level);
+void            makeSessionKey          (char *key, char *seed, int mode);
 
 
-/*
- *void          print_ls_output         (char *fname, char *lname, int type, struct stat *statp);
- */
 
 /* watchdog.c */
 int start_watchdog(void);