X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Ffastcgi.h;h=74468aedd3d6ab498b174fa7e21b640ae694b1ec;hb=e2c333035c595ef6e48ff66d46a811ca17f97a26;hp=965cf5cbcfbedbe72f24ed28fa7acbe2ddbc6cbf;hpb=bbd64b3c32d79d247c7535693aafa20a3baba6b8;p=matches%2FMCTX3420.git

diff --git a/server/fastcgi.h b/server/fastcgi.h
index 965cf5c..74468ae 100644
--- a/server/fastcgi.h
+++ b/server/fastcgi.h
@@ -17,15 +17,17 @@ typedef enum StatusCodes {
 	STATUS_OK = 1,
 	STATUS_ERROR = -1,
 	STATUS_UNAUTHORIZED = -2,
-	STATUS_OUTOFRANGE = -3
+	STATUS_NOTRUNNING = -3,
+	STATUS_ALREADYEXISTS = -4
 } StatusCodes;
 
 #define FCGI_PARAM_REQUIRED (1 << 0)
 #define FCGI_PARAM_RECEIVED (1 << 1)
 #define FCGI_BOOL_T (1 << 2)
-#define FCGI_LONG_T (1 << 3)
-#define FCGI_DOUBLE_T (1 << 4)
-#define FCGI_STRING_T (1 << 5)
+#define FCGI_INT_T	(1 << 3)
+#define FCGI_LONG_T (1 << 4)
+#define FCGI_DOUBLE_T (1 << 5)
+#define FCGI_STRING_T (1 << 6)
 #define FCGI_REQUIRED(x) ((x) | FCGI_PARAM_REQUIRED)
 #define FCGI_IS_REQUIRED(x) ((x) & FCGI_PARAM_REQUIRED)
 #define FCGI_RECEIVED(x) ((x) & FCGI_PARAM_RECEIVED)
@@ -37,11 +39,23 @@ typedef struct FCGIValue {
 	unsigned flags;
 } FCGIValue;
 
-typedef struct FCGIContext FCGIContext;
+/**Contextual information related to FCGI requests*/
+typedef struct  
+{
+	/**The time of last valid user access possessing the control key*/
+	time_t control_timestamp;
+	char control_key[41];
+	char control_ip[16];
+	/**The name of the current module**/
+	const char *current_module;
+	/**For debugging purposes?**/
+	int response_number;
+} FCGIContext;
+
 typedef void (*ModuleHandler) (FCGIContext *context, char *params);
 
-extern void FCGI_BeginControl(FCGIContext *context, bool force);
-extern void FCGI_EndControl(FCGIContext *context);
+extern void 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);
@@ -53,10 +67,12 @@ extern void FCGI_JSONBool(const char *key, bool value);
 extern void FCGI_JSONKey(const char *key);
 extern void FCGI_PrintRaw(const char *format, ...);
 extern void FCGI_EndJSON();
-extern char *FCGI_EscapeJSON(char *buf);
 extern void FCGI_RejectJSONEx(FCGIContext *context, StatusCodes status, const char *description);
+extern char *FCGI_EscapeText(char *buf);
 extern void *FCGI_RequestLoop (void *data);
 
+extern void FCGI_WriteBinary(void * data, size_t size, size_t num_elem);
+
 /**
  * Shortcut to calling FCGI_RejectJSONEx. Sets the error code
  * to STATUS_ERROR.