Update.

	* sysdeps/posix/getaddrinfo.c: Add support for SOCK_RAW.
	Patch by YOSHIFUJI Hideaki <yoshifuji@ecei.tohoku.ac.jp>.

diff --git a/ChangeLog b/ChangeLog
index 7181201..f59386e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-01-05  Ulrich Drepper  <drepper@cygnus.com>
 
+       * sysdeps/posix/getaddrinfo.c: Add support for SOCK_RAW.
+       Patch by YOSHIFUJI Hideaki <yoshifuji@ecei.tohoku.ac.jp>.
+
        * io/ftw.c (process_entry): Cache object dev/inode only for
        directories (PR libc/1514).
 

diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index 00788b7..5d6f3b8 100644 (file)
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -92,14 +92,19 @@ struct gaih_typeproto
     int socktype;
     int protocol;
     char *name;
+    int protoflag;
   };
 
+/* Values for `protoflag'.  */
+#define GAI_PROTO_NOSERVICE    1
+
 static struct gaih_typeproto gaih_inet_typeproto[] =
 {
   { 0, 0, NULL },
-  { SOCK_STREAM, IPPROTO_TCP, (char *) "tcp" },
-  { SOCK_DGRAM, IPPROTO_UDP, (char *) "udp" },
-  { 0, 0, NULL }
+  { SOCK_STREAM, IPPROTO_TCP, (char *) "tcp" ,0 },
+  { SOCK_DGRAM, IPPROTO_UDP, (char *) "udp", 0 },
+  { SOCK_RAW, IPPROTO_RAW, (char *) "raw", GAI_PROTO_NOSERVICE },
+  { 0, 0, NULL, 0 }
 };
 
 struct gaih
@@ -134,11 +139,15 @@ gaih_local (const char *name, const struct gaih_service *service,
 
   if (req->ai_protocol || req->ai_socktype)
     {
-      struct gaih_typeproto *tp = gaih_inet_typeproto;
+      struct gaih_typeproto *tp = gaih_inet_typeproto + 1;
+
+      while (tp->name != NULL
+            && (req->ai_socktype != tp->socktype || req->ai_socktype == 0)
+            && ((tp->protoflag & GAI_PROTO_NOSERVICE) != 0
+                || req->ai_protocol != tp->protocol
+                || req->ai_protocol == 0))
+       ++tp;
 
-      for (tp++; tp->name &&
-            ((req->ai_socktype != tp->socktype) || !req->ai_socktype) &&
-            ((req->ai_protocol != tp->protocol) || !req->ai_protocol); tp++);
       if (tp->name == NULL)
        {
          if (req->ai_socktype)
@@ -284,9 +293,15 @@ gaih_inet (const char *name, const struct gaih_service *service,
 
   if (req->ai_protocol || req->ai_socktype)
     {
-      for (tp++; tp->name &&
-            ((req->ai_socktype != tp->socktype) || !req->ai_socktype) &&
-            ((req->ai_protocol != tp->protocol) || !req->ai_protocol); tp++);
+      ++tp;
+
+      while (tp->name != NULL
+            && (req->ai_socktype != tp->socktype || req->ai_socktype == 0)
+            && ((tp->protoflag & GAI_PROTO_NOSERVICE) != 0
+                || req->ai_protocol != tp->protocol
+                || req->ai_protocol == 0))
+       ++tp;
+
       if (tp->name == NULL)
        {
          if (req->ai_socktype)
@@ -298,6 +313,9 @@ gaih_inet (const char *name, const struct gaih_service *service,
 
   if (service != NULL)
     {
+      if ((tp->protoflag & GAI_PROTO_NOSERVICE) != 0)
+       return (GAIH_OKIFUNSPEC | -EAI_SERVICE);
+
       if (service->num < 0)
        {
          if (tp->name != NULL)