#define INADDR_NONE -1
#endif
-#ifndef ENODATA /* not defined on BSD systems */
-#define ENODATA EPIPE
-#endif
-
#ifdef HAVE_WIN32
#define socketRead(fd, buf, len) recv(fd, buf, len, 0)
#define socketWrite(fd, buf, len) send(fd, buf, len, 0)
nleft = nbytes;
while (nleft > 0) {
errno = 0;
- nread = socketRead(bsock->fd, ptr, nleft);
- if (bsock->timed_out || bsock->terminated) {
+ nread = socketRead(bsock->m_fd, ptr, nleft);
+ if (bsock->is_timed_out() || bsock->is_terminated()) {
return nread;
}
if (nread == -1) {
{
int32_t nleft, nwritten;
- if (bsock->spool) {
- nwritten = fwrite(ptr, 1, nbytes, bsock->spool_fd);
+ if (bsock->m_spool) {
+ nwritten = fwrite(ptr, 1, nbytes, bsock->m_spool_fd);
if (nwritten != nbytes) {
berrno be;
bsock->b_errno = errno;
Qmsg1(bsock->jcr(), M_FATAL, 0, _("Attr spool write error. ERR=%s\n"),
- be.strerror());
+ be.bstrerror());
Dmsg2(400, "nwritten=%d nbytes=%d.\n", nwritten, nbytes);
errno = bsock->b_errno;
return -1;
while (nleft > 0) {
do {
errno = 0;
- nwritten = socketWrite(bsock->fd, ptr, nleft);
- if (bsock->timed_out || bsock->terminated) {
+ nwritten = socketWrite(bsock->m_fd, ptr, nleft);
+ if (bsock->is_timed_out() || bsock->is_terminated()) {
return nwritten;
}
} while (nwritten == -1 && errno == EINTR);
struct timeval tv;
FD_ZERO(&fdset);
- FD_SET((unsigned)bsock->fd, &fdset);
+ FD_SET((unsigned)bsock->m_fd, &fdset);
tv.tv_sec = 10;
tv.tv_usec = 0;
- select(bsock->fd + 1, NULL, &fdset, NULL, &tv);
+ select(bsock->m_fd + 1, NULL, &fdset, NULL, &tv);
continue;
}
if (nwritten <= 0) {
*/
bool is_bnet_stop(BSOCK * bsock)
{
- return bsock->errors || bsock->terminated;
+ return bsock->errors || bsock->is_terminated();
}
/*
*/
void bnet_suppress_error_messages(BSOCK * bsock, bool flag)
{
- bsock->suppress_error_msgs = flag;
+ bsock->m_suppress_error_msgs = flag;
}
-
-/*
- * Transmit spooled data now to a BSOCK
- */
-int bnet_despool_to_bsock(BSOCK * bsock, void update_attr_spool_size(ssize_t size),
- ssize_t tsize)
-{
- int32_t pktsiz;
- size_t nbytes;
- ssize_t last = 0, size = 0;
- int count = 0;
-
- rewind(bsock->spool_fd);
- while (fread((char *)&pktsiz, 1, sizeof(int32_t), bsock->spool_fd) ==
- sizeof(int32_t)) {
- size += sizeof(int32_t);
- bsock->msglen = ntohl(pktsiz);
- if (bsock->msglen > 0) {
- if (bsock->msglen > (int32_t) sizeof_pool_memory(bsock->msg)) {
- bsock->msg = realloc_pool_memory(bsock->msg, bsock->msglen + 1);
- }
- nbytes = fread(bsock->msg, 1, bsock->msglen, bsock->spool_fd);
- if (nbytes != (size_t) bsock->msglen) {
- berrno be;
- Dmsg2(400, "nbytes=%d msglen=%d\n", nbytes, bsock->msglen);
- Qmsg1(bsock->jcr(), M_FATAL, 0, _("fread attr spool error. ERR=%s\n"),
- be.strerror());
- update_attr_spool_size(tsize - last);
- return 0;
- }
- size += nbytes;
- if ((++count & 0x3F) == 0) {
- update_attr_spool_size(size - last);
- last = size;
- }
- }
- bnet_send(bsock);
- }
- update_attr_spool_size(tsize - last);
- if (ferror(bsock->spool_fd)) {
- berrno be;
- Qmsg1(bsock->jcr(), M_FATAL, 0, _("fread attr spool error. ERR=%s\n"),
- be.strerror());
- return 0;
- }
- return 1;
-}
-
-
/*
* Send a message over the network. The send consists of
* two network packets. The first is sends a 32 bit integer containing
return bsock->send();
}
-#ifdef xxx
-bool bnet_send(BSOCK * bsock)
-{
- int32_t rc;
- int32_t pktsiz;
-
- if (bsock->errors || bsock->terminated || bsock->msglen > 1000000) {
- return false;
- }
- pktsiz = htonl((int32_t)bsock->msglen);
- /* send int32_t containing size of data packet */
- bsock->timer_start = watchdog_time; /* start timer */
- bsock->timed_out = 0;
- rc = write_nbytes(bsock, (char *)&pktsiz, sizeof(int32_t));
- bsock->timer_start = 0; /* clear timer */
- if (rc != sizeof(int32_t)) {
- if (bsock->msglen == BNET_TERMINATE) { /* if we were terminating */
- bsock->terminated = 1;
- return false; /* ignore any errors */
- }
- bsock->errors++;
- if (errno == 0) {
- bsock->b_errno = EIO;
- } else {
- bsock->b_errno = errno;
- }
- if (rc < 0) {
- if (!bsock->suppress_error_msgs && !bsock->timed_out) {
- Qmsg4(bsock->jcr(), M_ERROR, 0,
- _("Write error sending len to %s:%s:%d: ERR=%s\n"), bsock->who,
- bsock->host(), bsock->port(), bnet_strerror(bsock));
- }
- } else {
- Qmsg5(bsock->jcr(), M_ERROR, 0,
- _("Wrote %d bytes to %s:%s:%d, but only %d accepted.\n"),
- sizeof(int32_t), bsock->who(),
- bsock->host(), bsock->port(), rc);
- }
- return false;
- }
-
- bsock->out_msg_no++; /* increment message number */
- if (bsock->msglen <= 0) { /* length only? */
- return true; /* yes, no data */
- }
-
- /* send data packet */
- bsock->timer_start = watchdog_time; /* start timer */
- bsock->timed_out = 0;
- rc = write_nbytes(bsock, bsock->msg, bsock->msglen);
- bsock->timer_start = 0; /* clear timer */
- if (rc != bsock->msglen) {
- bsock->errors++;
- if (errno == 0) {
- bsock->b_errno = EIO;
- } else {
- bsock->b_errno = errno;
- }
- if (rc < 0) {
- if (!bsock->suppress_error_msgs) {
- Qmsg5(bsock->jcr(), M_ERROR, 0,
- _("Write error sending %d bytes to %s:%s:%d: ERR=%s\n"),
- bsock->msglen, bsock->who(),
- bsock->host(), bsock->port(), bnet_strerror(bsock));
- }
- } else {
- Qmsg5(bsock->jcr(), M_ERROR, 0,
- _("Wrote %d bytes to %s:%s:%d, but only %d accepted.\n"),
- bsock->msglen, bsock->who(), bsock->host(),
- bsock->port(), rc);
- }
- return false;
- }
- return true;
-}
-#endif
/*
* Establish a TLS connection -- server side
{
TLS_CONNECTION *tls;
- tls = new_tls_connection(ctx, bsock->fd);
+ tls = new_tls_connection(ctx, bsock->m_fd);
if (!tls) {
Qmsg0(bsock->jcr(), M_FATAL, 0, _("TLS connection initialization failed.\n"));
return false;
* Returns: true on success
* false on failure
*/
-bool bnet_tls_client(TLS_CONTEXT *ctx, BSOCK * bsock)
+bool bnet_tls_client(TLS_CONTEXT *ctx, BSOCK * bsock, alist *verify_list)
{
TLS_CONNECTION *tls;
- tls = new_tls_connection(ctx, bsock->fd);
+ tls = new_tls_connection(ctx, bsock->m_fd);
if (!tls) {
Qmsg0(bsock->jcr(), M_FATAL, 0, _("TLS connection initialization failed.\n"));
return false;
goto err;
}
- 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"),
- bsock->host());
- goto err;
+ /* 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)) {
+ 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"),
+ bsock->host());
+ goto err;
+ }
}
+
return true;
err:
return false;
}
#else
+
bool bnet_tls_server(TLS_CONTEXT *ctx, BSOCK * bsock, alist *verify_list)
{
Jmsg(bsock->jcr(), M_ABORT, 0, _("TLS enabled but not configured.\n"));
return false;
}
-bool bnet_tls_client(TLS_CONTEXT *ctx, BSOCK * bsock)
+
+bool bnet_tls_client(TLS_CONTEXT *ctx, BSOCK * bsock, alist *verify_list)
{
Jmsg(bsock->jcr(), M_ABORT, 0, _("TLS enable but not configured.\n"));
return false;
}
+
#endif /* HAVE_TLS */
/*
struct timeval tv;
FD_ZERO(&fdset);
- FD_SET((unsigned)bsock->fd, &fdset);
+ FD_SET((unsigned)bsock->m_fd, &fdset);
for (;;) {
tv.tv_sec = sec;
tv.tv_usec = 0;
- switch (select(bsock->fd + 1, &fdset, NULL, NULL, &tv)) {
+ switch (select(bsock->m_fd + 1, &fdset, NULL, NULL, &tv)) {
case 0: /* timeout */
bsock->b_errno = 0;
return 0;
struct timeval tv;
FD_ZERO(&fdset);
- FD_SET((unsigned)bsock->fd, &fdset);
+ FD_SET((unsigned)bsock->m_fd, &fdset);
tv.tv_sec = sec;
tv.tv_usec = 0;
- switch (select(bsock->fd + 1, &fdset, NULL, NULL, &tv)) {
+ switch (select(bsock->m_fd + 1, &fdset, NULL, NULL, &tv)) {
case 0: /* timeout */
bsock->b_errno = 0;
return 0;
berrno be;
switch (h_errno) {
case NETDB_INTERNAL:
- msg = be.strerror();
+ msg = be.bstrerror();
break;
case NETDB_SUCCESS:
msg = _("No problem.");
* Returns BSOCK * pointer on success
*
*/
-static BSOCK *bnet_open(JCR * jcr, const char *name, char *host, char *service,
- int port, int *fatal)
+static BSOCK *bnet_open(JCR *jcr, const char *name, char *host, char *service,
+ int port, utime_t heart_beat, int *fatal)
{
int sockfd = -1;
dlist *addr_list;
save_errno = errno;
*fatal = 1;
Pmsg3(000, _("Socket open error. proto=%d port=%d. ERR=%s\n"),
- ipaddr->get_family(), ipaddr->get_port_host_order(), be.strerror());
+ ipaddr->get_family(), ipaddr->get_port_host_order(), be.bstrerror());
continue;
}
/*
if (setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, (sockopt_val_t)&turnon, sizeof(turnon)) < 0) {
berrno be;
Qmsg1(jcr, M_WARNING, 0, _("Cannot set SO_KEEPALIVE on socket: %s\n"),
- be.strerror());
+ be.bstrerror());
}
+#if defined(TCP_KEEPIDLE)
+ if (heart_beat) {
+ int opt = heart_beat
+ if (setsockopt(sockfd, IPPROTO_IP, TCP_KEEPIDLE, (sockopt_val_t)&opt, sizeof(opt)) < 0) {
+ berrno be;
+ Qmsg1(jcr, M_WARNING, 0, _("Cannot set SO_KEEPIDLE on socket: %s\n"),
+ be.bstrerror());
+ }
+ }
+#endif
+
/* connect to server */
if (connect(sockfd, ipaddr->get_sockaddr(), ipaddr->get_sockaddr_len()) < 0) {
save_errno = errno;
if (!connected) {
free_addresses(addr_list);
- errno = save_errno;
+ errno = save_errno | b_errno_win32;
return NULL;
}
/*
if (setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, (sockopt_val_t)&turnon, sizeof(turnon)) < 0) {
berrno be;
Qmsg1(jcr, M_WARNING, 0, _("Cannot set SO_KEEPALIVE on socket: %s\n"),
- be.strerror());
+ be.bstrerror());
}
BSOCK* ret = init_bsock(jcr, sockfd, name, host, port, ipaddr->get_sockaddr());
free_addresses(addr_list);
/*
* Try to connect to host for max_retry_time at retry_time intervals.
*/
-BSOCK *bnet_connect(JCR * jcr, int retry_interval, int max_retry_time,
+BSOCK *bnet_connect(JCR * jcr, int retry_interval, utime_t max_retry_time,
+ utime_t heart_beat,
const char *name, char *host, char *service, int port,
int verbose)
{
int i;
BSOCK *bsock;
int fatal = 0;
+ time_t begin_time = time(NULL);
+ time_t now;
+ btimer_t *tid = NULL;
- for (i = 0; (bsock = bnet_open(jcr, name, host, service, port, &fatal)) == NULL;
+ /* Try to trap out of OS call when time expires */
+ if (max_retry_time) {
+ tid = start_thread_timer(pthread_self(), (uint32_t)max_retry_time);
+ }
+
+ for (i = 0; (bsock = bnet_open(jcr, name, host, service, port, heart_beat, &fatal)) == NULL;
i -= retry_interval) {
berrno be;
if (fatal || (jcr && job_canceled(jcr))) {
- return NULL;
+ bsock = NULL;
+ goto bail_out;
}
Dmsg4(100, "Unable to connect to %s on %s:%d. ERR=%s\n",
- name, host, port, be.strerror());
+ name, host, port, be.bstrerror());
if (i < 0) {
i = 60 * 5; /* complain again in 5 minutes */
if (verbose)
Qmsg4(jcr, M_WARNING, 0, _(
"Could not connect to %s on %s:%d. ERR=%s\n"
- "Retrying ...\n"), name, host, port, be.strerror());
+ "Retrying ...\n"), name, host, port, be.bstrerror());
}
bmicrosleep(retry_interval, 0);
- max_retry_time -= retry_interval;
- if (max_retry_time <= 0) {
+ now = time(NULL);
+ if (begin_time + max_retry_time <= now) {
Qmsg4(jcr, M_FATAL, 0, _("Unable to connect to %s on %s:%d. ERR=%s\n"),
- name, host, port, be.strerror());
- return NULL;
+ name, host, port, be.bstrerror());
+ bsock = NULL;
+ goto bail_out;
}
}
+
+bail_out:
+ if (tid) {
+ stop_thread_timer(tid);
+ }
return bsock;
}
if (bsock->errmsg == NULL) {
bsock->errmsg = get_pool_memory(PM_MESSAGE);
}
- pm_strcpy(bsock->errmsg, be.strerror(bsock->b_errno));
+ pm_strcpy(bsock->errmsg, be.bstrerror(bsock->b_errno));
return bsock->errmsg;
}
va_list arg_ptr;
int maxlen;
- if (bs->errors || bs->terminated) {
+ if (bs->errors || bs->is_terminated()) {
return false;
}
/* This probably won't work, but we vsnprintf, then if we
bs->msg = realloc_pool_memory(bs->msg, maxlen + maxlen / 2);
}
return bs->send();
-// return bnet_send(bs);
}
-int bnet_get_peer(BSOCK *bs, char *buf, socklen_t buflen) {
-#if !defined(HAVE_WIN32)
- if (bs->peer_addr.sin_family == 0) {
- socklen_t salen = sizeof(bs->peer_addr);
- int rval = (getpeername)(bs->fd, (struct sockaddr *)&bs->peer_addr, &salen);
- if (rval < 0) return rval;
- }
- if (!inet_ntop(bs->peer_addr.sin_family, &bs->peer_addr.sin_addr, buf, buflen))
- return -1;
-
- return 0;
-#else
- return -1;
-#endif
+int bnet_get_peer(BSOCK *bs, char *buf, socklen_t buflen)
+{
+ return bs->get_peer(buf, buflen);
}
+
/*
* Set the network buffer size, suggested size is in size.
* Actual size obtained is returned in bs->msglen
*/
bool bnet_set_buffer_size(BSOCK * bs, uint32_t size, int rw)
{
- uint32_t dbuf_size, start_size;
-#if defined(IP_TOS) && defined(IPTOS_THROUGHPUT)
- int opt;
-
- opt = IPTOS_THROUGHPUT;
- setsockopt(bs->fd, IPPROTO_IP, IP_TOS, (sockopt_val_t) & opt, sizeof(opt));
-#endif
-
- if (size != 0) {
- dbuf_size = size;
- } else {
- dbuf_size = DEFAULT_NETWORK_BUFFER_SIZE;
- }
- start_size = dbuf_size;
- if ((bs->msg = realloc_pool_memory(bs->msg, dbuf_size + 100)) == NULL) {
- Qmsg0(bs->jcr(), M_FATAL, 0, _("Could not malloc BSOCK data buffer\n"));
- return false;
- }
- if (rw & BNET_SETBUF_READ) {
- while ((dbuf_size > TAPE_BSIZE) && (setsockopt(bs->fd, SOL_SOCKET,
- SO_RCVBUF, (sockopt_val_t) & dbuf_size, sizeof(dbuf_size)) < 0)) {
- berrno be;
- Qmsg1(bs->jcr(), M_ERROR, 0, _("sockopt error: %s\n"), be.strerror());
- dbuf_size -= TAPE_BSIZE;
- }
- Dmsg1(200, "set network buffer size=%d\n", dbuf_size);
- if (dbuf_size != start_size) {
- Qmsg1(bs->jcr(), M_WARNING, 0,
- _("Warning network buffer = %d bytes not max size.\n"), dbuf_size);
- }
- if (dbuf_size % TAPE_BSIZE != 0) {
- Qmsg1(bs->jcr(), M_ABORT, 0,
- _("Network buffer size %d not multiple of tape block size.\n"),
- dbuf_size);
- }
- }
- if (size != 0) {
- dbuf_size = size;
- } else {
- dbuf_size = DEFAULT_NETWORK_BUFFER_SIZE;
- }
- start_size = dbuf_size;
- if (rw & BNET_SETBUF_WRITE) {
- while ((dbuf_size > TAPE_BSIZE) && (setsockopt(bs->fd, SOL_SOCKET,
- SO_SNDBUF, (sockopt_val_t) & dbuf_size, sizeof(dbuf_size)) < 0)) {
- berrno be;
- Qmsg1(bs->jcr(), M_ERROR, 0, _("sockopt error: %s\n"), be.strerror());
- dbuf_size -= TAPE_BSIZE;
- }
- Dmsg1(900, "set network buffer size=%d\n", dbuf_size);
- if (dbuf_size != start_size) {
- Qmsg1(bs->jcr(), M_WARNING, 0,
- _("Warning network buffer = %d bytes not max size.\n"), dbuf_size);
- }
- if (dbuf_size % TAPE_BSIZE != 0) {
- Qmsg1(bs->jcr(), M_ABORT, 0,
- _("Network buffer size %d not multiple of tape block size.\n"),
- dbuf_size);
- }
- }
-
- bs->msglen = dbuf_size;
- return true;
+ return bs->set_buffer_size(size, rw);
}
/*
* Set socket non-blocking
* Returns previous socket flag
*/
-int bnet_set_nonblocking (BSOCK *bsock) {
-#ifndef HAVE_WIN32
- int oflags;
-
- /* Get current flags */
- if ((oflags = fcntl(bsock->fd, F_GETFL, 0)) < 0) {
- berrno be;
- Jmsg1(bsock->jcr(), M_ABORT, 0, _("fcntl F_GETFL error. ERR=%s\n"), be.strerror());
- }
-
- /* Set O_NONBLOCK flag */
- if ((fcntl(bsock->fd, F_SETFL, oflags|O_NONBLOCK)) < 0) {
- berrno be;
- Jmsg1(bsock->jcr(), M_ABORT, 0, _("fcntl F_SETFL error. ERR=%s\n"), be.strerror());
- }
-
- bsock->blocking = 0;
- return oflags;
-#else
- int flags;
- u_long ioctlArg = 1;
-
- flags = bsock->blocking;
- ioctlsocket(bsock->fd, FIONBIO, &ioctlArg);
- bsock->blocking = 0;
-
- return flags;
-#endif
+int bnet_set_nonblocking(BSOCK *bsock)
+{
+ return bsock->set_nonblocking();
}
/*
* Set socket blocking
* Returns previous socket flags
*/
-int bnet_set_blocking (BSOCK *bsock)
+int bnet_set_blocking(BSOCK *bsock)
{
-#ifndef HAVE_WIN32
- int oflags;
- /* Get current flags */
- if ((oflags = fcntl(bsock->fd, F_GETFL, 0)) < 0) {
- berrno be;
- Jmsg1(bsock->jcr(), M_ABORT, 0, _("fcntl F_GETFL error. ERR=%s\n"), be.strerror());
- }
-
- /* Set O_NONBLOCK flag */
- if ((fcntl(bsock->fd, F_SETFL, oflags & ~O_NONBLOCK)) < 0) {
- berrno be;
- Jmsg1(bsock->jcr(), M_ABORT, 0, _("fcntl F_SETFL error. ERR=%s\n"), be.strerror());
- }
-
- bsock->blocking = 1;
- return oflags;
-#else
- int flags;
- u_long ioctlArg = 0;
-
- flags = bsock->blocking;
- ioctlsocket(bsock->fd, FIONBIO, &ioctlArg);
- bsock->blocking = 1;
-
- return flags;
-#endif
+ return bsock->set_blocking();
}
/*
*/
void bnet_restore_blocking (BSOCK *bsock, int flags)
{
-#ifndef HAVE_WIN32
- if ((fcntl(bsock->fd, F_SETFL, flags)) < 0) {
- berrno be;
- Jmsg1(bsock->jcr(), M_ABORT, 0, _("fcntl F_SETFL error. ERR=%s\n"), be.strerror());
- }
-
- bsock->blocking = (flags & O_NONBLOCK);
-#else
- u_long ioctlArg = flags;
-
- ioctlsocket(bsock->fd, FIONBIO, &ioctlArg);
- bsock->blocking = 1;
-#endif
+ bsock->restore_blocking(flags);
}
Dmsg3(100, "who=%s host=%s port=%d\n", who, host, port);
BSOCK *bsock = (BSOCK *)malloc(sizeof(BSOCK));
memset(bsock, 0, sizeof(BSOCK));
- bsock->fd = sockfd;
+ bsock->m_fd = sockfd;
bsock->tls = NULL;
bsock->errors = 0;
- bsock->blocking = 1;
+ bsock->m_blocking = 1;
bsock->msg = get_pool_memory(PM_MESSAGE);
bsock->errmsg = get_pool_memory(PM_MESSAGE);
bsock->set_who(bstrdup(who));
if (osock->host()) {
bsock->set_host(bstrdup(osock->host()));
}
- bsock->duped = true;
+ bsock->m_duped = true;
return bsock;
}
projects / bacula / bacula / blobdiff