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
Preparing for release of 2.6.4pre1
[rsync/rsync.git]
/
socket.c
diff --git
a/socket.c
b/socket.c
index
88ef93e
..
4e6ef60
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')
@@
-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;
@@
-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);
+ 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);
@@
-506,17
+506,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 */
+ /*
Re-
open log file in child before possibly giving
+ * up privileges
(see log_close() above).
*/
log_open();
ret = fn(fd, fd);
close_all();
_exit(ret);
} else if (pid < 0) {
log_open();
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
+525,6
@@
void start_accept_loop(int port, int (*fn)(int, int))
close(fd);
}
}
close(fd);
}
}
- free(sp);
}
}
@@
-622,7
+619,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
+630,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
+653,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
+694,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
+724,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
+763,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)