removed some unused comments, etc.
authorerickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Fri, 5 Aug 2005 12:34:31 +0000 (12:34 +0000)
committererickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Fri, 5 Aug 2005 12:34:31 +0000 (12:34 +0000)
git-svn-id: svn://svn.open-ils.org/ILS/trunk@1613 dcc99617-32d9-48b4-a31d-7c20da2025e4

OpenSRF/src/libtransport/transport_client.c
OpenSRF/src/libtransport/transport_client.h
OpenSRF/src/libtransport/transport_session.c
OpenSRF/src/libtransport/transport_socket.c

index 3ab5fa5..b7b3b9e 100644 (file)
@@ -70,6 +70,7 @@ transport_client* client_init( char* server, int port, int component ) {
        return client;
 }
 
+
 int client_connect( transport_client* client, 
                char* username, char* password, char* resource, 
                int connect_timeout, enum TRANSPORT_AUTH_TYPE  auth_type ) {
@@ -78,6 +79,7 @@ int client_connect( transport_client* client,
                        password, resource, connect_timeout, auth_type );
 }
 
+
 int client_disconnect( transport_client* client ) {
        if( client == NULL ) { return 0; }
        return session_disconnect( client->session );
index 837e2f7..6e5f4ec 100644 (file)
@@ -41,6 +41,7 @@ typedef struct transport_client_struct transport_client;
 // ---------------------------------------------------------------------------
 transport_client* client_init( char* server, int port, int component );
 
+
 // ---------------------------------------------------------------------------
 // Connects to the Jabber server with the provided information. Returns 1 on
 // success, 0 otherwise.
@@ -49,6 +50,7 @@ int client_connect( transport_client* client,
                char* username, char* password, char* resource, 
                int connect_timeout, enum TRANSPORT_AUTH_TYPE auth_type );
 
+
 int client_disconnect( transport_client* client );
 
 // ---------------------------------------------------------------------------
index c2d0d33..f67b4e5 100644 (file)
@@ -33,7 +33,6 @@ transport_session* init_transport(  char* server, int port, void* user_data, int
        session->router_command_buffer  = buffer_init( JABBER_JID_BUFSIZE );
 
 
-
        if(     session->body_buffer            == NULL || session->subject_buffer       == NULL        ||
                        session->thread_buffer  == NULL || session->from_buffer          == NULL        ||
                        session->status_buffer  == NULL || session->recipient_buffer == NULL ||
@@ -66,6 +65,8 @@ transport_session* init_transport(  char* server, int port, void* user_data, int
        return session;
 }
 
+
+
 /* XXX FREE THE BUFFERS */
 int session_free( transport_session* session ) {
        if( ! session ) { return 0; }
@@ -143,16 +144,6 @@ int session_connect( transport_session* session,
        }
 
 
-       /*
-       session->state_machine->connected = 
-               tcp_connected( session->sock_obj );
-
-       if( session->state_machine->connected ) {
-               return 1;
-       }
-       */
-
-
        char* server = session->sock_obj->server;
 
        if( ! session->sock_obj ) {
index 893f743..a2cbb15 100644 (file)
@@ -44,16 +44,6 @@ int tcp_connect( transport_socket* sock_obj ){
        struct hostent *hptr;
        int sock_fd;
 
-       #ifdef WIN32
-       WSADATA data;
-       char bfr;
-       if( WSAStartup(MAKEWORD(1,1), &data) ) {
-               fatal_handler( "somethin's broke with windows socket startup" );
-               return -1;
-       }
-       #endif
-
-
        // ------------------------------------------------------------------
        // Create the socket
        // ------------------------------------------------------------------