Added dynamic memory allocation on encoding (whew). Code is now somewhat

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

diff --git a/server/seshigh.c b/server/seshigh.c
index 2007f3e..3edeba7 100644 (file)
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -4,7 +4,14 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $
- * Revision 1.17  1995-04-10 10:23:36  quinn
+ * Revision 1.19  1995-04-18 08:15:34  quinn
+ * Added dynamic memory allocation on encoding (whew). Code is now somewhat
+ * neater. We'll make the same change for decoding one day.
+ *
+ * Revision 1.18  1995/04/17  11:28:25  quinn
+ * Smallish
+ *
+ * Revision 1.17  1995/04/10  10:23:36  quinn
  * Some work to add scan and other things.
  *
  * Revision 1.16  1995/03/31  09:18:55  quinn
@@ -72,7 +79,7 @@
 
 #include <backend.h>
 
-#define ENCODE_BUFFER_SIZE 10000
+#define MAXRECORDSIZE 1024*1024
 
 static int process_apdu(IOCHAN chan);
 static int process_initRequest(IOCHAN client, Z_InitRequest *req);
@@ -134,9 +141,6 @@ association *create_association(IOCHAN channel, COMSTACK link)
     }
     else
        new->print = 0;
-    if (!(new->encode_buffer = malloc(ENCODE_BUFFER_SIZE)))
-       return 0;
-    odr_setbuf(new->encode, new->encode_buffer, ENCODE_BUFFER_SIZE);
     new->state = ASSOC_UNINIT;
     new->input_buffer = 0;
     new->input_buffer_len = 0;
@@ -154,7 +158,6 @@ void destroy_association(association *h)
     odr_destroy(h->encode);
     if (h->print)
        odr_destroy(h->print);
-    free(h->encode_buffer);
     if (h->input_buffer)
        free(h->input_buffer);
     if (h->backend)
@@ -162,6 +165,9 @@ void destroy_association(association *h)
     free(h);
 }
 
+/*
+ * process events on the association
+ */
 void ir_session(IOCHAN h, int event)
 {
     int res;
@@ -252,7 +258,7 @@ static int process_apdu(IOCHAN chan)
            logf(LOG_WARN, "Bad APDU");
            return -1;
     }
-    odr_reset(assoc->decode); /* release incopming APDU */
+    odr_reset(assoc->decode); /* release incoming APDU */
     odr_reset(assoc->encode); /* release stuff alloced before encoding */
     return res;
 }
@@ -278,7 +284,7 @@ static int process_initRequest(IOCHAN client, Z_InitRequest *req)
     binitreq.configname = "default-config";
     if (!(binitres = bend_init(&binitreq)) || binitres->errcode)
     {
-       logf(LOG_WARN, "Bad response from backend");
+       logf(LOG_WARN, "Negative response from backend");
        return -1;
     }
 
@@ -292,10 +298,14 @@ static int process_initRequest(IOCHAN client, Z_InitRequest *req)
        ODR_MASK_SET(&options, Z_Options_search);
     if (ODR_MASK_GET(req->options, Z_Options_present))
        ODR_MASK_SET(&options, Z_Options_present);
+#if 0
     if (ODR_MASK_GET(req->options, Z_Options_delSet))
        ODR_MASK_SET(&options, Z_Options_delSet);
+#endif
     if (ODR_MASK_GET(req->options, Z_Options_namedResultSets))
        ODR_MASK_SET(&options, Z_Options_namedResultSets);
+    if (ODR_MASK_GET(req->options, Z_Options_scan))
+       ODR_MASK_SET(&options, Z_Options_scan);
     resp.options = &options;
     ODR_MASK_ZERO(&protocolVersion);
     if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1))
@@ -308,8 +318,8 @@ static int process_initRequest(IOCHAN client, Z_InitRequest *req)
      * This is not so hot. The big todo for ODR is dynamic memory allocation
      * on encoding.
      */
-    if (assoc->maximumRecordSize > ENCODE_BUFFER_SIZE - 1000)
-       assoc->maximumRecordSize = ENCODE_BUFFER_SIZE - 1000;
+    if (assoc->maximumRecordSize > MAXRECORDSIZE)
+       assoc->maximumRecordSize = MAXRECORDSIZE;
     assoc->preferredMessageSize = *req->preferredMessageSize;
     if (assoc->preferredMessageSize > assoc->maximumRecordSize)
        assoc->preferredMessageSize = assoc->maximumRecordSize;
@@ -318,7 +328,7 @@ static int process_initRequest(IOCHAN client, Z_InitRequest *req)
     resp.result = &result;
     resp.implementationId = "YAZ";
     resp.implementationName = "Index Data/YAZ Generic Frontend Server";
-    resp.implementationVersion = "$Revision: 1.17 $";
+    resp.implementationVersion = "$Revision: 1.19 $";
     resp.userInformationField = 0;
     if (!z_APDU(assoc->encode, &apdup, 0))
     {
@@ -326,7 +336,7 @@ static int process_initRequest(IOCHAN client, Z_InitRequest *req)
            odr_errlist[odr_geterror(assoc->encode)]);
        return -1;
     }
-    odr_getbuf(assoc->encode, &assoc->encoded_len);
+    assoc->encode_buffer = odr_getbuf(assoc->encode, &assoc->encoded_len);
     odr_reset(assoc->encode);
     iochan_setflags(client, EVENT_OUTPUT | EVENT_EXCEPT);
     return 0;
@@ -635,7 +645,7 @@ static int process_searchRequest(IOCHAN client, Z_SearchRequest *req)
            odr_errlist[odr_geterror(assoc->encode)]);
        return -1;
     }
-    odr_getbuf(assoc->encode, &assoc->encoded_len);
+    assoc->encode_buffer = odr_getbuf(assoc->encode, &assoc->encoded_len);
     odr_reset(assoc->encode);
     iochan_setflags(client, EVENT_OUTPUT | EVENT_EXCEPT);
     return 0;
@@ -669,7 +679,7 @@ static int process_presentRequest(IOCHAN client, Z_PresentRequest *req)
            odr_errlist[odr_geterror(assoc->encode)]);
        return -1;
     }
-    odr_getbuf(assoc->encode, &assoc->encoded_len);
+    assoc->encode_buffer = odr_getbuf(assoc->encode, &assoc->encoded_len);
     odr_reset(assoc->encode);
     iochan_setflags(client, EVENT_OUTPUT | EVENT_EXCEPT);
     return 0;
@@ -727,7 +737,7 @@ static int process_scanRequest(IOCHAN client, Z_ScanRequest *req)
            if (srs->status == BEND_SCAN_PARTIAL)
                scanStatus = Z_Scan_partial_5;
            else
-               scanStatus = 1;  /* Z_Scan_success; */ /* assumption for now */
+               scanStatus = Z_Scan_success;
            ents.which = Z_ListEntries_entries;
            ents.u.entries = &list;
            list.entries = tab;
@@ -768,7 +778,7 @@ static int process_scanRequest(IOCHAN client, Z_ScanRequest *req)
            odr_errlist[odr_geterror(assoc->encode)]);
        return -1;
     }
-    odr_getbuf(assoc->encode, &assoc->encoded_len);
+    assoc->encode_buffer = odr_getbuf(assoc->encode, &assoc->encoded_len);
     odr_reset(assoc->encode);
     iochan_setflags(client, EVENT_OUTPUT | EVENT_EXCEPT);
     return 0;