Remove two unused struct decls

[pazpar2-moved-to-github.git] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index f17e5da..7913651 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -106,7 +106,7 @@ static void remove_connection_from_host(struct connection *con)
 }
 
 // Close connection and recycle structure
-void connection_destroy(struct connection *co)
+static void connection_destroy(struct connection *co)
 {
     if (co->link)
     {
@@ -250,13 +250,16 @@ static void connection_handler(IOCHAN iochan, int event)
            package.. We will just close the connection */
         yaz_log(YLOG_LOG, "timeout connection %p event=%d", co, event);
         connection_destroy(co);
+        yaz_mutex_leave(host->mutex);
     }
     else if (event & EVENT_TIMEOUT)
     {
         if (co->state == Conn_Connecting)
         {
             yaz_log(YLOG_WARN,  "connect timeout %s", client_get_url(cl));
-            client_fatal(cl);
+
+            connection_destroy(co);
+            client_set_state(cl, Client_Error);
         }
         else if (client_get_state(co->client) == Client_Idle)
         {
@@ -267,21 +270,25 @@ static void connection_handler(IOCHAN iochan, int event)
         {
             yaz_log(YLOG_LOG,  "ignore timeout %s", client_get_url(cl));
         }
+        yaz_mutex_leave(host->mutex);
     }
     else
     {
+        yaz_mutex_leave(host->mutex);
+
+        client_lock(cl);
         non_block_events(co);
 
         ZOOM_connection_fire_event_socket(co->link, event);
         
         non_block_events(co);
+        client_unlock(cl);
     }
-    yaz_mutex_leave(host->mutex);
 }
 
 
 // Disassociate connection from client
-void connection_release(struct connection *co)
+static void connection_release(struct connection *co)
 {
     struct client *cl = co->client;
 
@@ -432,11 +439,6 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man)
     return 0;
 }
 
-const char *connection_get_url(struct connection *co)
-{
-    return client_get_url(co->client);
-}
-
 // Ensure that client has a connection associated
 int client_prep_connection(struct client *cl,
                            int operation_timeout, int session_timeout,