From 2b744849213f057983fe1a297b924cd5461abd87 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 7 Dec 2012 17:01:27 -0800 Subject: [PATCH] Refresh of dsocket --- src/rsocket.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/rsocket.c b/src/rsocket.c index 9996d333..f35abebb 100644 --- a/src/rsocket.c +++ b/src/rsocket.c @@ -554,8 +554,10 @@ static struct rsocket *rs_alloc(struct rsocket *inherited_rs, int type) rs->type = type; rs->index = -1; - rs->udp_sock = -1; - rs->epfd = -1; + if (type == SOCK_DGRAM) { + rs->udp_sock = -1; + rs->epfd = -1; + } if (inherited_rs) { rs->sbuf_size = inherited_rs->sbuf_size; @@ -563,16 +565,20 @@ static struct rsocket *rs_alloc(struct rsocket *inherited_rs, int type) rs->sq_inline = inherited_rs->sq_inline; rs->sq_size = inherited_rs->sq_size; rs->rq_size = inherited_rs->rq_size; - rs->ctrl_avail = inherited_rs->ctrl_avail; - rs->target_iomap_size = inherited_rs->target_iomap_size; + if (type == SOCK_STREAM) { + rs->ctrl_avail = inherited_rs->ctrl_avail; + rs->target_iomap_size = inherited_rs->target_iomap_size; + } } else { rs->sbuf_size = def_wmem; rs->rbuf_size = def_mem; rs->sq_inline = def_inline; rs->sq_size = def_sqsize; rs->rq_size = def_rqsize; - rs->ctrl_avail = RS_QP_CTRL_SIZE; - rs->target_iomap_size = def_iomap_size; + if (type == SOCK_STREAM) { + rs->ctrl_avail = RS_QP_CTRL_SIZE; + rs->target_iomap_size = def_iomap_size; + } } fastlock_init(&rs->slock); fastlock_init(&rs->rlock); -- 2.41.0