Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- We need to send exclude info from the client to a server-receiver
[rsync/rsync.git]
/
socket.c
diff --git
a/socket.c
b/socket.c
index
0f47391
..
bc61bae
100644
(file)
--- a/
socket.c
+++ b/
socket.c
@@
-71,15
+71,13
@@
static int establish_proxy_connection(int fd, char *host, int port,
host, port, authhdr, authbuf);
len = strlen(buffer);
if (write(fd, buffer, len) != len) {
host, port, authhdr, authbuf);
len = strlen(buffer);
if (write(fd, buffer, len) != len) {
- rprintf(FERROR, "failed to write to proxy: %s\n",
- strerror(errno));
+ rsyserr(FERROR, errno, "failed to write to proxy");
return -1;
}
for (cp = buffer; cp < &buffer[sizeof buffer - 1]; cp++) {
if (read(fd, cp, 1) != 1) {
return -1;
}
for (cp = buffer; cp < &buffer[sizeof buffer - 1]; cp++) {
if (read(fd, cp, 1) != 1) {
- rprintf(FERROR, "failed to read from proxy: %s\n",
- strerror(errno));
+ rsyserr(FERROR, errno, "failed to read from proxy");
return -1;
}
if (*cp == '\n')
return -1;
}
if (*cp == '\n')
@@
-92,7
+90,7
@@
static int establish_proxy_connection(int fd, char *host, int port,
if (*cp == '\r')
*cp = '\0';
if (strncmp(buffer, "HTTP/", 5) != 0) {
if (*cp == '\r')
*cp = '\0';
if (strncmp(buffer, "HTTP/", 5) != 0) {
- rprintf(FERROR, "bad response from proxy - %s\n",
+ rprintf(FERROR, "bad response from proxy -
-
%s\n",
buffer);
return -1;
}
buffer);
return -1;
}
@@
-100,7
+98,7
@@
static int establish_proxy_connection(int fd, char *host, int port,
while (*cp == ' ')
cp++;
if (*cp != '2') {
while (*cp == ' ')
cp++;
if (*cp != '2') {
- rprintf(FERROR, "bad response from proxy - %s\n",
+ rprintf(FERROR, "bad response from proxy -
-
%s\n",
buffer);
return -1;
}
buffer);
return -1;
}
@@
-108,8
+106,8
@@
static int establish_proxy_connection(int fd, char *host, int port,
while (1) {
for (cp = buffer; cp < &buffer[sizeof buffer - 1]; cp++) {
if (read(fd, cp, 1) != 1) {
while (1) {
for (cp = buffer; cp < &buffer[sizeof buffer - 1]; cp++) {
if (read(fd, cp, 1) != 1) {
- r
printf(FERROR, "failed to read from proxy: %s\n"
,
-
strerror(errno)
);
+ r
syserr(FERROR, errno
,
+
"failed to read from proxy"
);
return -1;
}
if (*cp == '\n')
return -1;
}
if (*cp == '\n')
@@
-129,7
+127,7
@@
static int establish_proxy_connection(int fd, char *host, int port,
* if this fails.
**/
int try_bind_local(int s, int ai_family, int ai_socktype,
* if this fails.
**/
int try_bind_local(int s, int ai_family, int ai_socktype,
- const char *bind_addr
ess
)
+ const char *bind_addr)
{
int error;
struct addrinfo bhints, *bres_all, *r;
{
int error;
struct addrinfo bhints, *bres_all, *r;
@@
-138,9
+136,9
@@
int try_bind_local(int s, int ai_family, int ai_socktype,
bhints.ai_family = ai_family;
bhints.ai_socktype = ai_socktype;
bhints.ai_flags = AI_PASSIVE;
bhints.ai_family = ai_family;
bhints.ai_socktype = ai_socktype;
bhints.ai_flags = AI_PASSIVE;
- if ((error = getaddrinfo(bind_addr
ess
, NULL, &bhints, &bres_all))) {
+ if ((error = getaddrinfo(bind_addr, NULL, &bhints, &bres_all))) {
rprintf(FERROR, RSYNC_NAME ": getaddrinfo %s: %s\n",
rprintf(FERROR, RSYNC_NAME ": getaddrinfo %s: %s\n",
- bind_addr
ess
, gai_strerror(error));
+ bind_addr, gai_strerror(error));
return -1;
}
return -1;
}
@@
-174,12
+172,12
@@
int try_bind_local(int s, int ai_family, int ai_socktype,
* reachable, perhaps because we can't e.g. route ipv6 to that network
* but we can get ip4 packets through.
*
* reachable, perhaps because we can't e.g. route ipv6 to that network
* but we can get ip4 packets through.
*
- * @param bind_addr
ess
Local address to use. Normally NULL to bind
+ * @param bind_addr Local address to use. Normally NULL to bind
* the wildcard address.
*
* @param af_hint Address family, e.g. AF_INET or AF_INET6.
**/
* the wildcard address.
*
* @param af_hint Address family, e.g. AF_INET or AF_INET6.
**/
-int open_socket_out(char *host, int port, const char *bind_addr
ess
,
+int open_socket_out(char *host, int port, const char *bind_addr,
int af_hint)
{
int type = SOCK_STREAM;
int af_hint)
{
int type = SOCK_STREAM;
@@
-200,7
+198,7
@@
int open_socket_out(char *host, int port, const char *bind_address,
strlcpy(buffer, h, sizeof buffer);
/* Is the USER:PASS@ prefix present? */
strlcpy(buffer, h, sizeof buffer);
/* Is the USER:PASS@ prefix present? */
- if ((cp = strchr(buffer, '@')) != NULL) {
+ if ((cp = str
r
chr(buffer, '@')) != NULL) {
*cp++ = '\0';
/* The remainder is the HOST:PORT part. */
h = cp;
*cp++ = '\0';
/* The remainder is the HOST:PORT part. */
h = cp;
@@
-255,9
+253,9
@@
int open_socket_out(char *host, int port, const char *bind_address,
if (s < 0)
continue;
if (s < 0)
continue;
- if (bind_addr
ess
+ if (bind_addr
&& try_bind_local(s, res->ai_family, type,
&& try_bind_local(s, res->ai_family, type,
- bind_addr
ess
) == -1) {
+ bind_addr) == -1) {
close(s);
s = -1;
continue;
close(s);
s = -1;
continue;
@@
-278,8
+276,7
@@
int open_socket_out(char *host, int port, const char *bind_address,
}
freeaddrinfo(res0);
if (s < 0) {
}
freeaddrinfo(res0);
if (s < 0) {
- rprintf(FERROR, RSYNC_NAME ": failed to connect to %s: %s\n",
- h, strerror(errno));
+ rsyserr(FERROR, errno, "failed to connect to %s", h);
return -1;
}
return s;
return -1;
}
return s;
@@
-296,9
+293,9
@@
int open_socket_out(char *host, int port, const char *bind_address,
*
* This is based on the Samba LIBSMB_PROG feature.
*
*
* This is based on the Samba LIBSMB_PROG feature.
*
- * @param bind_addr
ess
Local address to use. Normally NULL to get the stack default.
+ * @param bind_addr Local address to use. Normally NULL to get the stack default.
**/
**/
-int open_socket_out_wrapped(char *host, int port, const char *bind_addr
ess
,
+int open_socket_out_wrapped(char *host, int port, const char *bind_addr,
int af_hint)
{
char *prog = getenv("RSYNC_CONNECT_PROG");
int af_hint)
{
char *prog = getenv("RSYNC_CONNECT_PROG");
@@
-310,7
+307,7
@@
int open_socket_out_wrapped(char *host, int port, const char *bind_address,
}
if (prog)
return sock_exec(prog);
}
if (prog)
return sock_exec(prog);
- return open_socket_out(host, port, bind_addr
ess
, af_hint);
+ return open_socket_out(host, port, bind_addr, af_hint);
}
}
@@
-325,10
+322,10
@@
int open_socket_out_wrapped(char *host, int port, const char *bind_address,
* We return an array of file-descriptors to the sockets, with a trailing
* -1 value to indicate the end of the list.
*
* We return an array of file-descriptors to the sockets, with a trailing
* -1 value to indicate the end of the list.
*
- * @param bind_addr
ess
Local address to bind, or NULL to allow it to
+ * @param bind_addr Local address to bind, or NULL to allow it to
* default.
**/
* default.
**/
-static int *open_socket_in(int type, int port, const char *bind_addr
ess
,
+static int *open_socket_in(int type, int port, const char *bind_addr,
int af_hint)
{
int one = 1;
int af_hint)
{
int one = 1;
@@
-342,10
+339,10
@@
static int *open_socket_in(int type, int port, const char *bind_address,
hints.ai_socktype = type;
hints.ai_flags = AI_PASSIVE;
snprintf(portbuf, sizeof portbuf, "%d", port);
hints.ai_socktype = type;
hints.ai_flags = AI_PASSIVE;
snprintf(portbuf, sizeof portbuf, "%d", port);
- error = getaddrinfo(bind_addr
ess
, portbuf, &hints, &all_ai);
+ error = getaddrinfo(bind_addr, portbuf, &hints, &all_ai);
if (error) {
rprintf(FERROR, RSYNC_NAME ": getaddrinfo: bind address %s: %s\n",
if (error) {
rprintf(FERROR, RSYNC_NAME ": getaddrinfo: bind address %s: %s\n",
- bind_addr
ess
, gai_strerror(error));
+ bind_addr, gai_strerror(error));
return NULL;
}
return NULL;
}
@@
-372,8
+369,12
@@
static int *open_socket_in(int type, int port, const char *bind_address,
#ifdef IPV6_V6ONLY
if (resp->ai_family == AF_INET6) {
#ifdef IPV6_V6ONLY
if (resp->ai_family == AF_INET6) {
- setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
- (char *)&one, sizeof one) < 0;
+ if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
+ (char *)&one, sizeof one) < 0
+ && default_af_hint != AF_INET6) {
+ close(s);
+ continue;
+ }
}
#endif
}
#endif
@@
-450,12
+451,11
@@
void start_accept_loop(int port, int (*fn)(int, int))
FD_ZERO(&deffds);
for (i = 0, maxfd = -1; sp[i] >= 0; i++) {
if (listen(sp[i], 5) < 0) {
FD_ZERO(&deffds);
for (i = 0, maxfd = -1; sp[i] >= 0; i++) {
if (listen(sp[i], 5) < 0) {
- rprintf(FERROR, "listen() on socket failed: %s\n",
- strerror(errno));
+ rsyserr(FERROR, errno, "listen() on socket failed");
#ifdef INET6
if (errno == EADDRINUSE && i > 0) {
rprintf(FINFO,
#ifdef INET6
if (errno == EADDRINUSE && i > 0) {
rprintf(FINFO,
- "Try using --ipv4 or --ipv6 to avoid this listen() error.");
+ "Try using --ipv4 or --ipv6 to avoid this listen() error.
\n
");
}
#endif
exit_cleanup(RERR_SOCKETIO);
}
#endif
exit_cleanup(RERR_SOCKETIO);
@@
-465,7
+465,6
@@
void start_accept_loop(int port, int (*fn)(int, int))
maxfd = sp[i];
}
maxfd = sp[i];
}
-
/* now accept incoming connections - forking a new process
* for each incoming connection */
while (1) {
/* now accept incoming connections - forking a new process
* for each incoming connection */
while (1) {
@@
-478,7
+477,7
@@
void start_accept_loop(int port, int (*fn)(int, int))
/* close log file before the potentially very long select so
* file can be trimmed by another process instead of growing
* forever */
/* close log file before the potentially very long select so
* file can be trimmed by another process instead of growing
* forever */
- log_close();
+ log
file
_close();
#ifdef FD_COPY
FD_COPY(&deffds, &fds);
#ifdef FD_COPY
FD_COPY(&deffds, &fds);
@@
-506,17
+505,15
@@
void start_accept_loop(int port, int (*fn)(int, int))
int ret;
for (i = 0; sp[i] >= 0; i++)
close(sp[i]);
int ret;
for (i = 0; sp[i] >= 0; i++)
close(sp[i]);
- /* open log file in child before possibly giving
- * up privileges */
- log
_
open();
+ /*
Re-
open log file in child before possibly giving
+ * up privileges
(see logfile_close() above).
*/
+ log
file_re
open();
ret = fn(fd, fd);
close_all();
_exit(ret);
} else if (pid < 0) {
ret = fn(fd, fd);
close_all();
_exit(ret);
} else if (pid < 0) {
- rprintf(FERROR,
- RSYNC_NAME
- ": could not create child server process: %s\n",
- strerror(errno));
+ rsyserr(FERROR, errno,
+ "could not create child server process");
close(fd);
/* This might have happened because we're
* overloaded. Sleep briefly before trying to
close(fd);
/* This might have happened because we're
* overloaded. Sleep briefly before trying to
@@
-527,7
+524,6
@@
void start_accept_loop(int port, int (*fn)(int, int))
close(fd);
}
}
close(fd);
}
}
- free(sp);
}
}
@@
-622,7
+618,7
@@
void set_socket_options(int fd, char *options)
case OPT_ON:
if (got_value)
case OPT_ON:
if (got_value)
- rprintf(FERROR,"syntax error - %s does not take a value\n",tok);
+ rprintf(FERROR,"syntax error -
-
%s does not take a value\n",tok);
{
int on = socket_options[i].value;
{
int on = socket_options[i].value;
@@
-633,9
+629,10
@@
void set_socket_options(int fd, char *options)
break;
}
break;
}
- if (ret != 0)
- rprintf(FERROR, "failed to set socket option %s: %s\n", tok,
- strerror(errno));
+ if (ret != 0) {
+ rsyserr(FERROR, errno,
+ "failed to set socket option %s", tok);
+ }
}
free(options);
}
free(options);
@@
-655,14
+652,12
@@
void become_daemon(void)
/* detach from the terminal */
#ifdef HAVE_SETSID
setsid();
/* detach from the terminal */
#ifdef HAVE_SETSID
setsid();
-#else
-#ifdef TIOCNOTTY
+#elif defined TIOCNOTTY
i = open("/dev/tty", O_RDWR);
if (i >= 0) {
ioctl(i, (int)TIOCNOTTY, (char *)0);
close(i);
}
i = open("/dev/tty", O_RDWR);
if (i >= 0) {
ioctl(i, (int)TIOCNOTTY, (char *)0);
close(i);
}
-#endif /* TIOCNOTTY */
#endif
/* make sure that stdin, stdout an stderr don't stuff things
* up (library functions, for example) */
#endif
/* make sure that stdin, stdout an stderr don't stuff things
* up (library functions, for example) */
@@
-698,7
+693,7
@@
static int socketpair_tcp(int fd[2])
goto failed;
memset(&sock2, 0, sizeof sock2);
goto failed;
memset(&sock2, 0, sizeof sock2);
-#if HAVE_SOCKADDR_IN_LEN
+#if
def
HAVE_SOCKADDR_IN_LEN
sock2.sin_len = sizeof sock2;
#endif
sock2.sin_family = PF_INET;
sock2.sin_len = sizeof sock2;
#endif
sock2.sin_family = PF_INET;
@@
-728,14
+723,16
@@
static int socketpair_tcp(int fd[2])
goto failed;
close(listener);
goto failed;
close(listener);
+ listener = -1;
+
+ set_blocking(fd[1]);
+
if (connect_done == 0) {
if (connect(fd[1], (struct sockaddr *)&sock, sizeof sock) != 0
&& errno != EISCONN)
goto failed;
}
if (connect_done == 0) {
if (connect(fd[1], (struct sockaddr *)&sock, sizeof sock) != 0
&& errno != EISCONN)
goto failed;
}
- set_blocking(fd[1]);
-
/* all OK! */
return 0;
/* all OK! */
return 0;
@@
-765,8
+762,7
@@
int sock_exec(const char *prog)
int fd[2];
if (socketpair_tcp(fd) != 0) {
int fd[2];
if (socketpair_tcp(fd) != 0) {
- rprintf(FERROR, RSYNC_NAME ": socketpair_tcp failed (%s)\n",
- strerror(errno));
+ rsyserr(FERROR, errno, "socketpair_tcp failed");
return -1;
}
if (verbose >= 2)
return -1;
}
if (verbose >= 2)