Merge Meno's IPv6-1 code

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

diff --git a/bacula/src/lib/protos.h b/bacula/src/lib/protos.h
index 5f97e090d86bd4368951d23cdca05c3dd56ff008..63d9a8d09a0c9b3661f28f81d7b94cea5abd97da 100644 (file)
--- a/bacula/src/lib/protos.h
+++ b/bacula/src/lib/protos.h
@@ -59,32 +59,34 @@ void          make_unique_filename   (POOLMEM **name, int Id, char *what);
 #ifndef HAVE_STRTOLL
 long long int strtoll           (const char *ptr, char **endptr, int base);
 #endif
-void read_state_file(char *dir, const char *progname, int port);
+void     read_state_file(char *dir, const char *progname, int port);
+int      bstrerror(int errnum, char *buf, size_t bufsiz);
 
 /* bnet.c */
 int32_t    bnet_recv            (BSOCK *bsock);
-int       bnet_send             (BSOCK *bsock);
-int       bnet_fsend            (BSOCK *bs, const char *fmt, ...);
-int       bnet_set_buffer_size  (BSOCK *bs, uint32_t size, int rw);
-int       bnet_sig              (BSOCK *bs, int sig);
+bool      bnet_send             (BSOCK *bsock);
+bool      bnet_fsend            (BSOCK *bs, const char *fmt, ...);
+bool      bnet_set_buffer_size  (BSOCK *bs, uint32_t size, int rw);
+bool      bnet_sig              (BSOCK *bs, int sig);
 int       bnet_ssl_server       (BSOCK *bsock, char *password, int ssl_need, int ssl_has);
 int       bnet_ssl_client       (BSOCK *bsock, char *password, int ssl_need);
 BSOCK *    bnet_connect           (JCR *jcr, int retry_interval,
               int max_retry_time, const char *name, char *host, char *service, 
               int port, int verbose);
 void      bnet_close            (BSOCK *bsock);
-BSOCK *    init_bsock           (JCR *jcr, int sockfd, const char *who, char *ip, 
-                                 int port, struct sockaddr_in *client_addr);
+BSOCK *    init_bsock           (JCR *jcr, int sockfd, const char *who, const char *ip, 
+                                 int port, struct sockaddr *client_addr);
 BSOCK *    dup_bsock            (BSOCK *bsock);
 void      term_bsock            (BSOCK *bsock);
 char *    bnet_strerror         (BSOCK *bsock);
-char *    bnet_sig_to_ascii     (BSOCK *bsock);
+const char *bnet_sig_to_ascii    (BSOCK *bsock);
 int       bnet_wait_data        (BSOCK *bsock, int sec);
 int       bnet_wait_data_intr   (BSOCK *bsock, int sec);
-int       bnet_despool_to_bsock (BSOCK *bsock);
-int       is_bnet_stop          (BSOCK *bsock);
+int       bnet_despool_to_bsock (BSOCK *bsock, void update(ssize_t size), ssize_t size);
+bool      is_bnet_stop          (BSOCK *bsock);
 int       is_bnet_error         (BSOCK *bsock);
-void      bnet_suppress_error_messages(BSOCK *bsock, int flag);
+void      bnet_suppress_error_messages(BSOCK *bsock, bool flag);
+dlist *bnet_host2ipaddrs(const char *host, int family, const char **errstr);
 
 /* bget_msg.c */
 int     bget_msg(BSOCK *sock);
@@ -128,12 +130,12 @@ void unlock_last_jobs_list();
 void read_last_jobs_list(int fd, uint64_t addr);
 uint64_t write_last_jobs_list(int fd, uint64_t addr);
 void write_state_file(char *dir, const char *progname, int port);
-void job_end_push(JCR *jcr, void job_end_cb(JCR *jcr));
+void job_end_push(JCR *jcr, void job_end_cb(JCR *jcr,void *), void *ctx);
 
 
 /* lex.c */
 LEX *    lex_close_file         (LEX *lf);
-LEX *    lex_open_file          (LEX *lf, char *fname, LEX_ERROR_HANDLER *scan_error);
+LEX *    lex_open_file          (LEX *lf, const char *fname, LEX_ERROR_HANDLER *scan_error);
 int      lex_get_char           (LEX *lf);
 void     lex_unget_char         (LEX *lf);
 const char *  lex_tok_to_str    (int token);
@@ -148,15 +150,14 @@ void         add_msg_dest          (MSGS *msg, int dest, int type, char *where, char *dest_c
 void      rem_msg_dest          (MSGS *msg, int dest, int type, char *where);
 void      Jmsg                  (JCR *jcr, int type, int level, const char *fmt, ...);
 void      dispatch_message      (JCR *jcr, int type, int level, char *buf);
-void      init_console_msg      (char *wd);
+void      init_console_msg      (const char *wd);
 void      free_msgs_res         (MSGS *msgs);
-int       open_spool_file       (JCR *jcr, BSOCK *bs);
-int       close_spool_file      (JCR *jcr, BSOCK *bs);
 void      dequeue_messages      (JCR *jcr);
-
+void      set_trace             (int trace_flag);
+void      set_exit_on_error     (int value);
 
 /* bnet_server.c */
-void      bnet_thread_server(char *bind_addr, int port, int max_clients, workq_t *client_wq, 
+void      bnet_thread_server(dlist *addr, int max_clients, workq_t *client_wq, 
                   void *handle_client_request(void *bsock));
 void      bnet_stop_thread_server(pthread_t tid);
 void            bnet_server             (int port, void handle_client_request(BSOCK *bsock));
@@ -180,10 +181,14 @@ void               strip_trailing_junk     (char *str);
 void            strip_trailing_slashes  (char *dir);
 bool            skip_spaces             (char **msg);
 bool            skip_nonspaces          (char **msg);
-int             fstrsch                 (char *a, char *b);
+int             fstrsch                 (const char *a, const char *b);
+char           *next_arg(char **s);
 int             parse_args(POOLMEM *cmd, POOLMEM **args, int *argc, 
                        char **argk, char **argv, int max_args);
-char           *next_arg(char **s);
+void           split_path_and_filename(const char *fname, POOLMEM **path, 
+                       int *pnl, POOLMEM **file, int *fnl);
+int            bsscanf(const char *buf, const char *fmt, ...);
+
 
 /* util.c */
 int             is_buf_zero             (char *buf, int len);
@@ -197,9 +202,9 @@ void                 jobstatus_to_ascii      (int JobStatus, char *msg, int maxlen);
 int             pm_strcat               (POOLMEM **pm, const char *str);
 int             pm_strcpy               (POOLMEM **pm, const 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);
+const char *    job_type_to_str         (int type);
+const char *    job_status_to_str       (int stat);
+const char *    job_level_to_str        (int level);
 void            make_session_key        (char *key, char *seed, int mode);
 POOLMEM        *edit_job_codes(JCR *jcr, char *omsg, char *imsg, const char *to);
 void            set_working_directory(char *wd);