#include "rsync.h"
+
+/* establish a proxy connection on an open socket to a web roxy by using the CONNECT
+ method */
+static int establish_proxy_connection(int fd, char *host, int port)
+{
+ char buffer[1024];
+ char *cp;
+
+ slprintf(buffer, sizeof(buffer), "CONNECT %s:%d HTTP/1.0\r\n\r\n", host, port);
+ if (write(fd, buffer, strlen(buffer)) != strlen(buffer)) {
+ rprintf(FERROR, "failed to write to proxy - %s\n",
+ strerror(errno));
+ return -1;
+ }
+
+ for (cp = buffer; cp < &buffer[sizeof(buffer) - 1]; cp++) {
+ if (read(fd, cp, 1) != 1) {
+ rprintf(FERROR, "failed to read from proxy\n");
+ return -1;
+ }
+ if (*cp == '\n')
+ break;
+ }
+
+ if (*cp != '\n')
+ cp++;
+ *cp-- = '\0';
+ if (*cp == '\r')
+ *cp = '\0';
+ if (strncmp(buffer, "HTTP/", 5) != 0) {
+ rprintf(FERROR, "bad response from proxy - %s\n",
+ buffer);
+ return -1;
+ }
+ for (cp = &buffer[5]; isdigit(*cp) || (*cp == '.'); cp++)
+ ;
+ while (*cp == ' ')
+ cp++;
+ if (*cp != '2') {
+ rprintf(FERROR, "bad response from proxy - %s\n",
+ buffer);
+ return -1;
+ }
+ /* throw away the rest of the HTTP header */
+ while (1) {
+ for (cp = buffer; cp < &buffer[sizeof(buffer) - 1];
+ cp++) {
+ if (read(fd, cp, 1) != 1) {
+ rprintf(FERROR, "failed to read from proxy\n");
+ return -1;
+ }
+ if (*cp == '\n')
+ break;
+ }
+ if ((cp > buffer) && (*cp == '\n'))
+ cp--;
+ if ((cp == buffer) && ((*cp == '\n') || (*cp == '\r')))
+ break;
+ }
+ return 0;
+}
+
+
/* open a socket to a tcp remote host with the specified port
- based on code from Warren */
-int open_socket_out(char *host, int port)
+ based on code from Warren
+ proxy support by Stephen Rothwell */
+int open_socket_out(char *host, int port, struct in_addr *address)
{
int type = SOCK_STREAM;
struct sockaddr_in sock_out;
+ struct sockaddr_in sock;
int res;
struct hostent *hp;
-
+ char *h;
+ unsigned p;
+ int proxied = 0;
+ char buffer[1024];
+ char *cp;
+
+ /* if we have a RSYNC_PROXY env variable then redirect our connetcion via a web proxy
+ at the given address. The format is hostname:port */
+ h = getenv("RSYNC_PROXY");
+ proxied = (h != NULL) && (*h != '\0');
+
+ if (proxied) {
+ strlcpy(buffer, h, sizeof(buffer));
+ cp = strchr(buffer, ':');
+ if (cp == NULL) {
+ rprintf(FERROR, "invalid proxy specification\n");
+ return -1;
+ }
+ *cp++ = '\0';
+ p = atoi(cp);
+ h = buffer;
+ } else {
+ h = host;
+ p = port;
+ }
res = socket(PF_INET, type, 0);
if (res == -1) {
return -1;
}
- hp = gethostbyname(host);
+ hp = gethostbyname(h);
if (!hp) {
- rprintf(FERROR,"unknown host: %s\n", host);
+ rprintf(FERROR,"unknown host: %s\n", h);
+ close(res);
return -1;
}
memcpy(&sock_out.sin_addr, hp->h_addr, hp->h_length);
- sock_out.sin_port = htons(port);
+ sock_out.sin_port = htons(p);
sock_out.sin_family = PF_INET;
+ if (address) {
+ sock.sin_addr = *address;
+ sock.sin_port = 0;
+ sock.sin_family = hp->h_addrtype;
+ bind(res, (struct sockaddr * ) &sock,sizeof(sock));
+ }
+
if (connect(res,(struct sockaddr *)&sock_out,sizeof(sock_out))) {
+ rprintf(FERROR,"failed to connect to %s - %s\n", h, strerror(errno));
close(res);
- rprintf(FERROR,"failed to connect to %s - %s\n", host, strerror(errno));
return -1;
}
- set_nonblocking(res);
+ if (proxied && establish_proxy_connection(res, host, port) != 0) {
+ close(res);
+ return -1;
+ }
return res;
}
/****************************************************************************
open a socket of the specified type, port and address for incoming data
****************************************************************************/
-static int open_socket_in(int type, int port)
+static int open_socket_in(int type, int port, struct in_addr *address)
{
struct hostent *hp;
struct sockaddr_in sock;
- char host_name[200];
+ char host_name[MAXHOSTNAMELEN];
int res;
int one=1;
memcpy((char *)&sock.sin_addr,(char *)hp->h_addr, hp->h_length);
sock.sin_port = htons(port);
sock.sin_family = hp->h_addrtype;
- sock.sin_addr.s_addr = INADDR_ANY;
+ if (address) {
+ sock.sin_addr = *address;
+ } else {
+ sock.sin_addr.s_addr = INADDR_ANY;
+ }
res = socket(hp->h_addrtype, type, 0);
if (res == -1) {
rprintf(FERROR,"socket failed\n");
void start_accept_loop(int port, int (*fn)(int ))
{
int s;
+ extern struct in_addr socket_address;
/* open an incoming socket */
- s = open_socket_in(SOCK_STREAM, port);
+ s = open_socket_in(SOCK_STREAM, port, &socket_address);
if (s == -1)
exit_cleanup(RERR_SOCKETIO);
but I have had reports that on Digital Unix zombies
are produced, so this ensures that they are reaped */
#ifdef WNOHANG
- waitpid(-1, NULL, WNOHANG);
+ while (waitpid(-1, NULL, WNOHANG) > 0);
#endif
if (fork()==0) {
close(s);
- set_nonblocking(fd);
-
_exit(fn(fd));
}
return name_buf;
}
+
+/*******************************************************************
+convert a string to an IP address. The string can be a name or
+dotted decimal number
+ ******************************************************************/
+struct in_addr *ip_address(const char *str)
+{
+ static struct in_addr ret;
+ struct hostent *hp;
+
+ /* try as an IP address */
+ if (inet_aton(str, &ret) != 0) {
+ return &ret;
+ }
+
+ /* otherwise assume it's a network name of some sort and use
+ gethostbyname */
+ if ((hp = gethostbyname(str)) == 0) {
+ rprintf(FERROR, "gethostbyname: Unknown host. %s\n",str);
+ return NULL;
+ }
+
+ if (hp->h_addr == NULL) {
+ rprintf(FERROR, "gethostbyname: host address is invalid for host %s\n",str);
+ return NULL;
+ }
+
+ if (hp->h_length > sizeof(ret)) {
+ rprintf(FERROR, "gethostbyname: host address is too large\n");
+ return NULL;
+ }
+
+ memcpy(&ret.s_addr, hp->h_addr, hp->h_length);
+
+ return(&ret);
+}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff