Merged from miles@gnu.org--gnu-2005 (patch 683-684)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-683
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-684
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-493

1 files changed, 142 insertions, 20 deletions

diff --git a/src/process.c b/src/process.c
index e869456e5c8..05ea7c863b0 100644
--- a/src/process.c
+++ b/src/process.c
@@ -118,6 +118,14 @@ Boston, MA 02110-1301, USA.  */
 #include <sys/wait.h>
 #endif
 
+/* Disable IPv6 support for w32 until someone figures out how to do it
+   properly.  */
+#ifdef WINDOWSNT
+# ifdef AF_INET6
+#  undef AF_INET6
+# endif
+#endif
+
 #include "lisp.h"
 #include "systime.h"
 #include "systty.h"
@@ -140,7 +148,10 @@ Boston, MA 02110-1301, USA.  */
 Lisp_Object Qprocessp;
 Lisp_Object Qrun, Qstop, Qsignal;
 Lisp_Object Qopen, Qclosed, Qconnect, Qfailed, Qlisten;
-Lisp_Object Qlocal, Qdatagram;
+Lisp_Object Qlocal, Qipv4, Qdatagram;
+#ifdef AF_INET6
+Lisp_Object Qipv6;
+#endif
 Lisp_Object QCname, QCbuffer, QChost, QCservice, QCtype;
 Lisp_Object QClocal, QCremote, QCcoding;
 Lisp_Object QCserver, QCnowait, QCnoquery, QCstop;
@@ -1195,9 +1206,11 @@ a socket connection.  */)
 DEFUN ("format-network-address", Fformat_network_address, Sformat_network_address,
        1, 2, 0,
        doc: /* Convert network ADDRESS from internal format to a string.
+A 4 or 5 element vector represents an IPv4 address (with port number).
+An 8 or 9 element vector represents an IPv6 address (with port number).
 If optional second argument OMIT-PORT is non-nil, don't include a port
-number in the string; in this case, interpret a 4 element vector as an
-IP address.  Returns nil if format of ADDRESS is invalid.  */)
+number in the string, even when present in ADDRESS.
+Returns nil if format of ADDRESS is invalid.  */)
      (address, omit_port)
      Lisp_Object address, omit_port;
 {
@@ -1207,13 +1220,13 @@ IP address.  Returns nil if format of ADDRESS is invalid.  */)
   if (STRINGP (address))  /* AF_LOCAL */
     return address;
 
-  if (VECTORP (address))  /* AF_INET */
+  if (VECTORP (address))  /* AF_INET or AF_INET6 */
     {
       register struct Lisp_Vector *p = XVECTOR (address);
       Lisp_Object args[6];
       int nargs, i;
 
-      if (!NILP (omit_port) && (p->size == 4 || p->size == 5))
+      if (p->size == 4 || (p->size == 5 && !NILP (omit_port)))
         {
           args[0] = build_string ("%d.%d.%d.%d");
           nargs = 4;
@@ -1223,6 +1236,16 @@ IP address.  Returns nil if format of ADDRESS is invalid.  */)
           args[0] = build_string ("%d.%d.%d.%d:%d");
           nargs = 5;
         }
+      else if (p->size == 8 || (p->size == 9 && !NILP (omit_port)))
+        {
+          args[0] = build_string ("%x:%x:%x:%x:%x:%x:%x:%x");
+          nargs = 8;
+        }
+      else if (p->size == 9)
+        {
+          args[0] = build_string ("[%x:%x:%x:%x:%x:%x:%x:%x]:%d");
+          nargs = 9;
+        }
       else
         return Qnil;
 
@@ -2212,6 +2235,20 @@ conv_sockaddr_to_lisp (sa, len)
         cp = (unsigned char *)&sin->sin_addr;
         break;
       }
+#ifdef AF_INET6
+    case AF_INET6:
+      {
+        struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) sa;
+        uint16_t *ip6 = (uint16_t *)&sin6->sin6_addr;
+        len = sizeof (sin6->sin6_addr)/2 + 1;
+        address = Fmake_vector (make_number (len), Qnil);
+        p = XVECTOR (address);
+        p->contents[--len] = make_number (ntohs (sin6->sin6_port));
+        for (i = 0; i < len; i++)
+          p->contents[i] = make_number (ntohs (ip6[i]));
+        return address;
+      }
+#endif
 #ifdef HAVE_LOCAL_SOCKETS
     case AF_LOCAL:
       {
@@ -2256,6 +2293,13 @@ get_lisp_to_sockaddr_size (address, familyp)
           *familyp = AF_INET;
           return sizeof (struct sockaddr_in);
         }
+#ifdef AF_INET6
+      else if (p->size == 9)
+        {
+          *familyp = AF_INET6;
+          return sizeof (struct sockaddr_in6);
+        }
+#endif
     }
 #ifdef HAVE_LOCAL_SOCKETS
   else if (STRINGP (address))
@@ -2302,6 +2346,23 @@ conv_lisp_to_sockaddr (family, address, sa, 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;
+          uint16_t *ip6 = (uint16_t *)&sin6->sin6_addr;
+          len = sizeof (sin6->sin6_addr) + 1;
+          i = XINT (p->contents[--len]);
+          sin6->sin6_port = htons (i);
+          for (i = 0; i < len; i++)
+            if (INTEGERP (p->contents[i]))
+              {
+                int j = XFASTINT (p->contents[i]) & 0xffff;
+                ip6[i] = ntohs (j);
+              }
+          return;
+        }
+#endif
     }
   else if (STRINGP (address))
     {
@@ -2595,10 +2656,13 @@ a random port number is selected for the server.
 stream type connection, `datagram' creates a datagram type connection.
 
 :family FAMILY -- FAMILY is the address (and protocol) family for the
-service specified by HOST and SERVICE.  The default address family is
-Inet (or IPv4) for the host and port number specified by HOST and
-SERVICE.  Other address families supported are:
+service specified by HOST and SERVICE.  The default (nil) is to use
+whatever address family (IPv4 or IPv6) that is defined for the host
+and port number specified by HOST and SERVICE.  Other address families
+supported are:
   local -- for a local (i.e. UNIX) address specified by SERVICE.
+  ipv4  -- use IPv4 address family only.
+  ipv6  -- use IPv6 address family only.
 
 :local ADDRESS -- ADDRESS is the local address used for the connection.
 This parameter is ignored when opening a client process. When specified
@@ -2715,8 +2779,8 @@ usage: (make-network-process &rest ARGS)  */)
   struct Lisp_Process *p;
 #ifdef HAVE_GETADDRINFO
   struct addrinfo ai, *res, *lres;
-      struct addrinfo hints;
-      char *portstring, portbuf[128];
+  struct addrinfo hints;
+  char *portstring, portbuf[128];
 #else /* HAVE_GETADDRINFO */
   struct _emacs_addrinfo
   {
@@ -2855,19 +2919,29 @@ usage: (make-network-process &rest ARGS)  */)
 
   /* :family FAMILY -- nil (for Inet), local, or integer.  */
   tem = Fplist_get (contact, QCfamily);
-  if (INTEGERP (tem))
-    family = XINT (tem);
-  else
+  if (NILP (tem))
     {
-      if (NILP (tem))
-        family = AF_INET;
-#ifdef HAVE_LOCAL_SOCKETS
-      else if (EQ (tem, Qlocal))
-        family = AF_LOCAL;
+#if defined(HAVE_GETADDRINFO) && defined(AF_INET6)
+      family = AF_UNSPEC;
+#else
+      family = AF_INET;
 #endif
     }
-  if (family < 0)
+#ifdef HAVE_LOCAL_SOCKETS
+  else if (EQ (tem, Qlocal))
+    family = AF_LOCAL;
+#endif
+#ifdef AF_INET6
+  else if (EQ (tem, Qipv6))
+    family = AF_INET6;
+#endif
+  else if (EQ (tem, Qipv4))
+    family = AF_INET;
+  else if (INTEGERP (tem))
+    family = XINT (tem);
+  else
     error ("Unknown address family");
+
   ai.ai_family = family;
 
   /* :service SERVICE -- string, integer (port number), or t (random port).  */
@@ -2933,7 +3007,7 @@ usage: (make-network-process &rest ARGS)  */)
       QUIT;
       memset (&hints, 0, sizeof (hints));
       hints.ai_flags = 0;
-      hints.ai_family = NILP (Fplist_member (contact, QCfamily)) ? AF_UNSPEC : family;
+      hints.ai_family = family;
       hints.ai_socktype = socktype;
       hints.ai_protocol = 0;
       ret = getaddrinfo (SDATA (host), portstring, &hints, &res);
@@ -3522,6 +3596,21 @@ static struct ifflag_def ifflag_table[] = {
 #ifdef IFF_DYNAMIC
   { IFF_DYNAMIC,        "dynamic" },
 #endif
+#ifdef IFF_OACTIV
+  { IFF_OACTIV,         "oactiv" },     /* OpenBSD: transmission in progress */
+#endif
+#ifdef IFF_SIMPLEX
+  { IFF_SIMPLEX,        "simplex" },    /* OpenBSD: can't hear own transmissions */
+#endif
+#ifdef IFF_LINK0
+  { IFF_LINK0,          "link0" },      /* OpenBSD: per link layer defined bit */
+#endif
+#ifdef IFF_LINK1
+  { IFF_LINK1,          "link1" },      /* OpenBSD: per link layer defined bit */
+#endif
+#ifdef IFF_LINK2
+  { IFF_LINK2,          "link2" },      /* OpenBSD: per link layer defined bit */
+#endif
   { 0, 0 }
 };
 
@@ -3816,6 +3905,9 @@ server_accept_connection (server, channel)
   union u_sockaddr {
     struct sockaddr sa;
     struct sockaddr_in in;
+#ifdef AF_INET6
+    struct sockaddr_in6 in6;
+#endif
 #ifdef HAVE_LOCAL_SOCKETS
     struct sockaddr_un un;
 #endif
@@ -3872,6 +3964,26 @@ server_accept_connection (server, channel)
       }
       break;
 
+#ifdef AF_INET6
+    case AF_INET6:
+      {
+        Lisp_Object args[9];
+        uint16_t *ip6 = (uint16_t *)&saddr.in6.sin6_addr;
+        int i;
+        args[0] = build_string ("%x:%x:%x:%x:%x:%x:%x:%x");
+        for (i = 0; i < 8; i++)
+          args[i+1] = make_number (ntohs(ip6[i]));
+        host = Fformat (9, args);
+        service = make_number (ntohs (saddr.in.sin_port));
+
+        args[0] = build_string (" <[%s]:%d>");
+        args[1] = host;
+        args[2] = service;
+        caller = Fformat (3, args);
+      }
+      break;
+#endif
+
 #ifdef HAVE_LOCAL_SOCKETS
     case AF_LOCAL:
 #endif
@@ -6721,6 +6833,10 @@ init_process ()
 #ifdef HAVE_LOCAL_SOCKETS
    ADD_SUBFEATURE (QCfamily, Qlocal);
 #endif
+   ADD_SUBFEATURE (QCfamily, Qipv4);
+#ifdef AF_INET6
+   ADD_SUBFEATURE (QCfamily, Qipv6);
+#endif
 #ifdef HAVE_GETSOCKNAME
    ADD_SUBFEATURE (QCservice, Qt);
 #endif
@@ -6779,6 +6895,12 @@ syms_of_process ()
   staticpro (&Qlisten);
   Qlocal = intern ("local");
   staticpro (&Qlocal);
+  Qipv4 = intern ("ipv4");
+  staticpro (&Qipv4);
+#ifdef AF_INET6
+  Qipv6 = intern ("ipv6");
+  staticpro (&Qipv6);
+#endif
   Qdatagram = intern ("datagram");
   staticpro (&Qdatagram);