* merged changes from the conference

[apt.git] / methods / connect.cc

diff --git a/methods/connect.cc b/methods/connect.cc
index e9109423bdabeb2a0f197255ab6b132890321518..981ac1371cc1d902eabf011fb398f5126db94466 100644 (file)
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -1,10 +1,13 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: connect.cc,v 1.8 2002/02/28 03:51:55 jgg Exp $
+// $Id: connect.cc,v 1.10.2.1 2004/01/16 18:58:50 mdz Exp $

 /* ######################################################################
 
    Connect - Replacement connect call
 /* ######################################################################
 
    Connect - Replacement connect call

-   
+
+   This was originally authored by Jason Gunthorpe <jgg@debian.org>
+   and is placed in the Public Domain, do with it what you will.
+      

    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/


@@ -23,6 +26,7 @@
 #include <netdb.h>
 
 #include "rfc2553emu.h"
 #include <netdb.h>
 
 #include "rfc2553emu.h"

+#include <apti18n.h>

                                                                        /*}}}*/
 
 static string LastHost;
                                                                        /*}}}*/
 
 static string LastHost;


@@ -57,14 +61,14 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
    getnameinfo(Addr->ai_addr,Addr->ai_addrlen,
               Name,sizeof(Name),Service,sizeof(Service),
               NI_NUMERICHOST|NI_NUMERICSERV);
    getnameinfo(Addr->ai_addr,Addr->ai_addrlen,
               Name,sizeof(Name),Service,sizeof(Service),
               NI_NUMERICHOST|NI_NUMERICSERV);

-   Owner->Status("Connecting to %s (%s)",Host.c_str(),Name);
+   Owner->Status(_("Connecting to %s (%s)"),Host.c_str(),Name);

 
    /* If this is an IP rotation store the IP we are using.. If something goes
       wrong this will get tacked onto the end of the error message */
    if (LastHostAddr->ai_next != 0)
    {
       char Name2[NI_MAXHOST + NI_MAXSERV + 10];
 
    /* If this is an IP rotation store the IP we are using.. If something goes
       wrong this will get tacked onto the end of the error message */
    if (LastHostAddr->ai_next != 0)
    {
       char Name2[NI_MAXHOST + NI_MAXSERV + 10];

-      snprintf(Name2,sizeof(Name2),"[IP: %s %s]",Name,Service);
+      snprintf(Name2,sizeof(Name2),_("[IP: %s %s]"),Name,Service);

       Owner->SetFailExtraMsg(string(Name2));
    }   
    else
       Owner->SetFailExtraMsg(string(Name2));
    }   
    else


@@ -73,31 +77,31 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
    // Get a socket
    if ((Fd = socket(Addr->ai_family,Addr->ai_socktype,
                    Addr->ai_protocol)) < 0)
    // Get a socket
    if ((Fd = socket(Addr->ai_family,Addr->ai_socktype,
                    Addr->ai_protocol)) < 0)

-      return _error->Errno("socket","Could not create a socket for %s (f=%u t=%u p=%u)",
+      return _error->Errno("socket",_("Could not create a socket for %s (f=%u t=%u p=%u)"),

                           Name,Addr->ai_family,Addr->ai_socktype,Addr->ai_protocol);
    
    SetNonBlock(Fd,true);
    if (connect(Fd,Addr->ai_addr,Addr->ai_addrlen) < 0 &&
        errno != EINPROGRESS)
                           Name,Addr->ai_family,Addr->ai_socktype,Addr->ai_protocol);
    
    SetNonBlock(Fd,true);
    if (connect(Fd,Addr->ai_addr,Addr->ai_addrlen) < 0 &&
        errno != EINPROGRESS)

-      return _error->Errno("connect","Cannot initiate the connection "
-                          "to %s:%s (%s).",Host.c_str(),Service,Name);
+      return _error->Errno("connect",_("Cannot initiate the connection "
+                          "to %s:%s (%s)."),Host.c_str(),Service,Name);

    
    /* This implements a timeout for connect by opening the connection
       nonblocking */
    if (WaitFd(Fd,true,TimeOut) == false)
    
    /* This implements a timeout for connect by opening the connection
       nonblocking */
    if (WaitFd(Fd,true,TimeOut) == false)

-      return _error->Error("Could not connect to %s:%s (%s), "
-                          "connection timed out",Host.c_str(),Service,Name);
+      return _error->Error(_("Could not connect to %s:%s (%s), "
+                          "connection timed out"),Host.c_str(),Service,Name);

 
    // Check the socket for an error condition
    unsigned int Err;
    unsigned int Len = sizeof(Err);
    if (getsockopt(Fd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0)
 
    // Check the socket for an error condition
    unsigned int Err;
    unsigned int Len = sizeof(Err);
    if (getsockopt(Fd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0)

-      return _error->Errno("getsockopt","Failed");
+      return _error->Errno("getsockopt",_("Failed"));

    
    if (Err != 0)
    {
       errno = Err;
    
    if (Err != 0)
    {
       errno = Err;

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

                           Service,Name);
    }
    
                           Service,Name);
    }
    


@@ -125,7 +129,7 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd,
       sensible */
    if (LastHost != Host || LastPort != Port)
    {
       sensible */
    if (LastHost != Host || LastPort != Port)
    {

-      Owner->Status("Connecting to %s",Host.c_str());
+      Owner->Status(_("Connecting to %s"),Host.c_str());

 
       // Free the old address structure
       if (LastHostAddr != 0)
 
       // Free the old address structure
       if (LastHostAddr != 0)


@@ -156,13 +160,13 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd,
                  DefPort = 0;
                  continue;
               }
                  DefPort = 0;
                  continue;
               }

-              return _error->Error("Could not resolve '%s'",Host.c_str());
+              return _error->Error(_("Could not resolve '%s'"),Host.c_str());

            }
            
            if (Res == EAI_AGAIN)
            }
            
            if (Res == EAI_AGAIN)

-              return _error->Error("Temporary failure resolving '%s'",
+              return _error->Error(_("Temporary failure resolving '%s'"),

                                    Host.c_str());
                                    Host.c_str());

-           return _error->Error("Something wicked happened resolving '%s:%s' (%i)",
+           return _error->Error(_("Something wicked happened resolving '%s:%s' (%i)"),

                                 Host.c_str(),ServStr,Res);
         }
         break;
                                 Host.c_str(),ServStr,Res);
         }
         break;


@@ -209,6 +213,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);

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