fix memset bug in enable_crypt()

[paraslash.git] / dccp_send.c

diff --git a/dccp_send.c b/dccp_send.c
index 9bfe65f68a7bc7634c5ba581589e95c96c434e18..08930ad1852321f877fac474b839ea71bc5ee5d8 100644 (file)
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -31,8 +31,10 @@
 #include "dccp.h"
 #include "error.h"
 #include "string.h"
 #include "dccp.h"
 #include "error.h"
 #include "string.h"

+#include "fd.h"
+#include "close_on_fork.h"

 #include "server.cmdline.h"
 #include "server.cmdline.h"

-extern struct gengetopt_args_info conf;
+

 /** the list of connected clients **/
 static struct list_head clients;
 static int listen_fd = -1;
 /** the list of connected clients **/
 static struct list_head clients;
 static int listen_fd = -1;


@@ -75,6 +77,8 @@ static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
        PARA_NOTICE_LOG("connection from %s\n", inet_ntoa(dc->addr.sin_addr));
        dc->fd = ret;
        list_add(&dc->node, &clients);
        PARA_NOTICE_LOG("connection from %s\n", inet_ntoa(dc->addr.sin_addr));
        dc->fd = ret;
        list_add(&dc->node, &clients);

+       add_close_on_fork_list(dc->fd);
+       mark_fd_nonblock(dc->fd);

 }
 
 static int dccp_open(void)
 }
 
 static int dccp_open(void)


@@ -101,6 +105,8 @@ static int dccp_open(void)
        if (ret < 0)
                return -E_DCCP_LISTEN;
        PARA_DEBUG_LOG("listening on fd %d\n", listen_fd);
        if (ret < 0)
                return -E_DCCP_LISTEN;
        PARA_DEBUG_LOG("listening on fd %d\n", listen_fd);

+       add_close_on_fork_list(listen_fd);
+       mark_fd_nonblock(listen_fd);

        return 1;
 }
 
        return 1;
 }
 


@@ -109,6 +115,7 @@ static void dccp_shutdown_client(struct dccp_client *dc)
        PARA_DEBUG_LOG("shutting down %s (fd %d)\n", inet_ntoa(dc->addr.sin_addr),
                dc->fd);
        close(dc->fd);
        PARA_DEBUG_LOG("shutting down %s (fd %d)\n", inet_ntoa(dc->addr.sin_addr),
                dc->fd);
        close(dc->fd);

+       del_close_on_fork_list(dc->fd);

        list_del(&dc->node);
        free(dc);
 }
        list_del(&dc->node);
        free(dc);
 }