extern "C" void *device_allocation(void *arg);
+
+
#define CONFIG_FILE "bacula-sd.conf" /* Default config file */
static void usage()
{
fprintf(stderr, _(
+"Copyright (C) 2000-2004 Kern Sibbald and John Walker.\n"
"\nVersion: " VERSION " (" BDATE ")\n\n"
"Usage: stored [options] [-c config_file] [config_file]\n"
" -c <file> use <file> as configuration file\n"
init_stack_dump(); /* pick up new pid */
}
- create_pid_file(me->pid_directory, "bacula-sd", me->SDport);
- read_state_file(me->working_directory, "bacula-sd", me->SDport);
+ create_pid_file(me->pid_directory, "bacula-sd", get_first_port_host_order(me->sdaddrs));
+ read_state_file(me->working_directory, "bacula-sd", get_first_port_host_order(me->sdaddrs));
drop(uid, gid);
bmicrosleep(1, 0);
/* Single server used for Director and File daemon */
- bnet_thread_server(me->SDaddr, me->SDport, me->max_concurrent_jobs * 2 + 1,
- &dird_workq, connection_request);
+ bnet_thread_server(me->sdaddrs, me->max_concurrent_jobs * 2 + 1,
+ &dird_workq, handle_connection_request);
exit(1); /* to keep compiler quiet */
}
JCR *jcr;
DCR *dcr;
jcr = new_jcr(sizeof(JCR), stored_free_jcr);
+ jcr->JobType = JT_SYSTEM;
+ /* Initialize FD start condition variable */
+ int errstat = pthread_cond_init(&jcr->job_start_wait, NULL);
+ if (errstat != 0) {
+ Jmsg1(jcr, M_ABORT, 0, _("Unable to init job cond variable: ERR=%s\n"), strerror(errstat));
+ }
jcr->device = device;
dcr = new_dcr(jcr, device->dev);
- switch (read_dev_volume_label(jcr, device->dev, dcr->block)) {
+ switch (read_dev_volume_label(dcr, dcr->block)) {
case VOL_OK:
break;
default:
bmicrosleep(0, 500000); /* give them 1/2 sec to clean up */
}
- write_state_file(me->working_directory, "bacula-sd", me->SDport);
- delete_pid_file(me->pid_directory, "bacula-sd", me->SDport);
+ write_state_file(me->working_directory, "bacula-sd", get_first_port_host_order(me->sdaddrs));
+ delete_pid_file(me->pid_directory, "bacula-sd", get_first_port_host_order(me->sdaddrs));
Dmsg1(200, "In terminate_stored() sig=%d\n", sig);