-/*
- * Read code for Storage daemon
- *
- * Kern Sibbald, November MM
- *
- * Version $Id$
- */
/*
Bacula® - The Network Backup Solution
- Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
The main author of Bacula is Kern Sibbald, with contributions from
many others, a complete list can be found in the file AUTHORS.
This program is Free Software; you can redistribute it and/or
modify it under the terms of version two of the GNU General Public
- License as published by the Free Software Foundation plus additions
- that are listed in the file LICENSE.
+ License as published by the Free Software Foundation and included
+ in the file LICENSE.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Bacula® is a registered trademark of John Walker.
+ Bacula® is a registered trademark of Kern Sibbald.
The licensor of Bacula is the Free Software Foundation Europe
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
*/
+/*
+ * Read code for Storage daemon
+ *
+ * Kern Sibbald, November MM
+ *
+ * Version $Id$
+ */
#include "bacula.h"
#include "stored.h"
return false;
}
-
- create_restore_volume_list(jcr);
- if (jcr->NumVolumes == 0) {
+ if (jcr->NumReadVolumes == 0) {
Jmsg(jcr, M_FATAL, 0, _("No Volume names found for restore.\n"));
- free_restore_volume_list(jcr);
- bnet_fsend(fd, FD_error);
+ fd->fsend(FD_error);
return false;
}
- Dmsg2(200, "Found %d volumes names to restore. First=%s\n", jcr->NumVolumes,
+ Dmsg2(200, "Found %d volumes names to restore. First=%s\n", jcr->NumReadVolumes,
jcr->VolList->VolumeName);
/* Ready device for reading */
if (!acquire_device_for_read(dcr)) {
- free_restore_volume_list(jcr);
- bnet_fsend(fd, FD_error);
+ fd->fsend(FD_error);
return false;
}
/* Tell File daemon we will send data */
- bnet_fsend(fd, OK_data);
+ fd->fsend(OK_data);
ok = read_records(dcr, record_cb, mount_next_read_volume);
/* Send end of data to FD */
- bnet_sig(fd, BNET_EOD);
+ fd->signal(BNET_EOD);
if (!release_device(jcr->read_dcr)) {
ok = false;
}
- free_restore_volume_list(jcr);
Dmsg0(30, "Done reading.\n");
return ok;
}
BSOCK *fd = jcr->file_bsock;
bool ok = true;
POOLMEM *save_msg;
+ char ec1[50], ec2[50];
if (rec->FileIndex < 0) {
return true;
}
- Dmsg5(400, "Send to FD: SessId=%u SessTim=%u FI=%d Strm=%d, len=%d\n",
- rec->VolSessionId, rec->VolSessionTime, rec->FileIndex, rec->Stream,
+ Dmsg5(400, "Send to FD: SessId=%u SessTim=%u FI=%s Strm=%s, len=%d\n",
+ rec->VolSessionId, rec->VolSessionTime,
+ FI_to_ascii(ec1, rec->FileIndex),
+ stream_to_ascii(ec2, rec->Stream, rec->FileIndex),
rec->data_len);
/* Send record header to File daemon */
- if (!bnet_fsend(fd, rec_header, rec->VolSessionId, rec->VolSessionTime,
+ if (!fd->fsend(rec_header, rec->VolSessionId, rec->VolSessionTime,
rec->FileIndex, rec->Stream, rec->data_len)) {
Pmsg1(000, _(">filed: Error Hdr=%s\n"), fd->msg);
Jmsg1(jcr, M_FATAL, 0, _("Error sending to File daemon. ERR=%s\n"),
- bnet_strerror(fd));
+ fd->bstrerror());
return false;
} else {
Dmsg1(400, ">filed: Hdr=%s\n", fd->msg);
/* Send data record to File daemon */
save_msg = fd->msg; /* save fd message pointer */
- fd->msg = rec->data; /* pass data directly to bnet_send */
+ fd->msg = rec->data; /* pass data directly to the FD */
fd->msglen = rec->data_len;
Dmsg1(400, ">filed: send %d bytes data.\n", fd->msglen);
- if (!bnet_send(fd)) {
- Pmsg1(000, _("Error sending to FD. ERR=%s\n"), bnet_strerror(fd));
+ if (!fd->send()) {
+ Pmsg1(000, _("Error sending to FD. ERR=%s\n"), fd->bstrerror());
Jmsg1(jcr, M_FATAL, 0, _("Error sending to File daemon. ERR=%s\n"),
- bnet_strerror(fd));
+ fd->bstrerror());
ok = false;
}