From 02b6a809f17f142071384ffac8e406b6e9fbd2fb Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 5 Jun 2008 22:52:27 +0200 Subject: [PATCH] Minor formatting changes. --- src/seshigh.c | 163 ++++++++++++++++++++++++++++---------------------------- src/statserv.c | 52 +++++++++--------- src/tcpip.c | 76 +++++++++++++------------- 3 files changed, 145 insertions(+), 146 deletions(-) diff --git a/src/seshigh.c b/src/seshigh.c index d1205ad..b2dcd41 100644 --- a/src/seshigh.c +++ b/src/seshigh.c @@ -93,10 +93,10 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, 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); @@ -224,7 +224,7 @@ void destroy_association(association *h) xmalloc_trav("session closed"); if (cb && cb->one_shot) { - exit (0); + exit(0); } } @@ -393,26 +393,26 @@ void ir_session(IOCHAN h, int event) } 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); } - 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; } @@ -486,7 +486,7 @@ static int process_z_request(association *assoc, request *req, char **msg); 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; @@ -514,7 +514,7 @@ static void assoc_init_reset(association *assoc) 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); } @@ -870,7 +870,7 @@ static void srw_bend_search(association *assoc, request *req, 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) @@ -908,15 +908,15 @@ static void srw_bend_search(association *assoc, request *req, 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; @@ -925,7 +925,7 @@ static void srw_bend_search(association *assoc, request *req, rr.query->which = Z_Query_type_1; rr.query->u.type_1 = RPNquery; - yaz_pqf_destroy (pqf_parser); + yaz_pqf_destroy(pqf_parser); } else { @@ -959,7 +959,7 @@ static void srw_bend_search(association *assoc, request *req, } 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, @@ -1003,7 +1003,7 @@ static void srw_bend_search(association *assoc, request *req, 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; @@ -1034,7 +1034,7 @@ static void srw_bend_search(association *assoc, request *req, 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, @@ -1079,7 +1079,7 @@ static void srw_bend_search(association *assoc, request *req, 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; @@ -1243,7 +1243,7 @@ static void srw_bend_scan(association *assoc, request *req, 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; @@ -1337,7 +1337,7 @@ static void srw_bend_scan(association *assoc, request *req, *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, @@ -2010,7 +2010,7 @@ static int process_z_request(association *assoc, request *req, char **msg) case Z_APDU_segmentRequest: if (assoc->init->bend_segment) { - res = process_segmentRequest (assoc, req); + res = process_segmentRequest(assoc, req); } else { @@ -2228,19 +2228,19 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) 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'; @@ -2265,7 +2265,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) 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)) { @@ -2440,7 +2440,7 @@ static Z_External *init_diagnostics(ODR odr, int error, const char *addinfo) */ 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 : ""); @@ -2471,11 +2471,11 @@ static Z_Records *pack_records(association *a, char *setname, int start, { 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; @@ -2615,7 +2615,7 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb, { 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; @@ -2704,10 +2704,10 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, 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; @@ -2739,7 +2739,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, 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; @@ -2770,7 +2770,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, 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; @@ -2882,13 +2882,13 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, 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; @@ -2913,7 +2913,7 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, 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); @@ -2965,16 +2965,16 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, 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"); @@ -3003,7 +3003,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) { 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; @@ -3044,8 +3044,8 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) 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; @@ -3059,7 +3059,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) { 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; @@ -3114,9 +3114,9 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) 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]; } } @@ -3171,11 +3171,11 @@ static Z_APDU *process_sortRequest(association *assoc, request *reqb, 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."); @@ -3249,10 +3249,10 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb, 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."); @@ -3289,18 +3289,18 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb, 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; inum_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; @@ -3353,13 +3353,13 @@ static void process_close(association *assoc, request *reqb) 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 { @@ -3368,44 +3368,44 @@ void save_referenceId (request *reqb, Z_ReferenceId *refid) } } -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; } @@ -3419,7 +3419,7 @@ void *bend_request_getdata(bend_request 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; @@ -3517,8 +3517,7 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd) { 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; diff --git a/src/statserv.c b/src/statserv.c index c5c416a..e64ac97 100644 --- a/src/statserv.c +++ b/src/statserv.c @@ -767,9 +767,9 @@ static void statserv_closedown() xml_config_close(); } -void __cdecl event_loop_thread (IOCHAN iochan) +void __cdecl event_loop_thread(IOCHAN iochan) { - iochan_event_loop (&iochan); + iochan_event_loop(&iochan); } /* WIN32 listener */ @@ -887,7 +887,7 @@ void sigterm(int sig) term_flag = 1; } -static void *new_session (void *vp); +static void *new_session(void *vp); static int no_sessions = 0; /* UNIX listener */ @@ -957,20 +957,20 @@ static void listener(IOCHAN h, int event) { #if YAZ_POSIX_THREADS pthread_t child_thread; - pthread_create (&child_thread, 0, new_session, new_line); - pthread_detach (child_thread); + pthread_create(&child_thread, 0, new_session, new_line); + pthread_detach(child_thread); #elif YAZ_GNU_THREADS pth_attr_t attr; pth_t child_thread; - attr = pth_attr_new (); - pth_attr_set (attr, PTH_ATTR_JOINABLE, FALSE); - pth_attr_set (attr, PTH_ATTR_STACK_SIZE, 32*1024); - pth_attr_set (attr, PTH_ATTR_NAME, "session"); - yaz_log (YLOG_DEBUG, "pth_spawn begin"); - child_thread = pth_spawn (attr, new_session, new_line); - yaz_log (YLOG_DEBUG, "pth_spawn finish"); - pth_attr_destroy (attr); + attr = pth_attr_new(); + pth_attr_set(attr, PTH_ATTR_JOINABLE, FALSE); + pth_attr_set(attr, PTH_ATTR_STACK_SIZE, 32*1024); + pth_attr_set(attr, PTH_ATTR_NAME, "session"); + yaz_log(YLOG_DEBUG, "pth_spawn begin"); + child_thread = pth_spawn(attr, new_session, new_line); + yaz_log(YLOG_DEBUG, "pth_spawn finish"); + pth_attr_destroy(attr); #else new_session(new_line); #endif @@ -990,7 +990,7 @@ static void listener(IOCHAN h, int event) } } -static void *new_session (void *vp) +static void *new_session(void *vp) { char *a; association *newas; @@ -1130,14 +1130,14 @@ static int add_listener(char *where, int listen_id) else yaz_log(YLOG_FATAL, "Failed to bind to %s: %s", where, cs_strerror(l)); - cs_close (l); + cs_close(l); return -1; } if (!(lst = iochan_create(cs_fileno(l), listener, EVENT_INPUT | EVENT_EXCEPT, listen_id))) { yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create IOCHAN-type"); - cs_close (l); + cs_close(l); return -1; } iochan_setdata(lst, l); /* user-defined data for listener is COMSTACK */ @@ -1212,7 +1212,7 @@ static int statserv_sc_main(yaz_sc_t s, int argc, char **argv) #else sep = '/'; #endif - if ((me = strrchr (argv[0], sep))) + if ((me = strrchr(argv[0], sep))) me++; /* get the basename */ else me = argv[0]; @@ -1228,7 +1228,7 @@ static int statserv_sc_main(yaz_sc_t s, int argc, char **argv) #ifdef WIN32 xml_config_add_listeners(); - yaz_log (log_server, "Starting server %s", me); + yaz_log(log_server, "Starting server %s", me); if (!pListener && *control_block.default_listen) add_listener(control_block.default_listen, 0); #else @@ -1306,21 +1306,21 @@ static int statserv_sc_main(yaz_sc_t s, int argc, char **argv) close(hand[1]); - yaz_log (log_server, "Starting server %s pid=%ld", programname, - (long) getpid()); + yaz_log(log_server, "Starting server %s pid=%ld", programname, + (long) getpid()); #if 0 sigset_t sigs_to_block; sigemptyset(&sigs_to_block); - sigaddset (&sigs_to_block, SIGTERM); - pthread_sigmask (SIG_BLOCK, &sigs_to_block, 0); + sigaddset(&sigs_to_block, SIGTERM); + pthread_sigmask(SIG_BLOCK, &sigs_to_block, 0); /* missing... */ #endif if (control_block.dynamic) signal(SIGCHLD, catchchld); } - signal (SIGPIPE, SIG_IGN); - signal (SIGTERM, sigterm); + signal(SIGPIPE, SIG_IGN); + signal(SIGTERM, sigterm); if (*control_block.setuid) { struct passwd *pw; @@ -1379,8 +1379,8 @@ int check_options(int argc, char **argv) control_block.default_proto = PROTO_Z3950; break; case 's': - fprintf (stderr, "%s: SR protocol no longer supported\n", me); - exit (1); + fprintf(stderr, "%s: SR protocol no longer supported\n", me); + exit(1); break; case 'S': control_block.dynamic = 0; diff --git a/src/tcpip.c b/src/tcpip.c index bd87856..1c5f780 100644 --- a/src/tcpip.c +++ b/src/tcpip.c @@ -125,7 +125,7 @@ typedef struct tcpip_state } tcpip_state; #ifdef WIN32 -static int tcpip_init (void) +static int tcpip_init(void) { static int initialized = 0; if (!initialized) @@ -141,7 +141,7 @@ static int tcpip_init (void) return 1; } #else -static int tcpip_init (void) +static int tcpip_init(void) { return 1; } @@ -156,7 +156,7 @@ COMSTACK tcpip_type(int s, int flags, int protocol, void *vp) COMSTACK p; tcpip_state *sp; - if (!tcpip_init ()) + if (!tcpip_init()) return 0; if (!(p = (struct comstack *)xmalloc(sizeof(struct comstack)))) return 0; @@ -247,7 +247,7 @@ COMSTACK ssl_type(int s, int flags, int protocol, void *vp) tcpip_state *sp; COMSTACK p; - p = tcpip_type (s, flags, protocol, 0); + p = tcpip_type(s, flags, protocol, 0); if (!p) return 0; p->f_get = ssl_get; @@ -389,7 +389,7 @@ void *tcpip_straddr(COMSTACK h, const char *str) const char *port = "210"; if (h->protocol == PROTO_HTTP) port = "80"; - if (!tcpip_init ()) + if (!tcpip_init()) return 0; if (sp->ai) @@ -422,9 +422,9 @@ void *tcpip_straddr(COMSTACK h, const char *str) if (h->protocol == PROTO_HTTP) port = 80; - if (!tcpip_init ()) + if (!tcpip_init()) return 0; - if (!tcpip_strtoaddr_ex (str, &sp->addr, port)) + if (!tcpip_strtoaddr_ex(str, &sp->addr, port)) return 0; if (h->state == CS_ST_UNBND) { @@ -484,7 +484,7 @@ int tcpip_connect(COMSTACK h, void *address) * This gives the connect a chance to negotiate with the other side * (see 'man tcp') */ - if ( getsockopt(h->iofile, SOL_SOCKET, SO_RCVBUF, (void *)&recbuflen, &rbufsize ) < 0 ) + if (getsockopt(h->iofile, SOL_SOCKET, SO_RCVBUF, (void *)&recbuflen, &rbufsize ) < 0 ) { h->cerrno = CSYSERR; return -1; @@ -492,18 +492,18 @@ int tcpip_connect(COMSTACK h, void *address) TRC(fprintf( stderr, "Current Size of TCP Receive Buffer= %d\n", recbuflen )); recbuflen *= 10; /* lets be optimistic */ - if ( setsockopt(h->iofile, SOL_SOCKET, SO_RCVBUF, (void *)&recbuflen, rbufsize ) < 0 ) + if (setsockopt(h->iofile, SOL_SOCKET, SO_RCVBUF, (void *)&recbuflen, rbufsize ) < 0 ) { h->cerrno = CSYSERR; return -1; } - if ( getsockopt(h->iofile, SOL_SOCKET, SO_RCVBUF, (void *)&recbuflen, &rbufsize ) ) + if (getsockopt(h->iofile, SOL_SOCKET, SO_RCVBUF, (void *)&recbuflen, &rbufsize ) ) { h->cerrno = CSYSERR; return -1; } - TRC(fprintf( stderr, "New Size of TCP Receive Buffer = %d\n", - recbuflen )); + TRC(fprintf(stderr, "New Size of TCP Receive Buffer = %d\n", + recbuflen )); #endif #if HAVE_GETADDRINFO @@ -538,7 +538,7 @@ int tcpip_connect(COMSTACK h, void *address) h->event = CS_CONNECT; h->state = CS_ST_CONNECTING; - return tcpip_rcvconnect (h); + return tcpip_rcvconnect(h); } /* @@ -564,7 +564,7 @@ int tcpip_rcvconnect(COMSTACK h) SSL_library_init(); SSL_load_error_strings(); - sp->ctx = sp->ctx_alloc = SSL_CTX_new (SSLv23_client_method()); + sp->ctx = sp->ctx_alloc = SSL_CTX_new(SSLv23_client_method()); if (!sp->ctx) { h->cerrno = CSERRORSSL; @@ -577,8 +577,8 @@ int tcpip_rcvconnect(COMSTACK h) if (!sp->ssl) { - sp->ssl = SSL_new (sp->ctx); - SSL_set_fd (sp->ssl, h->iofile); + sp->ssl = SSL_new(sp->ctx); + SSL_set_fd(sp->ssl, h->iofile); } res = SSL_connect(sp->ssl); if (res <= 0) @@ -597,7 +597,7 @@ int tcpip_rcvconnect(COMSTACK h) #define CERTF "ztest.pem" #define KEYF "ztest.pem" -static void tcpip_setsockopt (int fd) +static void tcpip_setsockopt(int fd) { #if 0 int len = 4096; @@ -646,7 +646,7 @@ static int tcpip_bind(COMSTACK h, void *address, int mode) SSL_library_init(); SSL_load_error_strings(); - sp->ctx = sp->ctx_alloc = SSL_CTX_new (SSLv23_server_method()); + sp->ctx = sp->ctx_alloc = SSL_CTX_new(SSLv23_server_method()); if (!sp->ctx) { h->cerrno = CSERRORSSL; @@ -668,9 +668,9 @@ static int tcpip_bind(COMSTACK h, void *address, int mode) fprintf(stderr, " SSL_CTX_use_certificate_file %s failed\n", sp->cert_fname); #endif - exit (2); + exit(2); } - res = SSL_CTX_use_PrivateKey_file (sp->ctx, sp->cert_fname, + res = SSL_CTX_use_PrivateKey_file(sp->ctx, sp->cert_fname, SSL_FILETYPE_PEM); if (res <= 0) { @@ -680,10 +680,10 @@ static int tcpip_bind(COMSTACK h, void *address, int mode) fprintf(stderr, " SSL_CTX_use_certificate_file %s failed\n", sp->cert_fname); #endif - exit (3); + exit(3); } #if HAVE_OPENSSL_SSL_H - res = SSL_CTX_check_private_key (sp->ctx); + res = SSL_CTX_check_private_key(sp->ctx); if (res <= 0) { ERR_print_errors_fp(stderr); @@ -691,14 +691,14 @@ static int tcpip_bind(COMSTACK h, void *address, int mode) } #endif } - TRC (fprintf (stderr, "ssl_bind\n")); + TRC(fprintf(stderr, "ssl_bind\n")); } else { - TRC (fprintf (stderr, "tcpip_bind\n")); + TRC(fprintf(stderr, "tcpip_bind\n")); } #else - TRC (fprintf (stderr, "tcpip_bind\n")); + TRC(fprintf(stderr, "tcpip_bind\n")); #endif #ifndef WIN32 if (setsockopt(h->iofile, SOL_SOCKET, SO_REUSEADDR, (char*) @@ -790,7 +790,7 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen, return -1; } h->state = CS_ST_INCON; - tcpip_setsockopt (h->newfd); + tcpip_setsockopt(h->newfd); return 0; } @@ -846,8 +846,8 @@ COMSTACK tcpip_accept(COMSTACK h) #endif h->newfd = -1; } - xfree (cnew); - xfree (state); + xfree(cnew); + xfree(state); return 0; } h->newfd = -1; @@ -867,8 +867,8 @@ COMSTACK tcpip_accept(COMSTACK h) state->ssl = st->ssl; if (state->ctx) { - state->ssl = SSL_new (state->ctx); - SSL_set_fd (state->ssl, cnew->iofile); + state->ssl = SSL_new(state->ctx); + SSL_set_fd(state->ssl, cnew->iofile); } #endif state->connect_request_buf = 0; @@ -1010,8 +1010,8 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize) return -1; } } - TRC (fprintf (stderr, " Out of read loop with hasread=%d, berlen=%d\n", - hasread, berlen)); + TRC(fprintf(stderr, " Out of read loop with hasread=%d, berlen=%d\n", + hasread, berlen)); /* move surplus buffer (or everything if we didn't get a BER rec.) */ if (hasread > berlen) { @@ -1079,7 +1079,7 @@ int ssl_get(COMSTACK h, char **buf, int *bufsize) else if (*bufsize - hasread < CS_TCPIP_BUFCHUNK) if (!(*buf =(char *)xrealloc(*buf, *bufsize *= 2))) return -1; - res = SSL_read (sp->ssl, *buf + hasread, CS_TCPIP_BUFCHUNK); + res = SSL_read(sp->ssl, *buf + hasread, CS_TCPIP_BUFCHUNK); TRC(fprintf(stderr, " SSL_read res=%d, hasread=%d\n", res, hasread)); if (res <= 0) { @@ -1238,7 +1238,7 @@ int tcpip_close(COMSTACK h) #if ENABLE_SSL if (sp->ssl) { - SSL_shutdown (sp->ssl); + SSL_shutdown(sp->ssl); } #endif #ifdef WIN32 @@ -1252,12 +1252,12 @@ int tcpip_close(COMSTACK h) #if ENABLE_SSL if (sp->ssl) { - TRC (fprintf(stderr, "SSL_free\n")); - SSL_free (sp->ssl); + TRC(fprintf(stderr, "SSL_free\n")); + SSL_free(sp->ssl); } sp->ssl = 0; if (sp->ctx_alloc) - SSL_CTX_free (sp->ctx_alloc); + SSL_CTX_free(sp->ctx_alloc); #endif #if HAVE_GETADDRINFO if (sp->ai) @@ -1395,7 +1395,7 @@ int cs_get_peer_certificate_x509(COMSTACK cs, char **buf, int *len) if (ssl) { #if HAVE_OPENSSL_SSL_H - X509 *server_cert = SSL_get_peer_certificate (ssl); + X509 *server_cert = SSL_get_peer_certificate(ssl); if (server_cert) { BIO *bio = BIO_new(BIO_s_mem()); -- 1.7.10.4