comparison src/process.c @ 69981:9fb9e33ecf2d

(conv_lisp_to_sockaddr): Fix previous change.

69980:f347a837af60

    }
  return 0;
}

/* Convert an address object (vector or string) to an internal sockaddr.
   Address format has already been validated by get_lisp_to_sockaddr_size,
   but just to be nice, we return without doing anything
   if FAMILY is not valid.  */

static void
conv_lisp_to_sockaddr (family, address, sa, len)
     int family;
     Lisp_Object address;

  register struct Lisp_Vector *p;
  register unsigned char *cp = NULL;
  register int i;

  bzero (sa, len);
  sa->sa_family = family;

  if (VECTORP (address))
    {
      p = XVECTOR (address);
      if (family == AF_INET)

	  struct sockaddr_in *sin = (struct sockaddr_in *) sa;
	  len = sizeof (sin->sin_addr) + 1;
	  i = XINT (p->contents[--len]);
	  sin->sin_port = htons (i);
	  cp = (unsigned char *)&sin->sin_addr;
	}
#ifdef AF_INET6
      else if (family == AF_INET6)
	{
	  struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) sa;

	    if (INTEGERP (p->contents[i]))
	      {
		int j = XFASTINT (p->contents[i]) & 0xffff;
		ip6[i] = ntohs (j);
	      }
	  return;
	}
#endif
      return;
    }
  else if (STRINGP (address))

	{
	  struct sockaddr_un *sockun = (struct sockaddr_un *) sa;
	  cp = SDATA (address);
	  for (i = 0; i < sizeof (sockun->sun_path) && *cp; i++)
	    sockun->sun_path[i] = *cp++;
	}
#endif
      return;
    }
  else

69981:9fb9e33ecf2d

    }
  return 0;
}

/* Convert an address object (vector or string) to an internal sockaddr.

   The address format has been basically validated by
   get_lisp_to_sockaddr_size, but this does not mean FAMILY is valid;
   it could have come from user data.  So if FAMILY is not valid,
   we return after zeroing *SA.  */

static void
conv_lisp_to_sockaddr (family, address, sa, len)
     int family;
     Lisp_Object address;

  register struct Lisp_Vector *p;
  register unsigned char *cp = NULL;
  register int i;

  bzero (sa, len);

  if (VECTORP (address))
    {
      p = XVECTOR (address);
      if (family == AF_INET)

	  struct sockaddr_in *sin = (struct sockaddr_in *) sa;
	  len = sizeof (sin->sin_addr) + 1;
	  i = XINT (p->contents[--len]);
	  sin->sin_port = htons (i);
	  cp = (unsigned char *)&sin->sin_addr;
	  sa->sa_family = family;
	}
#ifdef AF_INET6
      else if (family == AF_INET6)
	{
	  struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) sa;

	    if (INTEGERP (p->contents[i]))
	      {
		int j = XFASTINT (p->contents[i]) & 0xffff;
		ip6[i] = ntohs (j);
	      }
	  sa->sa_family = family;
	}
#endif
      return;
    }
  else if (STRINGP (address))

	{
	  struct sockaddr_un *sockun = (struct sockaddr_un *) sa;
	  cp = SDATA (address);
	  for (i = 0; i < sizeof (sockun->sun_path) && *cp; i++)
	    sockun->sun_path[i] = *cp++;
	  sa->sa_family = family;
	}
#endif
      return;
    }
  else