Changeset 91b1c8e6 in rtems

Timestamp:

12/07/98 17:42:52 (25 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

2ffe30d

Parents:

e203c04b

Message:

Patch from Ian Lance Taylor <ian@…>:

RTEMS permits using the SO_SNDTIMEO and SO_RCVTIMEO socket options to
set a timeout for most socket I/O operations. However, in RTEMS
4.0.0, those options do not affect connect or accept. I don't know of
any way to put a timeout on those calls in RTEMS 4.0.0; can anybody
point to one.

Since it is frequently useful to have a timeout on accept, and
sometimes useful to have a timeout on connect shorter than the BSD
system default of 75 seconds, the following patch causes SO_RCVTIMEO
to affect connect and accept.

Files:

• c/src/exec/libnetworking/rtems/rtems_bsdnet_internal.h (modified) (1 diff)
• c/src/exec/libnetworking/rtems/rtems_glue.c (modified) (3 diffs)
• c/src/exec/libnetworking/rtems/rtems_syscall.c (modified) (2 diffs)
• c/src/lib/libnetworking/rtems/rtems_bsdnet_internal.h (modified) (1 diff)
• c/src/lib/libnetworking/rtems/rtems_glue.c (modified) (3 diffs)
• c/src/lib/libnetworking/rtems/rtems_syscall.c (modified) (2 diffs)
• c/src/libnetworking/rtems/rtems_bsdnet_internal.h (modified) (1 diff)
• c/src/libnetworking/rtems/rtems_glue.c (modified) (3 diffs)
• c/src/libnetworking/rtems/rtems_syscall.c (modified) (2 diffs)
• cpukit/libnetworking/rtems/rtems_bsdnet_internal.h (modified) (1 diff)
• cpukit/libnetworking/rtems/rtems_glue.c (modified) (3 diffs)
• cpukit/libnetworking/rtems/rtems_syscall.c (modified) (2 diffs)

c/src/exec/libnetworking/rtems/rtems_bsdnet_internal.h

@@ -42 +42 @@
  */
 struct socket;
-extern void soconnsleep (struct socket *so);
+extern int soconnsleep (struct socket *so);
 extern void soconnwakeup (struct socket *so);
 #define splnet()        0

c/src/exec/libnetworking/rtems/rtems_glue.c

@@ -381 +381 @@
  * Wait for a connection/disconnection event.
  */
-void
+int
 soconnsleep (struct socket *so)
 {
         rtems_event_set events;
         rtems_id tid;
+        rtems_status_code sc;
 
         /*
@@ -405 +406 @@
          * Wait for the wakeup event.
          */
-        rtems_bsdnet_event_receive (SOSLEEP_EVENT, RTEMS_EVENT_ANY | RTEMS_WAIT, RTEMS_NO_TIMEOUT, &events);
+        sc = rtems_bsdnet_event_receive (SOSLEEP_EVENT, RTEMS_EVENT_ANY | RTEMS_WAIT, so->so_rcv.sb_timeo, &events);
 
         /*
@@ -411 +412 @@
          */
         so->so_pgid = 0;
+
+        switch (sc) {
+        case RTEMS_SUCCESSFUL:  return 0;
+        case RTEMS_TIMEOUT:     return EWOULDBLOCK;
+        default:                return ENXIO;
+        }
 }
 

c/src/exec/libnetworking/rtems/rtems_syscall.c

@@ -212 +212 @@
         }
         while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) {
-                soconnsleep (so);
+                so->so_error = soconnsleep (so);
         }
         if (error == 0) {
@@ -272 +272 @@
                         break;
                 }
-                soconnsleep (head);
+                head->so_error = soconnsleep (head);
         }
         if (head->so_error) {

c/src/lib/libnetworking/rtems/rtems_bsdnet_internal.h

@@ -42 +42 @@
  */
 struct socket;
-extern void soconnsleep (struct socket *so);
+extern int soconnsleep (struct socket *so);
 extern void soconnwakeup (struct socket *so);
 #define splnet()        0

c/src/lib/libnetworking/rtems/rtems_glue.c

@@ -381 +381 @@
  * Wait for a connection/disconnection event.
  */
-void
+int
 soconnsleep (struct socket *so)
 {
         rtems_event_set events;
         rtems_id tid;
+        rtems_status_code sc;
 
         /*
@@ -405 +406 @@
          * Wait for the wakeup event.
          */
-        rtems_bsdnet_event_receive (SOSLEEP_EVENT, RTEMS_EVENT_ANY | RTEMS_WAIT, RTEMS_NO_TIMEOUT, &events);
+        sc = rtems_bsdnet_event_receive (SOSLEEP_EVENT, RTEMS_EVENT_ANY | RTEMS_WAIT, so->so_rcv.sb_timeo, &events);
 
         /*
@@ -411 +412 @@
          */
         so->so_pgid = 0;
+
+        switch (sc) {
+        case RTEMS_SUCCESSFUL:  return 0;
+        case RTEMS_TIMEOUT:     return EWOULDBLOCK;
+        default:                return ENXIO;
+        }
 }
 

c/src/lib/libnetworking/rtems/rtems_syscall.c

@@ -212 +212 @@
         }
         while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) {
-                soconnsleep (so);
+                so->so_error = soconnsleep (so);
         }
         if (error == 0) {
@@ -272 +272 @@
                         break;
                 }
-                soconnsleep (head);
+                head->so_error = soconnsleep (head);
         }
         if (head->so_error) {

c/src/libnetworking/rtems/rtems_bsdnet_internal.h

@@ -42 +42 @@
  */
 struct socket;
-extern void soconnsleep (struct socket *so);
+extern int soconnsleep (struct socket *so);
 extern void soconnwakeup (struct socket *so);
 #define splnet()        0

c/src/libnetworking/rtems/rtems_glue.c

@@ -381 +381 @@
  * Wait for a connection/disconnection event.
  */
-void
+int
 soconnsleep (struct socket *so)
 {
         rtems_event_set events;
         rtems_id tid;
+        rtems_status_code sc;
 
         /*
@@ -405 +406 @@
          * Wait for the wakeup event.
          */
-        rtems_bsdnet_event_receive (SOSLEEP_EVENT, RTEMS_EVENT_ANY | RTEMS_WAIT, RTEMS_NO_TIMEOUT, &events);
+        sc = rtems_bsdnet_event_receive (SOSLEEP_EVENT, RTEMS_EVENT_ANY | RTEMS_WAIT, so->so_rcv.sb_timeo, &events);
 
         /*
@@ -411 +412 @@
          */
         so->so_pgid = 0;
+
+        switch (sc) {
+        case RTEMS_SUCCESSFUL:  return 0;
+        case RTEMS_TIMEOUT:     return EWOULDBLOCK;
+        default:                return ENXIO;
+        }
 }
 

c/src/libnetworking/rtems/rtems_syscall.c

@@ -212 +212 @@
         }
         while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) {
-                soconnsleep (so);
+                so->so_error = soconnsleep (so);
         }
         if (error == 0) {
@@ -272 +272 @@
                         break;
                 }
-                soconnsleep (head);
+                head->so_error = soconnsleep (head);
         }
         if (head->so_error) {

cpukit/libnetworking/rtems/rtems_bsdnet_internal.h

@@ -42 +42 @@
  */
 struct socket;
-extern void soconnsleep (struct socket *so);
+extern int soconnsleep (struct socket *so);
 extern void soconnwakeup (struct socket *so);
 #define splnet()        0

cpukit/libnetworking/rtems/rtems_glue.c

@@ -381 +381 @@
  * Wait for a connection/disconnection event.
  */
-void
+int
 soconnsleep (struct socket *so)
 {
         rtems_event_set events;
         rtems_id tid;
+        rtems_status_code sc;
 
         /*
@@ -405 +406 @@
          * Wait for the wakeup event.
          */
-        rtems_bsdnet_event_receive (SOSLEEP_EVENT, RTEMS_EVENT_ANY | RTEMS_WAIT, RTEMS_NO_TIMEOUT, &events);
+        sc = rtems_bsdnet_event_receive (SOSLEEP_EVENT, RTEMS_EVENT_ANY | RTEMS_WAIT, so->so_rcv.sb_timeo, &events);
 
         /*
@@ -411 +412 @@
          */
         so->so_pgid = 0;
+
+        switch (sc) {
+        case RTEMS_SUCCESSFUL:  return 0;
+        case RTEMS_TIMEOUT:     return EWOULDBLOCK;
+        default:                return ENXIO;
+        }
 }
 

cpukit/libnetworking/rtems/rtems_syscall.c

@@ -212 +212 @@
         }
         while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) {
-                soconnsleep (so);
+                so->so_error = soconnsleep (so);
         }
         if (error == 0) {
@@ -272 +272 @@
                         break;
                 }
-                soconnsleep (head);
+                head->so_error = soconnsleep (head);
         }
         if (head->so_error) {