net/haproxy/patches/0016-BUG-MINOR-lua-Fix-Server.get_addr-port-values.patch

   1 From c00347899e9f0c3420f98c53eab1469644e28e06 Mon Sep 17 00:00:00 2001
   2 From: Nenad Merdanovic <nmerdan@haproxy.com>
   3 Date: Sun, 23 Jul 2017 22:04:58 -0400
   4 Subject: [PATCH 16/18] BUG/MINOR: lua: Fix Server.get_addr() port values
   5
   6 The get_addr() method of the Lua Server class was using the
   7 'sockaddr_storage addr' member to get the port value. HAProxy does not
   8 store ports in this member as it uses a separate member, called
   9 'svc_port'.
  10
  11 This fix should be backported to 1.7.
  12
  13 (cherry picked from commit 3849473828f319829aff422d2fbbce0823e65d64)
  14 Signed-off-by: William Lallemand <wlallemand@haproxy.org>
  15 ---
  16  src/hlua_fcn.c | 6 ++----
  17  1 file changed, 2 insertions(+), 4 deletions(-)
  18
  19 diff --git a/src/hlua_fcn.c b/src/hlua_fcn.c
  20 index fe899a4a..0752220e 100644
  21 --- a/src/hlua_fcn.c
  22 +++ b/src/hlua_fcn.c
  23 @@ -545,8 +545,7 @@ int hlua_server_get_addr(lua_State *L)
  24                           addr, INET_ADDRSTRLEN);
  25                 luaL_addstring(&b, addr);
  26                 luaL_addstring(&b, ":");
  27 -               snprintf(addr, INET_ADDRSTRLEN, "%d",
  28 -                        ntohs(((struct sockaddr_in *)&srv->addr)->sin_port));
  29 +               snprintf(addr, INET_ADDRSTRLEN, "%d", srv->svc_port);
  30                 luaL_addstring(&b, addr);
  31                 break;
  32         case AF_INET6:
  33 @@ -554,8 +553,7 @@ int hlua_server_get_addr(lua_State *L)
  34                           addr, INET_ADDRSTRLEN);
  35                 luaL_addstring(&b, addr);
  36                 luaL_addstring(&b, ":");
  37 -               snprintf(addr, INET_ADDRSTRLEN, "%d",
  38 -                        ntohs(((struct sockaddr_in6 *)&srv->addr)->sin6_port));
  39 +               snprintf(addr, INET_ADDRSTRLEN, "%d", srv->svc_port);
  40                 luaL_addstring(&b, addr);
  41                 break;
  42         case AF_UNIX:
  43 --
  44 2.13.0
  45