Fixed bug in Generic Frontend Server that could cause a server to stop

[yaz-moved-to-github.git] / src / seshigh.c

diff --git a/src/seshigh.c b/src/seshigh.c
index ae494dc..5132309 100644 (file)
--- a/src/seshigh.c
+++ b/src/seshigh.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: seshigh.c,v 1.92 2006-07-07 10:31:26 marc Exp $
+ * $Id: seshigh.c,v 1.98 2006-09-06 09:35:41 adam Exp $
  */
 /**
  * \file seshigh.c
@@ -102,7 +102,8 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd);
 
 /* dynamic logging levels */
 static int logbits_set = 0;
-static int log_session = 0; 
+static int log_session = 0; /* one-line logs for session */
+static int log_sessiondetail = 0; /* more detailed stuff */
 static int log_request = 0; /* one-line logs for requests */
 static int log_requestdetail = 0;  /* more detailed stuff */
 
@@ -113,6 +114,7 @@ static void get_logbits()
     {
         logbits_set = 1;
         log_session = yaz_log_module_level("session"); 
+        log_sessiondetail = yaz_log_module_level("sessiondetail");
         log_request = yaz_log_module_level("request");
         log_requestdetail = yaz_log_module_level("requestdetail"); 
     }
@@ -291,7 +293,8 @@ void ir_session(IOCHAN h, int event)
         }
         else
         {
-            yaz_log(log_session, "Session idle too long. Sending close.");
+            yaz_log(log_sessiondetail, 
+                    "Session idle too long. Sending close.");
             do_close(assoc, Z_Close_lackOfActivity, 0);
         }
         return;
@@ -329,17 +332,27 @@ void ir_session(IOCHAN h, int event)
             /* We aren't speaking to this fellow */
             if (assoc->state == ASSOC_DEAD)
             {
-                yaz_log(log_session, "Connection closed - end of session");
+                yaz_log(log_sessiondetail, "Connection closed - end of session");
                 cs_close(conn);
                 destroy_association(assoc);
                 iochan_destroy(h);
                 return;
             }
             assoc->cs_get_mask = EVENT_INPUT;
-            if ((res = cs_get(conn, &assoc->input_buffer,
-                &assoc->input_buffer_len)) <= 0)
+            res = cs_get(conn, &assoc->input_buffer,
+                &assoc->input_buffer_len);
+            if (res < 0 && cs_errno(conn) == CSBUFSIZE)
             {
-                yaz_log(log_session, "Connection closed by client");
+                yaz_log(log_session, "Connection error: %s res=%d",
+                        cs_errmsg(cs_errno(conn)), res);
+                req = request_get(&assoc->incoming); /* get a new request */
+                do_close_req(assoc, Z_Close_protocolError, 
+                             "Incoming package too large", req);
+                return;
+            }
+            else if (res <= 0)
+            {
+                yaz_log(log_sessiondetail, "Connection closed by client");
                 cs_close(conn);
                 destroy_association(assoc);
                 iochan_destroy(h);
@@ -375,7 +388,7 @@ void ir_session(IOCHAN h, int event)
                     yaz_log(YLOG_WARN, "PDU dump:");
                     odr_dumpBER(yaz_log_file(), assoc->input_buffer, res);
                     request_release(req);
-                    do_close(assoc, Z_Close_protocolError,"Malformed package");
+                    do_close(assoc, Z_Close_protocolError, "Malformed package");
                 }
                 else
                 {
@@ -414,7 +427,7 @@ void ir_session(IOCHAN h, int event)
         switch (res = cs_put(conn, req->response, req->len_response))
         {
         case -1:
-            yaz_log(log_session, "Connection closed by client");
+            yaz_log(log_sessiondetail, "Connection closed by client");
             cs_close(conn);
             destroy_association(assoc);
             iochan_destroy(h);
@@ -506,9 +519,6 @@ static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num, Z_S
         yaz_log(log_requestdetail, "srw_bend_init config=%s", cb->configname);
         assoc_init_reset(assoc);
         
-        assoc->maximumRecordSize = 3000000;
-        assoc->preferredMessageSize = 3000000;
-
         if (sr->username)
         {
             Z_IdAuthentication *auth = odr_malloc(assoc->decode, sizeof(*auth));
@@ -687,7 +697,8 @@ static int retrieve_fetch(association *assoc, bend_fetch_rr *rr)
 
 static int srw_bend_fetch(association *assoc, int pos,
                           Z_SRW_searchRetrieveRequest *srw_req,
-                          Z_SRW_record *record)
+                          Z_SRW_record *record,
+                          const char **addinfo)
 {
     bend_fetch_rr rr;
     ODR o = assoc->encode;
@@ -786,7 +797,12 @@ static int srw_bend_fetch(association *assoc, int pos,
         else
             record->recordSchema = 0;
     }
-    return rr.errcode;
+    if (rr.errcode)
+    {
+        *addinfo = rr.errstring;
+        return rr.errcode;
+    }
+    return 0;
 }
 
 static int cql2pqf(ODR odr, const char *cql, cql_transform_t ct,
@@ -1079,20 +1095,22 @@ static void srw_bend_search(association *assoc, request *req,
                             for (i = 0; i<number; i++)
                             {
                                 int errcode;
+                                const char *addinfo = 0;
                                 
                                 srw_res->records[j].recordPacking = packing;
                                 srw_res->records[j].recordData_buf = 0;
                                 srw_res->extra_records[j] = 0;
                                 yaz_log(YLOG_DEBUG, "srw_bend_fetch %d", i+start);
                                 errcode = srw_bend_fetch(assoc, i+start, srw_req,
-                                                         srw_res->records + j);
+                                                         srw_res->records + j,
+                                                         &addinfo);
                                 if (errcode)
                                 {
                                     yaz_add_srw_diagnostic(assoc->encode,
                                                            &srw_res->diagnostics,
                                                            &srw_res->num_diagnostics,
                                                            yaz_diag_bib1_to_srw (errcode),
-                                                           rr.errstring);
+                                                           addinfo);
                                     
                                     break;
                                 }
@@ -1399,7 +1417,7 @@ static void srw_bend_scan(association *assoc, request *req,
             querystr = srw_req->scanClause.cql;
             break;
         default:
-            querytype = "Unknown";
+            querytype = "UNKNOWN";
             querystr = "";
         }
 
@@ -1409,6 +1427,8 @@ static void srw_bend_scan(association *assoc, request *req,
 
         if (srw_res->num_diagnostics)
             wrbuf_printf(wr, "ERROR %s - ", srw_res->diagnostics[0].uri);
+        else if (srw_res->num_terms)
+            wrbuf_printf(wr, "OK %d - ", srw_res->num_terms);
         else
             wrbuf_printf(wr, "OK - - ");
 
@@ -2285,13 +2305,12 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
     }
 
     yaz_log(log_requestdetail, "Negotiated to v%d: %s", assoc->version, options);
-    assoc->maximumRecordSize = *req->maximumRecordSize;
 
-    if (cb && assoc->maximumRecordSize > cb->maxrecordsize)
-        assoc->maximumRecordSize = cb->maxrecordsize;
-    assoc->preferredMessageSize = *req->preferredMessageSize;
-    if (assoc->preferredMessageSize > assoc->maximumRecordSize)
-        assoc->preferredMessageSize = assoc->maximumRecordSize;
+    if (*req->maximumRecordSize < assoc->maximumRecordSize)
+        assoc->maximumRecordSize = *req->maximumRecordSize;
+
+    if (*req->preferredMessageSize < assoc->preferredMessageSize)
+        assoc->preferredMessageSize = *req->preferredMessageSize;
 
     resp->preferredMessageSize = &assoc->preferredMessageSize;
     resp->maximumRecordSize = &assoc->maximumRecordSize;
@@ -2304,7 +2323,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
                 assoc->init->implementation_name,
                 odr_prepend(assoc->encode, "GFS", resp->implementationName));
 
-    version = odr_strdup(assoc->encode, "$Revision: 1.92 $");
+    version = odr_strdup(assoc->encode, "$Revision: 1.98 $");
     if (strlen(version) > 10)   /* check for unexpanded CVS strings */
         version[strlen(version)-2] = '\0';
     resp->implementationVersion = odr_prepend(assoc->encode,
@@ -3098,19 +3117,24 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
             wr_diag(wr, bsrr->errcode, bsrr->errstring);
             wrbuf_printf(wr, " ");
         }
-        else if (*res->scanStatus == Z_Scan_success)
-            wrbuf_printf(wr, "OK - - ");
         else
-            wrbuf_printf(wr, "Partial - - ");
+            wrbuf_printf(wr, "OK "); 
+        /* else if (*res->scanStatus == Z_Scan_success) */
+        /*    wrbuf_printf(wr, "OK "); */
+        /* else */
+        /* wrbuf_printf(wr, "Partial "); */
+
+        if (*res->numberOfEntriesReturned)
+            wrbuf_printf(wr, "%d - ", *res->numberOfEntriesReturned);
+        else
+            wrbuf_printf(wr, "0 - ");
 
         wrbuf_printf(wr, "%d+%d+%d ",
                      (req->preferredPositionInResponse ?
                       *req->preferredPositionInResponse : 1),
                      *req->numberOfTermsRequested,
                      (res->stepSize ? *res->stepSize : 1));
-        /* TODO - make this print out RPN: or CQL: in the beginning!! */
-        /* maybe wrbuf_printf(wr, "%s: %s ", querytype, querystr); 
-           see line 1415 */
+
         yaz_scan_to_wrbuf(wr, req->termListAndStartPoint, 
                           bsrr->attributeset);
         yaz_log(log_request, "%s", wrbuf_buf(wr) );