Diff: tcp/http/http.h

Revision:

156:be12b8fd5b21

Parent:

154:ba9879b19d9f

--- a/tcp/http/http.h	Tue Aug 20 14:49:00 2019 +0000
+++ b/tcp/http/http.h	Wed Aug 28 07:11:58 2019 +0000
@@ -3,34 +3,34 @@
 #include <stdint.h>
 #include <time.h>
 
-extern void   HttpAddChar       (char c);
-extern void   HttpFillChar      (char c, int length);
-extern int    HttpAddText       (const char* text);
-extern int    HttpAddV          (char *fmt, va_list argptr);
-extern int    HttpAddF          (char *fmt, ...);
-extern void   HttpAddData       (const char* data, int length);
-extern void   HttpAddStream     (void (*startFunction)(void), int (*enumerateFunction)(void));
-extern void   HttpAddNibbleAsHex(int value);
-extern void   HttpAddByteAsHex  (int value);
-extern void   HttpAddInt12AsHex (int value);
-extern void   HttpAddInt16AsHex (int value);
-extern void   HttpAddInt32AsHex (int value);
-extern void   HttpAddInt64AsHex (int64_t value);
-extern void   HttpAddBytesAsHex (const char* value, int size);
-extern void   HttpAddBytesAsHexRev(const char* value, int size);
+extern void   HttpAddChar         (char c);
+extern void   HttpFillChar        (char c, int length);
+extern int    HttpAddText         (const char* text);
+extern int    HttpAddV            (char *fmt, va_list argptr);
+extern int    HttpAddF            (char *fmt, ...);
+extern void   HttpAddData         (const char* data, int length);
+extern void   HttpAddStream       (void (*startFunction)(void), int (*enumerateFunction)(void));
+extern void   HttpAddNibbleAsHex  (int value);
+extern void   HttpAddByteAsHex    (int value);
+extern void   HttpAddInt12AsHex   (int value);
+extern void   HttpAddInt16AsHex   (int value);
+extern void   HttpAddInt32AsHex   (int value);
+extern void   HttpAddInt64AsHex   (int64_t value);
+extern void   HttpAddBytesAsHex   (const uint8_t* value, int size);
+extern void   HttpAddBytesAsHexRev(const uint8_t* value, int size);
 
-extern void   HttpAddTm         (struct tm* ptm);
-extern bool   HttpBufFilled     (void);
+extern void   HttpAddTm           (struct tm* ptm);
+extern bool   HttpBufFilled       (void);
 
 extern void   HttpOk(const char* contentType, const char* cacheControl, const char* lastModifiedDate, const char* lastModifiedTime);
 extern char*  HttpOkCookieName;
 extern char*  HttpOkCookieValue;
 extern int    HttpOkCookieMaxAge;
 
-extern void   HttpNotFound      (void);
-extern void   HttpNotModified   (void);
+extern void   HttpNotFound        (void);
+extern void   HttpNotModified     (void);
 
-extern int    HttpRequestRead  (char *p, int len, char** ppMethod, char** ppPath, char** ppQuery, char** ppLastModified, char** ppCookies, int* pContentLength);
+extern int    HttpRequestRead(char *p, int len, char** ppMethod, char** ppPath, char** ppQuery, char** ppLastModified, char** ppCookies, int* pContentLength);
 
 extern char*  HttpCookiesSplit   (char* pCookies, char** ppName, char** ppValue);
 extern char*  HttpQuerySplit     (char* pQuery,   char** ppName, char** ppValue);
@@ -48,6 +48,7 @@
 
 #define HTTP_DATE_LENGTH 30
 
-extern void (*HttpRequestFunction)(char* pState, int size, char* pRequestStream, uint32_t positionInRequestStream);
-extern bool (*HttpPollFunction   )(char* pState, bool clientFinished);
+extern void (*HttpFunctionReset  )(int connection);
+extern void (*HttpFunctionRequest)(int connection, int size, char* pRequestStream, uint32_t positionInRequestStream);
+extern bool (*HttpFunctionPoll   )(int connection, bool clientFinished);