time_t end_time; /* job end time */
POOLMEM *VolumeName; /* Volume name desired -- pool_memory */
POOLMEM *client_name; /* client name */
- POOLMEM *RestoreBootstrap; /* Bootstrap file to restore */
+ char *RestoreBootstrap; /* Bootstrap file to restore */
char *sd_auth_key; /* SD auth key */
- MSGS *msgs; /* Message resource */
+ MSGS *jcr_msgs; /* Copy of message resource -- actually used */
+ uint32_t ClientId; /* Client associated with Job */
/* Daemon specific part of JCR */
/* This should be empty in the library */
POOL *pool; /* Pool resource */
FILESET *fileset; /* FileSet resource */
CAT *catalog; /* Catalog resource */
+ MSGS *messages; /* Default message handler */
int SDJobStatus; /* Storage Job Status */
int mode; /* manual/auto run */
B_DB *db; /* database pointer */
- int MediaId; /* DB record IDs associated with this job */
- int ClientId; /* Client associated with file */
+ uint32_t MediaId; /* DB record IDs associated with this job */
uint32_t PoolId; /* Pool record id */
FileId_t FileId; /* Last file id inserted */
uint32_t FileIndex; /* Last FileIndex processed */
int fn_printed; /* printed filename */
POOLMEM *stime; /* start time for incremental/differential */
JOB_DBR jr; /* Job record in Database */
- int RestoreJobId; /* Id specified by UA */
+ uint32_t RestoreJobId; /* Id specified by UA */
char *RestoreWhere; /* Where to restore the files */
#endif /* DIRECTOR_DAEMON */
#ifdef STORAGE_DAEMON
/* Storage Daemon specific part of JCR */
+ struct s_jcr *next_dev; /* next JCR attached to device */
+ struct s_jcr *prev_dev; /* previous JCR attached to device */
pthread_cond_t job_start_wait; /* Wait for FD to start Job */
int type;
DEVRES *device; /* device to use */
DEV_RECORD rec; /* Read/Write record */
long Ticket; /* ticket for this job */
uint32_t VolFirstFile; /* First file index this Volume */
+ uint32_t FileIndex; /* Current File Index */
uint32_t start_block; /* Start write block */
uint32_t start_file; /* Start write file */
uint32_t end_block; /* Ending block written */
extern void free_jcr(JCR *jcr);
extern void free_locked_jcr(JCR *jcr);
extern JCR *get_jcr_by_id(uint32_t JobId);
+extern JCR *get_jcr_by_session(uint32_t SessionId, uint32_t SessionTime);
extern JCR *get_jcr_by_partial_name(char *Job);
extern JCR *get_jcr_by_full_name(char *Job);
extern JCR *get_next_jcr(JCR *jcr);