s4:web_server: use tsocket_address functions to get the local ip and port

metze
(cherry picked from commit 9a1a00199c2603376eacfdba7e7d0d55bc64f405)

diff --git a/source4/web_server/config.mk b/source4/web_server/config.mk
index ff587508fc4be30a8b37b4fab92935fe5f0988e9..74ecdb5f19654741771cb94ae036b23ab75ddc7b 100644 (file)
--- a/source4/web_server/config.mk
+++ b/source4/web_server/config.mk
@@ -5,7 +5,7 @@
 [MODULE::WEB]
 INIT_FUNCTION = server_service_web_init
 SUBSYSTEM = service
-PRIVATE_DEPENDENCIES = LIBTLS smbcalls process_model LIBPYTHON
+PRIVATE_DEPENDENCIES = LIBTLS smbcalls process_model LIBPYTHON LIBTSOCKET
 # End SUBSYSTEM WEB
 #######################
 

diff --git a/source4/web_server/wscript_build b/source4/web_server/wscript_build
index 5343c2f508737875568ce53dc464779da9eb7e1e..b7ff4413fb23112544ccceba661ed38a185110ff 100644 (file)
--- a/source4/web_server/wscript_build
+++ b/source4/web_server/wscript_build
@@ -3,7 +3,7 @@
 
 bld.SAMBA_PYTHON('WEB_WSGI',
                  source='wsgi.c',
-                 deps='talloc'
+                 deps='talloc LIBTSOCKET'
                  )
 
 

diff --git a/source4/web_server/wsgi.c b/source4/web_server/wsgi.c
index 4f1a75e0106760364ea3b854dd7ce709005e41f6..7ee70e11074166912e8ea3773ed0960b2069ccc4 100644 (file)
--- a/source4/web_server/wsgi.c
+++ b/source4/web_server/wsgi.c
@@ -26,6 +26,7 @@
 #include "../lib/util/dlinklist.h"
 #include "../lib/util/data_blob.h"
 #include "lib/tls/tls.h"
+#include "lib/tsocket/tsocket.h"
 
 typedef struct {
        PyObject_HEAD
@@ -320,18 +321,23 @@ static void wsgi_process_http_input(struct web_server_data *wdata,
 {
        PyObject *py_environ, *result, *item, *iter;
        PyObject *request_handler = (PyObject *)wdata->private_data;
-       struct socket_address *socket_address;
-
+       struct tsocket_address *my_address = web->conn->local_address;
+       const char *addr = "0.0.0.0";
+       uint16_t port = 0;
        web_request_Object *py_web = PyObject_New(web_request_Object, &web_request_Type);
        py_web->web = web;
 
-       socket_address = socket_get_my_addr(web->conn->socket, web);
+       if (tsocket_address_is_inet(my_address, "ip")) {
+               addr = tsocket_address_inet_addr_string(my_address, wdata);
+               port = tsocket_address_inet_port(my_address);
+       }
+
        py_environ = create_environ(tls_enabled(web->conn->socket),
                                    web->input.content_length, 
                                    web->input.headers, 
                                    web->input.post_request?"POST":"GET",
-                                   socket_address->addr,
-                                   socket_address->port,
+                                   addr,
+                                   port,
                                    Py_InputHttpStream(web),
                                    web->input.url
                                    );