Changeset 2516

Timestamp:

Feb 4, 2006, 1:26:03 PM (20 years ago)

Author:

bird

Message:

#25: Ensure correct address length returns from recvmsg and recvfrom.

Location:

branches/libc-0.6/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff)
• src/libsocket/recvfrom.c (modified) (2 diffs)
• src/libsocket/recvmsg.c (modified) (2 diffs)

branches/libc-0.6/src/emx/ChangeLog.LIBC

@@ -4 +4 @@
 
 2006-02-04: knut st. osmundsen <bird-gccos2-spam@anduin.net>
+    - libsocket:
+        o #25: Ensure correct address length returns from recvmsg and recvfrom.
     - libc:
         o #32: Fixed incorrect readdir_r return code when out of files.

branches/libc-0.6/src/emx/src/libsocket/recvfrom.c

@@ -30 +30 @@
 #include "libc-alias.h"
 #include <errno.h>
+#include <netinet/in.h>
 #include <sys/socket.h>
 #include <sys/fcntl.h>
@@ -47 +48 @@
         rc = __libsocket_recvfrom(pFHSocket->iSocket, buf, len, flags, from, fromlen);
         if (rc >= 0)
+        {
+            if (from && fromlen)
+            {
+#ifdef TCPV40HDRS
+                if (*fromlen > sizeof(struct sockaddr_in) && from->sa_family == AF_INET)
+                    *fromlen = sizeof(struct sockaddr_in);
+#else
+                if (*fromlen > from->sa_len)
+                    *fromlen = from->sa_len;
+#endif
+            }
             LIBCLOG_RETURN_INT(rc);
+        }
         __libc_TcpipUpdateErrno();
     }

branches/libc-0.6/src/emx/src/libsocket/recvmsg.c

@@ -31 +31 @@
 #include <errno.h>
 #include <sys/socket.h>
+#include <netinet/in.h>
 #include <sys/fcntl.h>
 #include <emx/io.h>
@@ -46 +47 @@
         rc = __libsocket_recvmsg(pFHSocket->iSocket, msg, flags);
         if (rc >= 0)
+        {
+            /* Workaround for missing msg_namelen update. Required if a IPV6 sized buffer is given.
+             * (This problem hasn't been explored well enough, so this workaround is rather cautious.)
+             */
+            if (msg)
+            {
+                struct sockaddr_in *pAddr = (struct sockaddr_in *)msg->msg_name;
+#ifndef TCPV40HDRS
+                if (pAddr && msg->msg_namelen > pAddr->sin_len)
+                    msg->msg_namelen = pAddr->sin_len;
+#else
+
+                if (    pAddr
+                    &&  pAddr->sin_family == AF_INET
+                    &&  msg->msg_namelen > sizeof(struct sockaddr_in))
+                    msg->msg_namelen = sizeof(struct sockaddr_in);
+#endif
+
+            }
             LIBCLOG_RETURN_INT(rc);
+        }
         __libc_TcpipUpdateErrno();
     }