Both transmit and transmit_stdin should return proper status of transmission.

2 files changed, 10 insertions, 7 deletions

diff --git a/apps/Gateway/Peer/Peer.cpp b/apps/Gateway/Peer/Peer.cpp
index 47ee65b5a26..a4c17e6218b 100644
--- a/apps/Gateway/Peer/Peer.cpp
+++ b/apps/Gateway/Peer/Peer.cpp
@@ -57,7 +57,7 @@ Peer_Handler::open (void *a)
   return 0;
 }
 
-void
+int
 Peer_Handler::transmit (ACE_Message_Block *mb,
                         size_t n,
                         int event_type)
@@ -89,7 +89,9 @@ Peer_Handler::transmit (ACE_Message_Block *mb,
       // Caller is responsible for freeing a ACE_Message_Block
       // if failures occur.
       mb->release ();
+      return -1;
     }
+  return 0;
 }
 
 // Read events from stdin and send them to the gatewayd.
@@ -130,13 +132,14 @@ Peer_Handler::transmit_stdin (void)
           break;
           /* NOTREACHED */
         default:
-          this->transmit (mb, n, ROUTING_EVENT);
-          break;
+          return this->transmit (mb, n, ROUTING_EVENT);
           /* NOTREACHED */
         }
+      return 0;
     }
 
-  return 0;
+  ACE_DEBUG ((LM_DEBUG, "Must transmit over an opened channel.\n"));
+  return -1;
 }
 
 // Perform a non-blocking <put> of event MB.  If we are unable to send
diff --git a/apps/Gateway/Peer/Peer.h b/apps/Gateway/Peer/Peer.h
index 80707d9e3e1..67b9a936dd7 100644
--- a/apps/Gateway/Peer/Peer.h
+++ b/apps/Gateway/Peer/Peer.h
@@ -94,9 +94,9 @@ public:
 protected:
   typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> inherited;
 
-  void transmit (ACE_Message_Block *mb,
-                 size_t n,
-                 int event_type);
+  int transmit (ACE_Message_Block *mb,
+                size_t n,
+                int event_type);
   // Transmit <mb> to the gatewayd.
 
   virtual int recv (ACE_Message_Block *&mb);