* Version $Id$
*/
/*
- Copyright (C) 2000-2005 Kern Sibbald
+ Copyright (C) 2000-2006 Kern Sibbald
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
- version 2 as ammended with additional clauses defined in the
+ version 2 as amended with additional clauses defined in the
file LICENSE in the main source directory.
This program is distributed in the hope that it will be useful,
/*
* Read Data and send to File Daemon
* Returns: false on failure
- * true on success
+ * true on success
*/
bool do_read_data(JCR *jcr)
{
BSOCK *fd = jcr->file_bsock;
bool ok = true;
- DCR *dcr = jcr->dcr;
+ DCR *dcr = jcr->read_dcr;
Dmsg0(20, "Start read data.\n");
}
- create_vol_list(jcr);
+ create_restore_volume_list(jcr);
if (jcr->NumVolumes == 0) {
Jmsg(jcr, M_FATAL, 0, _("No Volume names found for restore.\n"));
- free_vol_list(jcr);
+ free_restore_volume_list(jcr);
bnet_fsend(fd, FD_error);
return false;
}
/* Ready device for reading */
if (!acquire_device_for_read(dcr)) {
- free_vol_list(jcr);
+ free_restore_volume_list(jcr);
bnet_fsend(fd, FD_error);
return false;
}
/* Send end of data to FD */
bnet_sig(fd, BNET_EOD);
- if (!release_device(dcr)) {
+ if (!release_device(jcr->read_dcr)) {
ok = false;
}
- free_vol_list(jcr);
+ free_restore_volume_list(jcr);
Dmsg0(30, "Done reading.\n");
return ok;
}
/*
* Called here for each record from read_records()
* Returns: true if OK
- * false if error
+ * false if error
*/
static bool record_cb(DCR *dcr, DEV_RECORD *rec)
{
if (rec->FileIndex < 0) {
return true;
}
- Dmsg5(100, "Send to FD: SessId=%u SessTim=%u FI=%d Strm=%d, len=%d\n",
+ Dmsg5(400, "Send to FD: SessId=%u SessTim=%u FI=%d Strm=%d, len=%d\n",
rec->VolSessionId, rec->VolSessionTime, rec->FileIndex, rec->Stream,
rec->data_len);
/* Send record header to File daemon */
if (!bnet_fsend(fd, rec_header, rec->VolSessionId, rec->VolSessionTime,
- rec->FileIndex, rec->Stream, rec->data_len)) {
- Dmsg1(30, ">filed: Error Hdr=%s\n", fd->msg);
+ 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));
+ bnet_strerror(fd));
return false;
} else {
- Dmsg1(31, ">filed: Hdr=%s\n", fd->msg);
+ 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 */
+ save_msg = fd->msg; /* save fd message pointer */
+ fd->msg = rec->data; /* pass data directly to bnet_send */
fd->msglen = rec->data_len;
- Dmsg1(31, ">filed: send %d bytes data.\n", fd->msglen);
+ 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));
+ Pmsg1(000, _("Error sending to FD. ERR=%s\n"), bnet_strerror(fd));
Jmsg1(jcr, M_FATAL, 0, _("Error sending to File daemon. ERR=%s\n"),
- bnet_strerror(fd));
+ bnet_strerror(fd));
ok = false;
}
- fd->msg = save_msg; /* restore fd message pointer */
+ fd->msg = save_msg; /* restore fd message pointer */
return ok;
}