From 7360a155a72ce26b5c175f1137d1ffb867cac524 Mon Sep 17 00:00:00 2001 From: Georg Hopp Date: Fri, 30 Oct 2015 23:11:09 +0100 Subject: [PATCH] Use new flag that indicates a socket as a filedescriptor getter. --- src/comm_manager_epoll.c | 3 +-- src/comm_manager_poll.c | 3 +-- src/i_comm_manager.c | 6 ++---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/comm_manager_epoll.c b/src/comm_manager_epoll.c index fb64514..b301ea2 100644 --- a/src/comm_manager_epoll.c +++ b/src/comm_manager_epoll.c @@ -99,8 +99,7 @@ TR_commManagerEpollSelect(void * _this, TR_Event event, unsigned long timeout) int handle = endpoint->transport->handle; if ((events[i].events & EPOLLIN) == EPOLLIN) { - if (TR_INSTANCE_OF(TR_TcpSocket, endpoint->transport) - && ((TR_TcpSocket)endpoint->transport)->listen) { + if (TR_socketFdGetter(endpoint->transport)) { TR_setAdd(cmgr->accept, endpoint); } else { if (! event->subject->fin) { diff --git a/src/comm_manager_poll.c b/src/comm_manager_poll.c index 925471f..2c3e285 100644 --- a/src/comm_manager_poll.c +++ b/src/comm_manager_poll.c @@ -95,8 +95,7 @@ TR_commManagerPollSelect(void * _this, TR_Event event, unsigned long timeout) nevents--; if ((this->fds[i].revents & POLLIN) == POLLIN) { - if (TR_INSTANCE_OF(TR_TcpSocket, endpoint->transport) - && ((TR_TcpSocket)endpoint->transport)->listen) { + if (TR_socketFdGetter(endpoint->transport)) { TR_setAdd(cmgr->accept, endpoint); } else { if (! event->subject->fin) { diff --git a/src/i_comm_manager.c b/src/i_comm_manager.c index 0f769ff..0d42534 100644 --- a/src/i_comm_manager.c +++ b/src/i_comm_manager.c @@ -50,8 +50,7 @@ TR_commManagerAddEndpoint(void * _this, TR_CommEndPoint endpoint) this->endpoints[endpoint->transport->handle] = endpoint; - if (TR_INSTANCE_OF(TR_TcpSocket, endpoint->transport) - && ((TR_TcpSocket)endpoint->transport)->listen) { + if (TR_socketFdGetter(endpoint->transport)) { TR_setAdd(this->accept, endpoint); TR_ISSUE_IO_ACC_EVENT(this, endpoint); } else { @@ -117,8 +116,7 @@ TR_commManagerPollRead(void * _this, TR_Event event) TR_CommManager this = _this; TR_CommEndPoint endpoint = (TR_CommEndPoint)event->subject; - if (TR_INSTANCE_OF(TR_TcpSocket, endpoint->transport) - && ((TR_TcpSocket)endpoint->transport)->listen) { + if (TR_socketFdGetter(endpoint->transport)) { TR_setDelete(this->accept, event->subject); } else { TR_setDelete(this->read, event->subject);