From 2372fc535ea5cb9d70ab7b5677bd456c6a8900af Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Wed, 16 Jan 2019 10:42:20 +0000 Subject: [PATCH] changed the return type of on_connect to void --- mio/lib/main.c | 16 ++++++++-------- mio/lib/mio-sck.c | 20 +++++++++++--------- mio/lib/mio-sck.h | 2 +- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/mio/lib/main.c b/mio/lib/main.c index 1c15d07..f5d1a6e 100644 --- a/mio/lib/main.c +++ b/mio/lib/main.c @@ -155,9 +155,9 @@ static void tcp_sck_on_disconnect (mio_dev_sck_t* tcp) break; } } -static int tcp_sck_on_connect (mio_dev_sck_t* tcp) -{ +static void tcp_sck_on_connect (mio_dev_sck_t* tcp) +{ mio_sckfam_t fam; mio_scklen_t len; mio_bch_t buf1[128], buf2[128]; @@ -173,16 +173,17 @@ static int tcp_sck_on_connect (mio_dev_sck_t* tcp) if (tcp->state & MIO_DEV_SCK_CONNECTED) { - printf ("DEVICE connected to a remote server... LOCAL %s:%d REMOTE %s:%d.", buf1, mio_getsckaddrport(&tcp->localaddr), buf2, mio_getsckaddrport(&tcp->remoteaddr)); - } else if (tcp->state & MIO_DEV_SCK_ACCEPTED) { printf ("DEVICE accepted client device... .LOCAL %s:%d REMOTE %s:%d\n", buf1, mio_getsckaddrport(&tcp->localaddr), buf2, mio_getsckaddrport(&tcp->remoteaddr)); } - return mio_dev_sck_write(tcp, "hello", 5, MIO_NULL, MIO_NULL); + if (mio_dev_sck_write(tcp, "hello", 5, MIO_NULL, MIO_NULL) <= -1) + { + mio_dev_sck_halt (tcp); + } } static int tcp_sck_on_write (mio_dev_sck_t* tcp, mio_iolen_t wrlen, void* wrctx, const mio_sckaddr_t* dstaddr) @@ -301,10 +302,9 @@ static int arp_sck_on_write (mio_dev_sck_t* dev, mio_iolen_t wrlen, void* wrctx, return 0; } -static int arp_sck_on_connect (mio_dev_sck_t* dev) +static void arp_sck_on_connect (mio_dev_sck_t* dev) { printf ("STARTING UP ARP SOCKET %d...\n", dev->sck); - return 0; } static void arp_sck_on_disconnect (mio_dev_sck_t* dev) @@ -814,7 +814,7 @@ int main (int argc, char* argv[]) { mio_exec (mio); } -#endif +#endif mio_loop (mio); oops: diff --git a/mio/lib/mio-sck.c b/mio/lib/mio-sck.c index 369f9c0..a4cfef0 100644 --- a/mio/lib/mio-sck.c +++ b/mio/lib/mio-sck.c @@ -1074,7 +1074,7 @@ fcntl (rdev->sck, F_SETFL, flags | O_NONBLOCK); * the underlying socket connection has been established immediately */ if (mio_ispostime(&conn->connect_tmout)) { - if (schedule_timer_job_after (rdev, &conn->connect_tmout, ssl_connect_timedout) <= -1) + if (schedule_timer_job_after(rdev, &conn->connect_tmout, ssl_connect_timedout) <= -1) { /* no device halting in spite of failure. * let the caller handle this after having @@ -1105,7 +1105,7 @@ fcntl (rdev->sck, F_SETFL, flags | O_NONBLOCK); ssl_connected: #endif MIO_DEV_SCK_SET_PROGRESS (rdev, MIO_DEV_SCK_CONNECTED); - if (rdev->on_connect(rdev) <= -1) return -1; + if (rdev->on_connect) rdev->on_connect (rdev); #if defined(USE_SSL) } #endif @@ -1208,9 +1208,9 @@ static int harvest_outgoing_connection (mio_dev_sck_t* rdev) } addrlen = MIO_SIZEOF(localaddr); - if (getsockname (rdev->sck, (struct sockaddr*)&localaddr, &addrlen) == 0) rdev->localaddr = localaddr; + if (getsockname(rdev->sck, (struct sockaddr*)&localaddr, &addrlen) == 0) rdev->localaddr = localaddr; - if (mio_dev_watch ((mio_dev_t*)rdev, MIO_DEV_WATCH_RENEW, 0) <= -1) + if (mio_dev_watch((mio_dev_t*)rdev, MIO_DEV_WATCH_RENEW, 0) <= -1) { /* watcher update failure. it's critical */ mio_stop (rdev->mio, MIO_STOPREQ_WATCHER_ERROR); @@ -1236,7 +1236,7 @@ static int harvest_outgoing_connection (mio_dev_sck_t* rdev) * when the CONNECT IOCTL command has been executed. use the * same deadline here */ if (mio_ispostime(&rdev->tmout) && - schedule_timer_job_at (rdev, &rdev->tmout, ssl_connect_timedout) <= -1) + schedule_timer_job_at(rdev, &rdev->tmout, ssl_connect_timedout) <= -1) { mio_dev_halt ((mio_dev_t*)rdev); } @@ -1253,7 +1253,7 @@ static int harvest_outgoing_connection (mio_dev_sck_t* rdev) ssl_connected: #endif MIO_DEV_SCK_SET_PROGRESS (rdev, MIO_DEV_SCK_CONNECTED); - if (rdev->on_connect (rdev) <= -1) return -1; + if (rdev->on_connect) rdev->on_connect (rdev); #if defined(USE_SSL) } #endif @@ -1404,7 +1404,8 @@ accept_done: else { MIO_DEV_SCK_SET_PROGRESS (clidev, MIO_DEV_SCK_ACCEPTED); - if (clidev->on_connect(clidev) <= -1) mio_dev_sck_halt (clidev); + /*if (clidev->on_connect(clidev) <= -1) mio_dev_sck_halt (clidev);*/ + if (clidev->on_connect) clidev->on_connect (clidev); } return 0; @@ -1490,7 +1491,7 @@ static int dev_evcb_sck_ready_stateful (mio_dev_t* dev, int events) } MIO_DEV_SCK_SET_PROGRESS (rdev, MIO_DEV_SCK_CONNECTED); - if (rdev->on_connect (rdev) <= -1) return -1; + if (rdev->on_connect) rdev->on_connect (rdev); return 0; } else @@ -1552,7 +1553,8 @@ static int dev_evcb_sck_ready_stateful (mio_dev_t* dev, int events) } MIO_DEV_SCK_SET_PROGRESS (rdev, MIO_DEV_SCK_ACCEPTED); - if (rdev->on_connect(rdev) <= -1) mio_dev_sck_halt (rdev); + /*if (rdev->on_connect(rdev) <= -1) mio_dev_sck_halt (rdev);*/ + if (rdev->on_connect) rdev->on_connect (rdev); return 0; } diff --git a/mio/lib/mio-sck.h b/mio/lib/mio-sck.h index ecc79cc..f4bf608 100644 --- a/mio/lib/mio-sck.h +++ b/mio/lib/mio-sck.h @@ -319,7 +319,7 @@ typedef void (*mio_dev_sck_on_disconnect_t) ( mio_dev_sck_t* dev ); -typedef int (*mio_dev_sck_on_connect_t) ( +typedef void (*mio_dev_sck_on_connect_t) ( mio_dev_sck_t* dev );