diff --git a/nfq2/helpers.c b/nfq2/helpers.c index 09e4a1c..2697a49 100644 --- a/nfq2/helpers.c +++ b/nfq2/helpers.c @@ -396,16 +396,16 @@ void phton64(uint8_t *p, uint64_t v) p[7] = (uint8_t)v; } -uint16_t swap16(uint16_t u) +uint16_t bswap16(uint16_t u) { // __builtin_bswap16 is absent in ancient lexra gcc 4.6 return (u>>8) | ((u&0xFF)<<8); } -uint32_t swap24(uint32_t u) +uint32_t bswap24(uint32_t u) { return (u>>16) & 0xFF | u & 0xFF00 | (u<<16) & 0xFF0000; } -uint64_t swap48(uint64_t u) +uint64_t bswap48(uint64_t u) { return ((u & 0xFF0000000000) >> 40) | ((u & 0xFF00000000) >> 24) | ((u & 0xFF000000) >> 8) | ((u & 0xFF0000) << 8) | ((u & 0xFF00) << 24) | ((u & 0xFF) << 40); } diff --git a/nfq2/helpers.h b/nfq2/helpers.h index 2012403..1a96a5b 100644 --- a/nfq2/helpers.h +++ b/nfq2/helpers.h @@ -66,9 +66,9 @@ void phton48(uint8_t *p, uint64_t v); uint64_t pntoh64(const uint8_t *p); void phton64(uint8_t *p, uint64_t v); -uint16_t swap16(uint16_t u); -uint32_t swap24(uint32_t u); -uint64_t swap48(uint64_t u); +uint16_t bswap16(uint16_t u); +uint32_t bswap24(uint32_t u); +uint64_t bswap48(uint64_t u); bool parse_hex_str(const char *s, uint8_t *pbuf, size_t *size); char hex_digit(uint8_t v); diff --git a/nfq2/lua.c b/nfq2/lua.c index a237e37..1925a77 100644 --- a/nfq2/lua.c +++ b/nfq2/lua.c @@ -279,7 +279,7 @@ static int luacall_swap16(lua_State *L) int64_t i = (int64_t)luaL_checklint(L,1); if (i>0xFFFF || i<-(int64_t)0xFFFF) luaL_error(L, "out of range"); uint16_t u = (uint16_t)i; - lua_pushinteger(L,swap16(u)); + lua_pushinteger(L,bswap16(u)); return 1; } static int luacall_swap24(lua_State *L) @@ -289,7 +289,7 @@ static int luacall_swap24(lua_State *L) int64_t i =(int64_t)luaL_checklint(L,1); if (i>0xFFFFFF || i<-(int64_t)0xFFFFFF) luaL_error(L, "out of range"); uint32_t u = (uint32_t)i; - lua_pushlint(L,swap24(u)); + lua_pushlint(L,bswap24(u)); return 1; } static int luacall_swap32(lua_State *L) @@ -309,7 +309,7 @@ static int luacall_swap48(lua_State *L) int64_t i =(int64_t)luaL_checklint(L,1); if (i>0xFFFFFFFFFFFF || i<-(int64_t)0xFFFFFFFFFFFF) luaL_error(L, "out of range"); uint64_t u = (uint64_t)i; - lua_pushlint(L, swap48(u)); + lua_pushlint(L, bswap48(u)); return 1; } static int lua_uxadd(lua_State *L, int64_t max)