From d3a57db467897357e32343cdecebe09b226c7d7b Mon Sep 17 00:00:00 2001 From: "hyunghwan.chung" Date: Fri, 19 Jan 2018 09:33:47 +0000 Subject: [PATCH] refactored code for legacy platforms --- moo/mod/_sck.h | 2 ++ moo/mod/sck-addr.c | 26 ++++++++++++++++++++------ moo/mod/sck.c | 27 +++++++++++++++++++++------ 3 files changed, 43 insertions(+), 12 deletions(-) diff --git a/moo/mod/_sck.h b/moo/mod/_sck.h index 9c4c735..6d6dafb 100644 --- a/moo/mod/_sck.h +++ b/moo/mod/_sck.h @@ -71,6 +71,7 @@ struct sck_t typedef moo_uint64_t sck_len_t; #endif #else +# undef MOO_SIZEOF_SOCKLEN_T # define MOO_SIZEOF_SOCKLEN_T MOO_SIZEOF_INT # define MOO_SOCKLEN_T_IS_SIGNED typedef int sck_len_t; @@ -101,6 +102,7 @@ struct sck_t typedef moo_uint64_t sck_addr_family_t; #endif #else +# undef MOO_SIZEOF_SA_FAMILY_T # define MOO_SIZEOF_SA_FAMILY_T MOO_SIZEOF_INT # define MOO_SA_FAMILY_T_IS_SIGNED typedef int sck_addr_family_t; diff --git a/moo/mod/sck-addr.c b/moo/mod/sck-addr.c index 2b862a8..616ed6b 100644 --- a/moo/mod/sck-addr.c +++ b/moo/mod/sck-addr.c @@ -79,22 +79,22 @@ struct sck_addr_trailer_t { moo_ooch_t path[100]; } local; */ - }; + } u; }; union sockaddr_t { -#if defined(MOO_SIZEOF_STRUCT_SOCKADDR_IN) +#if (MOO_SIZEOF_STRUCT_SOCKADDR_IN > 0) struct sockaddr_in in4; #endif -#if defined(MOO_SIZEOF_STRUCT_SOCKADDR_IN6) +#if (MOO_SIZEOF_STRUCT_SOCKADDR_IN6 > 0) struct sockaddr_in6 in6; #endif -#if defined(MOO_SIZEOF_STRUCT_SOCKADDR_LL) +#if (MOO_SIZEOF_STRUCT_SOCKADDR_LL > 0) struct sockaddr_ll ll; #endif -#if defined(MOO_SIZEOF_STRUCT_SOCKADDR_UN) +#if (MOO_SIZEOF_STRUCT_SOCKADDR_UN > 0) struct sockaddr_un un; #endif }; @@ -142,6 +142,7 @@ static int str_to_ipv4 (const moo_ooch_t* str, moo_oow_t len, struct in_addr* in } +#if (MOO_SIZEOF_STRUCT_SOCKADDR_IN6 > 0) static int str_to_ipv6 (const moo_ooch_t* src, moo_oow_t len, struct in6_addr* inaddr) { moo_uint8_t* tp, * endp, * colonp; @@ -251,6 +252,7 @@ static int str_to_ipv6 (const moo_ooch_t* src, moo_oow_t len, struct in6_addr* i return 0; } +#endif static int str_to_sockaddr (moo_t* moo, const moo_ooch_t* str, moo_oow_t len, sockaddr_t* nwad) @@ -291,6 +293,7 @@ static int str_to_sockaddr (moo_t* moo, const moo_ooch_t* str, moo_oow_t len, so } #endif +#if (MOO_SIZEOF_STRUCT_SOCKADDR_IN6 > 0) if (*p == '[') { /* IPv6 address */ @@ -353,6 +356,7 @@ TODO: } else { +#endif /* IPv4 address */ tmp.ptr = (moo_ooch_t*)p; while (p < end && *p != ':') p++; @@ -360,6 +364,7 @@ TODO: if (str_to_ipv4(tmp.ptr, tmp.len, &nwad->in4.sin_addr) <= -1) { + #if (MOO_SIZEOF_STRUCT_SOCKADDR_IN6 > 0) /* check if it is an IPv6 address not enclosed in []. * the port number can't be specified in this format. */ if (p >= end || *p != ':') @@ -423,10 +428,15 @@ TODO nwad->in6.sin6_family = AF_INET6; return 0; + #else + goto unrecog; + #endif } nwad->in4.sin_family = AF_INET; +#if (MOO_SIZEOF_STRUCT_SOCKADDR_IN6 > 0) } +#endif if (p < end && *p == ':') { @@ -450,10 +460,14 @@ TODO return -1; } + #if (MOO_SIZEOF_STRUCT_SOCKADDR_IN6 > 0) if (nwad->in4.sin_family == AF_INET) nwad->in4.sin_port = moo_hton16(port); else nwad->in6.sin6_port = moo_hton16(port); + #else + nwad->in4.sin_port = moo_hton16(port); + #endif } return 0; @@ -546,7 +560,7 @@ sck_len_t moo_sck_addr_len (sck_addr_t* addr) case AF_INET: return MOO_SIZEOF(struct sockaddr_in); #endif - #if defined(AF_INET) + #if defined(AF_INET6) case AF_INET6: return MOO_SIZEOF(struct sockaddr_in6); #endif diff --git a/moo/mod/sck.c b/moo/mod/sck.c index b0eb4e1..e9d236a 100644 --- a/moo/mod/sck.c +++ b/moo/mod/sck.c @@ -88,14 +88,22 @@ create_socket: if (!(typev & (SOCK_NONBLOCK | SOCK_CLOEXEC))) #endif { - int oldfl; + int fl; - oldfl = fcntl(fd, F_GETFL, 0); - if (oldfl == -1 || fcntl(fd, F_SETFL, oldfl | O_CLOEXEC | O_NONBLOCK) == -1) + fl = fcntl(fd, F_GETFL, 0); + if (fl == -1) { + fcntl_failure: moo_seterrwithsyserr (moo, errno); goto oops; } + + fl |= O_NONBLOCK; + #if defined(O_CLOEXEC) + fl |= O_CLOEXEC; + #endif + + if (fcntl(fd, F_SETFL, fl) == -1) goto fcntl_failure; } sck->handle = MOO_SMOOI_TO_OOP(fd); @@ -179,7 +187,7 @@ static moo_pfrc_t pf_accept_socket (moo_t* moo, moo_ooi_t nargs) oop_sck_t sck, newsck; moo_oop_t arg; sck_len_t addrlen; - int fd, newfd, oldfl; + int fd, newfd, fl; sck = (oop_sck_t)MOO_STACK_GETRCV(moo, nargs); arg = MOO_STACK_GETARG(moo, nargs, 0); @@ -219,13 +227,20 @@ static moo_pfrc_t pf_accept_socket (moo_t* moo, moo_ooi_t nargs) moo_seterrwithsyserr (moo, errno); return MOO_PF_FAILURE; } - oldfl = fcntl(newfd, F_GETFL, 0); - if (oldfl == -1 || fcntl(newfd, F_SETFL, oldfl | O_NONBLOCK | O_CLOEXEC) == -1) + fl = fcntl(newfd, F_GETFL, 0); + if (fl == -1) { + fcntl_failure: moo_seterrwithsyserr (moo, errno); close (newfd); return MOO_PF_FAILURE; } + + fl |= O_NONBLOCK; +#if defined(O_CLOEXEC) + fl |= O_CLOEXEC; +#endif + if (fcntl(newfd, F_SETFL, fl) == -1) goto fcntl_failure; accept_done: newsck = (oop_sck_t)moo_instantiate (moo, MOO_OBJ_GET_CLASS(sck), MOO_NULL, 0);