Merge tag 'upstream/1.3.0+dfsg'

Upstream version 1.3.0+dfsg

1 files changed, 66 insertions, 56 deletions

diff --git a/src/web_client.h b/src/web_client.h
index f663be4a1..2555a0c24 100644
--- a/src/web_client.h
+++ b/src/web_client.h
@@ -1,92 +1,94 @@
-
-#ifdef NETDATA_WITH_ZLIB
-#include <zlib.h>
-#endif
-
-#include <sys/time.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-
-#include "web_buffer.h"
-#include "dictionary.h"
+#ifndef NETDATA_WEB_CLIENT_H
+#define NETDATA_WEB_CLIENT_H 1
 
 #define DEFAULT_DISCONNECT_IDLE_WEB_CLIENTS_AFTER_SECONDS 60
 extern int web_client_timeout;
-extern int web_enable_gzip;
 
-#ifndef NETDATA_WEB_CLIENT_H
-#define NETDATA_WEB_CLIENT_H 1
+#ifdef NETDATA_WITH_ZLIB
+extern int web_enable_gzip, web_gzip_level, web_gzip_strategy, web_donotrack_comply;
+#endif /* NETDATA_WITH_ZLIB */
 
-#define WEB_CLIENT_MODE_NORMAL		0
-#define WEB_CLIENT_MODE_FILECOPY	1
-#define WEB_CLIENT_MODE_OPTIONS		2
+#define WEB_CLIENT_MODE_NORMAL      0
+#define WEB_CLIENT_MODE_FILECOPY    1
+#define WEB_CLIENT_MODE_OPTIONS     2
 
 #define URL_MAX 8192
-#define ZLIB_CHUNK 	16384
+#define ZLIB_CHUNK  16384
 #define HTTP_RESPONSE_HEADER_SIZE 4096
 #define COOKIE_MAX 1024
 #define ORIGIN_MAX 1024
 
 struct response {
-	BUFFER *header;					// our response header
-	BUFFER *header_output;			// internal use
-	BUFFER *data;					// our response data buffer
+    BUFFER *header;                 // our response header
+    BUFFER *header_output;          // internal use
+    BUFFER *data;                   // our response data buffer
 
-	int code;						// the HTTP response code
+    int code;                       // the HTTP response code
 
-	size_t rlen;					// if non-zero, the excepted size of ifd (input)
-	size_t sent;					// current data length sent to output
+    size_t rlen;                    // if non-zero, the excepted size of ifd (input of firecopy)
+    size_t sent;                    // current data length sent to output
 
-	int zoutput;					// if set to 1, web_client_send() will send compressed data
+    int zoutput;                    // if set to 1, web_client_send() will send compressed data
 #ifdef NETDATA_WITH_ZLIB
-	z_stream zstream;				// zlib stream for sending compressed output to client
-	Bytef zbuffer[ZLIB_CHUNK];		// temporary buffer for storing compressed output
-	long zsent;						// the compressed bytes we have sent to the client
-	long zhave;						// the compressed bytes that we have to send
-	int zinitialized;
-#endif
+    z_stream zstream;               // zlib stream for sending compressed output to client
+    Bytef zbuffer[ZLIB_CHUNK];      // temporary buffer for storing compressed output
+    size_t zsent;                   // the compressed bytes we have sent to the client
+    size_t zhave;                   // the compressed bytes that we have received from zlib
+    int zinitialized:1;
+#endif /* NETDATA_WITH_ZLIB */
 
 };
 
 struct web_client {
-	unsigned long long id;
+    unsigned long long id;
+
+    uint8_t obsolete:1;                 // if set to 1, the listener will remove this client
+                                        // after setting this to 1, you should not touch
+                                        // this web_client
+
+    uint8_t dead:1;                     // if set to 1, this client is dead
+
+    uint8_t keepalive:1;                // if set to 1, the web client will be re-used
 
-	char client_ip[NI_MAXHOST+1];
-	char client_port[NI_MAXSERV+1];
+    uint8_t mode:3;                     // the operational mode of the client
 
-	char last_url[URL_MAX+1];
+    uint8_t wait_receive:1;             // 1 = we are waiting more input data
+    uint8_t wait_send:1;                // 1 = we have data to send to the client
 
-	struct timeval tv_in, tv_ready;
+    uint8_t donottrack:1;               // 1 = we should not set cookies on this client
+    uint8_t tracking_required:1;        // 1 = if the request requires cookies
 
-	char cookie1[COOKIE_MAX+1];
-	char cookie2[COOKIE_MAX+1];
-	char origin[ORIGIN_MAX+1];
+    int tcp_cork;                       // 1 = we have a cork on the socket
 
-	int mode;
-	int keepalive;
-	int enable_gzip;
-	char *decoded_url;
+    int ifd;
+    int ofd;
 
-	struct sockaddr_storage clientaddr;
+    char client_ip[NI_MAXHOST+1];
+    char client_port[NI_MAXSERV+1];
 
-	pthread_t thread;				// the thread servicing this client
-	int obsolete;					// if set to 1, the listener will remove this client
+    char decoded_url[URL_MAX + 1];  // we decode the URL in this buffer
+    char last_url[URL_MAX+1];       // we keep a copy of the decoded URL here
 
-	int ifd;
-	int ofd;
+    struct timeval tv_in, tv_ready;
 
-	struct response response;
+    char cookie1[COOKIE_MAX+1];
+    char cookie2[COOKIE_MAX+1];
+    char origin[ORIGIN_MAX+1];
 
-	int wait_receive;
-	int wait_send;
+    struct sockaddr_storage clientaddr;
+    struct response response;
 
-	struct web_client *prev;
-	struct web_client *next;
+    size_t stats_received_bytes;
+    size_t stats_sent_bytes;
+
+    pthread_t thread;               // the thread servicing this client
+
+    struct web_client *prev;
+    struct web_client *next;
 };
 
+#define WEB_CLIENT_IS_DEAD(w) (w)->dead=1
+
 extern struct web_client *web_clients;
 
 extern uid_t web_files_uid(void);
@@ -94,7 +96,15 @@ extern uid_t web_files_gid(void);
 
 extern struct web_client *web_client_create(int listener);
 extern struct web_client *web_client_free(struct web_client *w);
+extern ssize_t web_client_send(struct web_client *w);
+extern ssize_t web_client_receive(struct web_client *w);
+extern void web_client_process(struct web_client *w);
+extern void web_client_reset(struct web_client *w);
 
 extern void *web_client_main(void *ptr);
 
+extern int web_client_api_request_v1_data_group(char *name, int def);
+extern const char *group_method2string(int group);
+
+extern void buffer_data_options2string(BUFFER *wb, uint32_t options);
 #endif