* @author Christian Grothoff
*/
#include "platform.h"
-#include "disk.h"
#include "gnunet_util_lib.h"
+#include "disk.h"
#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
#define LOG_STRERROR_FILE(kind,syscall,filename) GNUNET_log_from_strerror_file (kind, "util", syscall, filename)
{
if (EAFNOSUPPORT == errno)
return GNUNET_NO;
- fprintf (stderr, "Failed to create test socket: %s\n", STRERROR (errno));
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Failed to create test socket: %s\n",
+ STRERROR (errno));
return GNUNET_SYSERR;
}
#if WINDOWS
struct GNUNET_CRYPTO_HashAsciiEncoded ae;
size_t upm;
- upm = sizeof (dummy.sun_path);
+ upm = sizeof (dummy.sun_path);
slen = strlen (unixpath);
if (slen < upm)
return unixpath; /* no shortening required */
GNUNET_CRYPTO_hash (unixpath, slen, &sh);
- while (sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) +
+ while (16 +
strlen (unixpath) >= upm)
{
if (NULL == (end = strrchr (unixpath, '/')))
*end = '\0';
}
GNUNET_CRYPTO_hash_to_enc (&sh, &ae);
- strcat (unixpath, (char*) ae.encoding);
+ strncat (unixpath, (char*) ae.encoding, 16);
return unixpath;
}
int abs_value = 1;
if (0 !=
- setsockopt (h->fd, SOL_SOCKET, SO_NOSIGPIPE,
+ setsockopt (h->fd, SOL_SOCKET, SO_NOSIGPIPE,
(const void *) &abs_value,
sizeof (abs_value)))
LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
const char *abs_value = "1";
if (0 !=
- setsockopt (h->fd, IPPROTO_TCP, TCP_NODELAY,
+ setsockopt (h->fd, IPPROTO_TCP, TCP_NODELAY,
(const void *) abs_value,
sizeof (abs_value)))
LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
#ifdef DARWIN
socket_set_nosigpipe (h);
#endif
- if ( (type == SOCK_STREAM)
+ if ( (type == SOCK_STREAM)
#ifdef AF_UNIX
&& (af != AF_UNIX)
#endif
*
* @param desc bound socket
* @param address address of the connecting peer, may be NULL
- * @param address_len length of address
+ * @param address_len length of @a address
* @return client socket
*/
struct GNUNET_NETWORK_Handle *
GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc,
- struct sockaddr *address, socklen_t * address_len)
+ struct sockaddr *address,
+ socklen_t *address_len)
{
struct GNUNET_NETWORK_Handle *ret;
- ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle));
+ ret = GNUNET_new (struct GNUNET_NETWORK_Handle);
#if DEBUG_NETWORK
{
struct sockaddr name;
int gsn = getsockname (desc->fd, &name, &namelen);
if (gsn == 0)
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Accepting connection on `%s'\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Accepting connection on `%s'\n",
GNUNET_a2s (&name, namelen));
}
#endif
ret->fd = accept (desc->fd, address, address_len);
+ if (-1 == ret->fd)
+ {
+ GNUNET_free (ret);
+ return NULL;
+ }
if (GNUNET_OK != initialize_network_handle (ret,
(NULL != address) ? address->sa_family : desc->af,
SOCK_STREAM))
*
* @param desc socket to bind
* @param address address to be bound
- * @param address_len length of address
- * @param flags flags affecting bind behaviour
+ * @param address_len length of @a address
* @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
int
GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
const struct sockaddr *address,
- socklen_t address_len,
- int flags)
+ socklen_t address_len)
{
int ret;
{
const int on = 1;
- if (desc->af == AF_INET6)
- if (setsockopt (desc->fd, IPPROTO_IPV6, IPV6_V6ONLY,
- (const void *) &on,
+ if (AF_INET6 == desc->af)
+ if (setsockopt (desc->fd, IPPROTO_IPV6, IPV6_V6ONLY,
+ (const void *) &on,
sizeof (on)))
LOG_STRERROR (GNUNET_ERROR_TYPE_DEBUG, "setsockopt");
}
#ifndef WINDOWS
{
const int on = 1;
-
+
/* This is required here for TCP sockets, but only on UNIX */
- if ((SOCK_STREAM == desc->type)
+ if ((SOCK_STREAM == desc->type)
&& (0 != setsockopt (desc->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on))))
LOG_STRERROR (GNUNET_ERROR_TYPE_DEBUG, "setsockopt");
}
#endif
-#ifndef LINUX
-#ifndef MINGW
- if (address->sa_family == AF_UNIX && (flags & GNUNET_BIND_EXCLUSIVE) == 0)
+#ifndef WINDOWS
{
- const struct sockaddr_un *un = (const struct sockaddr_un *) address;
+ /* set permissions of newly created UNIX domain socket to "user-only"; applications
+ can choose to relax this later */
+ mode_t old_mask = 0; /* assigned to make compiler happy */
- (void) unlink (un->sun_path);
- }
+ if (AF_UNIX == address->sa_family)
+ old_mask = umask (S_IWGRP | S_IRGRP | S_IXGRP | S_IWOTH | S_IROTH | S_IXOTH);
#endif
+
+ ret = bind (desc->fd, address, address_len);
+#ifndef WINDOWS
+ if (AF_UNIX == address->sa_family)
+ (void) umask (old_mask);
+ }
#endif
- ret = bind (desc->fd, address, address_len);
#ifdef MINGW
if (SOCKET_ERROR == ret)
SetErrnoFromWinsockError (WSAGetLastError ());
if (ret != 0)
return GNUNET_SYSERR;
#ifndef MINGW
-#ifndef LINUX
desc->addr = GNUNET_malloc (address_len);
memcpy (desc->addr, address, address_len);
desc->addrlen = address_len;
-#endif
#endif
return GNUNET_OK;
}
#else
ret = close (desc->fd);
#endif
-#ifndef LINUX
#ifndef MINGW
if ((desc->af == AF_UNIX) && (NULL != desc->addr))
{
const struct sockaddr_un *un = (const struct sockaddr_un *) desc->addr;
if (0 != unlink (un->sun_path))
- LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "unlink", un->sun_path);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING,
+ "unlink",
+ un->sun_path);
}
#endif
-#endif
+ GNUNET_NETWORK_socket_free_memory_only_ (desc);
+ return (ret == 0) ? GNUNET_OK : GNUNET_SYSERR;
+}
+
+
+/**
+ * Only free memory of a socket, keep the file descriptor untouched.
+ *
+ * @param desc socket
+ */
+void
+GNUNET_NETWORK_socket_free_memory_only_ (struct GNUNET_NETWORK_Handle *desc)
+{
GNUNET_free_non_null (desc->addr);
GNUNET_free (desc);
- return (ret == 0) ? GNUNET_OK : GNUNET_SYSERR;
}
/* FIXME: Find a better call to check that FD is valid */
if (WSAIoctl (fd, FIONBIO, (void *) &i, sizeof (i), NULL, 0, &d, NULL, NULL) != 0)
return NULL; /* invalid FD */
- ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle));
+ ret = GNUNET_new (struct GNUNET_NETWORK_Handle);
ret->fd = fd;
ret->af = AF_UNSPEC;
return ret;
#else
if (fcntl (fd, F_GETFD) < 0)
return NULL; /* invalid FD */
- ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle));
+ ret = GNUNET_new (struct GNUNET_NETWORK_Handle);
ret->fd = fd;
ret->af = AF_UNSPEC;
return ret;
*
* @param desc socket
* @param address peer address
- * @param address_len length of address
+ * @param address_len length of @a address
* @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
int
* @param level protocol level of the option
* @param optname identifier of the option
* @param optval options
- * @param optlen length of optval
+ * @param optlen length of @a optval
* @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
int
GNUNET_NETWORK_socket_getsockopt (const struct GNUNET_NETWORK_Handle *desc,
int level, int optname, void *optval,
- socklen_t * optlen)
+ socklen_t *optlen)
{
int ret;
*
* @param desc socket
* @param buffer buffer
- * @param length length of buffer
+ * @param length length of @a buffer
* @param src_addr either the source to recv from, or all zeroes
* to be filled in by recvfrom
- * @param addrlen length of the addr
+ * @param addrlen length of the @a src_addr
*/
ssize_t
GNUNET_NETWORK_socket_recvfrom (const struct GNUNET_NETWORK_Handle *desc,
*
* @param desc socket
* @param buffer buffer
- * @param length length of buffer
+ * @param length length of @a buffer
*/
ssize_t
GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Handle * desc,
*
* @param desc socket
* @param buffer data to send
- * @param length size of the buffer
- * @return number of bytes sent, GNUNET_SYSERR on error
+ * @param length size of the @a buffer
+ * @return number of bytes sent, #GNUNET_SYSERR on error
*/
ssize_t
GNUNET_NETWORK_socket_send (const struct GNUNET_NETWORK_Handle * desc,
* @param message data to send
* @param length size of the data
* @param dest_addr destination address
- * @param dest_len length of address
+ * @param dest_len length of @a address
* @return number of bytes sent, #GNUNET_SYSERR on error
*/
ssize_t
{
struct GNUNET_NETWORK_Handle *ret;
- ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle));
+ ret = GNUNET_new (struct GNUNET_NETWORK_Handle);
ret->fd = socket (domain, type, protocol);
+ if (-1 == ret->fd)
+ {
+ GNUNET_free (ret);
+ return NULL;
+ }
if (GNUNET_OK !=
initialize_network_handle (ret, domain, type))
return NULL;
{
struct GNUNET_NETWORK_FDSet *fds;
- fds = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_FDSet));
+ fds = GNUNET_new (struct GNUNET_NETWORK_FDSet);
#ifdef MINGW
fds->handles = GNUNET_CONTAINER_slist_create ();
#endif
tv.tv_usec =
(timeout.rel_value_us -
(tv.tv_sec * GNUNET_TIME_UNIT_SECONDS.rel_value_us));
- return select (nfds,
+ return select (nfds,
(NULL != rfds) ? &rfds->sds : NULL,
(NULL != wfds) ? &wfds->sds : NULL,
(NULL != efds) ? &efds->sds : NULL,