comparison lib/protocols.c @ 641:efe90b739e98

2004-12-12 Brian Masney <[e-mail]> * lib/gftp.h lib/protocols.c (gftp_connect_server) - if getaddrinfo() is not defined in the system, save the current index of the host that we are connected to

640:cad45ebbc520

    }

#else /* !HAVE_GETADDRINFO */
  struct sockaddr_in remote_address;
  struct servent serv_struct;
  int curhost;

  if ((request->use_proxy = gftp_need_proxy (request, service,
                                             proxy_hostname, proxy_port)) < 0)
    return (request->use_proxy);
  else if (request->use_proxy == 1)

          return (GFTP_ERETRYABLE);
        }
    }

  disphost = NULL;
  for (curhost = 0; request->host.h_addr_list[curhost] != NULL; curhost++)
    {
      disphost = request->host.h_name;
      memcpy (&remote_address.sin_addr, request->host.h_addr_list[curhost],
              request->host.h_length);
      request->logging_function (gftp_logging_misc, request,
                                 _("Trying %s:%d\n"),
                                 request->host.h_name, port);

                                     connect_host, g_strerror (errno));
        }
      break;
    }

  if (request->host.h_addr_list[curhost] == NULL)
    {
      close (sock);
      return (GFTP_ERETRYABLE);
    }
#endif /* HAVE_GETADDRINFO */

641:efe90b739e98

    }

#else /* !HAVE_GETADDRINFO */
  struct sockaddr_in remote_address;
  struct servent serv_struct;

  if ((request->use_proxy = gftp_need_proxy (request, service,
                                             proxy_hostname, proxy_port)) < 0)
    return (request->use_proxy);
  else if (request->use_proxy == 1)

          return (GFTP_ERETRYABLE);
        }
    }

  disphost = NULL;
  for (request->curhost = 0;
       request->host.h_addr_list[request->curhost] != NULL;
       request->curhost++)
    {
      disphost = request->host.h_name;
      memcpy (&remote_address.sin_addr,
              request->host.h_addr_list[request->curhost],
              request->host.h_length);
      request->logging_function (gftp_logging_misc, request,
                                 _("Trying %s:%d\n"),
                                 request->host.h_name, port);

                                     connect_host, g_strerror (errno));
        }
      break;
    }

  if (request->host.h_addr_list[request->curhost] == NULL)
    {
      close (sock);
      return (GFTP_ERETRYABLE);
    }
#endif /* HAVE_GETADDRINFO */