server: Introduce command_{pre,post}_select().

[paraslash.git] / net.c

diff --git a/net.c b/net.c
index 09963f2e8b4b55d4931b8dd5236aecc2a9012015..b2c9c43a81ad356ec021373c12d5c764fa5b76f4 100644 (file)
--- a/net.c
+++ b/net.c
@@ -19,11 +19,13 @@
 #define AI_ADDRCONFIG 0
 #endif
 
 #define AI_ADDRCONFIG 0
 #endif
 

+#include <dirent.h>

 
 #include "para.h"
 #include "error.h"
 #include "net.h"
 #include "string.h"
 
 #include "para.h"
 #include "error.h"
 #include "net.h"
 #include "string.h"

+#include "fd.h"

 
 
 /** Information about one encrypted connection. */
 
 
 /** Information about one encrypted connection. */


@@ -172,7 +174,7 @@ int makesock(unsigned l3type, unsigned l4type, int passive,
        if ((rc = getaddrinfo(host, port, &hints, passive ? &local : &remote))) {
                PARA_ERROR_LOG("can not resolve %s address %s#%s: %s.\n",
                                layer4_name(l4type),
        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;
        }
                                port, gai_strerror(rc));
                return -E_ADDRESS_LOOKUP;
        }


@@ -226,7 +228,7 @@ get_next_src:
 
        if (src == NULL && dst == NULL) {
                PARA_ERROR_LOG("can not create %s socket %s#%s.\n",
 
        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);
        }
                        "[loopback]" : "[localhost]"), port);
                return -ERRNO_TO_PARA_ERROR(errno);
        }


@@ -345,31 +347,6 @@ struct in_addr extract_v4_addr(const struct sockaddr_storage *ss)
        return ia;
 }
 
        return ia;
 }
 

-/*
- * 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.
- *
- * \return Standard. In any case, the number of bytes actually sent is stored
- * in \a len.
- */
-static int sendall(int fd, const char *buf, size_t *len)
-{
-       size_t total = *len;
-
-       assert(total);
-       *len = 0;
-       while (*len < total) {
-               int ret = write(fd, buf + *len, total - *len);
-               if (ret == -1)
-                       return -ERRNO_TO_PARA_ERROR(errno);
-               *len += ret;
-       }
-       return 1;
-}
-

 /**
  * Encrypt and send a binary buffer.
  *
 /**
  * Encrypt and send a binary buffer.
  *


@@ -389,7 +366,7 @@ int send_bin_buffer(int fd, const char *buf, size_t len)
        crypt_function *cf = NULL;
 
        if (!len)
        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) {
        if (fd + 1 <= cda_size)
                cf = crypt_data_array[fd].send;
        if (cf) {


@@ -397,10 +374,10 @@ int send_bin_buffer(int fd, const char *buf, size_t len)
                /* 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);
                /* 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
                free(outbuf);
        } else

-               ret = sendall(fd, buf, &len);
+               ret = write_all(fd, buf, &len);

        return ret;
 }
 
        return ret;
 }