/*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
#define AI_ADDRCONFIG 0
#endif
+#include <dirent.h>
#include "para.h"
#include "error.h"
#include "net.h"
#include "string.h"
+#include "fd.h"
/** Information about one encrypted connection. */
{
struct addrinfo *local = NULL, *src,
*remote = NULL, *dst, hints;
- char *port = make_message("%u", port_number);
int rc, on = 1, sockfd = -1,
socktype = sock_type(l4type);
+ char port[6]; /* port number has at most 5 digits */
+ sprintf(port, "%u", port_number);
/* Set up address hint structure */
memset(&hints, 0, sizeof(hints));
hints.ai_family = l3type;
- /* getaddrinfo does not really work well with SOCK_DCCP */
- if (socktype == SOCK_DGRAM || socktype == SOCK_STREAM)
- hints.ai_socktype = socktype;
+ hints.ai_socktype = socktype;
+ /*
+ * getaddrinfo does not support SOCK_DCCP, so for the sake of lookup
+ * (and only then) pretend to be UDP.
+ */
+ if (l4type == IPPROTO_DCCP)
+ hints.ai_socktype = SOCK_DGRAM;
/* only use addresses available on the host */
hints.ai_flags = AI_ADDRCONFIG;
if ((rc = getaddrinfo(host, port, &hints, passive ? &local : &remote))) {
PARA_ERROR_LOG("can not resolve %s address %s#%s: %s.\n",
layer4_name(l4type),
- host? : (passive? "[loopback]" : "[localhost]"),
+ host? host : (passive? "[loopback]" : "[localhost]"),
port, gai_strerror(rc));
return -E_ADDRESS_LOOKUP;
}
if (src == NULL && dst == NULL) {
PARA_ERROR_LOG("can not create %s socket %s#%s.\n",
- layer4_name(l4type), host? : (passive?
+ layer4_name(l4type), host? host : (passive?
"[loopback]" : "[localhost]"), port);
return -ERRNO_TO_PARA_ERROR(errno);
}
*
* \sa getnameinfo(3).
*/
-char *host_and_port(struct sockaddr *sa, socklen_t len)
+static char *host_and_port(struct sockaddr *sa, socklen_t len)
{
static char output[NI_MAXHOST + NI_MAXSERV + 2];
char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV];
ret = getnameinfo(sa, len, hbuf, sizeof(hbuf), sbuf, sizeof(sbuf),
NI_NUMERICHOST | NI_NUMERICSERV);
- if (ret) {
- PARA_WARNING_LOG("hostname lookup error (%s).\n", gai_strerror(ret));
+ if (ret) {
+ PARA_WARNING_LOG("hostname lookup error (%s).\n",
+ gai_strerror(ret));
sprintf(output, "(unknown)");
- } else {
+ } else
sprintf(output, "%s#%s", hbuf, sbuf);
- }
return output;
}
return host_and_port((struct sockaddr *)&ss, sslen);
}
-char *local_name(int sockfd)
+char *local_name(int sockfd)
{
return __get_sock_name(sockfd, getsockname);
}
return __get_sock_name(sockfd, getpeername);
}
-/*
- * Send out a buffer, resend on short writes.
- *
- * \param fd The file descriptor.
- * \param buf The buffer to be sent.
- * \param len The length of \a buf.
+/**
+ * Extract IPv4 or IPv6-mapped-IPv4 address from sockaddr_storage.
+ * \param ss Container of IPv4/6 address
+ * \return Extracted IPv4 address (different from 0) or 0 if unsuccessful.
*
- * \return Standard. In any case, the number of bytes actually sent is stored
- * in \a len.
+ * \sa RFC 3493
*/
-static int sendall(int fd, const char *buf, size_t *len)
+struct in_addr extract_v4_addr(const struct sockaddr_storage *ss)
{
- size_t total = *len;
+ struct in_addr ia = {.s_addr = 0};
- assert(total);
- *len = 0;
- while (*len < total) {
- int ret = send(fd, buf + *len, total - *len, 0);
- if (ret == -1)
- return -ERRNO_TO_PARA_ERROR(errno);
- *len += ret;
+ if (ss->ss_family == AF_INET)
+ ia.s_addr = ((struct sockaddr_in *)ss)->sin_addr.s_addr;
+ if (ss->ss_family == AF_INET6) {
+ const struct in6_addr v6_addr = ((struct sockaddr_in6 *)ss)->sin6_addr;
+
+ if (IN6_IS_ADDR_V4MAPPED(&v6_addr))
+ memcpy(&ia.s_addr, &(v6_addr.s6_addr[12]), 4);
}
- return 1;
+ return ia;
}
/**
crypt_function *cf = NULL;
if (!len)
- PARA_CRIT_LOG("%s", "len == 0\n");
+ PARA_CRIT_LOG("len == 0\n");
if (fd + 1 <= cda_size)
cf = crypt_data_array[fd].send;
if (cf) {
/* RC4 may write more than len to the output buffer */
unsigned char *outbuf = para_malloc(ROUND_UP(len, 8));
(*cf)(len, (unsigned char *)buf, outbuf, private);
- ret = sendall(fd, (char *)outbuf, &len);
+ ret = write_all(fd, (char *)outbuf, &len);
free(outbuf);
} else
- ret = sendall(fd, buf, &len);
+ ret = write_all(fd, buf, &len);
return ret;
}