X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Ffastcgi.h;h=a417a43442fcc3791484490ea9bd95a562a2606d;hb=15a32ab1123375e1a52c319fca71ab8d02c58261;hp=85dab5737e358592f64d1febebff739501d8cf12;hpb=f7e1e1e4b7c22ef34702cff9b01025612809aab8;p=matches%2FMCTX3420.git

diff --git a/server/fastcgi.h b/server/fastcgi.h
index 85dab57..a417a43 100644
--- a/server/fastcgi.h
+++ b/server/fastcgi.h
@@ -33,6 +33,8 @@ typedef enum StatusCodes {
 #define FCGI_RECEIVED(x) ((x) & FCGI_PARAM_RECEIVED)
 #define FCGI_TYPE(x) ((x) & ~(FCGI_PARAM_REQUIRED | FCGI_PARAM_RECEIVED))
 
+#define CONTROL_KEY_BUFSIZ 41
+
 typedef struct FCGIValue {
 	const char *key;
 	void *value;
@@ -47,13 +49,17 @@ typedef struct
 	/**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]; 
+	char control_key[CONTROL_KEY_BUFSIZ]; 
+	/**The received control key for the current request**/
+	char received_key[CONTROL_KEY_BUFSIZ];
 	/**The IPv4 address of the logged-in user**/
 	char control_ip[16];
 	/**Determines if the user is an admin or not**/
 	UserType user_type;
 	/**Name of the logged in user**/
 	char user_name[31];
+	/**User directory for the logged in user**/
+	char user_dir[BUFSIZ];
 	/**The name of the current module**/
 	const char *current_module;
 	/**For debugging purposes?**/
@@ -64,11 +70,13 @@ typedef void (*ModuleHandler) (FCGIContext *context, char *params);
 
 extern bool FCGI_LockControl(FCGIContext *context, const char * user_name, UserType user_type);
 extern void FCGI_ReleaseControl(FCGIContext *context);
-extern bool FCGI_HasControl(FCGIContext *context, const char *key);
+extern bool FCGI_HasControl(FCGIContext *context);
+extern void FCGI_GetControlCookie(char buffer[CONTROL_KEY_BUFSIZ]);
+extern void FCGI_SendControlCookie(FCGIContext *context, bool set);
 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_AcceptJSON(FCGIContext *context, const char *description);
 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);
@@ -77,6 +85,7 @@ extern void FCGI_JSONKey(const char *key);
 extern void FCGI_PrintRaw(const char *format, ...);
 extern void FCGI_EndJSON();
 extern void FCGI_RejectJSONEx(FCGIContext *context, StatusCodes status, const char *description);
+extern char *FCGI_URLDecode(char *buf);
 extern char *FCGI_EscapeText(char *buf);
 extern void *FCGI_RequestLoop (void *data);