merge fixes: ssl, vmbuf, ringfile, sendmail

Author: Lior Amram

examples/httpd/src/httpd.c

@@ -77,10 +77,12 @@ int main(int argc, char *argv[]) {
         {"port", 1, 0, 'p'},
         {"daemonize", 0, 0, 'd'},
         {"forks", 1, 0, 'f'},
+#ifdef RIBS2_SSL
         {"ssl_port", 1, 0 ,'s'},
         {"key_file", 1, 0, 'k'},
         {"chain_file", 1, 0, 'c'},
         {"cipher_list", 1, 0, 'l'},
+#endif
         {0, 0, 0, 0}
     };
 
@@ -95,7 +97,11 @@ int main(int argc, char *argv[]) {
 #endif
     for (;;) {
         int option_index = 0;
-        int c = getopt_long(argc, argv, "p:f:s:c:k:l:d", long_options, &option_index);
+        int c = getopt_long(argc, argv, "dp:f:"
+#ifdef RIBS2_SSL
+                            "s:c:k:l:"
+#endif
+                            , long_options, &option_index);
         if (c == -1)
             break;
         switch (c) {
@@ -209,12 +215,28 @@ int main(int argc, char *argv[]) {
 
     if (key_file && 0 > http_server_init2(&server_ssl))
         exit(EXIT_FAILURE);
+
+    if (sport == 0) {
+            struct vmfile vmf = VMFILE_INITIALIZER;
+            if (0 > vmfile_init(&vmf, "httpd.sport", 4096))
+                exit(EXIT_FAILURE);
+            vmfile_sprintf(&vmf, "%d", server_ssl.port);
+            vmfile_close(&vmf);
+    }
 #endif
 
     /* initialize server, but don't accept connections yet */
     if (0 > http_server_init2(&server))
         exit(EXIT_FAILURE);
 
+    if (port == 0) {
+            struct vmfile vmf = VMFILE_INITIALIZER;
+            if (0 > vmfile_init(&vmf, "httpd.port", 4096))
+                exit(EXIT_FAILURE);
+            vmfile_sprintf(&vmf, "%d", server.port);
+            vmfile_close(&vmf);
+    }
+
     if (0 > ribs_server_init(daemon_mode, "httpd.pid", "httpd.log", forks))
         exit(EXIT_FAILURE);
 

examples/httpget/src/httpget.c

@@ -28,61 +28,88 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <ctype.h>
+#include <unistd.h>
 
 void usage(char *progname) {
     dprintf(STDERR_FILENO,
             "Usage: %s [options]... <URL>\n"
-            "\t-o, --outfile <FILE>\tOutput to file. Ignores -n,-h,-H,-s\n"
-            "\t-c, --cacert <FILE>\tRead Certificate Authorities certificates file, turns on certificate validation\n"
+            "\t-C, --cacert <FILE>\tRead Certificate Authorities certificates file, turns on certificate validation\n"
+            "\t-o, --outfile <FILE>\tOutput to file. Below options are ignored\n"
             "\t-h, --headers\t\tPrint headers too\n"
             "\t-H, -hh, --headers-only\tPrint headers only\n"
             "\t-s, --silent\t\tSilent mode. Print nothing\n"
-            "\t-n, --nreqs\t\tNumber of request\n", progname);
+            "\t-n, --nreqs\t\tNumber of request\n"
+            "\t-c, --concurrency\tNuber of concurrent requests\n"
+            "\t-r, --reconnect\t\tRequest non-persistent\n"
+            "\t-f, --filedes\t\tFile descritor for data output (default: 1)\n"
+            "Debugging options:\n"
+            "\t-p, \t\t\tUse the 'content' pointer instead of vmbuf_write\n"
+            , progname);
+
     exit(EXIT_FAILURE);
 }
 
 int main(int argc, char *argv[]) {
 
     static struct option long_options[] = {
         {"outfile", 1, 0, 'o'},
-        {"cacert", 1, 0, 'c'},
+        {"cacert", 1, 0, 'C'},
         {"headers", 0, 0, 'h'},
         {"nreqs", 1, 0, 'n'},
         {"silent", 0, 0, 's'},
         {"headers-only", 0, 0, 'H'},
+        {"reconnect", 0, 0, 'r'},
+        {"concurrency", 1, 0, 'c'},
+        {"filedes", 1, 0, 'f'},
         {0, 0, 0, 0}
     };
 
-    int silent = 0;
+    int concurrency = 1;
+    char silent = 0;
     int64_t nreqs = 0;
-    int headers = 0;
+    char headers = 0;
     char *cacert = NULL;
-    char *file = NULL;
+    char *save_to_file = NULL;
+    char force_close = 0;
+    char use_content = 0;
+    int output_fileno = STDOUT_FILENO;
 
     for (;;) {
         int option_index = 0;
-        int c = getopt_long(argc, argv, "o:c:hn:sH", long_options, &option_index);
+        int c = getopt_long(argc, argv, "o:c:n:C:f:shHrp", long_options, &option_index);
         if (c == -1)
             break;
         switch (c) {
         case 'o':
-            file = optarg;
+            save_to_file = optarg;
             break;
-        case 'c':
+        case 'C':
             cacert = optarg;
             break;
         case 'h':
             ++headers;
             break;
         case 'n':
-            nreqs = atoi(optarg);
+            nreqs = strtoull(optarg, NULL, 10);
             break;
         case 's':
             silent = 1;
             break;
         case 'H':
             headers += 2;
             break;
+        case 'r':
+            force_close = 1;
+            break;
+        case 'c':
+            concurrency = atoi(optarg);
+            break;
+        case 'p':
+            use_content = 1;
+            break;
+        case 'f':
+            output_fileno = atoi(optarg);
+            break;
         default:
             LOGGER_ERROR("Wrong argument:-%c", c);
             usage(argv[0]);
@@ -100,7 +127,7 @@ int main(int argc, char *argv[]) {
 
     if (nreqs < 1) nreqs = 1;
 
-    if (file) {
+    if (save_to_file) {
         if (nreqs > 1)
             LOGGER_INFO("File mode, nreqs will be ignored");
         if (silent)
@@ -125,14 +152,14 @@ int main(int argc, char *argv[]) {
     if (!strncasecmp("http://", url, 7)) {
         url += 7;
     } else if (!strncasecmp("https://", url, 8)) {
-        if (http_client_pool_init_ssl(&client_pool, 1, 1, cacert))
+        if (http_client_pool_init_ssl(&client_pool, concurrency, 1, cacert))
             exit(EXIT_FAILURE);
         url += 8;
         port = 443;
     }
 
     if (80 == port)
-        if (http_client_pool_init(&client_pool, 1, 1))
+        if (http_client_pool_init(&client_pool, concurrency, 1))
             exit(EXIT_FAILURE);
 
     char *hostandport = strtok(url, "/");
@@ -155,12 +182,12 @@ int main(int argc, char *argv[]) {
         LOGGER_ERROR("Could not resolve: %s", host);
         exit(EXIT_FAILURE);
     }
-    struct in_addr addr;
-    addr = *(struct in_addr *)h->h_addr_list[0];
 
-    if (file) {
+    struct in_addr addr = *(struct in_addr *)h->h_addr_list[0];
+
+    if (save_to_file) {
         struct vmfile infile = VMFILE_INITIALIZER;
-        if (0 != vmfile_init(&infile, file, 4096)) {
+        if (0 != vmfile_init(&infile, save_to_file, 4096)) {
             LOGGER_PERROR("Error opening file for write");
             exit(EXIT_FAILURE);
         }
@@ -173,47 +200,65 @@ int main(int argc, char *argv[]) {
         vmfile_close(&infile);
 
     } else {
-        struct http_client_context *rcctx;
-    LOOP:
-        rcctx = http_client_pool_create_client2(&client_pool, addr, port, host, NULL);
-        if (NULL == rcctx) {
-            LOGGER_PERROR("Error sending request");
-            exit(EXIT_FAILURE);
-        }
-        vmbuf_sprintf(&rcctx->request, "GET /%s HTTP/1.1\r\nHost: %s\r\n\r\n", uri, host);
-        int persistent = 0;
-        for (; nreqs > 0; --nreqs) {
-            if (0 > http_client_send_request(rcctx)) {
-                if (!persistent) --nreqs;
-                http_client_free(rcctx);
-                goto LOOP;
+        void requestor(void) {
+            struct http_client_context *rcctx;
+        LOOP:
+            rcctx = http_client_pool_create_client2(&client_pool, addr, port, host, NULL);
+            if (NULL == rcctx) {
+                LOGGER_PERROR("Error sending request");
+                exit(EXIT_FAILURE);
             }
-            /* Try to read right away, without epoll_wait */
-            ribs_swapcurcontext(RIBS_RESERVED_TO_CONTEXT(rcctx));
-            //yield();
-            /* rcctx = http_client_get_last_context(); */
-            if (!silent) {
-                if (headers > 1)
-                    vmbuf_wlocset(&rcctx->response, vmbuf_rlocpos(&rcctx->response)-4);
-                if (headers)
-                    vmbuf_rlocset(&rcctx->response, 0);
-                vmbuf_write(&rcctx->response, STDOUT_FILENO);
-                printf("\n");
-            }
-            /* Not persistent? */
-            if (!rcctx->persistent) {
+            rcctx->persistent = 1;
+            vmbuf_sprintf(&rcctx->request, "GET /%s HTTP/1.1\r\nHost: %s\r\n", uri, host);
+            if (force_close)
+                vmbuf_strcpy(&rcctx->request, "Connection: close\r\n\r\n");
+            else
+                vmbuf_strcpy(&rcctx->request, "\r\n");
+            while(nreqs > 0) {
                 --nreqs;
-                http_client_free(rcctx);
-                goto LOOP;
+                /* attempt to write and read right away, without epoll_wait */
+                ribs_swapcurcontext(RIBS_RESERVED_TO_CONTEXT(rcctx));
+                if (!silent) {
+                    if (headers > 1)
+                        vmbuf_wlocset(&rcctx->response, vmbuf_rlocpos(&rcctx->response)-4);
+                    if (headers)
+                        vmbuf_rlocset(&rcctx->response, 0);
+                    if (STDOUT_FILENO == output_fileno)
+                        vmbuf_chrcpy(&rcctx->response, '\n');
+                    if (use_content && rcctx->content) {
+                        vmbuf_chrcpy(&rcctx->response, '\0');
+                        dprintf(output_fileno, "%s", rcctx->content);
+                    } else
+                        vmbuf_write(&rcctx->response, output_fileno);
+                }
+                /* Not persistent? */
+                if (!rcctx->persistent) {
+                    http_client_free(rcctx);
+                    goto LOOP;
+                }
+                /* clear the response buffer */
+                vmbuf_reset(&rcctx->response);
+                /* rollback and reuse the request */
+                vmbuf_rreset(&rcctx->request);
+                /* reset the fiber */
+                http_client_reuse_context(rcctx);
+            }
+            if (rcctx->persistent) {
+                rcctx->persistent = 0;
+                ribs_close(rcctx->fd);
             }
-            persistent = 1;
-            /* clear the response buffer */
-            vmbuf_reset(&rcctx->response);
-            /* rollback and reuse the request */
-            vmbuf_rreset(&rcctx->request);
-            /* reset the fiber */
-            http_client_reuse_context(rcctx);
-         }
+            http_client_free(rcctx);
+        }
+
+        int i;
+        for (i = 0; i < concurrency; ++i) {
+            struct ribs_context *ctx = ribs_context_create(1024 * 1024, 0, requestor);
+            queue_current_ctx();
+            ribs_swapcurcontext(ctx);
+        }
+        for (i = 0; i < concurrency; ++i) {
+            yield();
+        }
     }
     return 0;
 }

include/epoll_worker.h

@@ -44,12 +44,13 @@ int ribs_epoll_add(int fd, uint32_t events, struct ribs_context* ctx);
 struct ribs_context* small_ctx_for_fd(int fd, size_t reserved_size, void (*func)(void));
 int queue_current_ctx(void);
 int epoll_close();
+int ribs_close(int fd);
 
 _RIBS_INLINE_ void epoll_worker_ignore_events(int fd);
 _RIBS_INLINE_ void epoll_worker_resume_events(int fd);
 _RIBS_INLINE_ void epoll_worker_set_fd_ctx(int fd, struct ribs_context* ctx);
 _RIBS_INLINE_ void epoll_worker_set_last_fd(int fd);
-_RIBS_INLINE_ int ribs_close(int fd);
+
 
 #include "../src/_epoll_worker.c"
 

include/hash_funcs.h

@@ -20,16 +20,16 @@
 #ifndef _HASH_FUNCS__H_
 #define _HASH_FUNCS__H_
 
-#if 0
-static inline uint32_t hashcode(const void *key, size_t n) {
+
+static inline uint32_t hashcode2(const void *key, size_t n) {
     register const unsigned char *p = (const unsigned char *)key;
     register const unsigned char *end = p + n;
     uint32_t h = 5381;
     for (; p != end; ++p)
         h = ((h << 5) + h) ^ *p;
     return h;
 }
-#endif
+
 static inline uint32_t hashcode(const void *key, size_t n)
 {
     register const unsigned char *p = (const unsigned char *)key;

include/http_client_pool.h

@@ -40,18 +40,18 @@ struct http_client_pool {
 
 struct http_client_context {
     int fd;
+    uint32_t content_length;
     struct vmbuf request;
     struct vmbuf response;
-    epoll_data_t userdata;
-    int persistent;
-    int http_status_code;
     char *content;
-    uint32_t content_length;
     struct http_client_pool *pool;
+    epoll_data_t userdata;
+    short http_status_code;
 #ifdef RIBS2_SSL
-    int ssl_connected;
     const char *hostname;
+    char ssl_connected;
 #endif
+    char persistent;
     /* TODO: add initial buffer sizes */
 
     /* keep 1 byte aligned structs last */
@@ -74,7 +74,7 @@ int http_client_pool_get_request(struct http_client_pool *http_client_pool, stru
 int http_client_pool_get_request2(struct http_client_pool *http_client_pool, struct in_addr addr, uint16_t port, const char *hostname, const char **headers, const char *format, ...) __attribute__ ((format (gnu_printf, 6, 7)));
 int http_client_pool_post_request(struct http_client_pool *http_client_pool, struct in_addr addr, uint16_t port, const char *hostname, const char *data, size_t size_of_data, const char *format, ...) __attribute__ ((format (gnu_printf, 7, 8)));
 struct http_client_context *http_client_pool_post_request_init(struct http_client_pool *http_client_pool, struct in_addr addr, uint16_t port, const char *hostname, const char *format, ...) __attribute__ ((format (gnu_printf, 5, 6)));
-inline int http_client_pool_post_request_content_type(struct http_client_context *context, const char *content_type);
+inline int http_client_pool_post_request_content_type(struct http_client_context *cctx, const char *content_type);
 int http_client_pool_post_request_send(struct http_client_context *context, struct vmbuf *post_data);
 int http_client_get_file(struct http_client_pool *http_client_pool, struct vmfile *infile, struct in_addr addr, uint16_t port, const char *hostname, int compression, int * file_compressed, const char *format, ...) __attribute__ ((format (gnu_printf, 8, 9)));
 struct http_client_context *http_client_get_last_context(void);

include/http_headers.h

@@ -37,6 +37,7 @@ struct http_headers{
     char *if_none_match;
     char *accept_language;
     char *origin;
+    char *authorization;
     uint8_t accept_encoding_mask;
     char peer_ip_addr[INET_ADDRSTRLEN];
 };

include/ribs_zlib.h

@@ -25,6 +25,8 @@
 
 int vmbuf_deflate(struct vmbuf *buf);
 int vmbuf_deflate2(struct vmbuf *inbuf, struct vmbuf *outbuf);
+int vmbuf_deflate3(struct vmbuf *buf, int level);
+int vmbuf_deflate4(struct vmbuf *inbuf, struct vmbuf *outbuf, int level);
 int vmbuf_inflate(struct vmbuf *buf);
 int vmbuf_inflate2(struct vmbuf *inbuf, struct vmbuf *outbuf);
 int vmbuf_inflate_gzip(void *inbuf, size_t in_size, struct vmbuf *outbuf);