Skip to content

Commit

Permalink
Add an option to specify a source address.
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1914045 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
minfrin committed Nov 22, 2023
1 parent 7b2056b commit cf5e1a0
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 1 deletion.
4 changes: 4 additions & 0 deletions changes-entries/ab-source-address.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

*) Add an option to specify a source address. PR32524
[Daniel Rench <gauze omnimental tmetic com>]

3 changes: 3 additions & 0 deletions docs/man/ab.1
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ String to use as attributes for \fB<table>\fR\&. Attributes are inserted \fB<tab
\fB-X \fIproxy\fR[:\fIport\fR]\fR
Use a proxy server for the requests\&.
.TP
\fB-o \fIsrc_address\fR\fR
Set the local source address\&.
.TP
\fB-y \fI<tr>-attributes\fR\fR
String to use as attributes for \fB<tr>\fR\&.
.TP
Expand Down
16 changes: 15 additions & 1 deletion support/ab.c
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,7 @@ int bind_count = 0;
const char **bind_hosts;
apr_sockaddr_t **bind_addrs;
apr_port_t connectport;
char *src_address;
const char *gnuplot; /* GNUplot file */
const char *csvperc; /* CSV Percentile file */
const char *fullurl;
Expand Down Expand Up @@ -1613,6 +1614,7 @@ static void start_connection(struct connection * c)
{
struct worker *worker = c->worker;
apr_status_t rv;
apr_sockaddr_t *from;

if (!worker_can_connect(worker)) {
return;
Expand Down Expand Up @@ -1678,6 +1680,14 @@ static void start_connection(struct connection * c)
}
}

if (src_address) {
if ((rv = apr_sockaddr_info_get(&from, src_address, destsa->family,
0, 0, c->ctx)) != APR_SUCCESS)
graceful_strerror("src_address get", rv);
if ((rv = apr_socket_bind(c->aprsock, from)) != APR_SUCCESS)
graceful_strerror("src_address bind", rv);
}

c->read = 0;
c->bread = 0;
c->length = 0;
Expand Down Expand Up @@ -2790,6 +2800,7 @@ static void usage(const char *progname)
fprintf(stderr, " -P attribute Add Basic Proxy Authentication, the attributes\n");
fprintf(stderr, " are a colon separated username and password.\n");
fprintf(stderr, " -X proxy:port Proxyserver and port number to use\n");
fprintf(stderr, " -o src_address Set the local source address\n");
fprintf(stderr, " -V Print version number and exit\n");
fprintf(stderr, " -k Use HTTP KeepAlive feature\n");
fprintf(stderr, " -d Do not show percentiles served table.\n");
Expand Down Expand Up @@ -3030,7 +3041,7 @@ int main(int argc, const char * const argv[])
#endif

apr_getopt_init(&opt, cntxt, argc, argv);
while ((status = apr_getopt(opt, "n:c:t:s:b:T:p:u:v:lrkVhwiIx:y:z:C:H:P:A:g:X:de:SqQDB:m:R:"
while ((status = apr_getopt(opt, "n:c:t:s:b:T:p:u:v:lrkVhwiIx:y:z:C:H:P:A:g:X:de:SqQDB:m:R:o:"
#if APR_HAS_THREADS
"W:"
#endif
Expand All @@ -3056,6 +3067,9 @@ int main(int argc, const char * const argv[])
case 'k':
keepalive = 1;
break;
case 'o':
src_address = strdup(optarg);
break;
case 'q':
heartbeatres = 0;
break;
Expand Down

0 comments on commit cf5e1a0

Please sign in to comment.