add back a check for sa_len in sockaddr structure.
[deb_libnfs.git] / lib / socket.c
index fd675667214f9823d62e006216a2721d4b0f2133..e4de894c854e3e752271b1a3cb6833b400ec1a2c 100644 (file)
@@ -15,6 +15,9 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <rpc/rpc.h>
 #include <rpc/xdr.h>
 #include <arpa/inet.h>
+#ifdef HAVE_SYS_FILIO_H
+#include <sys/filio.h>
+#endif
 #include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-private.h"
@@ -47,6 +56,11 @@ int rpc_which_events(struct rpc_context *rpc)
 {
        int events = rpc->is_connected ? POLLIN : POLLOUT;
 
+       if (rpc->is_udp != 0) {
+               /* for udp sockets we only wait for pollin */
+               return POLLIN;
+       }
+
        if (rpc->outqueue) {
                events |= POLLOUT;
        }
@@ -94,7 +108,7 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
 {
        int available;
        int size;
-       unsigned char *buf;
+       int pdu_size;
        ssize_t count;
 
        if (ioctl(rpc->fd, FIONREAD, &available) != 0) {
@@ -105,57 +119,100 @@ static int rpc_read_from_socket(struct rpc_context *rpc)
                rpc_set_error(rpc, "Socket has been closed");
                return -1;
        }
-       size = rpc->insize - rpc->inpos + available;
-       buf = malloc(size);
-       if (buf == NULL) {
-               rpc_set_error(rpc, "Out of memory: failed to allocate %d bytes for input buffer. Closing socket.", size);
-               return -1;
-       }
-       if (rpc->insize > rpc->inpos) {
-               memcpy(buf, rpc->inbuf + rpc->inpos, rpc->insize - rpc->inpos);
-               rpc->insize -= rpc->inpos;
-               rpc->inpos   = 0;
-       }
 
-       count = read(rpc->fd, buf + rpc->insize, available);
-       if (count == -1) {
-               if (errno == EINTR) {
+       if (rpc->is_udp) {
+               char *buf;
+               socklen_t socklen = sizeof(rpc->udp_src);
+
+               buf = malloc(available);
+               if (buf == NULL) {
+                       rpc_set_error(rpc, "Failed to malloc buffer for recvfrom");
+                       return -1;
+               }
+               count = recvfrom(rpc->fd, buf, available, MSG_DONTWAIT, (struct sockaddr *)&rpc->udp_src, &socklen);
+               if (count < 0) {
+                       rpc_set_error(rpc, "Failed recvfrom: %s", strerror(errno));
                        free(buf);
-                       buf = NULL;
-                       return 0;
                }
-               rpc_set_error(rpc, "Read from socket failed, errno:%d. Closing socket.", errno);
+               if (rpc_process_pdu(rpc, buf, count) != 0) {
+                       rpc_set_error(rpc, "Invalid/garbage pdu received from server. Ignoring PDU");
+                       free(buf);
+                       return -1;
+               }
                free(buf);
-               buf = NULL;
-               return -1;
+               return 0;
        }
 
-       if (rpc->inbuf != NULL) {
-               free(rpc->inbuf);
+       /* read record marker, 4 bytes at the beginning of every pdu */
+       if (rpc->inbuf == NULL) {
+               rpc->insize = 4;
+               rpc->inbuf = malloc(rpc->insize);
+               if (rpc->inbuf == NULL) {
+                       rpc_set_error(rpc, "Failed to allocate buffer for record marker, errno:%d. Closing socket.", errno);
+                       return -1;
+               }
        }
-       rpc->inbuf   = (char *)buf;
-       rpc->insize += count;
+       if (rpc->inpos < 4) {
+               size = 4 - rpc->inpos;
 
-       while (1) {
-               if (rpc->insize - rpc->inpos < 4) {
-                       return 0;
+               count = read(rpc->fd, rpc->inbuf + rpc->inpos, size);
+               if (count == -1) {
+                       if (errno == EINTR) {
+                               return 0;
+                       }
+                       rpc_set_error(rpc, "Read from socket failed, errno:%d. Closing socket.", errno);
+                       return -1;
+               }
+               available  -= count;
+               rpc->inpos += count;
+       }
+
+       if (available == 0) {
+               return 0;
+       }
+
+       pdu_size = rpc_get_pdu_size(rpc->inbuf);
+       if (rpc->insize < pdu_size) {
+               unsigned char *buf;
+               
+               buf = malloc(pdu_size);
+               if (buf == NULL) {
+                       rpc_set_error(rpc, "Failed to allocate buffer of %d bytes for pdu, errno:%d. Closing socket.", pdu_size, errno);
+                       return -1;
                }
-               count = rpc_get_pdu_size(rpc->inbuf + rpc->inpos);
-               if (rpc->insize + rpc->inpos < count) {
+               memcpy(buf, rpc->inbuf, rpc->insize);
+               free(rpc->inbuf);
+               rpc->inbuf  = buf;
+               rpc->insize = rpc_get_pdu_size(rpc->inbuf);
+       }
+
+       size = available;
+       if (size > rpc->insize - rpc->inpos) {
+               size = rpc->insize - rpc->inpos;
+       }
+
+       count = read(rpc->fd, rpc->inbuf + rpc->inpos, size);
+       if (count == -1) {
+               if (errno == EINTR) {
                        return 0;
                }
-               if (rpc_process_pdu(rpc, rpc->inbuf + rpc->inpos, count) != 0) {
+               rpc_set_error(rpc, "Read from socket failed, errno:%d. Closing socket.", errno);
+               return -1;
+       }
+       available  -= count;
+       rpc->inpos += count;
+
+       if (rpc->inpos == rpc->insize) {
+               if (rpc_process_pdu(rpc, rpc->inbuf, pdu_size) != 0) {
                        rpc_set_error(rpc, "Invalid/garbage pdu received from server. Closing socket");
                        return -1;
                }
-               rpc->inpos += count;
-               if (rpc->inpos == rpc->insize) {
-                       free(rpc->inbuf);
-                       rpc->inbuf = NULL;
-                       rpc->insize = 0;
-                       rpc->inpos = 0;
-               }
+               free(rpc->inbuf);
+               rpc->inbuf  = NULL;
+               rpc->insize = 0;
+               rpc->inpos  = 0;
        }
+
        return 0;
 }
 
@@ -239,6 +296,11 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc
                return -1;
        }
 
+       if (rpc->is_udp != 0) {
+               rpc_set_error(rpc, "Trying to connect on UDP socket");
+               return -1;
+       }
+
        sin->sin_family = AF_INET;
        sin->sin_port   = htons(port);
        if (inet_pton(AF_INET, server, &sin->sin_addr) != 1) {
@@ -249,7 +311,7 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, rpc
        switch (s.ss_family) {
        case AF_INET:
                socksize = sizeof(struct sockaddr_in);
-#ifdef HAVE_SOCK_SIN_LEN
+#ifdef HAVE_SOCKADDR_LEN
                sin->sin_len = socksize;
 #endif
                rpc->fd = socket(AF_INET, SOCK_STREAM, 0);
@@ -287,3 +349,87 @@ int rpc_disconnect(struct rpc_context *rpc, char *error)
 
        return 0;
 }
+
+
+int rpc_bind_udp(struct rpc_context *rpc, char *addr, int port)
+{
+       struct addrinfo *ai = NULL;
+       char service[6];
+
+       if (rpc->is_udp == 0) {
+               rpc_set_error(rpc, "Cant not bind UDP. Not UDP context");
+               return -1;
+       }
+
+       snprintf(service, 6, "%d", port);
+       if (getaddrinfo(addr, service, NULL, &ai) != 0) {
+               rpc_set_error(rpc, "Invalid address:%s. "
+                       "Can not resolv into IPv4/v6 structure.");
+               return -1;
+       }
+
+       switch(ai->ai_family) {
+       case AF_INET:
+               rpc->fd = socket(ai->ai_family, SOCK_DGRAM, 0);
+               if (rpc->fd == -1) {
+                       rpc_set_error(rpc, "Failed to create UDP socket: %s", strerror(errno)); 
+                       freeaddrinfo(ai);
+                       return -1;
+               }
+
+               if (bind(rpc->fd, (struct sockaddr *)ai->ai_addr, sizeof(struct sockaddr_in)) != 0) {
+                       rpc_set_error(rpc, "Failed to bind to UDP socket: %s",strerror(errno)); 
+                       freeaddrinfo(ai);
+                       return -1;
+               }
+               break;
+       default:
+               rpc_set_error(rpc, "Can not handle UPD sockets of family %d yet", ai->ai_family);
+               freeaddrinfo(ai);
+               return -1;
+       }
+
+       freeaddrinfo(ai);
+
+       return 0;
+}
+
+int rpc_set_udp_destination(struct rpc_context *rpc, char *addr, int port, int is_broadcast)
+{
+       struct addrinfo *ai = NULL;
+       char service[6];
+
+       if (rpc->is_udp == 0) {
+               rpc_set_error(rpc, "Can not set destination sockaddr. Not UDP context");
+               return -1;
+       }
+
+       snprintf(service, 6, "%d", port);
+       if (getaddrinfo(addr, service, NULL, &ai) != 0) {
+               rpc_set_error(rpc, "Invalid address:%s. "
+                       "Can not resolv into IPv4/v6 structure.");
+               return -1;
+       }
+
+       if (rpc->udp_dest) {
+               free(rpc->udp_dest);
+               rpc->udp_dest = NULL;
+       }
+       rpc->udp_dest = malloc(ai->ai_addrlen);
+       if (rpc->udp_dest == NULL) {
+               rpc_set_error(rpc, "Out of memory. Failed to allocate sockaddr structure");
+               return -1;
+       }
+       memcpy(rpc->udp_dest, ai->ai_addr, ai->ai_addrlen);
+       freeaddrinfo(ai);
+
+       rpc->is_broadcast = is_broadcast;
+       setsockopt(rpc->fd, SOL_SOCKET, SO_BROADCAST, &is_broadcast, sizeof(is_broadcast));
+
+       return 0;
+}
+
+struct sockaddr *rpc_get_recv_sockaddr(struct rpc_context *rpc)
+{
+       return (struct sockaddr *)&rpc->udp_src;
+}