Add sockpushdata.

[doldaconnect.git] / daemon / net.c

diff --git a/daemon/net.c b/daemon/net.c
index 1eeaff1..410da96 100644 (file)
--- a/daemon/net.c
+++ b/daemon/net.c
@@ -270,6 +270,23 @@ void putsock(struct socket *sk)
     }
 }
 
+void sockpushdata(struct socket *sk, void *buf, size_t size)
+{
+    switch(sk->type)
+    {
+    case SOCK_STREAM:
+       sizebuf(&sk->inbuf.s.buf, &sk->inbuf.s.bufsize, sk->inbuf.s.datasize + size, 1, 1);
+       memmove(sk->inbuf.s.buf + size, sk->inbuf.s.buf, sk->inbuf.s.datasize);
+       memcpy(sk->inbuf.s.buf, buf, size);
+       sk->inbuf.s.datasize += size;
+       break;
+    case SOCK_DGRAM:
+       /* XXX */
+       break;
+    }
+    return;
+}
+
 void *sockgetinbuf(struct socket *sk, size_t *size)
 {
     void *buf;
@@ -574,6 +591,7 @@ struct socket *netcslisten(int type, struct sockaddr *name, socklen_t namelen, v
 struct socket *netcslistenlocal(int type, struct sockaddr *name, socklen_t namelen, void (*func)(struct socket *, struct socket *, void *), void *data)
 {
     struct socket *sk;
+    int intbuf;
     
     /* I don't know if this is actually correct (it probably isn't),
      * but since, at on least Linux systems, PF_* are specifically
@@ -584,6 +602,11 @@ struct socket *netcslistenlocal(int type, struct sockaddr *name, socklen_t namel
     if((sk = mksock(name->sa_family, type)) == NULL)
        return(NULL);
     sk->state = SOCK_LST;
+    if(confgetint("net", "reuseaddr"))
+    {
+       intbuf = 1;
+       setsockopt(sk->fd, SOL_SOCKET, SO_REUSEADDR, &intbuf, sizeof(intbuf));
+    }
     if(bind(sk->fd, name, namelen) < 0)
     {
        putsock(sk);