[svn] Make retryable_socket_connect_error return 0 on ENETUNREACH and

EHOSTUNREACH.

diff --git a/src/ChangeLog b/src/ChangeLog
index eb496ec99efdd0758a571583321567fbbc8a4994..dbc1b27c2d3fbbee10a75a80b254992f217ddc22 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-24  Hrvoje Niksic  <hniksic@xemacs.org>
+
+       * connect.c (retryable_socket_connect_error): Return 0 for
+       ENETUNREACH and EHOSTUNREACH.
+
 2005-04-23  Hrvoje Niksic  <hniksic@xemacs.org>
 
        * cmpt.c: Reenable the memmove implementation for systems that

diff --git a/src/connect.c b/src/connect.c
index 1aab01bb583638e016f9330c7beb540477f275fb..a95301b20aa5c60674d4b7a0f735d463094fd441 100644 (file)
--- a/src/connect.c
+++ b/src/connect.c
@@ -597,8 +597,16 @@ retryable_socket_connect_error (int err)
       )
     return 0;
 
-  if (err == ECONNREFUSED && !opt.retry_connrefused)
-    return 0;
+  if (!opt.retry_connrefused)
+    if (err == ECONNREFUSED
+#ifdef ENETUNREACH
+       || err == ENETUNREACH   /* network is unreachable */
+#endif
+#ifdef EHOSTUNREACH
+       || err == EHOSTUNREACH  /* host is unreachable */
+#endif
+       )
+      return 0;
 
   return 1;
 }