X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=src%2Fweb_buffer.h;h=8f0d29cd22546e82cfab46463cce773013f271a2;hb=aa6b96fc2d421517a59a1aaaf91be5f201d34287;hp=0370491e2828f8c685a2b5bb5ffe9567ed39f1ea;hpb=b69723411bc73bbee640a760fa2267ec29f4d69e;p=netdata.git

diff --git a/src/web_buffer.h b/src/web_buffer.h
index 0370491e..8f0d29cd 100644
--- a/src/web_buffer.h
+++ b/src/web_buffer.h
@@ -4,40 +4,45 @@
 #define WEB_DATA_LENGTH_INCREASE_STEP 1024
 
 typedef struct web_buffer {
-	size_t size;		// allocation size of buffer
-	size_t len;		// current data length in buffer
-	char *buffer;	// the buffer
-	uint8_t contenttype;
-	uint8_t options;
-	time_t date;	// the date this content has been generated
+    size_t size;        	// allocation size of buffer, in bytes
+    size_t len;     		// current data length in buffer, in bytes
+    char *buffer;   		// the buffer itself
+    uint8_t contenttype;	// the content type of the data in the buffer
+    uint8_t options;		// options related to the content
+    time_t date;    		// the timestamp this content has been generated
+    time_t expires;			// the timestamp this content expires
 } BUFFER;
 
 // options
-#define WB_CONTENT_CACHEABLE			1
-#define WB_CONTENT_NO_CACHEABLE			2
+#define WB_CONTENT_CACHEABLE            1
+#define WB_CONTENT_NO_CACHEABLE         2
 
 // content-types
-#define CT_APPLICATION_JSON				1
-#define CT_TEXT_PLAIN					2
-#define CT_TEXT_HTML					3
-#define CT_APPLICATION_X_JAVASCRIPT		4
-#define CT_TEXT_CSS						5
-#define CT_TEXT_XML						6
-#define CT_APPLICATION_XML				7
-#define CT_TEXT_XSL						8
-#define CT_APPLICATION_OCTET_STREAM		9
-#define CT_APPLICATION_X_FONT_TRUETYPE	10
-#define CT_APPLICATION_X_FONT_OPENTYPE	11
-#define CT_APPLICATION_FONT_WOFF		12
-#define CT_APPLICATION_FONT_WOFF2		13
-#define CT_APPLICATION_VND_MS_FONTOBJ	14
-#define CT_IMAGE_SVG_XML				15
-#define CT_IMAGE_PNG					16
-#define CT_IMAGE_JPG					17
-#define CT_IMAGE_GIF					18
-#define CT_IMAGE_XICON					19
-#define CT_IMAGE_ICNS					20
-#define CT_IMAGE_BMP					21
+#define CT_APPLICATION_JSON             1
+#define CT_TEXT_PLAIN                   2
+#define CT_TEXT_HTML                    3
+#define CT_APPLICATION_X_JAVASCRIPT     4
+#define CT_TEXT_CSS                     5
+#define CT_TEXT_XML                     6
+#define CT_APPLICATION_XML              7
+#define CT_TEXT_XSL                     8
+#define CT_APPLICATION_OCTET_STREAM     9
+#define CT_APPLICATION_X_FONT_TRUETYPE  10
+#define CT_APPLICATION_X_FONT_OPENTYPE  11
+#define CT_APPLICATION_FONT_WOFF        12
+#define CT_APPLICATION_FONT_WOFF2       13
+#define CT_APPLICATION_VND_MS_FONTOBJ   14
+#define CT_IMAGE_SVG_XML                15
+#define CT_IMAGE_PNG                    16
+#define CT_IMAGE_JPG                    17
+#define CT_IMAGE_GIF                    18
+#define CT_IMAGE_XICON                  19
+#define CT_IMAGE_ICNS                   20
+#define CT_IMAGE_BMP                    21
+#define CT_PROMETHEUS                   22
+
+#define buffer_cacheable(wb)    do { (wb)->options |= WB_CONTENT_CACHEABLE;    if((wb)->options & WB_CONTENT_NO_CACHEABLE) (wb)->options &= ~WB_CONTENT_NO_CACHEABLE; } while(0)
+#define buffer_no_cacheable(wb) do { (wb)->options |= WB_CONTENT_NO_CACHEABLE; if((wb)->options & WB_CONTENT_CACHEABLE)    (wb)->options &= ~WB_CONTENT_CACHEABLE;  (wb)->expires = 0; } while(0)
 
 #define buffer_strlen(wb) ((wb)->len)
 extern const char *buffer_tostring(BUFFER *wb);
@@ -57,9 +62,10 @@ extern BUFFER *buffer_create(size_t size);
 extern void buffer_free(BUFFER *b);
 extern void buffer_increase(BUFFER *b, size_t free_size_required);
 
-extern void buffer_snprintf(BUFFER *wb, size_t len, const char *fmt, ...) __attribute__ (( format (printf, 3, 4)));
+extern void buffer_snprintf(BUFFER *wb, size_t len, const char *fmt, ...) PRINTFLIKE(3, 4);
 extern void buffer_vsprintf(BUFFER *wb, const char *fmt, va_list args);
-extern void buffer_sprintf(BUFFER *wb, const char *fmt, ...) __attribute__ (( format (printf, 2, 3)));
+extern void buffer_sprintf(BUFFER *wb, const char *fmt, ...) PRINTFLIKE(2,3);
+extern void buffer_strcat_htmlescape(BUFFER *wb, const char *txt);
 
 extern void buffer_char_replace(BUFFER *wb, char from, char to);