comparison src/process.c @ 25262:ccf83ed7326a

(Fopen_network_stream): Fix previous change.

25261:89be69860eeb

  struct hostent *host_info_ptr, host_info;
  char *(addr_list[2]);
  IN_ADDR numeric_addr;
  struct hostent host_info_fixed;
  int port;
#else /* ! HAVE_GETADDRINFO */
  struct addrinfo hints, *res, *lres;
  int ret = 0;
  int xerrno = 0;
  char *portstring, portbuf [128];
#endif /* ! HAVE_GETADDRINFO */
  int s, outch, inch;
  struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
  int retry = 0;
  int count = specpdl_ptr - specpdl;

#ifdef WINDOWSNT

#ifdef HAVE_GETADDRINFO
  {
    immediate_quit = 1;
    QUIT;
    memset (&hints, 0, sizeof (hints));
    hints.ai_flags = AI_NUMERICHOST;
    hints.ai_family = AF_UNSPEC;
    hints.ai_socktype = SOCK_STREAM;
    hints.ai_protocol = 0;
    ret = getaddrinfo (XSTRING (host)->data, portstring, &hints, &res);
    if (!ret)	  /* numeric */
      {
	freeaddrinfo (res);
	hints.ai_flags = AI_CANONNAME;
      }
    else	  /* non-numeric */
      {
	hints.ai_flags = 0;
      }
    ret = getaddrinfo (XSTRING (host)->data, portstring, &hints, &res);
    if (ret)
      {
	error ("%s/%s %s", XSTRING (host)->data, portstring,
	      gai_strerror (ret));
      }
    immediate_quit = 0;
  }

  for (lres = res; lres ; lres = lres->ai_next)
    {
      s = socket (lres->ai_family, lres->ai_socktype, lres->ai_protocol);
      if (s < 0) 
	report_file_error ("error creating socket", Fcons (name, Qnil));

      /* Kernel bugs (on Ultrix at least) cause lossage (not just EINTR)
	 when connect is interrupted.  So let's not let it get interrupted.
	 Note we do not turn off polling, because polling is only used
	 when not interrupt_input, and thus not normally used on the systems
	 which have this bug.  On systems which use polling, there's no way
	 to quit if polling is turned off.  */
      if (interrupt_input)
	unrequest_sigio ();

  loop:

      immediate_quit = 1;
      QUIT;

      ret = connect (s, lres->ai_addr, lres->ai_addrlen);

      if (ret == -1 && errno != EISCONN)
	{
	  xerrno = errno;

	  immediate_quit = 0;

	  if (errno == EINTR)
	    goto loop;
	  if (errno == EADDRINUSE && retry < 20)
	    {
	      /* A delay here is needed on some FreeBSD systems,
		 and it is harmless, since this retrying takes time anyway
		 and should be infrequent.  */
	      Fsleep_for (make_number (1), Qnil);
	      retry++;
	      goto loop;
	    }

	  close (s);
	}
      if (ret == 0)		/* We got a valid connect */
	break;
  } /* address loop */
  freeaddrinfo (res);
  if (ret != 0)
    {
      if (interrupt_input)
	request_sigio ();

      errno = xerrno;

25262:ccf83ed7326a

  struct hostent *host_info_ptr, host_info;
  char *(addr_list[2]);
  IN_ADDR numeric_addr;
  struct hostent host_info_fixed;
  int port;
#else /* HAVE_GETADDRINFO */
  struct addrinfo hints, *res, *lres;
  int ret = 0;
  int xerrno = 0;
  char *portstring, portbuf[128];
#endif /* HAVE_GETADDRINFO */
  int s = -1, outch, inch;
  struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
  int retry = 0;
  int count = specpdl_ptr - specpdl;

#ifdef WINDOWSNT

#ifdef HAVE_GETADDRINFO
  {
    immediate_quit = 1;
    QUIT;
    memset (&hints, 0, sizeof (hints));
    hints.ai_flags = 0;
    hints.ai_family = AF_UNSPEC;
    hints.ai_socktype = SOCK_STREAM;
    hints.ai_protocol = 0;
    ret = getaddrinfo (XSTRING (host)->data, portstring, &hints, &res);
    if (ret)
      {
	error ("%s/%s %s", XSTRING (host)->data, portstring,
	       gai_strerror (ret));
      }
    immediate_quit = 0;
  }

  for (lres = res; lres; lres = lres->ai_next)
    {
      s = socket (lres->ai_family, lres->ai_socktype, lres->ai_protocol);
      if (s < 0) 
	continue;

      /* Kernel bugs (on Ultrix at least) cause lossage (not just EINTR)
	 when connect is interrupted.  So let's not let it get interrupted.
	 Note we do not turn off polling, because polling is only used
	 when not interrupt_input, and thus not normally used on the systems
	 which have this bug.  On systems which use polling, there's no way
	 to quit if polling is turned off.  */
      if (interrupt_input)
	unrequest_sigio ();

      immediate_quit = 1;
      QUIT;

      ret = connect (s, lres->ai_addr, lres->ai_addrlen);
      if (ret == 0)
	break;
      close (s);
      s = -1;
    }

  freeaddrinfo (res);
  if (s < 0)
    {
      if (interrupt_input)
	request_sigio ();

      errno = xerrno;