returning error code on disconnect

git-svn-id: svn://svn.open-ils.org/ILS/trunk@4633 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/OpenSRF/src/libtransport/transport_session.c b/OpenSRF/src/libtransport/transport_session.c
index 82b5415..3de292f 100644 (file)
--- a/OpenSRF/src/libtransport/transport_session.c
+++ b/OpenSRF/src/libtransport/transport_session.c
@@ -374,6 +374,7 @@ void startElementHandler(
 
        if( strcmp( name, "stream:error" ) == 0 ) {
                ses->state_machine->in_error = 1;
+               ses->state_machine->connected = 0;
                osrfLogWarning(  OSRF_LOG_MARK, "Received <stream:error> message from Jabber server" );
                return;
        }

diff --git a/OpenSRF/src/utils/socket_bundle.c b/OpenSRF/src/utils/socket_bundle.c
index c865030..fc0f13a 100644 (file)
--- a/OpenSRF/src/utils/socket_bundle.c
+++ b/OpenSRF/src/utils/socket_bundle.c
@@ -597,7 +597,10 @@ int _socket_route_data_id( socket_manager* mgr, int sock_id) {
                if(node->endpoint == CLIENT_SOCKET ) 
                        status = _socket_handle_client_data(mgr, node);
 
-               if(status == -1) socket_remove_node(mgr, sock_id);
+               if(status == -1) {
+                       socket_remove_node(mgr, sock_id);
+                       return -1;
+               }
                return 0;
        }