diff --git a/src/lua/bsdsocket.cc b/src/lua/bsdsocket.cc index 4760e64685f0afbd8691dd9e9110c3b960cb9881..f506998b9cb67ac38c12d308f6a43d5aa034601d 100644 --- a/src/lua/bsdsocket.cc +++ b/src/lua/bsdsocket.cc @@ -26,7 +26,6 @@ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ - #include "bsdsocket.h" #include <errno.h> @@ -253,13 +252,13 @@ static const struct { char name[32]; int value, type, rw; } so_opts[] = { #ifdef SO_PROTOCOL {"SO_PROTOCOL", SO_PROTOCOL, 1, 0, }, #else - #define SO_PROTOCOL 38 +#define SO_PROTOCOL 38 #endif #ifdef SO_TYPE {"SO_TYPE", SO_TYPE, 1, 0, }, #else - #define SO_TYPE 3 +#define SO_TYPE 3 #endif {"", 0, 0, 0, } @@ -407,18 +406,18 @@ lbox_bsdsocket_iowait(struct lua_State *L) int events = lua_tointeger(L, 2); ev_tstamp timeout = lua_tonumber(L, 3); - switch(events) { - case 0: - events = EV_READ; - break; - case 1: - events = EV_WRITE; - break; - case 2: - events = EV_READ | EV_WRITE; - break; - default: - assert(false); + switch (events) { + case 0: + events = EV_READ; + break; + case 1: + events = EV_WRITE; + break; + case 2: + events = EV_READ | EV_WRITE; + break; + default: + assert(false); } struct ev_io io; @@ -452,79 +451,79 @@ bsdsocket_getaddrinfo_cb(va_list ap) int rc = getaddrinfo(host, port, hints, res); - switch(rc) { - case EAI_NONAME: - *res = NULL; - case 0: - return 0; + switch (rc) { + case EAI_NONAME: + *res = NULL; + case 0: + return 0; - case EAI_SYSTEM: - *res_errno = errno; - return -1; - default: - *res_errno = rc; - return -1; + case EAI_SYSTEM: + *res_errno = errno; + return -1; + default: + *res_errno = rc; + return -1; } } static int lbox_bsdsocket_push_family(struct lua_State *L, int family) { - switch(family) { + switch (family) { #ifdef AF_UNIX - case AF_UNIX: - lua_pushliteral(L, "AF_UNIX"); - break; + case AF_UNIX: + lua_pushliteral(L, "AF_UNIX"); + break; #endif #ifdef AF_INET - case AF_INET: - lua_pushliteral(L, "AF_INET"); - break; + case AF_INET: + lua_pushliteral(L, "AF_INET"); + break; #endif #ifdef AF_INET6 - case AF_INET6: - lua_pushliteral(L, "AF_INET6"); - break; + case AF_INET6: + lua_pushliteral(L, "AF_INET6"); + break; #endif #ifdef AF_IPX - case AF_IPX: - lua_pushliteral(L, "AF_IPX"); - break; + case AF_IPX: + lua_pushliteral(L, "AF_IPX"); + break; #endif #ifdef AF_NETLINK - case AF_NETLINK: - lua_pushliteral(L, "AF_NETLINK"); - break; + case AF_NETLINK: + lua_pushliteral(L, "AF_NETLINK"); + break; #endif #ifdef AF_X25 - case AF_X25: - lua_pushliteral(L, "AF_X25"); - break; + case AF_X25: + lua_pushliteral(L, "AF_X25"); + break; #endif #ifdef AF_AX25 - case AF_AX25: - lua_pushliteral(L, "AF_AX25"); - break; + case AF_AX25: + lua_pushliteral(L, "AF_AX25"); + break; #endif #ifdef AF_ATMPVC - case AF_ATMPVC: - lua_pushliteral(L, "AF_ATMPVC"); - break; + case AF_ATMPVC: + lua_pushliteral(L, "AF_ATMPVC"); + break; #endif #ifdef AF_APPLETALK - case AF_APPLETALK: - lua_pushliteral(L, "AF_APPLETALK"); - break; + case AF_APPLETALK: + lua_pushliteral(L, "AF_APPLETALK"); + break; #endif #ifdef AF_PACKET - case AF_PACKET: - lua_pushliteral(L, "AF_PACKET"); - break; + case AF_PACKET: + lua_pushliteral(L, "AF_PACKET"); + break; #endif - default: - lua_pushinteger(L, family); - break; + default: + lua_pushinteger(L, family); + break; } return 1; } @@ -545,50 +544,50 @@ static int lbox_bsdsocket_push_sotype(struct lua_State *L, int sotype) { /* man 7 socket says that sotype can contain some flags */ - #if defined(SOCK_NONBLOCK) && defined(SOCK_CLOEXEC) - sotype &= ~(SOCK_NONBLOCK | SOCK_CLOEXEC); - #endif - switch(sotype) { +#if defined(SOCK_NONBLOCK) && defined(SOCK_CLOEXEC) + sotype &= ~(SOCK_NONBLOCK | SOCK_CLOEXEC); +#endif + switch (sotype) { #ifdef SOCK_STREAM - case SOCK_STREAM: - lua_pushliteral(L, "SOCK_STREAM"); - break; + case SOCK_STREAM: + lua_pushliteral(L, "SOCK_STREAM"); + break; #endif #ifdef SOCK_DGRAM - case SOCK_DGRAM: - lua_pushliteral(L, "SOCK_DGRAM"); - break; + case SOCK_DGRAM: + lua_pushliteral(L, "SOCK_DGRAM"); + break; #endif #ifdef SOCK_SEQPACKET - case SOCK_SEQPACKET: - lua_pushliteral(L, "SOCK_SEQPACKET"); - break; + case SOCK_SEQPACKET: + lua_pushliteral(L, "SOCK_SEQPACKET"); + break; #endif #ifdef SOCK_RAW - case SOCK_RAW: - lua_pushliteral(L, "SOCK_RAW"); - break; + case SOCK_RAW: + lua_pushliteral(L, "SOCK_RAW"); + break; #endif #ifdef SOCK_RDM - case SOCK_RDM: - lua_pushliteral(L, "SOCK_RDM"); - break; + case SOCK_RDM: + lua_pushliteral(L, "SOCK_RDM"); + break; #endif #ifdef SOCK_PACKET - case SOCK_PACKET: - lua_pushliteral(L, "SOCK_PACKET"); - break; + case SOCK_PACKET: + lua_pushliteral(L, "SOCK_PACKET"); + break; #endif - default: - lua_pushinteger(L, sotype); - break; + default: + lua_pushinteger(L, sotype); + break; } return 1; } static int lbox_bsdsocket_push_addr(struct lua_State *L, - const struct sockaddr *addr, socklen_t alen) + const struct sockaddr *addr, socklen_t alen) { lua_newtable(L); @@ -596,46 +595,46 @@ lbox_bsdsocket_push_addr(struct lua_State *L, lbox_bsdsocket_push_family(L, addr->sa_family); lua_rawset(L, -3); - switch(addr->sa_family) { - case PF_INET: - case PF_INET6: { - char shost[NI_MAXHOST]; - char sservice[NI_MAXSERV]; - int rc = getnameinfo(addr, - alen, - shost, sizeof(shost), - sservice, sizeof(sservice), - NI_NUMERICHOST|NI_NUMERICSERV - ); - - if (rc == 0) { - lua_pushliteral(L, "host"); - lua_pushstring(L, shost); - lua_rawset(L, -3); - - lua_pushliteral(L, "port"); - lua_pushinteger(L, atol(sservice)); - lua_rawset(L, -3); - } - - break; - } - - case PF_UNIX: + switch (addr->sa_family) { + case PF_INET: + case PF_INET6: { + char shost[NI_MAXHOST]; + char sservice[NI_MAXSERV]; + int rc = getnameinfo(addr, + alen, + shost, sizeof(shost), + sservice, sizeof(sservice), + NI_NUMERICHOST|NI_NUMERICSERV + ); + + if (rc == 0) { lua_pushliteral(L, "host"); - lua_pushliteral(L, "unix/"); + lua_pushstring(L, shost); lua_rawset(L, -3); lua_pushliteral(L, "port"); - lua_pushstring(L, - ((struct sockaddr_un *)addr)->sun_path); + lua_pushinteger(L, atol(sservice)); lua_rawset(L, -3); - break; + } + + break; + } + + case PF_UNIX: + lua_pushliteral(L, "host"); + lua_pushliteral(L, "unix/"); + lua_rawset(L, -3); - default: /* unknown family */ - lua_pop(L, 1); - lua_pushnil(L); - break; + lua_pushliteral(L, "port"); + lua_pushstring(L, + ((struct sockaddr_un *)addr)->sun_path); + lua_rawset(L, -3); + break; + + default: /* unknown family */ + lua_pop(L, 1); + lua_pushnil(L); + break; } return 1; @@ -679,7 +678,7 @@ lbox_bsdsocket_getaddrinfo(struct lua_State *L) int res_errno = 0; int dns_res = coeio_custom(bsdsocket_getaddrinfo_cb, timeout, - host, port, &hints, &result, &res_errno); + host, port, &hints, &result, &res_errno); lua_pop(L, 2); /* host, port */ if (dns_res != 0) { @@ -695,8 +694,8 @@ lbox_bsdsocket_getaddrinfo(struct lua_State *L) } auto scope_guard = make_scoped_guard([&]{ - freeaddrinfo(result); - }); + freeaddrinfo(result); + }); lua_newtable(L); int i = 1; @@ -815,7 +814,7 @@ lbox_bsdsocket_recvfrom(struct lua_State *L) auto scope_guard = make_scoped_guard([&]{ free(buf); }); ssize_t res = recvfrom(fh, buf, size, flags, - (struct sockaddr*)&fa, &len); + (struct sockaddr*)&fa, &len); if (res < 0) { lua_pushnil(L); @@ -842,7 +841,7 @@ tarantool_lua_bsdsocket_init(struct lua_State *L) if (luaL_dostring(L, bsdsocket_lua)) panic("Error loading Lua source (internal)/bsdsocket.lua: %s", - lua_tostring(L, -1)); + lua_tostring(L, -1)); lua_getfield(L, LUA_GLOBALSINDEX, "box"); lua_getfield(L, -1, "socket"); diff --git a/src/lua/bsdsocket.h b/src/lua/bsdsocket.h index 6e28fe3940a650be0c96558c7c0cb02442c1d5be..a81454da04d8009edd0b5da823674346ec7954ef 100644 --- a/src/lua/bsdsocket.h +++ b/src/lua/bsdsocket.h @@ -1,3 +1,5 @@ +#ifndef INCLUDES_TARANTOOL_LUA_BSDSOCKET_H +#define INCLUDES_TARANTOOL_LUA_BSDSOCKET_H /* * Redistribution and use in source and binary forms, with or * without modification, are permitted provided that the following @@ -26,10 +28,6 @@ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ - -#ifndef INCLUDES_TARANTOOL_LUA_BSDSOCKET_H -#define INCLUDES_TARANTOOL_LUA_BSDSOCKET_H - #include <stddef.h> #include <sys/socket.h> @@ -45,7 +43,7 @@ bsdsocket_local_resolve(const char *host, const char *port, struct sockaddr *addr, socklen_t *socklen); int bsdsocket_nonblock(int fh, int mode); int bsdsocket_sendto(int fh, const char *host, const char *port, - const void *octets, size_t len, int flags); + const void *octets, size_t len, int flags); #if defined(__cplusplus) }