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
Don't kluge the value of statret for --whole-file.
[rsync/rsync.git]
/
socket.c
diff --git
a/socket.c
b/socket.c
index
549d40d
..
c6341ce
100644
(file)
--- a/
socket.c
+++ b/
socket.c
@@
-90,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;
}
@@
-98,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;
}
@@
-198,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;
@@
-369,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
@@
-451,7
+455,7
@@
void start_accept_loop(int port, int (*fn)(int, int))
#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);
@@
-502,8
+506,8
@@
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();
log_open();
ret = fn(fd, fd);
close_all();
@@
-521,7
+525,6
@@
void start_accept_loop(int port, int (*fn)(int, int))
close(fd);
}
}
close(fd);
}
}
- free(sp);
}
}
@@
-616,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;
@@
-650,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) */
@@
-693,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;
@@
-723,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;