Changeset 161 for branches/samba-3.0/source/lib

Timestamp:

Jan 21, 2009, 6:19:11 PM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.34

Location:

branches/samba-3.0/source/lib

Files:

• sendfile.c (modified) (2 diffs)
• system.c (modified) (4 diffs)
• util_sock.c (modified) (1 diff)

branches/samba-3.0/source/lib/sendfile.c

@@ -67 +67 @@
                 } while (nwritten == -1 && errno == EINTR);
                 if (nwritten == -1) {
-                        if (errno == ENOSYS) {
+                        if (errno == ENOSYS || errno == EINVAL) {
                                 /* Ok - we're in a world of pain here. We just sent
                                  * the header, but the sendfile failed. We have to
@@ -145 +145 @@
                 } while (nwritten == -1 && errno == EINTR);
                 if (nwritten == -1) {
-                        if (errno == ENOSYS) {
+                        if (errno == ENOSYS || errno == EINVAL) {
                                 /* Ok - we're in a world of pain here. We just sent
                                  * the header, but the sendfile failed. We have to

branches/samba-3.0/source/lib/system.c

@@ -123 +123 @@
 {
         ssize_t ret;
-
+DEBUG(0,("sys_read - count = %d\n",count));
         do {
                 ret = read(fd, buf, count);
-#ifndef __OS2__
+#ifndef __OS2__x
         } while (ret == -1 && errno == EINTR);
 #else
@@ -132 +132 @@
         } while (ret == -1 && ((errno == EINTR)||(errno == EAGAIN)));
 #endif
-
+        if (errno == EAGAIN)
+                DEBUG(0,("sys_read - EAGAIN returned - count = %d\n",count));
         return ret;
 }
@@ -143 +144 @@
 {
         ssize_t ret;
-
+DEBUG(0,("sys_write - count = %d\n",count));
         do {
                 ret = write(fd, buf, count);
-#ifndef __OS2__
+#ifndef __OS2__x
         } while (ret == -1 && errno == EINTR);
 #else
@@ -152 +153 @@
         } while (ret == -1 && ((errno == EINTR)||(errno == EAGAIN)));
 #endif
+        if (errno == EAGAIN)
+                DEBUG(0,("sys_write - EAGAIN returned - count = %d\n",count));
         return ret;
 }

branches/samba-3.0/source/lib/util_sock.c

@@ -155 +155 @@
   {"TCP_KEEPINTVL",     IPPROTO_TCP,   TCP_KEEPINTVL,   0,                 OPT_INT},
 #endif
-#ifdef IPTOS_LOWDELAY
+#if defined(IPTOS_LOWDELAY) && !defined(TCPV40HDRS)
   {"IPTOS_LOWDELAY",    IPPROTO_IP,    IP_TOS,          IPTOS_LOWDELAY,    OPT_ON},
 #endif
-#ifdef IPTOS_THROUGHPUT
+#if defined(IPTOS_THROUGHPUT) && !defined(TCPV40HDRS)
   {"IPTOS_THROUGHPUT",  IPPROTO_IP,    IP_TOS,          IPTOS_THROUGHPUT,  OPT_ON},
 #endif