#include "includes.h"
-/* the following 3 client_*() functions are nasty ways of allowing
- some generic functions to get info that really should be hidden in
- particular modules */
-static int client_fd = -1;
-/* What to print out on a client disconnect error. */
-static char client_ip_string[INET6_ADDRSTRLEN];
-
-/****************************************************************************
- Return true if a string could be an IPv4 address.
-****************************************************************************/
-
-bool is_ipaddress_v4(const char *str)
-{
- int ret = -1;
- struct in_addr dest;
-
- ret = inet_pton(AF_INET, str, &dest);
- if (ret > 0) {
- return true;
- }
- return false;
-}
-
-/****************************************************************************
- Return true if a string could be an IPv4 or IPv6 address.
-****************************************************************************/
-
-bool is_ipaddress(const char *str)
-{
- int ret = -1;
-
-#if defined(HAVE_IPV6)
- if (strchr_m(str, ':')) {
- char addr[INET6_ADDRSTRLEN];
- struct in6_addr dest6;
- const char *sp = str;
- char *p = strchr_m(str, '%');
-
- /*
- * Cope with link-local.
- * This is IP:v6:addr%ifname.
- */
-
- if (p && (p > str) && (if_nametoindex(p+1) != 0)) {
- strlcpy(addr, str,
- MIN(PTR_DIFF(p,str)+1,
- sizeof(addr)));
- sp = addr;
- }
- ret = inet_pton(AF_INET6, addr, &dest6);
- if (ret > 0) {
- return true;
- }
- }
-#endif
- return is_ipaddress_v4(str);
-}
-
-/****************************************************************************
- Is a sockaddr_storage a broadcast address ?
-****************************************************************************/
-
-bool is_broadcast_addr(const struct sockaddr_storage *pss)
-{
-#if defined(HAVE_IPV6)
- if (pss->ss_family == AF_INET6) {
- const struct in6_addr *sin6 =
- &((const struct sockaddr_in6 *)pss)->sin6_addr;
- return IN6_IS_ADDR_MULTICAST(sin6);
- }
-#endif
- if (pss->ss_family == AF_INET) {
- uint32_t addr =
- ntohl(((const struct sockaddr_in *)pss)->sin_addr.s_addr);
- return addr == INADDR_BROADCAST;
- }
- return false;
-}
-
-/*******************************************************************
- Wrap getaddrinfo...
-******************************************************************/
-
-static bool interpret_string_addr_internal(struct addrinfo **ppres,
- const char *str, int flags)
-{
- int ret;
- struct addrinfo hints;
-
- memset(&hints, '\0', sizeof(hints));
- /* By default make sure it supports TCP. */
- hints.ai_socktype = SOCK_STREAM;
- hints.ai_flags = flags;
-
- ret = getaddrinfo(str, NULL,
- &hints,
- ppres);
- if (ret) {
- DEBUG(3,("interpret_string_addr_interal: getaddrinfo failed "
- "for name %s [%s]\n",
- str,
- gai_strerror(ret) ));
- return false;
- }
- return true;
-}
-
-/****************************************************************************
- Interpret an internet address or name into an IP address in 4 byte form.
- RETURNS IN NETWORK BYTE ORDER (big endian).
-****************************************************************************/
-
-uint32 interpret_addr(const char *str)
-{
- uint32 ret;
-
- /* If it's in the form of an IP address then
- * get the lib to interpret it */
- if (is_ipaddress_v4(str)) {
- struct in_addr dest;
-
- if (inet_pton(AF_INET, str, &dest) <= 0) {
- /* Error - this shouldn't happen ! */
- DEBUG(0,("interpret_addr: inet_pton failed "
- "host %s\n",
- str));
- return 0;
- }
- ret = dest.s_addr; /* NETWORK BYTE ORDER ! */
- } else {
- /* Otherwise assume it's a network name of some sort and use
- getadddrinfo. */
- struct addrinfo *res = NULL;
- struct addrinfo *res_list = NULL;
- if (!interpret_string_addr_internal(&res_list,
- str,
- AI_ADDRCONFIG)) {
- DEBUG(3,("interpret_addr: Unknown host. %s\n",str));
- return 0;
- }
-
- /* Find the first IPv4 address. */
- for (res = res_list; res; res = res->ai_next) {
- if (res->ai_family != AF_INET) {
- continue;
- }
- if (res->ai_addr == NULL) {
- continue;
- }
- break;
- }
- if(res == NULL) {
- DEBUG(3,("interpret_addr: host address is "
- "invalid for host %s\n",str));
- if (res_list) {
- freeaddrinfo(res_list);
- }
- return 0;
- }
- putip((char *)&ret,
- &((struct sockaddr_in *)res->ai_addr)->sin_addr.s_addr);
- if (res_list) {
- freeaddrinfo(res_list);
- }
- }
-
- /* This is so bogus - all callers need fixing... JRA. */
- if (ret == (uint32)-1) {
- return 0;
- }
-
- return ret;
-}
-
-/*******************************************************************
- A convenient addition to interpret_addr().
-******************************************************************/
-
-struct in_addr *interpret_addr2(struct in_addr *ip, const char *str)
-{
- uint32 a = interpret_addr(str);
- ip->s_addr = a;
- return ip;
-}
-
/*******************************************************************
Map a text hostname or IP address (IPv4 or IPv6) into a
struct sockaddr_storage.
const char *str,
int flags)
{
- char addr[INET6_ADDRSTRLEN];
struct addrinfo *res = NULL;
#if defined(HAVE_IPV6)
+ char addr[INET6_ADDRSTRLEN];
unsigned int scope_id = 0;
if (strchr_m(str, ':')) {
}
#endif
- zero_addr(pss);
+ zero_sockaddr(pss);
if (!interpret_string_addr_internal(&res, str, flags|AI_ADDRCONFIG)) {
return false;
return true;
}
-/*******************************************************************
- Check if an IPv7 is 127.0.0.1
-******************************************************************/
-
-bool is_loopback_ip_v4(struct in_addr ip)
-{
- struct in_addr a;
- a.s_addr = htonl(INADDR_LOOPBACK);
- return(ip.s_addr == a.s_addr);
-}
-
-/*******************************************************************
- Check if a struct sockaddr_storage is the loopback address.
-******************************************************************/
-
-bool is_loopback_addr(const struct sockaddr_storage *pss)
-{
-#if defined(HAVE_IPV6)
- if (pss->ss_family == AF_INET6) {
- struct in6_addr *pin6 =
- &((struct sockaddr_in6 *)pss)->sin6_addr;
- return IN6_IS_ADDR_LOOPBACK(pin6);
- }
-#endif
- if (pss->ss_family == AF_INET) {
- struct in_addr *pin = &((struct sockaddr_in *)pss)->sin_addr;
- return is_loopback_ip_v4(*pin);
- }
- return false;
-}
-
-/*******************************************************************
- Check if an IPv4 is 0.0.0.0.
-******************************************************************/
-
-bool is_zero_ip_v4(struct in_addr ip)
-{
- uint32 a;
- putip((char *)&a,(char *)&ip);
- return(a == 0);
-}
-
-/*******************************************************************
- Check if a struct sockaddr_storage has an unspecified address.
-******************************************************************/
-
-bool is_zero_addr(const struct sockaddr_storage *pss)
-{
-#if defined(HAVE_IPV6)
- if (pss->ss_family == AF_INET6) {
- struct in6_addr *pin6 =
- &((struct sockaddr_in6 *)pss)->sin6_addr;
- return IN6_IS_ADDR_UNSPECIFIED(pin6);
- }
-#endif
- if (pss->ss_family == AF_INET) {
- struct in_addr *pin = &((struct sockaddr_in *)pss)->sin_addr;
- return is_zero_ip_v4(*pin);
- }
- return false;
-}
-
-/*******************************************************************
- Set an IP to 0.0.0.0.
-******************************************************************/
-
-void zero_ip_v4(struct in_addr *ip)
-{
- memset(ip, '\0', sizeof(struct in_addr));
-}
-
/*******************************************************************
Set an address to INADDR_ANY.
******************************************************************/
-void zero_addr(struct sockaddr_storage *pss)
+void zero_sockaddr(struct sockaddr_storage *pss)
{
memset(pss, '\0', sizeof(*pss));
/* Ensure we're at least a valid sockaddr-storage. */
pss->ss_family = AF_INET;
}
-/*******************************************************************
- Are two IPs on the same subnet - IPv4 version ?
-********************************************************************/
-
-bool same_net_v4(struct in_addr ip1,struct in_addr ip2,struct in_addr mask)
-{
- uint32 net1,net2,nmask;
-
- nmask = ntohl(mask.s_addr);
- net1 = ntohl(ip1.s_addr);
- net2 = ntohl(ip2.s_addr);
-
- return((net1 & nmask) == (net2 & nmask));
-}
-
-/*******************************************************************
- Convert an IPv4 struct in_addr to a struct sockaddr_storage.
-********************************************************************/
-
-void in_addr_to_sockaddr_storage(struct sockaddr_storage *ss,
- struct in_addr ip)
-{
- struct sockaddr_in *sa = (struct sockaddr_in *)ss;
- memset(ss, '\0', sizeof(*ss));
- ss->ss_family = AF_INET;
- sa->sin_addr = ip;
-}
-
-#if defined(HAVE_IPV6)
-/*******************************************************************
- Convert an IPv6 struct in_addr to a struct sockaddr_storage.
-********************************************************************/
-
-void in6_addr_to_sockaddr_storage(struct sockaddr_storage *ss,
- struct in6_addr ip)
-{
- struct sockaddr_in6 *sa = (struct sockaddr_in6 *)ss;
- memset(ss, '\0', sizeof(*ss));
- ss->ss_family = AF_INET6;
- sa->sin6_addr = ip;
-}
-#endif
-
-/*******************************************************************
- Are two IPs on the same subnet?
-********************************************************************/
-
-bool same_net(const struct sockaddr_storage *ip1,
- const struct sockaddr_storage *ip2,
- const struct sockaddr_storage *mask)
-{
- if (ip1->ss_family != ip2->ss_family) {
- /* Never on the same net. */
- return false;
- }
-
-#if defined(HAVE_IPV6)
- if (ip1->ss_family == AF_INET6) {
- struct sockaddr_in6 ip1_6 = *(struct sockaddr_in6 *)ip1;
- struct sockaddr_in6 ip2_6 = *(struct sockaddr_in6 *)ip2;
- struct sockaddr_in6 mask_6 = *(struct sockaddr_in6 *)mask;
- char *p1 = (char *)&ip1_6.sin6_addr;
- char *p2 = (char *)&ip2_6.sin6_addr;
- char *m = (char *)&mask_6.sin6_addr;
- int i;
-
- for (i = 0; i < sizeof(struct in6_addr); i++) {
- *p1++ &= *m;
- *p2++ &= *m;
- m++;
- }
- return (memcmp(&ip1_6.sin6_addr,
- &ip2_6.sin6_addr,
- sizeof(struct in6_addr)) == 0);
- }
-#endif
- if (ip1->ss_family == AF_INET) {
- return same_net_v4(((const struct sockaddr_in *)ip1)->sin_addr,
- ((const struct sockaddr_in *)ip2)->sin_addr,
- ((const struct sockaddr_in *)mask)->sin_addr);
- }
- return false;
-}
-
-/*******************************************************************
- Are two sockaddr_storage's the same family and address ? Ignore port etc.
-********************************************************************/
-
-bool addr_equal(const struct sockaddr_storage *ip1,
- const struct sockaddr_storage *ip2)
-{
- if (ip1->ss_family != ip2->ss_family) {
- /* Never the same. */
- return false;
- }
-
-#if defined(HAVE_IPV6)
- if (ip1->ss_family == AF_INET6) {
- return (memcmp(&((const struct sockaddr_in6 *)ip1)->sin6_addr,
- &((const struct sockaddr_in6 *)ip2)->sin6_addr,
- sizeof(struct in6_addr)) == 0);
- }
-#endif
- if (ip1->ss_family == AF_INET) {
- return (memcmp(&((const struct sockaddr_in *)ip1)->sin_addr,
- &((const struct sockaddr_in *)ip2)->sin_addr,
- sizeof(struct in_addr)) == 0);
- }
- return false;
-}
-
/****************************************************************************
- Is an IP address the INADDR_ANY or in6addr_any value ?
+ Get a port number in host byte order from a sockaddr_storage.
****************************************************************************/
-bool is_address_any(const struct sockaddr_storage *psa)
+uint16_t get_sockaddr_port(const struct sockaddr_storage *pss)
{
+ uint16_t port = 0;
+
+ if (pss->ss_family != AF_INET) {
#if defined(HAVE_IPV6)
- if (psa->ss_family == AF_INET6) {
- struct sockaddr_in6 *si6 = (struct sockaddr_in6 *)psa;
- if (memcmp(&in6addr_any,
- &si6->sin6_addr,
- sizeof(in6addr_any)) == 0) {
- return true;
- }
- return false;
- }
+ /* IPv6 */
+ const struct sockaddr_in6 *sa6 =
+ (const struct sockaddr_in6 *)pss;
+ port = ntohs(sa6->sin6_port);
#endif
- if (psa->ss_family == AF_INET) {
- struct sockaddr_in *si = (struct sockaddr_in *)psa;
- if (si->sin_addr.s_addr == INADDR_ANY) {
- return true;
- }
- return false;
+ } else {
+ const struct sockaddr_in *sa =
+ (const struct sockaddr_in *)pss;
+ port = ntohs(sa->sin_port);
}
- return false;
+ return port;
}
/****************************************************************************
static char *print_sockaddr_len(char *dest,
size_t destlen,
- const struct sockaddr_storage *psa,
+ const struct sockaddr *psa,
socklen_t psalen)
{
if (destlen > 0) {
dest[0] = '\0';
}
- (void)sys_getnameinfo((const struct sockaddr *)psa,
+ (void)sys_getnameinfo(psa,
psalen,
dest, destlen,
NULL, 0,
size_t destlen,
const struct sockaddr_storage *psa)
{
- return print_sockaddr_len(dest, destlen, psa,
+ return print_sockaddr_len(dest, destlen, (struct sockaddr *)psa,
sizeof(struct sockaddr_storage));
}
char *dest = NULL;
int ret;
- ret = getnameinfo((const struct sockaddr *)pss,
+ /* Linux getnameinfo() man pages says port is unitialized if
+ service name is NULL. */
+
+ ret = sys_getnameinfo((const struct sockaddr *)pss,
sizeof(struct sockaddr_storage),
addr, sizeof(addr),
NULL, 0,
NI_NUMERICHOST);
- if (ret) {
+ if (ret != 0) {
return NULL;
}
+
if (pss->ss_family != AF_INET) {
#if defined(HAVE_IPV6)
- /* IPv6 */
- const struct sockaddr_in6 *sa6 =
- (const struct sockaddr_in6 *)pss;
- uint16_t port = ntohs(sa6->sin6_port);
-
- if (port) {
- dest = talloc_asprintf(ctx,
- "[%s]:%d",
- addr,
- (unsigned int)port);
- } else {
- dest = talloc_asprintf(ctx,
- "[%s]",
- addr);
- }
+ dest = talloc_asprintf(ctx, "[%s]", addr);
#else
return NULL;
#endif
} else {
- const struct sockaddr_in *sa =
- (const struct sockaddr_in *)pss;
- uint16_t port = ntohs(sa->sin_port);
-
- if (port) {
- dest = talloc_asprintf(ctx,
- "%s:%d",
- addr,
- (unsigned int)port);
- } else {
- dest = talloc_asprintf(ctx,
- "%s",
- addr);
- }
+ dest = talloc_asprintf(ctx, "%s", addr);
}
+
return dest;
}
-/****************************************************************************
- Set the global client_fd variable.
-****************************************************************************/
-
-void client_setfd(int fd)
-{
- char addr[INET6_ADDRSTRLEN];
- client_fd = fd;
- safe_strcpy(client_ip_string,
- get_peer_addr(client_fd,addr,sizeof(addr)),
- sizeof(client_ip_string)-1);
-}
-
/****************************************************************************
Return the string of an IP address (IPv4 or IPv6).
****************************************************************************/
* zero IPv6 address. No good choice here.
*/
- safe_strcpy(addr_buf, "0.0.0.0", addr_len-1);
+ strlcpy(addr_buf, "0.0.0.0", addr_len);
if (fd == -1) {
return addr_buf;
return addr_buf;
}
- return print_sockaddr_len(addr_buf, addr_len, &sa, length);
+ return print_sockaddr_len(addr_buf, addr_len, (struct sockaddr *)&sa, length);
}
+#if 0
+/* Not currently used. JRA. */
/****************************************************************************
Return the port number we've bound to on a socket.
****************************************************************************/
}
return -1;
}
+#endif
-const char *client_name(void)
+const char *client_name(int fd)
{
- return get_peer_name(client_fd,false);
+ return get_peer_name(fd,false);
}
-const char *client_addr(char *addr, size_t addrlen)
+const char *client_addr(int fd, char *addr, size_t addrlen)
{
- return get_peer_addr(client_fd,addr,addrlen);
+ return get_peer_addr(fd,addr,addrlen);
}
-const char *client_socket_addr(char *addr, size_t addr_len)
+const char *client_socket_addr(int fd, char *addr, size_t addr_len)
{
- return get_socket_addr(client_fd, addr, addr_len);
+ return get_socket_addr(fd, addr, addr_len);
}
-int client_socket_port(void)
+#if 0
+/* Not currently used. JRA. */
+int client_socket_port(int fd)
{
- return get_socket_port(client_fd);
+ return get_socket_port(fd);
}
+#endif
/****************************************************************************
Accessor functions to make thread-safe code easier later...
****************************************************************************/
-static enum smb_read_errors smb_read_error = SMB_READ_OK;
-
-enum smb_read_errors get_smb_read_error(void)
+void set_smb_read_error(enum smb_read_errors *pre,
+ enum smb_read_errors newerr)
{
- return smb_read_error;
-}
-
-void set_smb_read_error(enum smb_read_errors newerr)
-{
- smb_read_error = newerr;
+ if (pre) {
+ *pre = newerr;
+ }
}
-void cond_set_smb_read_error(enum smb_read_errors newerr)
+void cond_set_smb_read_error(enum smb_read_errors *pre,
+ enum smb_read_errors newerr)
{
- if (smb_read_error == SMB_READ_OK) {
- smb_read_error = newerr;
+ if (pre && *pre == SMB_READ_OK) {
+ *pre = newerr;
}
}
* leak in SCO Openserver 5.0 */
/* reported on samba-technical --jerry */
if ( DEBUGLEVEL >= 5 ) {
+ DEBUG(5,("Socket options:\n"));
for (; p->name != NULL; p++) {
if (getsockopt(s, p->level, p->option,
(void *)&value, &vlen) == -1) {
- DEBUG(5,("Could not test socket option %s.\n",
+ DEBUGADD(5,("\tCould not test socket option %s.\n",
p->name));
} else {
- DEBUG(5,("socket option %s = %d\n",
+ DEBUGADD(5,("\t%s = %d\n",
p->name,value));
}
}
void set_socket_options(int fd, const char *options)
{
- fstring tok;
+ TALLOC_CTX *ctx = talloc_stackframe();
+ char *tok;
- while (next_token(&options,tok," \t,", sizeof(tok))) {
+ while (next_token_talloc(ctx, &options, &tok," \t,")) {
int ret=0,i;
int value = 1;
char *p;
}
if (ret != 0) {
- DEBUG(0,("Failed to set socket option %s (Error %s)\n",
+ /* be aware that some systems like Solaris return
+ * EINVAL to a setsockopt() call when the client
+ * sent a RST previously - no need to worry */
+ DEBUG(2,("Failed to set socket option %s (Error %s)\n",
tok, strerror(errno) ));
}
}
+ TALLOC_FREE(ctx);
print_socket_options(fd);
}
time_out = timeout in milliseconds
****************************************************************************/
-ssize_t read_socket_with_timeout(int fd,
- char *buf,
- size_t mincnt,
- size_t maxcnt,
- unsigned int time_out)
+NTSTATUS read_socket_with_timeout(int fd, char *buf,
+ size_t mincnt, size_t maxcnt,
+ unsigned int time_out,
+ size_t *size_ret)
{
fd_set fds;
int selrtn;
ssize_t readret;
size_t nread = 0;
struct timeval timeout;
+ char addr[INET6_ADDRSTRLEN];
/* just checking .... */
if (maxcnt <= 0)
- return(0);
-
- set_smb_read_error(SMB_READ_OK);
+ return NT_STATUS_OK;
/* Blocking read */
if (time_out == 0) {
if (readret == 0) {
DEBUG(5,("read_socket_with_timeout: "
"blocking read. EOF from client.\n"));
- set_smb_read_error(SMB_READ_EOF);
- return -1;
+ return NT_STATUS_END_OF_FILE;
}
if (readret == -1) {
- if (fd == client_fd) {
+ if (fd == get_client_fd()) {
/* Try and give an error message
* saying what client failed. */
DEBUG(0,("read_socket_with_timeout: "
"client %s read error = %s.\n",
- client_ip_string,
+ get_peer_addr(fd,addr,sizeof(addr)),
strerror(errno) ));
} else {
DEBUG(0,("read_socket_with_timeout: "
"read error = %s.\n",
strerror(errno) ));
}
- set_smb_read_error(SMB_READ_ERROR);
- return -1;
+ return map_nt_error_from_unix(errno);
}
nread += readret;
}
- return((ssize_t)nread);
+ goto done;
}
/* Most difficult - timeout read */
/* Check if error */
if (selrtn == -1) {
/* something is wrong. Maybe the socket is dead? */
- if (fd == client_fd) {
+ if (fd == get_client_fd()) {
/* Try and give an error message saying
* what client failed. */
DEBUG(0,("read_socket_with_timeout: timeout "
"read for client %s. select error = %s.\n",
- client_ip_string, strerror(errno) ));
+ get_peer_addr(fd,addr,sizeof(addr)),
+ strerror(errno) ));
} else {
DEBUG(0,("read_socket_with_timeout: timeout "
"read. select error = %s.\n",
strerror(errno) ));
}
- set_smb_read_error(SMB_READ_ERROR);
- return -1;
+ return map_nt_error_from_unix(errno);
}
/* Did we timeout ? */
if (selrtn == 0) {
DEBUG(10,("read_socket_with_timeout: timeout read. "
"select timed out.\n"));
- set_smb_read_error(SMB_READ_TIMEOUT);
- return -1;
+ return NT_STATUS_IO_TIMEOUT;
}
readret = sys_read(fd, buf+nread, maxcnt-nread);
/* we got EOF on the file descriptor */
DEBUG(5,("read_socket_with_timeout: timeout read. "
"EOF from client.\n"));
- set_smb_read_error(SMB_READ_EOF);
- return -1;
+ return NT_STATUS_END_OF_FILE;
}
if (readret == -1) {
/* the descriptor is probably dead */
- if (fd == client_fd) {
+ if (fd == get_client_fd()) {
/* Try and give an error message
* saying what client failed. */
DEBUG(0,("read_socket_with_timeout: timeout "
"read to client %s. read error = %s.\n",
- client_ip_string, strerror(errno) ));
+ get_peer_addr(fd,addr,sizeof(addr)),
+ strerror(errno) ));
} else {
DEBUG(0,("read_socket_with_timeout: timeout "
"read. read error = %s.\n",
strerror(errno) ));
}
- set_smb_read_error(SMB_READ_ERROR);
- return -1;
+ return map_nt_error_from_unix(errno);
}
nread += readret;
}
+ done:
/* Return the number we got */
- return (ssize_t)nread;
+ if (size_ret) {
+ *size_ret = nread;
+ }
+ return NT_STATUS_OK;
}
/****************************************************************************
Read data from the client, reading exactly N bytes.
****************************************************************************/
-ssize_t read_data(int fd,char *buffer,size_t N)
+NTSTATUS read_data(int fd, char *buffer, size_t N)
{
- ssize_t ret;
- size_t total=0;
+ return read_socket_with_timeout(fd, buffer, N, N, 0, NULL);
+}
- set_smb_read_error(SMB_READ_OK);
+/****************************************************************************
+ Write all data from an iov array
+****************************************************************************/
- while (total < N) {
- ret = sys_read(fd,buffer + total,N - total);
+ssize_t write_data_iov(int fd, const struct iovec *orig_iov, int iovcnt)
+{
+ int i;
+ size_t to_send;
+ ssize_t thistime;
+ size_t sent;
+ struct iovec *iov_copy, *iov;
- if (ret == 0) {
- DEBUG(10,("read_data: read of %d returned 0. "
- "Error = %s\n",
- (int)(N - total), strerror(errno) ));
- set_smb_read_error(SMB_READ_EOF);
- return 0;
- }
+ to_send = 0;
+ for (i=0; i<iovcnt; i++) {
+ to_send += orig_iov[i].iov_len;
+ }
- if (ret == -1) {
- if (fd == client_fd) {
- /* Try and give an error message saying
- * what client failed. */
- DEBUG(0,("read_data: read failure for %d "
- "bytes to client %s. Error = %s\n",
- (int)(N - total),
- client_ip_string,
- strerror(errno) ));
- } else {
- DEBUG(0,("read_data: read failure for %d. "
- "Error = %s\n",
- (int)(N - total),
- strerror(errno) ));
+ thistime = sys_writev(fd, orig_iov, iovcnt);
+ if ((thistime <= 0) || (thistime == to_send)) {
+ return thistime;
+ }
+ sent = thistime;
+
+ /*
+ * We could not send everything in one call. Make a copy of iov that
+ * we can mess with. We keep a copy of the array start in iov_copy for
+ * the TALLOC_FREE, because we're going to modify iov later on,
+ * discarding elements.
+ */
+
+ iov_copy = (struct iovec *)TALLOC_MEMDUP(
+ talloc_tos(), orig_iov, sizeof(struct iovec) * iovcnt);
+
+ if (iov_copy == NULL) {
+ errno = ENOMEM;
+ return -1;
+ }
+ iov = iov_copy;
+
+ while (sent < to_send) {
+ /*
+ * We have to discard "thistime" bytes from the beginning
+ * iov array, "thistime" contains the number of bytes sent
+ * via writev last.
+ */
+ while (thistime > 0) {
+ if (thistime < iov[0].iov_len) {
+ char *new_base =
+ (char *)iov[0].iov_base + thistime;
+ iov[0].iov_base = new_base;
+ iov[0].iov_len -= thistime;
+ break;
}
- set_smb_read_error(SMB_READ_ERROR);
- return -1;
+ thistime -= iov[0].iov_len;
+ iov += 1;
+ iovcnt -= 1;
+ }
+
+ thistime = sys_writev(fd, iov, iovcnt);
+ if (thistime <= 0) {
+ break;
}
- total += ret;
+ sent += thistime;
}
- return (ssize_t)total;
+
+ TALLOC_FREE(iov_copy);
+ return sent;
}
/****************************************************************************
ssize_t write_data(int fd, const char *buffer, size_t N)
{
- size_t total=0;
ssize_t ret;
+ struct iovec iov;
- while (total < N) {
- ret = sys_write(fd,buffer + total,N - total);
+ iov.iov_base = CONST_DISCARD(char *, buffer);
+ iov.iov_len = N;
- if (ret == -1) {
- if (fd == client_fd) {
- /* Try and give an error message saying
- * what client failed. */
- DEBUG(0,("write_data: write failure in "
- "writing to client %s. Error %s\n",
- client_ip_string, strerror(errno) ));
- } else {
- DEBUG(0,("write_data: write failure. "
- "Error = %s\n", strerror(errno) ));
- }
- return -1;
- }
-
- if (ret == 0) {
- return total;
- }
+ ret = write_data_iov(fd, &iov, 1);
+ if (ret >= 0) {
+ return ret;
+ }
- total += ret;
+ if (fd == get_client_fd()) {
+ char addr[INET6_ADDRSTRLEN];
+ /*
+ * Try and give an error message saying what client failed.
+ */
+ DEBUG(0, ("write_data: write failure in writing to client %s. "
+ "Error %s\n", get_peer_addr(fd,addr,sizeof(addr)),
+ strerror(errno)));
+ } else {
+ DEBUG(0,("write_data: write failure. Error = %s\n",
+ strerror(errno) ));
}
- return (ssize_t)total;
+
+ return -1;
}
/****************************************************************************
Timeout is in milliseconds.
****************************************************************************/
-ssize_t read_smb_length_return_keepalive(int fd,
- char *inbuf,
- unsigned int timeout)
+NTSTATUS read_smb_length_return_keepalive(int fd, char *inbuf,
+ unsigned int timeout,
+ size_t *len)
{
- ssize_t len=0;
int msg_type;
- bool ok = false;
+ NTSTATUS status;
- while (!ok) {
- if (timeout > 0) {
- ok = (read_socket_with_timeout(fd,inbuf,4,4,timeout)
- == 4);
- } else {
- ok = (read_data(fd,inbuf,4) == 4);
- }
- if (!ok) {
- return -1;
- }
+ status = read_socket_with_timeout(fd, inbuf, 4, 4, timeout, NULL);
- len = smb_len(inbuf);
- msg_type = CVAL(inbuf,0);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
- if (msg_type == SMBkeepalive) {
- DEBUG(5,("Got keepalive packet\n"));
- }
+ *len = smb_len(inbuf);
+ msg_type = CVAL(inbuf,0);
+
+ if (msg_type == SMBkeepalive) {
+ DEBUG(5,("Got keepalive packet\n"));
}
- DEBUG(10,("got smb length of %lu\n",(unsigned long)len));
+ DEBUG(10,("got smb length of %lu\n",(unsigned long)(*len)));
- return(len);
+ return NT_STATUS_OK;
}
/****************************************************************************
Timeout is in milliseconds.
****************************************************************************/
-ssize_t read_smb_length(int fd, char *inbuf, unsigned int timeout)
+NTSTATUS read_smb_length(int fd, char *inbuf, unsigned int timeout,
+ size_t *len)
{
- ssize_t len;
+ uint8_t msgtype = SMBkeepalive;
- for(;;) {
- len = read_smb_length_return_keepalive(fd, inbuf, timeout);
+ while (msgtype == SMBkeepalive) {
+ NTSTATUS status;
- if(len < 0)
- return len;
+ status = read_smb_length_return_keepalive(fd, inbuf, timeout,
+ len);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
- /* Ignore session keepalives. */
- if(CVAL(inbuf,0) != SMBkeepalive)
- break;
+ msgtype = CVAL(inbuf, 0);
}
DEBUG(10,("read_smb_length: got smb length of %lu\n",
(unsigned long)len));
- return len;
+ return NT_STATUS_OK;
}
/****************************************************************************
- Read an smb from a fd. Note that the buffer *MUST* be of size
- BUFFER_SIZE+SAFETY_MARGIN.
+ Read an smb from a fd.
The timeout is in milliseconds.
This function will return on receipt of a session keepalive packet.
maxlen is the max number of bytes to return, not including the 4 byte
- length. If zero it means BUFFER_SIZE+SAFETY_MARGIN limit.
+ length. If zero it means buflen limit.
Doesn't check the MAC on signed packets.
****************************************************************************/
-ssize_t receive_smb_raw(int fd,
- char *buffer,
- unsigned int timeout,
- size_t maxlen)
+NTSTATUS receive_smb_raw(int fd, char *buffer, size_t buflen, unsigned int timeout,
+ size_t maxlen, size_t *p_len)
{
- ssize_t len,ret;
-
- set_smb_read_error(SMB_READ_OK);
-
- len = read_smb_length_return_keepalive(fd,buffer,timeout);
- if (len < 0) {
- DEBUG(10,("receive_smb_raw: length < 0!\n"));
+ size_t len;
+ NTSTATUS status;
- /*
- * Correct fix. smb_read_error may have already been
- * set. Only set it here if not already set. Global
- * variables still suck :-). JRA.
- */
+ status = read_smb_length_return_keepalive(fd,buffer,timeout,&len);
- cond_set_smb_read_error(SMB_READ_ERROR);
- return -1;
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(10, ("receive_smb_raw: %s!\n", nt_errstr(status)));
+ return status;
}
- /*
- * A WRITEX with CAP_LARGE_WRITEX can be 64k worth of data plus 65 bytes
- * of header. Don't print the error if this fits.... JRA.
- */
-
- if (len > (BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE)) {
+ if (len > buflen) {
DEBUG(0,("Invalid packet length! (%lu bytes).\n",
(unsigned long)len));
- if (len > BUFFER_SIZE + (SAFETY_MARGIN/2)) {
-
- /*
- * Correct fix. smb_read_error may have already been
- * set. Only set it here if not already set. Global
- * variables still suck :-). JRA.
- */
-
- cond_set_smb_read_error(SMB_READ_ERROR);
- return -1;
- }
+ return NT_STATUS_INVALID_PARAMETER;
}
if(len > 0) {
len = MIN(len,maxlen);
}
- if (timeout > 0) {
- ret = read_socket_with_timeout(fd,
- buffer+4,
- len,
- len,
- timeout);
- } else {
- ret = read_data(fd,buffer+4,len);
- }
+ status = read_socket_with_timeout(
+ fd, buffer+4, len, len, timeout, &len);
- if (ret != len) {
- cond_set_smb_read_error(SMB_READ_ERROR);
- return -1;
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
}
/* not all of samba3 properly checks for packet-termination
SSVAL(buffer+4,len, 0);
}
- return len;
-}
-
-/****************************************************************************
- Wrapper for receive_smb_raw().
- Checks the MAC on signed packets.
-****************************************************************************/
-
-bool receive_smb(int fd, char *buffer, unsigned int timeout)
-{
- if (receive_smb_raw(fd, buffer, timeout, 0) < 0) {
- return false;
- }
-
- /* Check the incoming SMB signature. */
- if (!srv_check_sign_mac(buffer, true)) {
- DEBUG(0, ("receive_smb: SMB Signature verification "
- "failed on incoming packet!\n"));
- if (get_smb_read_error() == 0) {
- smb_read_error = SMB_READ_BAD_SIG;
- }
- return false;
- }
-
- return true;
-}
-
-/****************************************************************************
- Send an smb to a fd.
-****************************************************************************/
-
-bool send_smb(int fd, char *buffer)
-{
- size_t len;
- size_t nwritten=0;
- ssize_t ret;
-
- /* Sign the outgoing packet if required. */
- srv_calculate_sign_mac(buffer);
-
- len = smb_len(buffer) + 4;
-
- while (nwritten < len) {
- ret = write_data(fd,buffer+nwritten,len - nwritten);
- if (ret <= 0) {
- DEBUG(0,("Error writing %d bytes to client. %d. (%s)\n",
- (int)len,(int)ret, strerror(errno) ));
- return false;
- }
- nwritten += ret;
- }
-
- return true;
+ *p_len = len;
+ return NT_STATUS_OK;
}
/****************************************************************************
return( res );
}
+struct open_socket_out_state {
+ int fd;
+ struct event_context *ev;
+ struct sockaddr_storage ss;
+ socklen_t salen;
+ uint16_t port;
+ int wait_nsec;
+};
+
+static void open_socket_out_connected(struct async_req *subreq);
+
+static int open_socket_out_state_destructor(struct open_socket_out_state *s)
+{
+ if (s->fd != -1) {
+ close(s->fd);
+ }
+ return 0;
+}
+
/****************************************************************************
Create an outgoing socket. timeout is in milliseconds.
**************************************************************************/
-int open_socket_out(int type,
- const struct sockaddr_storage *pss,
- uint16_t port,
- int timeout)
+struct async_req *open_socket_out_send(TALLOC_CTX *mem_ctx,
+ struct event_context *ev,
+ const struct sockaddr_storage *pss,
+ uint16_t port,
+ int timeout)
{
char addr[INET6_ADDRSTRLEN];
- struct sockaddr_storage sock_out = *pss;
- int res,ret;
- int connect_loop = 10;
- int increment = 10;
+ struct async_req *result, *subreq;
+ struct open_socket_out_state *state;
+ NTSTATUS status;
- /* create a socket to write to */
- res = socket(pss->ss_family, type, 0);
- if (res == -1) {
- DEBUG(0,("socket error (%s)\n", strerror(errno)));
- return -1;
+ if (!async_req_setup(mem_ctx, &result, &state,
+ struct open_socket_out_state)) {
+ return NULL;
+ }
+ state->ev = ev;
+ state->ss = *pss;
+ state->port = port;
+ state->wait_nsec = 10000;
+ state->salen = -1;
+
+ state->fd = socket(state->ss.ss_family, SOCK_STREAM, 0);
+ if (state->fd == -1) {
+ status = map_nt_error_from_unix(errno);
+ goto post_status;
}
+ talloc_set_destructor(state, open_socket_out_state_destructor);
- if (type != SOCK_STREAM) {
- return res;
+ if (!async_req_set_timeout(result, ev, timeval_set(0, timeout*1000))) {
+ goto fail;
}
#if defined(HAVE_IPV6)
if (pss->ss_family == AF_INET6) {
- struct sockaddr_in6 *psa6 = (struct sockaddr_in6 *)&sock_out;
+ struct sockaddr_in6 *psa6;
+ psa6 = (struct sockaddr_in6 *)&state->ss;
psa6->sin6_port = htons(port);
- if (psa6->sin6_scope_id == 0 &&
- IN6_IS_ADDR_LINKLOCAL(&psa6->sin6_addr)) {
- setup_linklocal_scope_id(&sock_out);
+ if (psa6->sin6_scope_id == 0
+ && IN6_IS_ADDR_LINKLOCAL(&psa6->sin6_addr)) {
+ setup_linklocal_scope_id(
+ (struct sockaddr *)&(state->ss));
}
+ state->salen = sizeof(struct sockaddr_in6);
}
#endif
if (pss->ss_family == AF_INET) {
- struct sockaddr_in *psa = (struct sockaddr_in *)&sock_out;
+ struct sockaddr_in *psa;
+ psa = (struct sockaddr_in *)&state->ss;
psa->sin_port = htons(port);
+ state->salen = sizeof(struct sockaddr_in);
}
- /* set it non-blocking */
- set_blocking(res,false);
+ print_sockaddr(addr, sizeof(addr), &state->ss);
+ DEBUG(3,("Connecting to %s at port %u\n", addr, (unsigned int)port));
- print_sockaddr(addr, sizeof(addr), &sock_out);
- DEBUG(3,("Connecting to %s at port %u\n",
- addr,
- (unsigned int)port));
+ subreq = async_connect_send(state, state->ev, state->fd,
+ (struct sockaddr *)&state->ss,
+ state->salen);
+ if ((subreq == NULL)
+ || !async_req_set_timeout(subreq, state->ev,
+ timeval_set(0, state->wait_nsec))) {
+ status = NT_STATUS_NO_MEMORY;
+ goto post_status;
+ }
+ subreq->async.fn = open_socket_out_connected;
+ subreq->async.priv = result;
+ return result;
- /* and connect it to the destination */
- connect_again:
+ post_status:
+ if (!async_post_ntstatus(result, ev, status)) {
+ goto fail;
+ }
+ return result;
+ fail:
+ TALLOC_FREE(result);
+ return NULL;
+}
- ret = connect(res,(struct sockaddr *)&sock_out,sizeof(sock_out));
+static void open_socket_out_connected(struct async_req *subreq)
+{
+ struct async_req *req = talloc_get_type_abort(
+ subreq->async.priv, struct async_req);
+ struct open_socket_out_state *state = talloc_get_type_abort(
+ req->private_data, struct open_socket_out_state);
+ NTSTATUS status;
+ int sys_errno;
- /* Some systems return EAGAIN when they mean EINPROGRESS */
- if (ret < 0 && (errno == EINPROGRESS || errno == EALREADY ||
- errno == EAGAIN) && (connect_loop < timeout) ) {
- smb_msleep(connect_loop);
- timeout -= connect_loop;
- connect_loop += increment;
- if (increment < 250) {
- /* After 8 rounds we end up at a max of 255 msec */
- increment *= 1.5;
- }
- goto connect_again;
+ status = async_connect_recv(subreq, &sys_errno);
+ TALLOC_FREE(subreq);
+ if (NT_STATUS_IS_OK(status)) {
+ async_req_done(req);
+ return;
}
- if (ret < 0 && (errno == EINPROGRESS || errno == EALREADY ||
- errno == EAGAIN)) {
- DEBUG(1,("timeout connecting to %s:%u\n",
- addr,
- (unsigned int)port));
- close(res);
- return -1;
+ if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)
+ || (sys_errno == EINPROGRESS)
+ || (sys_errno == EALREADY)
+ || (sys_errno == EAGAIN)) {
+
+ /*
+ * retry
+ */
+
+ if (state->wait_nsec < 250000) {
+ state->wait_nsec *= 1.5;
+ }
+
+ subreq = async_connect_send(state, state->ev, state->fd,
+ (struct sockaddr *)&state->ss,
+ state->salen);
+ if (async_req_ntnomem(subreq, req)) {
+ return;
+ }
+ if (!async_req_set_timeout(subreq, state->ev,
+ timeval_set(0, state->wait_nsec))) {
+ async_req_nterror(req, NT_STATUS_NO_MEMORY);
+ return;
+ }
+ subreq->async.fn = open_socket_out_connected;
+ subreq->async.priv = req;
+ return;
}
#ifdef EISCONN
- if (ret < 0 && errno == EISCONN) {
- errno = 0;
- ret = 0;
+ if (sys_errno == EISCONN) {
+ async_req_done(req);
+ return;
}
#endif
- if (ret < 0) {
- DEBUG(2,("error connecting to %s:%d (%s)\n",
- addr,
- (unsigned int)port,
- strerror(errno)));
- close(res);
- return -1;
+ /* real error */
+ async_req_nterror(req, map_nt_error_from_unix(sys_errno));
+}
+
+NTSTATUS open_socket_out_recv(struct async_req *req, int *pfd)
+{
+ struct open_socket_out_state *state = talloc_get_type_abort(
+ req->private_data, struct open_socket_out_state);
+ NTSTATUS status;
+
+ if (async_req_is_nterror(req, &status)) {
+ return status;
}
+ *pfd = state->fd;
+ state->fd = -1;
+ return NT_STATUS_OK;
+}
- /* set it blocking again */
- set_blocking(res,true);
+NTSTATUS open_socket_out(const struct sockaddr_storage *pss, uint16_t port,
+ int timeout, int *pfd)
+{
+ TALLOC_CTX *frame = talloc_stackframe();
+ struct event_context *ev;
+ struct async_req *req;
+ NTSTATUS status = NT_STATUS_NO_MEMORY;
- return res;
+ ev = event_context_init(frame);
+ if (ev == NULL) {
+ goto fail;
+ }
+
+ req = open_socket_out_send(frame, ev, pss, port, timeout);
+ if (req == NULL) {
+ goto fail;
+ }
+ while (req->state < ASYNC_REQ_DONE) {
+ event_loop_once(ev);
+ }
+
+ status = open_socket_out_recv(req, pfd);
+ fail:
+ TALLOC_FREE(frame);
+ return status;
}
-/****************************************************************************
- Create an outgoing TCP socket to any of the addrs. This is for
- simultaneous connects to port 445 and 139 of a host or even a variety
- of DC's all of which are equivalent for our purposes.
-**************************************************************************/
+struct open_socket_out_defer_state {
+ struct event_context *ev;
+ struct sockaddr_storage ss;
+ uint16_t port;
+ int timeout;
+ int fd;
+};
+
+static void open_socket_out_defer_waited(struct async_req *subreq);
+static void open_socket_out_defer_connected(struct async_req *subreq);
+
+struct async_req *open_socket_out_defer_send(TALLOC_CTX *mem_ctx,
+ struct event_context *ev,
+ struct timeval wait_time,
+ const struct sockaddr_storage *pss,
+ uint16_t port,
+ int timeout)
+{
+ struct async_req *result, *subreq;
+ struct open_socket_out_defer_state *state;
+ NTSTATUS status;
+
+ if (!async_req_setup(mem_ctx, &result, &state,
+ struct open_socket_out_defer_state)) {
+ return NULL;
+ }
+ state->ev = ev;
+ state->ss = *pss;
+ state->port = port;
+ state->timeout = timeout;
+
+ subreq = async_wait_send(state, ev, wait_time);
+ if (subreq == NULL) {
+ status = NT_STATUS_NO_MEMORY;
+ goto post_status;
+ }
+ subreq->async.fn = open_socket_out_defer_waited;
+ subreq->async.priv = result;
+ return result;
+
+ post_status:
+ if (!async_post_ntstatus(result, ev, status)) {
+ goto fail;
+ }
+ return result;
+ fail:
+ TALLOC_FREE(result);
+ return NULL;
+}
+
+static void open_socket_out_defer_waited(struct async_req *subreq)
+{
+ struct async_req *req = talloc_get_type_abort(
+ subreq->async.priv, struct async_req);
+ struct open_socket_out_defer_state *state = talloc_get_type_abort(
+ req->private_data, struct open_socket_out_defer_state);
+ bool ret;
+
+ ret = async_wait_recv(subreq);
+ TALLOC_FREE(subreq);
+ if (!ret) {
+ async_req_nterror(req, NT_STATUS_INTERNAL_ERROR);
+ return;
+ }
+
+ subreq = open_socket_out_send(state, state->ev, &state->ss,
+ state->port, state->timeout);
+ if (async_req_ntnomem(subreq, req)) {
+ return;
+ }
+ subreq->async.fn = open_socket_out_defer_connected;
+ subreq->async.priv = req;
+}
+
+static void open_socket_out_defer_connected(struct async_req *subreq)
+{
+ struct async_req *req = talloc_get_type_abort(
+ subreq->async.priv, struct async_req);
+ struct open_socket_out_defer_state *state = talloc_get_type_abort(
+ req->private_data, struct open_socket_out_defer_state);
+ NTSTATUS status;
+
+ status = open_socket_out_recv(subreq, &state->fd);
+ TALLOC_FREE(subreq);
+ if (!NT_STATUS_IS_OK(status)) {
+ async_req_nterror(req, status);
+ return;
+ }
+ async_req_done(req);
+}
+
+NTSTATUS open_socket_out_defer_recv(struct async_req *req, int *pfd)
+{
+ struct open_socket_out_defer_state *state = talloc_get_type_abort(
+ req->private_data, struct open_socket_out_defer_state);
+ NTSTATUS status;
+
+ if (async_req_is_nterror(req, &status)) {
+ return status;
+ }
+ *pfd = state->fd;
+ state->fd = -1;
+ return NT_STATUS_OK;
+}
+
+/*******************************************************************
+ Create an outgoing TCP socket to the first addr that connects.
+
+ This is for simultaneous connection attempts to port 445 and 139 of a host
+ or for simultatneous connection attempts to multiple DCs at once. We return
+ a socket fd of the first successful connection.
+
+ @param[in] addrs list of Internet addresses and ports to connect to
+ @param[in] num_addrs number of address/port pairs in the addrs list
+ @param[in] timeout time after which we stop waiting for a socket connection
+ to succeed, given in milliseconds
+ @param[out] fd_index the entry in addrs which we successfully connected to
+ @param[out] fd fd of the open and connected socket
+ @return true on a successful connection, false if all connection attempts
+ failed or we timed out
+*******************************************************************/
bool open_any_socket_out(struct sockaddr_storage *addrs, int num_addrs,
int timeout, int *fd_index, int *fd)
good_connect = false;
for (i=0; i<num_addrs; i++) {
+ const struct sockaddr * a =
+ (const struct sockaddr *)&(addrs[i]);
if (sockets[i] == -1)
continue;
- if (connect(sockets[i], (struct sockaddr *)&(addrs[i]),
- sizeof(*addrs)) == 0) {
+ if (sys_connect(sockets[i], a) == 0) {
/* Rather unlikely as we are non-blocking, but it
* might actually happen. */
resulting_index = i;
int res;
struct in_addr addr;
- (void)interpret_addr2(&addr, host);
+ addr = interpret_addr2(host);
res = socket(PF_INET, type, 0);
if (res == -1) {
sock_out.sin_port = htons(port);
sock_out.sin_family = PF_INET;
- if (connect(res,(struct sockaddr *)&sock_out,sizeof(sock_out))) {
+ if (sys_connect(res,(struct sockaddr *)&sock_out)) {
close(res);
return -1;
}
static const char *get_peer_addr_internal(int fd,
char *addr_buf,
size_t addr_buf_len,
- struct sockaddr_storage *pss,
+ struct sockaddr *pss,
socklen_t *plength)
{
struct sockaddr_storage ss;
socklen_t length = sizeof(ss);
- safe_strcpy(addr_buf,"0.0.0.0",addr_buf_len-1);
+ strlcpy(addr_buf,"0.0.0.0",addr_buf_len);
if (fd == -1) {
return addr_buf;
}
if (pss == NULL) {
- pss = &ss;
- }
- if (plength == NULL) {
+ pss = (struct sockaddr *)&ss;
plength = &length;
}
******************************************************************/
static bool matchname(const char *remotehost,
- const struct sockaddr_storage *pss,
+ const struct sockaddr *pss,
socklen_t len)
{
struct addrinfo *res = NULL;
if (!res->ai_addr) {
continue;
}
- if (addr_equal((const struct sockaddr_storage *)res->ai_addr,
- pss)) {
+ if (sockaddr_equal((const struct sockaddr *)res->ai_addr,
+ (struct sockaddr *)pss)) {
freeaddrinfo(ailist);
return true;
}
}
/*******************************************************************
- Return the DNS name of the remote end of a socket.
+ Deal with the singleton cache.
+******************************************************************/
+
+struct name_addr_pair {
+ struct sockaddr_storage ss;
+ const char *name;
+};
+
+/*******************************************************************
+ Lookup a name/addr pair. Returns memory allocated from memcache.
******************************************************************/
-static char addr_buf_cache[INET6_ADDRSTRLEN];
+static bool lookup_nc(struct name_addr_pair *nc)
+{
+ DATA_BLOB tmp;
+
+ ZERO_STRUCTP(nc);
+
+ if (!memcache_lookup(
+ NULL, SINGLETON_CACHE,
+ data_blob_string_const_null("get_peer_name"),
+ &tmp)) {
+ return false;
+ }
+
+ memcpy(&nc->ss, tmp.data, sizeof(nc->ss));
+ nc->name = (const char *)tmp.data + sizeof(nc->ss);
+ return true;
+}
+
+/*******************************************************************
+ Save a name/addr pair.
+******************************************************************/
+
+static void store_nc(const struct name_addr_pair *nc)
+{
+ DATA_BLOB tmp;
+ size_t namelen = strlen(nc->name);
+
+ tmp = data_blob(NULL, sizeof(nc->ss) + namelen + 1);
+ if (!tmp.data) {
+ return;
+ }
+ memcpy(tmp.data, &nc->ss, sizeof(nc->ss));
+ memcpy(tmp.data+sizeof(nc->ss), nc->name, namelen+1);
+
+ memcache_add(NULL, SINGLETON_CACHE,
+ data_blob_string_const_null("get_peer_name"),
+ tmp);
+ data_blob_free(&tmp);
+}
+
+/*******************************************************************
+ Return the DNS name of the remote end of a socket.
+******************************************************************/
const char *get_peer_name(int fd, bool force_lookup)
{
- static pstring name_buf;
+ struct name_addr_pair nc;
char addr_buf[INET6_ADDRSTRLEN];
struct sockaddr_storage ss;
socklen_t length = sizeof(ss);
const char *p;
int ret;
- pstring tmp_name;
+ char name_buf[MAX_DNS_NAME_LENGTH];
+ char tmp_name[MAX_DNS_NAME_LENGTH];
/* reverse lookups can be *very* expensive, and in many
situations won't work because many networks don't link dhcp
with dns. To avoid the delay we avoid the lookup if
possible */
if (!lp_hostname_lookups() && (force_lookup == false)) {
- pstrcpy(name_buf, get_peer_addr(fd, addr_buf, sizeof(addr_buf)));
- return name_buf;
+ length = sizeof(nc.ss);
+ nc.name = get_peer_addr_internal(fd, addr_buf, sizeof(addr_buf),
+ (struct sockaddr *)&nc.ss, &length);
+ store_nc(&nc);
+ lookup_nc(&nc);
+ return nc.name ? nc.name : "UNKNOWN";
}
- p = get_peer_addr_internal(fd, addr_buf, sizeof(addr_buf), &ss, &length);
+ lookup_nc(&nc);
+
+ memset(&ss, '\0', sizeof(ss));
+ p = get_peer_addr_internal(fd, addr_buf, sizeof(addr_buf), (struct sockaddr *)&ss, &length);
/* it might be the same as the last one - save some DNS work */
- if (strcmp(p, addr_buf_cache) == 0) {
- return name_buf;
+ if (sockaddr_equal((struct sockaddr *)&ss, (struct sockaddr *)&nc.ss)) {
+ return nc.name ? nc.name : "UNKNOWN";
}
- pstrcpy(name_buf,"UNKNOWN");
+ /* Not the same. We need to lookup. */
if (fd == -1) {
- return name_buf;
+ return "UNKNOWN";
}
- safe_strcpy(addr_buf_cache, p, sizeof(addr_buf_cache)-1);
-
/* Look up the remote host name. */
- ret = getnameinfo((struct sockaddr *)&ss,
+ ret = sys_getnameinfo((struct sockaddr *)&ss,
length,
name_buf,
sizeof(name_buf),
"for %s with error %s\n",
p,
gai_strerror(ret)));
- pstrcpy(name_buf, p);
+ strlcpy(name_buf, p, sizeof(name_buf));
} else {
- if (!matchname(name_buf, &ss, length)) {
+ if (!matchname(name_buf, (struct sockaddr *)&ss, length)) {
DEBUG(0,("Matchname failed on %s %s\n",name_buf,p));
- pstrcpy(name_buf,"UNKNOWN");
+ strlcpy(name_buf,"UNKNOWN",sizeof(name_buf));
}
}
use --enable-developer or the clobber_region() call will
get you */
- pstrcpy(tmp_name, name_buf );
+ strlcpy(tmp_name, name_buf, sizeof(tmp_name));
alpha_strcpy(name_buf, tmp_name, "_-.", sizeof(name_buf));
if (strstr(name_buf,"..")) {
- pstrcpy(name_buf, "UNKNOWN");
+ strlcpy(name_buf, "UNKNOWN", sizeof(name_buf));
}
- return name_buf;
+ nc.name = name_buf;
+ nc.ss = ss;
+
+ store_nc(&nc);
+ lookup_nc(&nc);
+ return nc.name ? nc.name : "UNKNOWN";
}
/*******************************************************************
struct stat st;
int sock;
mode_t old_umask;
- pstring path;
+ char *path = NULL;
old_umask = umask(0);
sock = socket(AF_UNIX, SOCK_STREAM, 0);
if (sock == -1) {
- perror("socket");
- goto out_umask;
+ DEBUG(0, ("create_pipe_sock: socket error %s\n",
+ strerror(errno) ));
+ goto out_close;
}
- pstr_sprintf(path, "%s/%s", socket_dir, socket_name);
+ if (asprintf(&path, "%s/%s", socket_dir, socket_name) == -1) {
+ goto out_close;
+ }
unlink(path);
memset(&sunaddr, 0, sizeof(sunaddr));
sunaddr.sun_family = AF_UNIX;
- safe_strcpy(sunaddr.sun_path, path, sizeof(sunaddr.sun_path)-1);
+ strlcpy(sunaddr.sun_path, path, sizeof(sunaddr.sun_path));
if (bind(sock, (struct sockaddr *)&sunaddr, sizeof(sunaddr)) == -1) {
DEBUG(0, ("bind failed on pipe socket %s: %s\n", path,
goto out_close;
}
+ SAFE_FREE(path);
+
umask(old_umask);
return sock;
out_close:
- close(sock);
+ SAFE_FREE(path);
+ if (sock != -1)
+ close(sock);
out_umask:
umask(old_umask);
Get my own canonical name, including domain.
****************************************************************************/
-static fstring dnshostname_cache;
-
-bool get_mydnsfullname(fstring my_dnsname)
+const char *get_mydnsfullname(void)
{
- if (!*dnshostname_cache) {
- struct addrinfo *res = NULL;
- bool ret;
-
- /* get my host name */
- if (gethostname(dnshostname_cache, sizeof(dnshostname_cache)) == -1) {
- *dnshostname_cache = '\0';
- DEBUG(0,("get_mydnsfullname: gethostname failed\n"));
- return false;
- }
+ struct addrinfo *res = NULL;
+ char my_hostname[HOST_NAME_MAX];
+ bool ret;
+ DATA_BLOB tmp;
- /* Ensure null termination. */
- dnshostname_cache[sizeof(dnshostname_cache)-1] = '\0';
+ if (memcache_lookup(NULL, SINGLETON_CACHE,
+ data_blob_string_const_null("get_mydnsfullname"),
+ &tmp)) {
+ SMB_ASSERT(tmp.length > 0);
+ return (const char *)tmp.data;
+ }
- ret = interpret_string_addr_internal(&res,
- dnshostname_cache,
- AI_ADDRCONFIG|AI_CANONNAME);
+ /* get my host name */
+ if (gethostname(my_hostname, sizeof(my_hostname)) == -1) {
+ DEBUG(0,("get_mydnsfullname: gethostname failed\n"));
+ return NULL;
+ }
- if (!ret || res == NULL) {
- DEBUG(3,("get_mydnsfullname: getaddrinfo failed for "
- "name %s [%s]\n",
- dnshostname_cache,
- gai_strerror(ret) ));
- return false;
- }
+ /* Ensure null termination. */
+ my_hostname[sizeof(my_hostname)-1] = '\0';
- /*
- * Make sure that getaddrinfo() returns the "correct" host name.
- */
+ ret = interpret_string_addr_internal(&res,
+ my_hostname,
+ AI_ADDRCONFIG|AI_CANONNAME);
- if (res->ai_canonname == NULL) {
- DEBUG(3,("get_mydnsfullname: failed to get "
- "canonical name for %s\n",
- dnshostname_cache));
- freeaddrinfo(res);
- return false;
- }
+ if (!ret || res == NULL) {
+ DEBUG(3,("get_mydnsfullname: getaddrinfo failed for "
+ "name %s [%s]\n",
+ my_hostname,
+ gai_strerror(ret) ));
+ return NULL;
+ }
+ /*
+ * Make sure that getaddrinfo() returns the "correct" host name.
+ */
- fstrcpy(dnshostname_cache, res->ai_canonname);
+ if (res->ai_canonname == NULL) {
+ DEBUG(3,("get_mydnsfullname: failed to get "
+ "canonical name for %s\n",
+ my_hostname));
freeaddrinfo(res);
+ return NULL;
}
- fstrcpy(my_dnsname, dnshostname_cache);
- return true;
+
+ /* This copies the data, so we must do a lookup
+ * afterwards to find the value to return.
+ */
+
+ memcache_add(NULL, SINGLETON_CACHE,
+ data_blob_string_const_null("get_mydnsfullname"),
+ data_blob_string_const_null(res->ai_canonname));
+
+ if (!memcache_lookup(NULL, SINGLETON_CACHE,
+ data_blob_string_const_null("get_mydnsfullname"),
+ &tmp)) {
+ tmp = data_blob_talloc(talloc_tos(), res->ai_canonname,
+ strlen(res->ai_canonname) + 1);
+ }
+
+ freeaddrinfo(res);
+
+ return (const char *)tmp.data;
}
/************************************************************
bool is_myname_or_ipaddr(const char *s)
{
- fstring name, dnsname;
- char *servername;
+ TALLOC_CTX *ctx = talloc_tos();
+ char addr[INET6_ADDRSTRLEN];
+ char *name = NULL;
+ const char *dnsname;
+ char *servername = NULL;
if (!s) {
return false;
}
/* Santize the string from '\\name' */
- fstrcpy(name, s);
+ name = talloc_strdup(ctx, s);
+ if (!name) {
+ return false;
+ }
servername = strrchr_m(name, '\\' );
if (!servername) {
}
/* Maybe it's my dns name */
- if (get_mydnsfullname(dnsname)) {
- if (strequal(servername, dnsname)) {
- return true;
- }
+ dnsname = get_mydnsfullname();
+ if (dnsname && strequal(servername, dnsname)) {
+ return true;
}
/* Handle possible CNAME records - convert to an IP addr. */
if (!is_ipaddress(servername)) {
/* Use DNS to resolve the name, but only the first address */
struct sockaddr_storage ss;
- if (interpret_string_addr(&ss, servername,0)) {
- print_sockaddr(name,
- sizeof(name),
+ if (interpret_string_addr(&ss, servername, 0)) {
+ print_sockaddr(addr,
+ sizeof(addr),
&ss);
- servername = name;
+ servername = addr;
}
}
/* Maybe its an IP address? */
if (is_ipaddress(servername)) {
struct sockaddr_storage ss;
- struct iface_struct nics[MAX_INTERFACES];
+ struct iface_struct *nics;
int i, n;
if (!interpret_string_addr(&ss, servername, AI_NUMERICHOST)) {
return false;
}
- if (is_zero_addr(&ss) || is_loopback_addr(&ss)) {
+ if (is_zero_addr((struct sockaddr *)&ss) ||
+ is_loopback_addr((struct sockaddr *)&ss)) {
return false;
}
+ nics = TALLOC_ARRAY(ctx, struct iface_struct,
+ MAX_INTERFACES);
+ if (!nics) {
+ return false;
+ }
n = get_interfaces(nics, MAX_INTERFACES);
for (i=0; i<n; i++) {
- if (addr_equal(&nics[i].ip, &ss)) {
+ if (sockaddr_equal((struct sockaddr *)&nics[i].ip, (struct sockaddr *)&ss)) {
+ TALLOC_FREE(nics);
return true;
}
}
+ TALLOC_FREE(nics);
}
/* No match */