* methods/bzip2.cc:

[apt.git] / methods / connect.cc

diff --git a/methods/connect.cc b/methods/connect.cc
index c5d57a99fc881084cc9acfe407cd11dd0233491f..a5af1f1a68f094d929d4748405e00bd49c3b6bbe 100644 (file)
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -115,6 +115,9 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
       errno = Err;
       if(errno == ECONNREFUSED)
          Owner->SetFailReason("ConnectionRefused");
       errno = Err;
       if(errno == ECONNREFUSED)
          Owner->SetFailReason("ConnectionRefused");

+      else if (errno == ETIMEDOUT)
+        Owner->SetFailReason("ConnectionTimedOut");
+      bad_addr.insert(bad_addr.begin(), string(Name));

       return _error->Errno("connect",_("Could not connect to %s:%s (%s)."),Host.c_str(),
                           Service,Name);
    }
       return _error->Errno("connect",_("Could not connect to %s:%s (%s)."),Host.c_str(),
                           Service,Name);
    }


@@ -157,6 +160,7 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd,
       struct addrinfo Hints;
       memset(&Hints,0,sizeof(Hints));
       Hints.ai_socktype = SOCK_STREAM;
       struct addrinfo Hints;
       memset(&Hints,0,sizeof(Hints));
       Hints.ai_socktype = SOCK_STREAM;

+      Hints.ai_flags = AI_ADDRCONFIG;

       Hints.ai_protocol = 0;
       
       // if we couldn't resolve the host before, we don't try now
       Hints.ai_protocol = 0;
       
       // if we couldn't resolve the host before, we don't try now


@@ -189,8 +193,8 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd,
               return _error->Error(_("Temporary failure resolving '%s'"),
                                    Host.c_str());
            }
               return _error->Error(_("Temporary failure resolving '%s'"),
                                    Host.c_str());
            }

-           return _error->Error(_("Something wicked happened resolving '%s:%s' (%i)"),
-                                Host.c_str(),ServStr,Res);
+           return _error->Error(_("Something wicked happened resolving '%s:%s' (%i - %s)"),
+                                Host.c_str(),ServStr,Res,gai_strerror(Res));

         }
         break;
       }
         }
         break;
       }


@@ -236,6 +240,6 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd,
 
    if (_error->PendingError() == true)
       return false;   
 
    if (_error->PendingError() == true)
       return false;   

-   return _error->Error(_("Unable to connect to %s %s:"),Host.c_str(),ServStr);
+   return _error->Error(_("Unable to connect to %s:%s:"),Host.c_str(),ServStr);

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/