Commit 6ab6d4bf authored by David Dykstra's avatar David Dykstra

When INET6 is not defined, meaning that IPv6 is not supported, need to

initalize the global_opts.af_hint to AF_INET or systems such as Linux that
have a native getaddrinfo() because they support IPv6 will attempt to
create IPv6 sockets.  This brings up a problem with the new global_opts
structure; in order to initialize them to a value other than 0, we need to
explicitly initialize them all in an order that matches the order in
rsync.h.  I think that's more inconvenient & error prone than keeping
global variables.
parent cb1bcc7e
...@@ -75,7 +75,14 @@ int modify_window=0; ...@@ -75,7 +75,14 @@ int modify_window=0;
int blocking_io=0; int blocking_io=0;
/** Global options set from command line. **/ /** Global options set from command line. **/
struct global_opts global_opts; struct global_opts global_opts = {
#ifdef INET6
0, /* af_hint -- allow any protocol */
#else
AF_INET, /* af_hint -- prefer IPv4 */
#endif
0, /* no_detach */
};
int read_batch=0; /* dw */ int read_batch=0; /* dw */
int write_batch=0; /* dw */ int write_batch=0; /* dw */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment