X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=server%2Ffastcgi.h;h=c4d2ef55bfd64235251be392aec8411407863eaf;hb=9839a36649fbd852835693ec2096c4601372b7c1;hp=c43927d69461438bbdaf455e7a209b9b7edddba7;hpb=ab0ae45f79caaae86b36f8230f9399138c9e73bc;p=matches%2FMCTX3420.git

diff --git a/server/fastcgi.h b/server/fastcgi.h
index c43927d..c4d2ef5 100644
--- a/server/fastcgi.h
+++ b/server/fastcgi.h
@@ -6,21 +6,33 @@
 #ifndef _FASTCGI_H
 #define _FASTCGI_H
  
-/**HTTP status codes that fcgi module handlers can return**/
+/**(HTTP) Status codes that fcgi module handlers can return**/
 typedef enum StatusCodes {
-	STATUS_OK = 200, 
-	STATUS_BADREQUEST = 400,
+	STATUS_OK = 200,
+	STATUS_ERROR = 400,
 	STATUS_UNAUTHORIZED = 401
 } StatusCodes;
 
-typedef void (*ModuleHandler) (void *data, char *params);
+typedef struct FCGIContext FCGIContext;
+typedef void (*ModuleHandler) (FCGIContext *context, char *params);
 
+extern void FCGI_BeginControl(FCGIContext *context, bool force);
+extern void FCGI_EndControl(FCGIContext *context);
+extern bool FCGI_HasControl(FCGIContext *context, const char *key);
 extern char *FCGI_KeyPair(char *in, const char **key, const char **value);
-extern void FCGI_BeginJSON(StatusCodes status_code, const char *module);
-extern void FCGI_BuildJSON(const char *key, const char *value);
+extern void FCGI_BeginJSON(FCGIContext *context, StatusCodes status_code);
+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);
+extern void FCGI_JSONBool(const char *key, bool value);
+extern void FCGI_JSONKey(const char *key);
+extern void FCGI_JSONValue(const char *format, ...);
 extern void FCGI_EndJSON();
-extern void FCGI_RequestLoop (void *data);
+extern void FCGI_RejectJSON(FCGIContext *context);
+extern void FCGI_RejectJSONEx(FCGIContext *context, StatusCodes status, const char *description);
+extern void * FCGI_RequestLoop (void *data);
+#define FCGI_PrintRaw FCGI_JSONValue // Functionality is identical
+
+#endif
 
-#define SENSOR_QUERYBUFSIZ 10
 
-#endif //_FASTCGI_H