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 3.0.3pre1
[rsync/rsync.git]
/
socket.c
diff --git
a/socket.c
b/socket.c
index
89f285a
..
8d4a89d
100644
(file)
--- a/
socket.c
+++ b/
socket.c
@@
-3,7
+3,7
@@
*
* Copyright (C) 1992-2001 Andrew Tridgell <tridge@samba.org>
* Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
*
* Copyright (C) 1992-2001 Andrew Tridgell <tridge@samba.org>
* Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-200
7
Wayne Davison
+ * Copyright (C) 2003-200
8
Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-31,6
+31,7
@@
#include <netinet/tcp.h>
extern char *bind_address;
#include <netinet/tcp.h>
extern char *bind_address;
+extern char *sockopts;
extern int default_af_hint;
extern int connect_timeout;
extern int default_af_hint;
extern int connect_timeout;
@@
-272,6
+273,7
@@
int open_socket_out(char *host, int port, const char *bind_addr,
alarm(connect_timeout);
}
alarm(connect_timeout);
}
+ set_socket_options(s, sockopts);
while (connect(s, res->ai_addr, res->ai_addrlen) < 0) {
if (connect_timeout < 0)
exit_cleanup(RERR_CONTIMEOUT);
while (connect(s, res->ai_addr, res->ai_addrlen) < 0) {
if (connect_timeout < 0)
exit_cleanup(RERR_CONTIMEOUT);
@@
-433,6
+435,10
@@
static int *open_socket_in(int type, int port, const char *bind_addr,
setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
(char *)&one, sizeof one);
setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
(char *)&one, sizeof one);
+ if (sockopts)
+ set_socket_options(s, sockopts);
+ else
+ set_socket_options(s, lp_socket_options());
#ifdef IPV6_V6ONLY
if (resp->ai_family == AF_INET6) {
#ifdef IPV6_V6ONLY
if (resp->ai_family == AF_INET6) {