Changeset 4634 in vbox for trunk/src

Timestamp:

Sep 9, 2007 6:13:29 AM (17 years ago)

Author:

vboxsync

Message:

Don't use TCPV40HDRS.

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (1 diff)
• nsprpub/pr/include/md/_os2.h (modified) (1 diff)
• nsprpub/pr/src/md/os2/os2sock.c (modified) (7 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -50 +50 @@
 TEMPLATE_XPCOM_DEFS.linux          = OSTYPE=\"Linux2.6\"    OSARCH=\"Linux\"  XP_UNIX=1 _GNU_SOURCE HAVE_VISIBILITY_ATTRIBUTE=1
 TEMPLATE_XPCOM_DEFS.l4             = OSTYPE=\"L4ENV\"       OSARCH=\"L4\"     XP_UNIX=1 L4ENV HAVE_VISIBILITY_ATTRIBUTE=1
-TEMPLATE_XPCOM_DEFS.os2            = OSTYPE=\"OS/2_4.5\"    OSARCH=\"OS/2\"   XP_OS2 XP_PC BSD_SELECT TCPV40HDRS
-TEMPLATE_XPCOM_LIBPATH.os2         = $(PATH_EMXPGCC)/lib/tcpipv4
+TEMPLATE_XPCOM_DEFS.os2            = OSTYPE=\"OS/2_4.5\"    OSARCH=\"OS/2\"   XP_OS2 XP_PC BSD_SELECT
 TEMPLATE_XPCOM_LDFLAGS.darwin      = $(VBOXR3NP_LDFLAGS.darwin) \
                                      -fshort-wchar -fno-rtti -fno-exceptions -fpascal-strings \

trunk/src/libs/xpcom18a4/nsprpub/pr/include/md/_os2.h

@@ -92 +92 @@
 #define _PR_HAVE_THREADSAFE_GETHOST
 #define _PR_HAVE_ATOMIC_OPS
+#ifndef TCPV40HDRS                      /* bird */
+#define _PR_HAVE_SOCKADDR_LEN           /* bird */
+#endif                                  /* bird */
 
 #define HANDLE unsigned long

trunk/src/libs/xpcom18a4/nsprpub/pr/src/md/os2/os2sock.c

@@ -310 +310 @@
     }
 done:
+#ifdef _PR_HAVE_SOCKADDR_LEN /* bird - !TCPV40HDRS */
+    if (rv != -1 && addr) /* ignore the sa_len field of struct sockaddr */
+        addr->raw.family = ((struct sockaddr *) addr)->sa_family;
+#endif /* _PR_HAVE_SOCKADDR_LEN */
     return(rv);
 }
@@ -320 +324 @@
     PRThread *me = _PR_MD_CURRENT_THREAD();
     PRInt32 osfd = fd->secret->md.osfd;
+#ifdef _PR_HAVE_SOCKADDR_LEN /* bird - !TCPV40HDRS */
+    PRNetAddr addrCopy = *addr;
+    ((struct sockaddr *)&addrCopy)->sa_len = addrlen;
+    ((struct sockaddr *)&addrCopy)->sa_family = addr->raw.family;
+    addr = &addrCopy;
+#endif
 
      /*
@@ -382 +392 @@
 {
     PRInt32 rv, err;
+#ifdef _PR_HAVE_SOCKADDR_LEN /* bird - !TCPV40HDRS */
+    PRNetAddr addrCopy = *addr;
+    ((struct sockaddr *)&addrCopy)->sa_len = addrlen;
+    ((struct sockaddr *)&addrCopy)->sa_family = addr->raw.family;
+    addr = &addrCopy;
+#endif
     rv = bind(fd->secret->md.osfd, (struct sockaddr *) addr, (int )addrlen);
     if (rv < 0) {
@@ -485 +501 @@
     PRInt32 rv, err;
     PRThread *me = _PR_MD_CURRENT_THREAD();
+#ifdef _PR_HAVE_SOCKADDR_LEN /* bird - !TCPV40HDRS */
+    PRNetAddr addrCopy = *addr;
+    ((struct sockaddr *)&addrCopy)->sa_len = addrlen;
+    ((struct sockaddr *)&addrCopy)->sa_family = addr->raw.family;
+    addr = &addrCopy;
+#endif
     while ((rv = sendto(osfd, buf, amount, flags,
            (struct sockaddr *) addr, addrlen)) == -1)
@@ -538 +560 @@
     }
 done:
+#ifdef _PR_HAVE_SOCKADDR_LEN /* bird - !TCPV40HDRS */
+    if (rv != -1 && addr) /* ignore the sa_len field of struct sockaddr */
+        addr->raw.family = ((struct sockaddr *) addr)->sa_family;
+#endif /* _PR_HAVE_SOCKADDR_LEN */
     return(rv);
 }
@@ -630 +656 @@
     rv = getsockname(fd->secret->md.osfd,
                      (struct sockaddr *) addr, (int *)addrlen);
+#ifdef _PR_HAVE_SOCKADDR_LEN /* bird - !TCPV40HDRS */
+    if (rv == 0 && addr) /* ignore the sa_len field of struct sockaddr */
+        addr->raw.family = ((struct sockaddr *) addr)->sa_family;
+#endif /* _PR_HAVE_SOCKADDR_LEN */
     if (rv < 0) {
         err = sock_errno();
@@ -644 +674 @@
     rv = getpeername(fd->secret->md.osfd,
                      (struct sockaddr *) addr, (int *)addrlen);
+#ifdef _PR_HAVE_SOCKADDR_LEN /* bird - !TCPV40HDRS */
+    if (rv == 0 && addr) /* ignore the sa_len field of struct sockaddr */
+        addr->raw.family = ((struct sockaddr *) addr)->sa_family;
+#endif /* _PR_HAVE_SOCKADDR_LEN */
     if (rv < 0) {
         err = sock_errno();