bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modified the opensock() function to respect the Listen directive. If it's

Browse Source 
set, bind all outgoing addresses to this local address.
This commit is contained in:
Robert James Kaes 2002-04-13 05:20:19 +00:00
parent 1685e9ca66
commit be47c1791d
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2002-04-13 Robert James Kaes <rjkaes@flarenet.com>
* src/sock.c (opensock): If the Listen directive is in use, then
we should bind outgoing address to this address.
2002-04-12 Robert James Kaes <rjkaes@flarenet.com> 2002-04-12 Robert James Kaes <rjkaes@flarenet.com>
* src/scanner.l: * src/scanner.l:

18
src/sock.c
View File

@ -1,4 +1,4 @@
/* $Id: sock.c,v 1.23 2001-12-24 00:01:32 rjkaes Exp $ /* $Id: sock.c,v 1.24 2002-04-13 05:20:19 rjkaes Exp $
* *
* Sockets are created and destroyed here. When a new connection comes in from * Sockets are created and destroyed here. When a new connection comes in from
* a client, we need to copy the socket and the create a second socket to the * a client, we need to copy the socket and the create a second socket to the
@ -97,6 +97,7 @@ opensock(char *ip_addr, uint16_t port)
{ {
int sock_fd; int sock_fd;
struct sockaddr_in port_info; struct sockaddr_in port_info;
struct sockaddr_in bind_addr;
int ret; int ret;
assert(ip_addr != NULL); assert(ip_addr != NULL);
@ -124,6 +125,21 @@ opensock(char *ip_addr, uint16_t port)
return -1; return -1;
} }
/* Bind to our listening address*/
if (config.ipAddr) {
memset(&bind_addr, 0, sizeof(bind_addr));
bind_addr.sin_family = AF_INET;
bind_addr.sin_addr.s_addr = inet_addr(config.ipAddr);
ret = bind(sock_fd, (struct sockaddr *)&bind_addr, sizeof(bind_addr));
if (ret < 0) {
log_message(LOG_ERR, "Could not bind local address \"%\" because of %s",
config.ipAddr,
strerror(errno));
return -1;
}
}
if (connect(sock_fd, (struct sockaddr *) &port_info, sizeof(port_info)) < 0) { if (connect(sock_fd, (struct sockaddr *) &port_info, sizeof(port_info)) < 0) {
log_message(LOG_ERR, "opensock: connect() error \"%s\".", log_message(LOG_ERR, "opensock: connect() error \"%s\".",
strerror(errno)); strerror(errno));