sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

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

Browse Source 
metze
(cherry picked from commit 9a1a00199c2603376eacfdba7e7d0d55bc64f405)
This commit is contained in:
Stefan Metzmacher 2010-04-28 14:52:40 +02:00
parent a53b09141c
commit 6129aa0cf5
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/web_server/config.mk
View File

@ -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
#######################

2
source4/web_server/wscript_build
View File

@ -3,7 +3,7 @@
bld.SAMBA_PYTHON('WEB_WSGI',
source='wsgi.c',
deps='talloc'
deps='talloc LIBTSOCKET'
)

16
source4/web_server/wsgi.c
View File

@ -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
);