static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd);
static Z_APDU *process_sortRequest(association *assoc, request *reqb, int *fd);
static void process_close(association *assoc, request *reqb);
-void save_referenceId (request *reqb, Z_ReferenceId *refid);
+void save_referenceId(request *reqb, Z_ReferenceId *refid);
static Z_APDU *process_deleteRequest(association *assoc, request *reqb,
int *fd);
-static Z_APDU *process_segmentRequest (association *assoc, request *reqb);
+static Z_APDU *process_segmentRequest(association *assoc, request *reqb);
static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd);
xmalloc_trav("session closed");
if (cb && cb->one_shot)
{
- exit (0);
+ exit(0);
}
}
}
if (event & assoc->cs_accept_mask)
{
- if (!cs_accept (conn))
+ if (!cs_accept(conn))
{
- yaz_log (YLOG_WARN, "accept failed");
+ yaz_log(YLOG_WARN, "accept failed");
destroy_association(assoc);
iochan_destroy(h);
+ return;
}
- iochan_clearflag (h, EVENT_OUTPUT);
+ iochan_clearflag(h, EVENT_OUTPUT);
if (conn->io_pending)
{ /* cs_accept didn't complete */
assoc->cs_accept_mask =
((conn->io_pending & CS_WANT_WRITE) ? EVENT_OUTPUT : 0) |
((conn->io_pending & CS_WANT_READ) ? EVENT_INPUT : 0);
- iochan_setflag (h, assoc->cs_accept_mask);
+ iochan_setflag(h, assoc->cs_accept_mask);
}
else
{ /* cs_accept completed. Prepare for reading (cs_get) */
assoc->cs_accept_mask = 0;
assoc->cs_get_mask = EVENT_INPUT;
- iochan_setflag (h, assoc->cs_get_mask);
+ iochan_setflag(h, assoc->cs_get_mask);
}
return;
}
static void assoc_init_reset(association *assoc)
{
xfree (assoc->init);
- assoc->init = (bend_initrequest *) xmalloc (sizeof(*assoc->init));
+ assoc->init = (bend_initrequest *) xmalloc(sizeof(*assoc->init));
assoc->init->stream = assoc->encode;
assoc->init->print = assoc->print;
assoc->init->decode = assoc->decode;
assoc->init->peer_name =
- odr_strdup (assoc->encode, cs_addrstr(assoc->client_link));
+ odr_strdup(assoc->encode, cs_addrstr(assoc->client_link));
yaz_log(log_requestdetail, "peer %s", assoc->init->peer_name);
}
rr.srw_setnameIdleTime = 0;
rr.estimated_hit_count = 0;
rr.partial_resultset = 0;
- rr.query = (Z_Query *) odr_malloc (assoc->decode, sizeof(*rr.query));
+ rr.query = (Z_Query *) odr_malloc(assoc->decode, sizeof(*rr.query));
rr.query->u.type_1 = 0;
if (srw_req->query_type == Z_SRW_query_type_cql)
Z_RPNQuery *RPNquery;
YAZ_PQF_Parser pqf_parser;
- pqf_parser = yaz_pqf_create ();
+ pqf_parser = yaz_pqf_create();
- RPNquery = yaz_pqf_parse (pqf_parser, assoc->decode,
- srw_req->query.pqf);
+ RPNquery = yaz_pqf_parse(pqf_parser, assoc->decode,
+ srw_req->query.pqf);
if (!RPNquery)
{
const char *pqf_msg;
size_t off;
- int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off);
+ int code = yaz_pqf_error(pqf_parser, &pqf_msg, &off);
yaz_log(log_requestdetail, "Parse error %d %s near offset %ld",
code, pqf_msg, (long) off);
srw_error = YAZ_SRW_QUERY_SYNTAX_ERROR;
rr.query->which = Z_Query_type_1;
rr.query->u.type_1 = RPNquery;
- yaz_pqf_destroy (pqf_parser);
+ yaz_pqf_destroy(pqf_parser);
}
else
{
}
else
{
- srw_error = yaz_diag_bib1_to_srw (rr.errcode);
+ srw_error = yaz_diag_bib1_to_srw(rr.errcode);
yaz_add_srw_diagnostic(assoc->encode,
&srw_res->diagnostics,
&srw_res->num_diagnostics,
if (assoc->init->bend_present)
{
bend_present_rr *bprr = (bend_present_rr*)
- odr_malloc (assoc->decode, sizeof(*bprr));
+ odr_malloc(assoc->decode, sizeof(*bprr));
bprr->setname = "default";
bprr->start = start;
bprr->number = number;
return;
if (bprr->errcode)
{
- srw_error = yaz_diag_bib1_to_srw (bprr->errcode);
+ srw_error = yaz_diag_bib1_to_srw(bprr->errcode);
yaz_add_srw_diagnostic(assoc->encode,
&srw_res->diagnostics,
&srw_res->num_diagnostics,
yaz_add_srw_diagnostic(assoc->encode,
&srw_res->diagnostics,
&srw_res->num_diagnostics,
- yaz_diag_bib1_to_srw (errcode),
+ yaz_diag_bib1_to_srw(errcode),
addinfo);
break;
querystr = srw_req->query.pqf;
break;
}
- wrbuf_printf(wr, "SRWSearch ");
- wrbuf_printf(wr, srw_req->database);
- wrbuf_printf(wr, " ");
+ wrbuf_printf(wr, "SRWSearch %s ", srw_req->database);
if (srw_res->num_diagnostics)
wrbuf_printf(wr, "ERROR %s", srw_res->diagnostics[0].uri);
else if (*http_code != 200)
struct scan_entry *save_entries;
bend_scan_rr *bsrr = (bend_scan_rr *)
- odr_malloc (assoc->encode, sizeof(*bsrr));
+ odr_malloc(assoc->encode, sizeof(*bsrr));
bsrr->num_bases = 1;
bsrr->basenames = &srw_req->database;
*http_code = 404;
return;
}
- srw_error = yaz_diag_bib1_to_srw (bsrr->errcode);
+ srw_error = yaz_diag_bib1_to_srw(bsrr->errcode);
yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
&srw_res->num_diagnostics,
querystr = "";
}
- wrbuf_printf(wr, "SRWScan ");
- wrbuf_printf(wr, srw_req->database);
- wrbuf_printf(wr, " ");
+ wrbuf_printf(wr, "SRWScan %s ", srw_req->database);
if (srw_res->num_diagnostics)
wrbuf_printf(wr, "ERROR %s - ", srw_res->diagnostics[0].uri);
return 1;
}
-static char *read_file(const char *fname, ODR o, int *sz)
+static char *read_file(const char *fname, ODR o, size_t *sz)
{
char *buf;
FILE *inf = fopen(fname, "rb");
*sz = ftell(inf);
rewind(inf);
buf = (char *) odr_malloc(o, *sz);
- fread(buf, 1, *sz, inf);
+ if (fread(buf, 1, *sz, inf) != *sz)
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "short read %s", fname);
fclose(inf);
return buf;
}
}
else
{
- int content_size = 0;
+ size_t content_size = 0;
char *content_buf = read_file(hreq->path+1, o, &content_size);
if (!content_buf)
{
case Z_APDU_segmentRequest:
if (assoc->init->bend_segment)
{
- res = process_segmentRequest (assoc, req);
+ res = process_segmentRequest(assoc, req);
}
else
{
Z_APDU *apdu = zget_APDU(assoc->encode, Z_APDU_initResponse);
Z_InitResponse *resp = apdu->u.initResponse;
bend_initresult *binitres;
- char *version;
char options[140];
statserv_options_block *cb = 0; /* by default no control for backend */
iochan_settimeout(assoc->client_chan, 10);
}
if ((assoc->init->bend_sort))
- yaz_log (YLOG_DEBUG, "Sort handler installed");
+ yaz_log(YLOG_DEBUG, "Sort handler installed");
if ((assoc->init->bend_search))
- yaz_log (YLOG_DEBUG, "Search handler installed");
+ yaz_log(YLOG_DEBUG, "Search handler installed");
if ((assoc->init->bend_present))
- yaz_log (YLOG_DEBUG, "Present handler installed");
+ yaz_log(YLOG_DEBUG, "Present handler installed");
if ((assoc->init->bend_esrequest))
- yaz_log (YLOG_DEBUG, "ESRequest handler installed");
+ yaz_log(YLOG_DEBUG, "ESRequest handler installed");
if ((assoc->init->bend_delete))
- yaz_log (YLOG_DEBUG, "Delete handler installed");
+ yaz_log(YLOG_DEBUG, "Delete handler installed");
if ((assoc->init->bend_scan))
- yaz_log (YLOG_DEBUG, "Scan handler installed");
+ yaz_log(YLOG_DEBUG, "Scan handler installed");
if ((assoc->init->bend_segment))
- yaz_log (YLOG_DEBUG, "Segment handler installed");
+ yaz_log(YLOG_DEBUG, "Segment handler installed");
resp->referenceId = req->referenceId;
*options = '\0';
assoc->init->bend_esrequest)
{
ODR_MASK_SET(resp->options, Z_Options_extendedServices);
- strcat (options, " extendedServices");
+ strcat(options, " extendedServices");
}
if (ODR_MASK_GET(req->options, Z_Options_namedResultSets))
{
assoc->init->implementation_name,
odr_prepend(assoc->encode, "GFS", resp->implementationName));
- version = odr_strdup(assoc->encode, "$Revision: 1.128 $");
- if (strlen(version) > 10) /* check for unexpanded CVS strings */
- version[strlen(version)-2] = '\0';
- resp->implementationVersion = odr_prepend(assoc->encode,
- assoc->init->implementation_version,
- odr_prepend(assoc->encode, &version[11],
- resp->implementationVersion));
-
if (binitres->errcode)
{
assoc->state = ASSOC_DEAD;
*/
static Z_Records *diagrec(association *assoc, int error, char *addinfo)
{
- Z_Records *rec = (Z_Records *) odr_malloc (assoc->encode, sizeof(*rec));
+ Z_Records *rec = (Z_Records *) odr_malloc(assoc->encode, sizeof(*rec));
yaz_log(log_requestdetail, "[%d] %s%s%s", error, diagbib1_str(error),
addinfo ? " -- " : "", addinfo ? addinfo : "");
{
int recno, total_length = 0, toget = *num, dumped_records = 0;
Z_Records *records =
- (Z_Records *) odr_malloc (a->encode, sizeof(*records));
+ (Z_Records *) odr_malloc(a->encode, sizeof(*records));
Z_NamePlusRecordList *reclist =
- (Z_NamePlusRecordList *) odr_malloc (a->encode, sizeof(*reclist));
+ (Z_NamePlusRecordList *) odr_malloc(a->encode, sizeof(*reclist));
Z_NamePlusRecord **list =
- (Z_NamePlusRecord **) odr_malloc (a->encode, sizeof(*list) * toget);
+ (Z_NamePlusRecord **) odr_malloc(a->encode, sizeof(*list) * toget);
records->which = Z_Records_DBOSD;
records->u.databaseOrSurDiagnostics = reclist;
{
Z_SearchRequest *req = reqb->apdu_request->u.searchRequest;
bend_search_rr *bsrr =
- (bend_search_rr *)nmem_malloc (reqb->request_mem, sizeof(*bsrr));
+ (bend_search_rr *)nmem_malloc(reqb->request_mem, sizeof(*bsrr));
yaz_log(log_requestdetail, "Got SearchRequest.");
bsrr->fd = fd;
bend_search_rr *bsrt, int *fd)
{
Z_SearchRequest *req = reqb->apdu_request->u.searchRequest;
- Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu));
+ Z_APDU *apdu = (Z_APDU *)odr_malloc(assoc->encode, sizeof(*apdu));
Z_SearchResponse *resp = (Z_SearchResponse *)
- odr_malloc (assoc->encode, sizeof(*resp));
- int *nulint = odr_intdup (assoc->encode, 0);
+ odr_malloc(assoc->encode, sizeof(*resp));
+ int *nulint = odr_intdup(assoc->encode, 0);
int *next = odr_intdup(assoc->encode, 0);
int *none = odr_intdup(assoc->encode, Z_SearchResponse_none);
int returnedrecs = 0;
int *toget = odr_intdup(assoc->encode, 0);
Z_RecordComposition comp, *compp = 0;
- yaz_log (log_requestdetail, "resultCount: %d", bsrt->hits);
+ yaz_log(log_requestdetail, "resultCount: %d", bsrt->hits);
resp->records = 0;
resp->resultCount = &bsrt->hits;
if (assoc->init->bend_present)
{
bend_present_rr *bprr = (bend_present_rr *)
- nmem_malloc (reqb->request_mem, sizeof(*bprr));
+ nmem_malloc(reqb->request_mem, sizeof(*bprr));
bprr->setname = req->resultSetName;
bprr->start = 1;
bprr->number = *toget;
for (i = 0 ; i < req->num_databaseNames; i++){
if (i)
wrbuf_printf(wr, "+");
- wrbuf_printf(wr, req->databaseNames[i]);
+ wrbuf_puts(wr, req->databaseNames[i]);
}
wrbuf_printf(wr, " ");
yaz_log(log_requestdetail, "Got PresentRequest.");
- resp = (Z_PresentResponse *)odr_malloc (assoc->encode, sizeof(*resp));
+ resp = (Z_PresentResponse *)odr_malloc(assoc->encode, sizeof(*resp));
resp->records = 0;
resp->presentStatus = odr_intdup(assoc->encode, 0);
if (assoc->init->bend_present)
{
bend_present_rr *bprr = (bend_present_rr *)
- nmem_malloc (reqb->request_mem, sizeof(*bprr));
+ nmem_malloc(reqb->request_mem, sizeof(*bprr));
bprr->setname = req->resultSetId;
bprr->start = *req->resultSetStartPoint;
bprr->number = *req->numberOfRecordsRequested;
errstring = bprr->errstring;
}
}
- apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu));
+ apdu = (Z_APDU *)odr_malloc(assoc->encode, sizeof(*apdu));
next = odr_intdup(assoc->encode, 0);
num = odr_intdup(assoc->encode, 0);
static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
{
Z_ScanRequest *req = reqb->apdu_request->u.scanRequest;
- Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu));
+ Z_APDU *apdu = (Z_APDU *)odr_malloc(assoc->encode, sizeof(*apdu));
Z_ScanResponse *res = (Z_ScanResponse *)
- odr_malloc (assoc->encode, sizeof(*res));
+ odr_malloc(assoc->encode, sizeof(*res));
int *scanStatus = odr_intdup(assoc->encode, Z_Scan_failure);
int *numberOfEntriesReturned = odr_intdup(assoc->encode, 0);
Z_ListEntries *ents = (Z_ListEntries *)
- odr_malloc (assoc->encode, sizeof(*ents));
+ odr_malloc(assoc->encode, sizeof(*ents));
Z_DiagRecs *diagrecs_p = NULL;
bend_scan_rr *bsrr = (bend_scan_rr *)
- odr_malloc (assoc->encode, sizeof(*bsrr));
+ odr_malloc(assoc->encode, sizeof(*bsrr));
struct scan_entry *save_entries;
yaz_log(log_requestdetail, "Got ScanRequest");
{
int i;
for (i = 0; i < req->num_databaseNames; i++)
- yaz_log (log_requestdetail, "Database '%s'", req->databaseNames[i]);
+ yaz_log(log_requestdetail, "Database '%s'", req->databaseNames[i]);
}
bsrr->scanClause = 0;
bsrr->errcode = 0;
save_entries = bsrr->entries; /* save it so we can compare later */
bsrr->attributeset = req->attributeSet;
- log_scan_term_level (log_requestdetail, req->termListAndStartPoint,
- bsrr->attributeset);
+ log_scan_term_level(log_requestdetail, req->termListAndStartPoint,
+ bsrr->attributeset);
bsrr->term_position = req->preferredPositionInResponse ?
*req->preferredPositionInResponse : 1;
{
int i;
Z_Entry **tab = (Z_Entry **)
- odr_malloc (assoc->encode, sizeof(*tab) * bsrr->num_entries);
+ odr_malloc(assoc->encode, sizeof(*tab) * bsrr->num_entries);
if (bsrr->status == BEND_SCAN_PARTIAL)
*scanStatus = Z_Scan_partial_5;
Z_DiagRecs *drecs = zget_DiagRecs(assoc->encode,
bsrr->entries[i].errcode,
bsrr->entries[i].errstring);
- assert (drecs->num_diagRecs == 1);
+ assert(drecs->num_diagRecs == 1);
e->which = Z_Entry_surrogateDiagnostic;
- assert (drecs->diagRecs[0]);
+ assert(drecs->diagRecs[0]);
e->u.surrogateDiagnostic = drecs->diagRecs[0];
}
}
{
if (i)
wrbuf_printf(wr, "+");
- wrbuf_printf(wr, req->databaseNames[i]);
+ wrbuf_puts(wr, req->databaseNames[i]);
}
wrbuf_printf(wr, " ");
int i;
Z_SortRequest *req = reqb->apdu_request->u.sortRequest;
Z_SortResponse *res = (Z_SortResponse *)
- odr_malloc (assoc->encode, sizeof(*res));
+ odr_malloc(assoc->encode, sizeof(*res));
bend_sort_rr *bsrr = (bend_sort_rr *)
- odr_malloc (assoc->encode, sizeof(*bsrr));
+ odr_malloc(assoc->encode, sizeof(*bsrr));
- Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu));
+ Z_APDU *apdu = (Z_APDU *)odr_malloc(assoc->encode, sizeof(*apdu));
yaz_log(log_requestdetail, "Got SortRequest.");
{
if (i)
wrbuf_printf(wr, "+");
- wrbuf_printf(wr, req->inputResultSetNames[i]);
+ wrbuf_puts(wr, req->inputResultSetNames[i]);
}
wrbuf_printf(wr, ")->%s ",req->sortedResultSetName);
Z_DeleteResultSetRequest *req =
reqb->apdu_request->u.deleteResultSetRequest;
Z_DeleteResultSetResponse *res = (Z_DeleteResultSetResponse *)
- odr_malloc (assoc->encode, sizeof(*res));
+ odr_malloc(assoc->encode, sizeof(*res));
bend_delete_rr *bdrr = (bend_delete_rr *)
- odr_malloc (assoc->encode, sizeof(*bdrr));
- Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu));
+ odr_malloc(assoc->encode, sizeof(*bdrr));
+ Z_APDU *apdu = (Z_APDU *)odr_malloc(assoc->encode, sizeof(*apdu));
yaz_log(log_requestdetail, "Got DeleteRequest.");
res->deleteListStatuses->num = bdrr->num_setnames;
res->deleteListStatuses->elements =
(Z_ListStatus **)
- odr_malloc (assoc->encode,
+ odr_malloc(assoc->encode,
sizeof(*res->deleteListStatuses->elements) *
bdrr->num_setnames);
for (i = 0; i<bdrr->num_setnames; i++)
{
res->deleteListStatuses->elements[i] =
(Z_ListStatus *)
- odr_malloc (assoc->encode,
+ odr_malloc(assoc->encode,
sizeof(**res->deleteListStatuses->elements));
res->deleteListStatuses->elements[i]->status = bdrr->statuses+i;
res->deleteListStatuses->elements[i]->id =
- odr_strdup (assoc->encode, bdrr->setnames[i]);
+ odr_strdup(assoc->encode, bdrr->setnames[i]);
}
}
res->numberNotDeleted = 0;
yaz_log(log_request,"Close OK");
}
-void save_referenceId (request *reqb, Z_ReferenceId *refid)
+void save_referenceId(request *reqb, Z_ReferenceId *refid)
{
if (refid)
{
reqb->len_refid = refid->len;
- reqb->refid = (char *)nmem_malloc (reqb->request_mem, refid->len);
- memcpy (reqb->refid, refid->buf, refid->len);
+ reqb->refid = (char *)nmem_malloc(reqb->request_mem, refid->len);
+ memcpy(reqb->refid, refid->buf, refid->len);
}
else
{
}
}
-void bend_request_send (bend_association a, bend_request req, Z_APDU *res)
+void bend_request_send(bend_association a, bend_request req, Z_APDU *res)
{
- process_z_response (a, req, res);
+ process_z_response(a, req, res);
}
-bend_request bend_request_mk (bend_association a)
+bend_request bend_request_mk(bend_association a)
{
- request *nreq = request_get (&a->outgoing);
- nreq->request_mem = nmem_create ();
+ request *nreq = request_get(&a->outgoing);
+ nreq->request_mem = nmem_create();
return nreq;
}
-Z_ReferenceId *bend_request_getid (ODR odr, bend_request req)
+Z_ReferenceId *bend_request_getid(ODR odr, bend_request req)
{
Z_ReferenceId *id;
if (!req->refid)
return 0;
- id = (Odr_oct *)odr_malloc (odr, sizeof(*odr));
- id->buf = (unsigned char *)odr_malloc (odr, req->len_refid);
+ id = (Odr_oct *)odr_malloc(odr, sizeof(*odr));
+ id->buf = (unsigned char *)odr_malloc(odr, req->len_refid);
id->len = id->size = req->len_refid;
- memcpy (id->buf, req->refid, req->len_refid);
+ memcpy(id->buf, req->refid, req->len_refid);
return id;
}
-void bend_request_destroy (bend_request *req)
+void bend_request_destroy(bend_request *req)
{
nmem_destroy((*req)->request_mem);
request_release(*req);
*req = NULL;
}
-int bend_backend_respond (bend_association a, bend_request req)
+int bend_backend_respond(bend_association a, bend_request req)
{
char *msg;
int r;
- r = process_z_request (a, req, &msg);
+ r = process_z_request(a, req, &msg);
if (r < 0)
- yaz_log (YLOG_WARN, "%s", msg);
+ yaz_log(YLOG_WARN, "%s", msg);
return r;
}
return r->clientData;
}
-static Z_APDU *process_segmentRequest (association *assoc, request *reqb)
+static Z_APDU *process_segmentRequest(association *assoc, request *reqb)
{
bend_segment_rr req;
{
resp->taskPackage = z_ext_record_oid(
assoc->encode, yaz_oid_recsyn_extended,
- (const char *) esrequest.taskPackage, -1
- );
+ (const char *) esrequest.taskPackage, -1);
}
yaz_log(YLOG_DEBUG,"Send the result apdu");
return apdu;
projects / yaz-moved-to-github.git / blobdiff