comparison src/process.c @ 58072:4ebc52bf6429

(Fmake_network_process): Remove kludge for interrupted connects on BSD. If connect is interrupted, just close socket and start over rather than sleeping and retry with same socket.

58071:253aa382ba57

  for (lres = res; lres; lres = lres->ai_next)
    {
      int optn, optbits;

      s = socket (lres->ai_family, lres->ai_socktype, lres->ai_protocol);
      if (s < 0)
	{
	  xerrno = errno;
	  continue;

	    report_file_error ("Cannot listen on server socket", Qnil);

	  break;
	}

    retry_connect:

      immediate_quit = 1;
      QUIT;

      /* This turns off all alarm-based interrupts; the
	 bind_polling_period call above doesn't always turn all the

#endif
#endif

      immediate_quit = 0;

      if (xerrno == EINTR)
	goto retry_connect;
      if (xerrno == 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 retry_connect;
	}

      /* Discard the unwind protect closing S.  */
      specpdl_ptr = specpdl + count1;
      emacs_close (s);
      s = -1;
    }

  if (s >= 0)
    {
#ifdef DATAGRAM_SOCKETS

58072:4ebc52bf6429

  for (lres = res; lres; lres = lres->ai_next)
    {
      int optn, optbits;

    retry_connect:

      s = socket (lres->ai_family, lres->ai_socktype, lres->ai_protocol);
      if (s < 0)
	{
	  xerrno = errno;
	  continue;

	    report_file_error ("Cannot listen on server socket", Qnil);

	  break;
	}

      immediate_quit = 1;
      QUIT;

      /* This turns off all alarm-based interrupts; the
	 bind_polling_period call above doesn't always turn all the

#endif
#endif

      immediate_quit = 0;

      /* Discard the unwind protect closing S.  */
      specpdl_ptr = specpdl + count1;
      emacs_close (s);
      s = -1;

      if (xerrno == EINTR)
	goto retry_connect;
    }

  if (s >= 0)
    {
#ifdef DATAGRAM_SOCKETS