--- a/src/server/request.h Mon Dec 26 15:48:32 2011 +0100 +++ b/src/server/request.h Tue Dec 27 20:12:21 2011 +0100 @@ -38,12 +38,16 @@ typedef struct NSAPIRequest NSAPIRequest; +struct NSAPIRequest { + Request rq; + RequestPhase phase; + VirtualServer *vs; + NSAPIContext context; +}; -struct NSAPIRequest { - Request rq; - RequestPhase phase; - VirtualServer *vs; -}; +/* macros for short context access */ +#define NCX_OI(rq) rq->context.objset_index +#define NCX_DI(rq) rq->context.dtable_index #define REQ_HASHSIZE 10