NEWS update.

[paraslash.git] / net.c

diff --git a/net.c b/net.c
index 10fc121912b8d242b7ca15a8081c2e7e490e44c5..601396477c66715e21bc222d69c0d7e0b1aa9f92 100644 (file)
--- a/net.c
+++ b/net.c
@@ -172,7 +172,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),
-                               host?  : (passive? "[loopback]" : "[localhost]"),
+                               host? host : (passive? "[loopback]" : "[localhost]"),
                                port, gai_strerror(rc));
                return -E_ADDRESS_LOOKUP;
        }
@@ -226,7 +226,7 @@ get_next_src:
 
        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);
        }
@@ -362,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;
@@ -389,7 +389,7 @@ int send_bin_buffer(int fd, const char *buf, size_t 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) {