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
Added an anchored exclude to a filter file.
[rsync/rsync.git]
/
socket.c
diff --git
a/socket.c
b/socket.c
index
c6341ce
..
bc61bae
100644
(file)
--- a/
socket.c
+++ b/
socket.c
@@
-127,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;
@@
-136,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;
}
@@
-172,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;
@@
-253,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;
@@
-293,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");
@@
-307,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);
}
}
@@
-322,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;
@@
-339,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;
}
@@
-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);
@@
-507,8
+506,8
@@
void start_accept_loop(int port, int (*fn)(int, int))
for (i = 0; sp[i] >= 0; i++)
close(sp[i]);
/* Re-open log file in child before possibly giving
for (i = 0; sp[i] >= 0; i++)
close(sp[i]);
/* Re-open log file in child before possibly giving
- * up privileges (see log_close() above). */
- log
_
open();
+ * up privileges (see log
file
_close() above). */
+ log
file_re
open();
ret = fn(fd, fd);
close_all();
_exit(ret);
ret = fn(fd, fd);
close_all();
_exit(ret);