[patch] ProxySourceAddress patch for 2.2.6

proxy_source_address-2.2.6.diff (text/plain), 4.76 KB, created by Aleksey Midenkov on 2008-02-11 08:09:46 UTC

(hide)

Description: ProxySourceAddress patch for 2.2.6

Filename:

MIME Type:

Creator: Aleksey Midenkov

Created: 2008-02-11 08:09:46 UTC

Size: 4.76 KB

patch

obsolete

>diff -uarpd modules/proxy/mod_proxy.c /home/sigil/src/httpd-2.2.6/modules/proxy/mod_proxy.c >--- modules/proxy/mod_proxy.c 2008-02-11 17:58:11.000000000 +0300 >+++ /home/sigil/src/httpd-2.2.6/modules/proxy/mod_proxy.c 2007-11-23 17:09:13.000000000 +0300 >@@ -912,6 +959,8 @@ static void * create_proxy_config(apr_po > ps->timeout_set = 0; > ps->badopt = bad_error; > ps->badopt_set = 0; >+ ps->source_address = 0; >+ ps->source_address_set = 0; > ps->pool = p; > > return ps; >@@ -955,6 +1009,8 @@ static void * merge_proxy_config(apr_poo > ps->badopt_set = overrides->badopt_set || base->badopt_set; > ps->proxy_status = (overrides->proxy_status_set == 0) ? base->proxy_status : overrides->proxy_status; > ps->proxy_status_set = overrides->proxy_status_set || base->proxy_status_set; >+ ps->source_address = (overrides->source_address_set == 0) ? base->source_address : overrides->source_address; >+ ps->source_address_set = overrides->source_address_set || base->source_address_set; > ps->pool = p; > return ps; > } >@@ -1685,6 +1746,24 @@ static const char * > return NULL; > } > >+static const char * >+ set_source_address(cmd_parms *parms, void *dummy, const char *arg) >+{ >+ proxy_server_conf *psf = >+ ap_get_module_config(parms->server->module_config, &proxy_module); >+ struct apr_sockaddr_t *addr; >+ >+ if (APR_SUCCESS == apr_sockaddr_info_get(&addr, arg, APR_UNSPEC, 0, 0, psf->pool)) { >+ psf->source_address = addr; >+ psf->source_address_set = 1; >+ } >+ else { >+ return "ProxySourceAddress invalid value"; >+ } >+ >+ return NULL; >+} >+ > static void ap_add_per_proxy_conf(server_rec *s, ap_conf_vector_t *dir_config) > { > proxy_server_conf *sconf = ap_get_module_config(s->module_config, >@@ -1892,6 +2018,8 @@ static const command_rec proxy_cmds[] = > "Configure Status: proxy status to one of: on | off | full"), > AP_INIT_RAW_ARGS("ProxySet", set_proxy_param, NULL, RSRC_CONF|ACCESS_CONF, > "A balancer or worker name with list of params"), >+ AP_INIT_TAKE1("ProxySourceAddress", set_source_address, NULL, RSRC_CONF, >+ "Configure local source IP used for request forward"), > {NULL} > }; > >diff -uarpd modules/proxy/mod_proxy.h /home/sigil/src/httpd-2.2.6/modules/proxy/mod_proxy.h >--- modules/proxy/mod_proxy.h 2008-02-11 17:58:11.000000000 +0300 >+++ /home/sigil/src/httpd-2.2.6/modules/proxy/mod_proxy.h 2007-11-23 17:07:50.000000000 +0300 >@@ -186,6 +186,8 @@ typedef struct { > status_full > } proxy_status; /* Status display options */ > char proxy_status_set; >+ apr_sockaddr_t *source_address; >+ char source_address_set; > apr_pool_t *pool; /* Pool used for allocating this struct */ > } proxy_server_conf; > >diff -uarpd modules/proxy/proxy_util.c /home/sigil/src/httpd-2.2.6/modules/proxy/proxy_util.c >--- modules/proxy/proxy_util.c 2008-02-11 17:58:11.000000000 +0300 >+++ /home/sigil/src/httpd-2.2.6/modules/proxy/proxy_util.c 2008-01-31 18:06:49.000000000 +0300 >@@ -1523,6 +1523,15 @@ PROXY_DECLARE(int) ap_proxy_connect_to_b > "proxy: %s: fam %d socket created to connect to %s", > proxy_function, backend_addr->family, backend_name); > >+ if (conf->source_address) { >+ rv = apr_socket_bind(*newsock, conf->source_address); >+ if (rv != APR_SUCCESS) { >+ ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, >+ "proxy: %s: failed to bind socket to local address", >+ proxy_function); >+ } >+ } >+ > /* make the connection out of the socket */ > rv = apr_socket_connect(*newsock, backend_addr); > >@@ -2092,6 +2101,7 @@ PROXY_DECLARE(int) ap_proxy_connect_back > int connected = 0; > int loglevel; > apr_sockaddr_t *backend_addr = conn->addr; >+ apr_sockaddr_t *local_addr; > apr_socket_t *newsock; > void *sconf = s->module_config; > proxy_server_conf *conf = >@@ -2170,6 +2180,18 @@ PROXY_DECLARE(int) ap_proxy_connect_back > "proxy: %s: fam %d socket created to connect to %s", > proxy_function, backend_addr->family, worker->hostname); > >+ if (conf->source_address_set == 1) { >+ local_addr = apr_pcalloc(conn->pool, sizeof(apr_sockaddr_t)); >+ memcpy(local_addr, conf->source_address, sizeof(apr_sockaddr_t)); >+ local_addr->pool = conn->pool; >+ rv = apr_socket_bind(newsock, local_addr); >+ if (rv != APR_SUCCESS) { >+ ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, >+ "proxy: %s: failed to bind socket to local address", >+ proxy_function); >+ } >+ } >+ > /* make the connection out of the socket */ > rv = apr_socket_connect(newsock, backend_addr); > View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]