Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

[matches/MCTX3420.git] / server / fastcgi.h

diff --git a/server/fastcgi.h b/server/fastcgi.h
index 74468ae..dd89594 100644 (file)
--- a/server/fastcgi.h
+++ b/server/fastcgi.h
@@ -42,10 +42,16 @@ typedef struct FCGIValue {
 /**Contextual information related to FCGI requests*/
 typedef struct  
 {
-       /**The time of last valid user access possessing the control key*/
+       /**The time of last valid user access possessing the control key**/
        time_t control_timestamp;
+       /**A SHA-1 hash that is the control key, determining who is logged in**/
        char control_key[41];
+       /**Determines if the user is an admin or not**/
+       bool is_admin;
+       /**The IPv4 address of the logged-in user**/
        char control_ip[16];
+       /**A friendly name for the logged-in user. Max length 30**/
+       char friendly_name[31];
        /**The name of the current module**/
        const char *current_module;
        /**For debugging purposes?**/
@@ -54,12 +60,13 @@ typedef struct
 
 typedef void (*ModuleHandler) (FCGIContext *context, char *params);
 
-extern void FCGI_LockControl(FCGIContext *context, bool force);
+extern bool FCGI_LockControl(FCGIContext *context, bool force);
 extern void FCGI_ReleaseControl(FCGIContext *context);
 extern bool FCGI_HasControl(FCGIContext *context, const char *key);
 extern char *FCGI_KeyPair(char *in, const char **key, const char **value);
 extern bool FCGI_ParseRequest(FCGIContext *context, char *params, FCGIValue values[], size_t count);
 extern void FCGI_BeginJSON(FCGIContext *context, StatusCodes status_code);
+extern void FCGI_AcceptJSON(FCGIContext *context, const char *description, const char *cookie);
 extern void FCGI_JSONPair(const char *key, const char *value);
 extern void FCGI_JSONLong(const char *key, long value);
 extern void FCGI_JSONDouble(const char *key, double value);