Module: sip-router Branch: andrei/tcp_tls_changes Commit: 7f1b8eb817b26c27d273433d4365d10defca6301 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7f1b8eb… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 25 20:29:32 2010 +0100 tcp: minor cleanups & spelling - removed F_CONN_NON_BLOCKING (not used anymore) - spelling & whitespace cleanups --- tcp_conn.h | 1 - tcp_main.c | 4 ++-- tcp_read.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tcp_conn.h b/tcp_conn.h index bedaf4d..3ce6084 100644 --- a/tcp_conn.h +++ b/tcp_conn.h @@ -61,7 +61,6 @@ /* tcp connection flags */ -#define F_CONN_NON_BLOCKING 1 #define F_CONN_READ_W 2 /* watched for READ ev. in main */ #define F_CONN_WRITE_W 4 /* watched for WRITE (main) */ #define F_CONN_READER 8 /* handled by a tcp reader */ diff --git a/tcp_main.c b/tcp_main.c index 1b26add..e539896 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -3750,9 +3750,9 @@ inline static int handle_tcpconn_ev(struct tcp_connection* tcpconn, short ev, #ifdef TCP_ASYNC send_to_child: #endif - DBG("tcp: DBG: sendig to child, events %x\n", ev); + DBG("tcp: DBG: sending to child, events %x\n", ev); #ifdef POLLRDHUP - tcpconn->flags|=((int)!(ev & (POLLRDHUP|POLLHUP|POLLERR)) -1) & + tcpconn->flags|=((int)!(ev & (POLLRDHUP|POLLHUP|POLLERR)) -1) & F_CONN_EOF_SEEN; #else /* POLLRDHUP */ tcpconn->flags|=((int)!(ev & (POLLHUP|POLLERR)) -1) & F_CONN_EOF_SEEN; diff --git a/tcp_read.c b/tcp_read.c index c5fc575..2946554 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -928,7 +928,7 @@ again: } /* if we received the fd there is most likely data waiting to * be read => process it first to avoid extra sys calls */ - read_flags=((con->flags & (F_CONN_EOF_SEEN|F_CONN_FORCE_EOF)) && + read_flags=((con->flags & (F_CONN_EOF_SEEN|F_CONN_FORCE_EOF)) && !(con->flags & F_CONN_OOB_DATA))? RD_CONN_FORCE_EOF :0; resp=tcp_read_req(con, &n, &read_flags);