Checks for the partial directories before doing downloads

[apt.git] / methods / http.cc

diff --git a/methods/http.cc b/methods/http.cc
index 067d805643d7e34fcab47bfcd0b6214d79314c7e..c4a3f16295d44b1282844fd101f481aff3fd499c 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: http.cc,v 1.32 1999/05/26 04:08:39 jgg Exp $
+// $Id: http.cc,v 1.38 1999/10/03 21:09:27 jgg Exp $
 /* ######################################################################
 
    HTTP Aquire Method - This is the HTTP aquire method for APT.
@@ -41,11 +41,9 @@
 #include <errno.h>
 
 // Internet stuff
-/*#include <netinet/in.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netdb.h>*/
+#include <netdb.h>
 
+#include "connect.h"
 #include "rfc2553emu.h"
 #include "http.h"
 
@@ -56,6 +54,7 @@ int HttpMethod::FailFd = -1;
 time_t HttpMethod::FailTime = 0;
 unsigned long PipelineDepth = 10;
 unsigned long TimeOut = 120;
+bool Debug = false;
 
 // CircleBuf::CircleBuf - Circular input buffer                                /*{{{*/
 // ---------------------------------------------------------------------
@@ -306,65 +305,9 @@ bool ServerState::Open()
       Host = Proxy.Host;
    }
    
-   /* We used a cached address record.. Yes this is against the spec but
-      the way we have setup our rotating dns suggests that this is more
-      sensible */
-   if (LastHost != Host || LastPort != Port)
-   {
-      Owner->Status("Connecting to %s",Host.c_str());
-
-      // Lookup the host
-      char S[30] = "http";
-      if (Port != 0)
-        snprintf(S,sizeof(S),"%u",Port);
-
-      // Free the old address structure
-      if (LastHostAddr != 0)
-      {
-        freeaddrinfo(LastHostAddr);
-        LastHostAddr = 0;
-      }
-      
-      // We only understand SOCK_STREAM sockets.
-      struct addrinfo Hints;
-      memset(&Hints,0,sizeof(Hints));
-      Hints.ai_socktype = SOCK_STREAM;
-      
-      // Resolve both the host and service simultaneously
-      if (getaddrinfo(Host.c_str(),S,&Hints,&LastHostAddr) != 0 ||
-         LastHostAddr == 0)
-        return _error->Error("Could not resolve '%s'",Host.c_str());
-
-      LastHost = Host;
-      LastPort = Port;
-   }
-
-   // Get the printable IP address
-   char Name[NI_MAXHOST];
-   Name[0] = 0;
-   getnameinfo(LastHostAddr->ai_addr,LastHostAddr->ai_addrlen,
-              Name,sizeof(Name),0,0,NI_NUMERICHOST);
-   Owner->Status("Connecting to %s (%s)",Host.c_str(),Name);
-   
-   // Get a socket
-   if ((ServerFd = socket(LastHostAddr->ai_family,LastHostAddr->ai_socktype,
-                         LastHostAddr->ai_protocol)) < 0)
-      return _error->Errno("socket","Could not create a socket");
-   SetNonBlock(ServerFd,true);
-   if (connect(ServerFd,LastHostAddr->ai_addr,LastHostAddr->ai_addrlen) < 0 &&
-       errno != EINPROGRESS)
-      return _error->Errno("connect","Connect initiate the connection");
-
-   /* This implements a timeout for connect by opening the connection
-      nonblocking */
-   if (WaitFd(ServerFd,true,TimeOut) == false)
-      return _error->Error("Could not connect, connection timed out");
-   unsigned int Err;
-   unsigned int Len = sizeof(Err);
-   if (getsockopt(ServerFd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0)
-      return _error->Errno("getsockopt","Failed");
-   if (Err != 0)
-      return _error->Error("Could not connect.");
+   // Connect to the remote server
+   if (Connect(Host,Port,"http",80,ServerFd,TimeOut,Owner) == false)
+      return false;
    
    return true;
 }
@@ -689,7 +632,9 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
           Base64Encode(Proxy.User + ":" + Proxy.Password) + "\r\n";
 
    Req += "User-Agent: Debian APT-HTTP/1.2\r\n\r\n";
-//   cerr << Req << endl;
+   
+   if (Debug == true)
+      cerr << Req << endl;
 
    Out.Read(Req);
 }
@@ -701,7 +646,8 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
 bool HttpMethod::Go(bool ToFile,ServerState *Srv)
 {
    // Server has closed the connection
-   if (Srv->ServerFd == -1 && Srv->In.WriteSpace() == false)
+   if (Srv->ServerFd == -1 && (Srv->In.WriteSpace() == false || 
+                              ToFile == false))
       return false;
    
    fd_set rfds,wfds,efds;
@@ -736,7 +682,7 @@ bool HttpMethod::Go(bool ToFile,ServerState *Srv)
    int MaxFd = FileFD;
    if (MaxFd < Srv->ServerFd)
       MaxFd = Srv->ServerFd;
-   
+
    // Select
    struct timeval tv;
    tv.tv_sec = TimeOut;
@@ -781,7 +727,7 @@ bool HttpMethod::Go(bool ToFile,ServerState *Srv)
    // Handle commands from APT
    if (FD_ISSET(STDIN_FILENO,&rfds))
    {
-      if (Run(true) != 0)
+      if (Run(true) != -1)
         exit(100);
    }   
        
@@ -996,6 +942,7 @@ bool HttpMethod::Configuration(string Message)
    TimeOut = _config->FindI("Acquire::http::Timeout",TimeOut);
    PipelineDepth = _config->FindI("Acquire::http::Pipeline-Depth",
                                  PipelineDepth);
+   Debug = _config->FindB("Debug::Acquire::http",false);
    
    return true;
 }
@@ -1020,8 +967,10 @@ int HttpMethod::Loop()
            return 0;
       }
       
-      // Run messages
-      if (Run(true) != 0)
+      /* Run messages, we can accept 0 (no message) if we didn't
+         do a WaitFd above.. Otherwise the FD is closed. */
+      int Result = Run(true);
+      if (Result != -1 && (Result != 0 || Queue == 0))
         return 100;
 
       if (Queue == 0)
@@ -1074,7 +1023,7 @@ int HttpMethod::Loop()
 
            if (FailCounter >= 2)
            {
-              Fail("Connection timed out",true);
+              Fail("Connection failed",true);
               FailCounter = 0;
            }