/*
Bacula® - The Network Backup Solution
- Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2011 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
+ modify it under the terms of version three of the GNU Affero General Public
License as published by the Free Software Foundation and included
in the file LICENSE.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Affero General Public License
along with this program; if not, write to the Free Software
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.
* Adapted and enhanced for Bacula, originally written
* for inclusion in the Apcupsd package
*
- * Version $Id$
*/
#include "jcr.h"
#include <netdb.h>
-extern time_t watchdog_time;
-
#ifndef INADDR_NONE
#define INADDR_NONE -1
#endif
continue;
}
if (errno == EAGAIN) {
- bmicrosleep(0, 200000); /* try again in 200ms */
+ bmicrosleep(0, 20000); /* try again in 20ms */
continue;
}
}
{
int32_t nleft, nwritten;
- if (bsock->m_spool) {
+ if (bsock->is_spooling()) {
nwritten = fwrite(ptr, 1, nbytes, bsock->m_spool_fd);
if (nwritten != nbytes) {
berrno be;
FD_ZERO(&fdset);
FD_SET((unsigned)bsock->m_fd, &fdset);
- tv.tv_sec = 10;
+ tv.tv_sec = 1;
tv.tv_usec = 0;
select(bsock->m_fd + 1, NULL, &fdset, NULL, &tv);
continue;
*/
bool is_bnet_stop(BSOCK * bsock)
{
- return bsock->errors || bsock->is_terminated();
+ return bsock->is_stop();
}
/*
*/
int is_bnet_error(BSOCK * bsock)
{
- errno = bsock->b_errno;
- return bsock->errors;
+ return bsock->is_error();
}
/*
bool bnet_tls_server(TLS_CONTEXT *ctx, BSOCK * bsock, alist *verify_list)
{
TLS_CONNECTION *tls;
+ JCR *jcr = bsock->jcr();
tls = new_tls_connection(ctx, bsock->m_fd);
if (!tls) {
}
if (verify_list) {
- if (!tls_postconnect_verify_cn(tls, verify_list)) {
+ if (!tls_postconnect_verify_cn(jcr, tls, verify_list)) {
Qmsg1(bsock->jcr(), M_FATAL, 0, _("TLS certificate verification failed."
" Peer certificate did not match a required commonName\n"),
bsock->host());
goto err;
}
}
+ Dmsg0(50, "TLS server negotiation established.\n");
return true;
err:
bool bnet_tls_client(TLS_CONTEXT *ctx, BSOCK * bsock, alist *verify_list)
{
TLS_CONNECTION *tls;
+ JCR *jcr = bsock->jcr();
tls = new_tls_connection(ctx, bsock->m_fd);
if (!tls) {
/* If there's an Allowed CN verify list, use that to validate the remote
* certificate's CN. Otherwise, we use standard host/CN matching. */
if (verify_list) {
- if (!tls_postconnect_verify_cn(tls, verify_list)) {
+ if (!tls_postconnect_verify_cn(jcr, tls, verify_list)) {
Qmsg1(bsock->jcr(), M_FATAL, 0, _("TLS certificate verification failed."
" Peer certificate did not match a required commonName\n"),
bsock->host());
goto err;
}
} else {
- if (!tls_postconnect_verify_host(tls, bsock->host())) {
- Qmsg1(bsock->jcr(), M_FATAL, 0, _("TLS host certificate verification failed. Host %s did not match presented certificate\n"),
+ if (!tls_postconnect_verify_host(jcr, tls, bsock->host())) {
+ Qmsg1(bsock->jcr(), M_FATAL, 0, _("TLS host certificate verification failed. Host name \"%s\" did not match presented certificate\n"),
bsock->host());
goto err;
}
}
-
+ Dmsg0(50, "TLS client negotiation established.\n");
return true;
err:
return 0;
}
} else {
- errmsg = resolv_host(AF_INET, host, addr_list);
#ifdef HAVE_IPV6
- if (errmsg) {
- errmsg = resolv_host(AF_INET6, host, addr_list);
- }
+ /* We try to resolv host for ipv6 and ipv4, the connection procedure
+ * will try to reach the host for each protocols. We report only "Host
+ * not found" ipv4 message (no need to have ipv6 and ipv4 messages).
+ */
+ resolv_host(AF_INET6, host, addr_list);
#endif
- if (errmsg) {
+ errmsg = resolv_host(AF_INET, host, addr_list);
+
+ if (addr_list->size() == 0) {
*errstr = errmsg;
free_addresses(addr_list);
return 0;
return "BNET_HEARTBEAT";
case BNET_HB_RESPONSE:
return "BNET_HB_RESPONSE";
- case BNET_PROMPT:
- return "BNET_PROMPT";
+ case BNET_SUB_PROMPT:
+ return "BNET_SUB_PROMPT";
+ case BNET_TEXT_INPUT:
+ return "BNET_TEXT_INPUT";
default:
sprintf(buf, _("Unknown sig %d"), (int)bs->msglen);
return buf;
bsock->tls = NULL;
bsock->errors = 0;
bsock->m_blocking = 1;
- bsock->msg = get_pool_memory(PM_MESSAGE);
+ bsock->msg = get_pool_memory(PM_BSOCK);
bsock->errmsg = get_pool_memory(PM_MESSAGE);
bsock->set_who(bstrdup(who));
bsock->set_host(bstrdup(host));
return bsock;
}
-BSOCK *dup_bsock(BSOCK * osock)
+BSOCK *dup_bsock(BSOCK *osock)
{
BSOCK *bsock = (BSOCK *)malloc(sizeof(BSOCK));
memcpy(bsock, osock, sizeof(BSOCK));
- bsock->msg = get_pool_memory(PM_MESSAGE);
+ bsock->msg = get_pool_memory(PM_BSOCK);
bsock->errmsg = get_pool_memory(PM_MESSAGE);
if (osock->who()) {
bsock->set_who(bstrdup(osock->who()));
if (osock->host()) {
bsock->set_host(bstrdup(osock->host()));
}
- bsock->m_duped = true;
+ if (osock->src_addr) {
+ bsock->src_addr = New( IPADDR( *(osock->src_addr)) );
+ }
+ bsock->set_duped();
return bsock;
}