X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fsession.h;h=90ee0b190e45067164bc0a94fcd0b31ef04fa384;hp=faa860151ce493e477a6b43f88bdbc7530243464;hb=c586ade2977ae5f6bf01f24cc7c8a84492c544a8;hpb=ee6ab2ee3a9ee1a8c65d7272ec7fba1d886f5af0 diff --git a/src/session.h b/src/session.h index faa8601..90ee0b1 100644 --- a/src/session.h +++ b/src/session.h @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2008 Index Data. + * Copyright (C) 1995-2013 Index Data. * All rights reserved. * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -43,7 +43,8 @@ struct gfs_server { statserv_options_block cb; char *host; - int listen_ref; + char *id; + int *listen_ref; cql_transform_t cql_transform; CCL_bibset ccl_transform; void *server_node_ptr; @@ -68,8 +69,6 @@ typedef enum { typedef struct request { - int len_refid; /* length of referenceid */ - char *refid; /* referenceid */ request_state state; Z_GDU *gdu_request; /* Current request */ @@ -82,7 +81,7 @@ typedef struct request void *clientData; struct request *next; - struct request_q *q; + struct request_q *q; } request; typedef struct request_q @@ -98,8 +97,8 @@ typedef struct request_q */ typedef enum { - ASSOC_NEW, /* not initialized yet */ - ASSOC_UP, /* normal operation */ + ASSOC_NEW, /* not initialized yet or HTTP session */ + ASSOC_UP, /* Z39.50 session is UP */ ASSOC_DEAD /* dead. Close if input arrives */ } association_state; @@ -126,9 +125,9 @@ typedef struct association int maximumRecordSize; int version; /* highest version-bit set (2 or 3) */ - unsigned cs_get_mask; - unsigned cs_put_mask; - unsigned cs_accept_mask; + int cs_get_mask; + int cs_put_mask; + int cs_accept_mask; struct bend_initrequest *init; statserv_options_block *last_control; @@ -150,8 +149,6 @@ void request_delq(request_q *q); request *request_get(request_q *q); void request_release(request *r); -int statserv_must_terminate(void); - int control_association(association *assoc, const char *host, int force); int ir_read(IOCHAN h, int event); @@ -160,6 +157,7 @@ int ir_read(IOCHAN h, int event); /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab