From ab0ae36d99f292a9afce1d9742f00234e25526c3 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Tue, 26 Jun 2012 14:08:48 -0700 Subject: [PATCH] Refresh of shut_wr --- src/rsocket.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/rsocket.c b/src/rsocket.c index 8263def6..5dfec0ba 100644 --- a/src/rsocket.c +++ b/src/rsocket.c @@ -131,21 +131,21 @@ union rs_wr_id { }; }; -/* - * rsocket states are ordered as passive, connecting, connected, disconnected. - */ enum rs_state { rs_init, - rs_bound, - rs_listening, - rs_resolving_addr, - rs_resolving_route, - rs_connecting, - rs_accepting, - rs_connect_error, - rs_connected, - rs_disconnected, - rs_error + rs_bound = 0x0001, + rs_listening = 0x0002, + rs_opening = 0x0004, + rs_resolving_addr = rs_opening | 0x0010, + rs_resolving_route = rs_opening | 0x0020, + rs_connecting = rs_opening | 0x0040, + rs_accepting = rs_opening | 0x0080, + rs_connected = 0x0100, + rs_connect_wr = rs_connected | 0x0200, + rs_connect_rd = rs_connected | 0x0400, + rs_disconnected = 0x0800, + rs_error = 0x1000, + rs_connect_error = rs_error | 0x2000 }; #define RS_OPT_SWAP_SGL 1 @@ -701,9 +701,9 @@ do_connect: if (!ret) goto connected; if (errno == EAGAIN || errno == EWOULDBLOCK) - rs->state = rs_connecting; + rs->state = rs_active_connect; break; - case rs_connecting: + case rs_active_connect: ret = ucma_complete(rs->cm_id); if (ret) break; @@ -1444,7 +1444,7 @@ static int rs_poll_rs(struct rsocket *rs, int events, return fds.revents; case rs_resolving_addr: case rs_resolving_route: - case rs_connecting: + case rs_active_connect: case rs_accepting: ret = rs_do_connect(rs); if (ret) { -- 2.45.2