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
In hlink_compare(), call f_name_cmp() directly instead of using
[rsync/rsync.git]
/
socket.c
diff --git
a/socket.c
b/socket.c
index
549d40d
..
a64aac6
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;
}
@@
-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
@@
-448,10
+452,10
@@
void start_accept_loop(int port, int (*fn)(int, int))
for (i = 0, maxfd = -1; sp[i] >= 0; i++) {
if (listen(sp[i], 5) < 0) {
rsyserr(FERROR, errno, "listen() on socket failed");
for (i = 0, maxfd = -1; sp[i] >= 0; i++) {
if (listen(sp[i], 5) < 0) {
rsyserr(FERROR, errno, "listen() on socket failed");
-#if
def
INET6
+#if INET6
if (errno == EADDRINUSE && i > 0) {
rprintf(FINFO,
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,9
+506,6
@@
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();
ret = fn(fd, fd);
close_all();
_exit(ret);
ret = fn(fd, fd);
close_all();
_exit(ret);
@@
-521,7
+522,6
@@
void start_accept_loop(int port, int (*fn)(int, int))
close(fd);
}
}
close(fd);
}
}
- free(sp);
}
}
@@
-616,7
+616,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;
@@
-648,7
+648,7
@@
void become_daemon(void)
}
/* detach from the terminal */
}
/* detach from the terminal */
-#if
def
HAVE_SETSID
+#if HAVE_SETSID
setsid();
#else
#ifdef TIOCNOTTY
setsid();
#else
#ifdef TIOCNOTTY
@@
-723,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;