From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 27 Apr 2010 14:36:26 +0000 (+0200)
Subject: s4:web_server: use tsocket_address functions to get the local ip and port
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;ds=sidebyside;h=9a1a00199c2603376eacfdba7e7d0d55bc64f405;p=metze%2Fsamba%2Fwip.git

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

metze
---

diff --git a/source4/web_server/wsgi.c b/source4/web_server/wsgi.c
index 9b5e38400c66..7ee70e110741 100644
--- 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
 				    );