http_send.c: Get rid of write_ok().

[paraslash.git] / net.c

diff --git a/net.c b/net.c
index 5d7c3fef7d15a5c2c58d380f5f0412bb493deb4a..09963f2e8b4b55d4931b8dd5236aecc2a9012015 100644 (file)
--- a/net.c
+++ b/net.c
@@ -1,5 +1,5 @@
 /*
- * 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.
  */
@@ -147,10 +147,11 @@ int makesock(unsigned l3type, unsigned l4type, int passive,
 {
        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;
@@ -322,6 +323,28 @@ char *remote_name(int sockfd)
        return __get_sock_name(sockfd, getpeername);
 }
 
+/**
+ * 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.
+ *
+ * \sa RFC 3493
+ */
+struct in_addr extract_v4_addr(const struct sockaddr_storage *ss)
+{
+       struct in_addr ia = {.s_addr = 0};
+
+       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 ia;
+}
+
 /*
  * Send out a buffer, resend on short writes.
  *
@@ -339,7 +362,7 @@ static int sendall(int fd, const char *buf, size_t *len)
        assert(total);
        *len = 0;
        while (*len < total) {
-               int ret = send(fd, buf + *len, total - *len, 0);
+               int ret = write(fd, buf + *len, total - *len);
                if (ret == -1)
                        return -ERRNO_TO_PARA_ERROR(errno);
                *len += ret;