Changeset 6de024fe1a245773c4b8c107f9063f2f40e5c344

Timestamp:

01/05/11 02:42:51 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1294195371 +0000

git-parent:

[000581aaa029b35ddf2cf5f65f70c943df0cb405]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1294195371 +0000

Message:

updates... yay! for test suites... all passes, refs #334

Files:

• src/noit_http.c (modified) (2 diffs)
• src/noit_http.h (modified) (3 diffs)
• src/noit_rest.c (modified) (11 diffs)
• src/stratcon_jlog_streamer.c (modified) (3 diffs)
• src/stratcon_realtime_http.c (modified) (13 diffs)

src/noit_http.c

@@ -47 +47 @@
-#define HEADER_EXPECT "expect"
-
+struct noit_http_connection {
+  eventer_t e;
+  int needs_close;
+};
+
+struct noit_http_request {
+  struct bchain *first_input; /* The start of the input chain */
+  struct bchain *last_input;  /* The end of the input chain */
+  struct bchain *current_input;  /* The point of the input where we */
+  size_t         current_offset; /* analyzing. */
+
+  enum { NOIT_HTTP_REQ_HEADERS = 0,
+         NOIT_HTTP_REQ_EXPECT,
+         NOIT_HTTP_REQ_PAYLOAD } state;
+  struct bchain *current_request_chain;
+  noit_boolean has_payload;
+  int64_t content_length;
+  int64_t content_length_read;
+  char *method_str;
+  char *uri_str;
+  char *protocol_str;
+  noit_hash_table querystring;
+  u_int32_t opts;
+  noit_http_method method;
+  noit_http_protocol protocol;
+  noit_hash_table headers;
+  noit_boolean complete;
+  struct timeval start_time;
+  char *orig_qs;
+};
+
+struct noit_http_response {
+  noit_http_protocol protocol;
+  int status_code;
+  char *status_reason;
+
+  noit_hash_table headers;
+  struct bchain *leader; /* serialization of status line and headers */
+
+  u_int32_t output_options;
+  struct bchain *output;       /* data is pushed in here */
+  struct bchain *output_raw;   /* internally transcoded here for output */
+  size_t output_raw_offset;    /* tracks our offset */
+  noit_boolean output_started; /* locks the options and leader */
+                               /*   and possibly output. */
+  noit_boolean closed;         /* set by _end() */
+  noit_boolean complete;       /* complete, drained and disposable */
+  size_t bytes_written;        /* tracks total bytes written */
+};
+
+struct noit_http_session_ctx {
+  noit_atomic32_t ref_cnt;
+  int64_t drainage;
+  int max_write;
+  noit_http_connection conn;
+  noit_http_request req;
+  noit_http_response res;
+  noit_http_dispatch_func dispatcher;
+  void *dispatcher_closure;
+  acceptor_closure_t *ac;
+};
+
-static noit_log_stream_t http_debug = NULL;
-static noit_log_stream_t http_io = NULL;
@@ -125 +187 @@
-  n->size = size;
-  return n;
+}
+
+noit_http_request *
+noit_http_session_request(noit_http_session_ctx *ctx) {
+  return &ctx->req;
+}
+noit_http_response *
+noit_http_session_response(noit_http_session_ctx *ctx) {
+  return &ctx->res;
+}
+noit_http_connection *
+noit_http_session_connection(noit_http_session_ctx *ctx) {
+  return &ctx->conn;
+}
+void
+noit_http_session_set_dispatcher(noit_http_session_ctx *ctx,
+                                 int (*d)(noit_http_session_ctx *), void *dc) {
+  ctx->dispatcher = d;
+  ctx->dispatcher_closure = dc;
+}
+void *noit_http_session_dispatcher_closure(noit_http_session_ctx *ctx) {
+  return ctx->dispatcher_closure;
+}
+void noit_http_session_trigger(noit_http_session_ctx *ctx, int state) {
+  if(ctx->conn.e) eventer_trigger(ctx->conn.e, state);
+}
+uint32_t noit_http_session_ref_cnt(noit_http_session_ctx *ctx) {
+  return ctx->ref_cnt;
+}
+uint32_t noit_http_session_ref_dec(noit_http_session_ctx *ctx) {
+  return noit_atomic_dec32(&ctx->ref_cnt);
+}
+uint32_t noit_http_session_ref_inc(noit_http_session_ctx *ctx) {
+  return noit_atomic_inc32(&ctx->ref_cnt);
+}
+eventer_t noit_http_connection_event(noit_http_connection *conn) {
+  return conn->e;
+}
+const char *noit_http_request_uri_str(noit_http_request *req) {
+  return req->uri_str;
+}
+const char *noit_http_request_method_str(noit_http_request *req) {
+  return req->method_str;
+}
+const char *noit_http_request_protocol_str(noit_http_request *req) {
+  return req->protocol_str;
+}
+size_t noit_http_request_content_length(noit_http_request *req) {
+  return req->content_length;
+}
+const char *noit_http_request_querystring(noit_http_request *req, const char *k) {
+  void *vv;
+  const char *v = NULL;
+  if(noit_hash_retrieve(&req->querystring, k, strlen(k), &vv))
+    v = vv;
+  return v;
+}
+noit_hash_table *noit_http_request_querystring_table(noit_http_request *req) {
+  return &req->querystring;
+}
+noit_hash_table *noit_http_request_headers_table(noit_http_request *req) {
+  return &req->headers;
+}
+noit_boolean noit_http_response_closed(noit_http_response *res) {
+  return res->closed;
-}
-

src/noit_http.h

@@ -58 +58 @@
-} bchain_type_t;
-
+struct bchain;
+
+#define DEFAULT_MAXWRITE 1<<14 /* 32k */
+#define DEFAULT_BCHAINSIZE ((1 << 15)-(offsetof(struct bchain, _buff)))
+/* 64k - delta */
+#define DEFAULT_BCHAINMINREAD (DEFAULT_BCHAINSIZE/4)
+#define BCHAIN_SPACE(a) ((a)->allocd - (a)->size - (a)->start)
+
+struct noit_http_connection;
+typedef struct noit_http_connection noit_http_connection;
+struct noit_http_request;
+typedef struct noit_http_request noit_http_request;
+struct noit_http_response;
+typedef struct noit_http_response noit_http_response;
+
-struct bchain {
-  bchain_type_t type;
@@ -68 +83 @@
-};
-
-#define DEFAULT_MAXWRITE 1<<14 /* 32k */
-#define DEFAULT_BCHAINSIZE ((1 << 15)-(offsetof(struct bchain, _buff)))
-/* 64k - delta */
-#define DEFAULT_BCHAINMINREAD (DEFAULT_BCHAINSIZE/4)
-#define BCHAIN_SPACE(a) ((a)->allocd - (a)->size - (a)->start)
-
-typedef struct {
-  eventer_t e;
-  int needs_close;
-} noit_http_connection;
-
-typedef struct {
-  struct bchain *first_input; /* The start of the input chain */
-  struct bchain *last_input;  /* The end of the input chain */
-  struct bchain *current_input;  /* The point of the input where we */
-  size_t         current_offset; /* analyzing. */
-
-  enum { NOIT_HTTP_REQ_HEADERS = 0,
-         NOIT_HTTP_REQ_EXPECT,
-         NOIT_HTTP_REQ_PAYLOAD } state;
-  struct bchain *current_request_chain;
-  noit_boolean has_payload;
-  int64_t content_length;
-  int64_t content_length_read;
-  char *method_str;
-  char *uri_str;
-  char *protocol_str;
-  noit_hash_table querystring;
-  u_int32_t opts;
-  noit_http_method method;
-  noit_http_protocol protocol;
-  noit_hash_table headers;
-  noit_boolean complete;
-  struct timeval start_time;
-  char *orig_qs;
-} noit_http_request;
-
-typedef struct {
-  noit_http_protocol protocol;
-  int status_code;
-  char *status_reason;
-
-  noit_hash_table headers;
-  struct bchain *leader; /* serialization of status line and headers */
-
-  u_int32_t output_options;
-  struct bchain *output;       /* data is pushed in here */
-  struct bchain *output_raw;   /* internally transcoded here for output */
-  size_t output_raw_offset;    /* tracks our offset */
-  noit_boolean output_started; /* locks the options and leader */
-                               /*   and possibly output. */
-  noit_boolean closed;         /* set by _end() */
-  noit_boolean complete;       /* complete, drained and disposable */
-  size_t bytes_written;        /* tracks total bytes written */
-} noit_http_response;
-
-struct noit_http_session_ctx;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-API_EXPORT(noit_http_session_ctx *)
@@ -144 +92 @@
-API_EXPORT(void)
-  noit_http_ctx_session_release(noit_http_session_ctx *ctx);
+API_EXPORT(uint32_t)
+  noit_http_session_ref_cnt(noit_http_session_ctx *);
+API_EXPORT(uint32_t)
+  noit_http_session_ref_dec(noit_http_session_ctx *);
+API_EXPORT(uint32_t)
+  noit_http_session_ref_inc(noit_http_session_ctx *);
+API_EXPORT(void)
+  noit_http_session_trigger(noit_http_session_ctx *, int state);
-
+API_EXPORT(noit_http_request *)
+  noit_http_session_request(noit_http_session_ctx *);
+API_EXPORT(noit_http_response *)
+  noit_http_session_response(noit_http_session_ctx *);
+API_EXPORT(noit_http_connection *)
+  noit_http_session_connection(noit_http_session_ctx *);
+
+API_EXPORT(void *)
+  noit_http_session_dispatcher_closure(noit_http_session_ctx *);
+API_EXPORT(void)
+  noit_http_session_set_dispatcher(noit_http_session_ctx *,
+                                   int (*)(noit_http_session_ctx *), void *);
+
+API_EXPORT(eventer_t)
+  noit_http_connection_event(noit_http_connection *);
+
+API_EXPORT(const char *)
+  noit_http_request_uri_str(noit_http_request *);
+API_EXPORT(const char *)
+  noit_http_request_method_str(noit_http_request *);
+API_EXPORT(const char *)
+  noit_http_request_protocol_str(noit_http_request *);
+API_EXPORT(size_t)
+  noit_http_request_content_length(noit_http_request *);
+API_EXPORT(const char *)
+  noit_http_request_querystring(noit_http_request *, const char *);
+API_EXPORT(noit_hash_table *)
+  noit_http_request_querystring_table(noit_http_request *);
+API_EXPORT(noit_hash_table *)
+  noit_http_request_headers_table(noit_http_request *);
+
+API_EXPORT(noit_boolean)
+  noit_http_response_closed(noit_http_response *);
-
-API_EXPORT(void)

src/noit_rest.c

@@ -96 +96 @@
-  struct rule_container *cont = NULL;
-  struct rest_url_dispatcher *rule;
-
-
+
+
+
+
+
-  if(!eoq)
-restc->http_ctx->req.uri_str + strlen(restc->http_ctx->req.
+uri_str + strlen(
-  eob = eoq - 1;
-
@@ -105 +108 @@
-  while(1) {
-    void *vcont;
-restc->http_ctx->req.
-restc->http_ctx->req.
-restc->http_ctx->req.
-restc->http_ctx->req.
+
+
+
+
-      cont = vcont;
-      eob++; /* move past the determined base */
@@ -119 +122 @@
-    int ovector[30];
-    int cnt;
-restc->http_ctx->req.method_str
+noit_http_request_method_str(req)
-    if((cnt = pcre_exec(rule->expression, rule->extra, eob, eoq - eob, 0, 0,
-                        ovector, sizeof(ovector)/sizeof(*ovector))) > 0) {
@@ -147 +150 @@
-  struct noit_rest_acl *acl;
-  struct noit_rest_acl_rule *rule;
+  noit_http_request *req = noit_http_session_request(restc->http_ctx);
+  const char *uri_str;
-  int ovector[30];
-
+  uri_str = noit_http_request_uri_str(req);
-  for(acl = global_rest_acls; acl; acl = acl->next) {
-    if(acl->cn && pcre_exec(acl->cn, NULL, "", 0, 0, 0,
-                            ovector, sizeof(ovector)/sizeof(*ovector)) <= 0)
-      continue;
-
-
+
-                             ovector, sizeof(ovector)/sizeof(*ovector)) <= 0)
-      continue;
@@ -161 +166 @@
-                               ovector, sizeof(ovector)/sizeof(*ovector)) <= 0)
-        continue;
-
-
+
-                                ovector, sizeof(ovector)/sizeof(*ovector)) <= 0)
-        continue;
@@ -176 +180 @@
-  struct noit_rest_acl *acl;
-  struct noit_rest_acl_rule *rule;
+  noit_http_request *req = noit_http_session_request(restc->http_ctx);
+  const char *uri_str;
-  int ovector[30];
-
+  uri_str = noit_http_request_uri_str(req);
-  if(!restc->remote_cn || !strlen(restc->remote_cn)) return noit_false;
-  for(acl = global_rest_acls; acl; acl = acl->next) {
@@ -184 +191 @@
-                            ovector, sizeof(ovector)/sizeof(*ovector)) <= 0)
-      continue;
-
-
+
-                             ovector, sizeof(ovector)/sizeof(*ovector)) <= 0)
-      continue;
@@ -193 +199 @@
-                               ovector, sizeof(ovector)/sizeof(*ovector)) <= 0)
-        continue;
-
-
+
-                                ovector, sizeof(ovector)/sizeof(*ovector)) <= 0)
-        continue;
@@ -282 +287 @@
-int
-noit_rest_request_dispatcher(noit_http_session_ctx *ctx) {
-ctx->dispatcher_closure
+noit_http_session_dispatcher_closure(ctx)
-  rest_request_handler handler = restc->fastpath;
-  if(!handler) handler = noit_http_get_handler(restc);
-  if(handler) {
+    noit_http_response *res = noit_http_session_response(ctx);
-    int rv;
-    rv = handler(restc, restc->nparams, restc->params);
-ctx->res.closed
+noit_http_response_closed(res)
-    return rv;
-  }
@@ -395 +401 @@
-                    int *mask, int *complete) {
-  struct rest_xml_payload *rxc;
+  noit_http_request *req = noit_http_session_request(restc->http_ctx);
+
-  if(restc->call_closure == NULL) {
-    restc->call_closure = calloc(1, sizeof(*rxc));
@@ -423 +431 @@
-      return NULL;
-    }
-restc->http_ctx->req.content_length
+noit_http_request_content_length(req)
-      rxc->indoc = xmlParseMemory(rxc->buffer, rxc->len);
-      rxc->complete = 1;

src/stratcon_jlog_streamer.c

@@ -1075 +1075 @@
-  noit_hash_iter iter = NOIT_HASH_ITER_ZERO;
-  char path[256];
-, *vstr
+
-  const char *type = NULL, *want_cn = NULL;
-  int klen, n = 0, i, di, cnt;
@@ -1083 +1083 @@
-  struct timeval now, diff, last;
-  xmlNodePtr node;
-
-
-
-
-
-
+
+
+
+
+
-
-  gettimeofday(&now, NULL);
@@ -1353 +1352 @@
-rest_set_noit(noit_http_rest_closure_t *restc,
-              int npats, char **pats) {
-  void *vcn;
-  const char *cn = NULL;
-  noit_http_session_ctx *ctx = restc->http_ctx;
+  noit_http_request *req = noit_http_session_request(ctx);
-  unsigned short port = 43191;
-  if(npats < 1 || npats > 2)
-    noit_http_response_server_error(ctx, "text/xml");
-  if(npats == 2) port = atoi(pats[1]);
-
-
-
+
+
-  if(stratcon_add_noit(pats[0], port, cn) >= 0)
-    noit_http_response_ok(ctx, "text/xml");

src/stratcon_realtime_http.c

@@ -115 +115 @@
-  char *scp, *ecp, *token;
-  int len;
-  void *vcb;
-  const char *v, *cb = NULL;
-  noit_hash_table json = NOIT_HASH_EMPTY;
+  noit_http_request *req = noit_http_session_request(ctx);
-  char s_inc_id[42];
-
-  snprintf(s_inc_id, sizeof(s_inc_id), "script-%08x", inc_id);
- if(noit_hash_retrieve(&ctx->req.querystring, "cb", strlen("cb"), &vcb))
-  cb = vcb;
+
+cb = noit_http_request_querystring(req, "cb"); 
-  for(v = cb; v && *v; v++)
-    if(!((*v >= '0' && *v <= '9') ||
@@ -162 +162 @@
-  if(buff[1] == '\t' && (buff[0] == 'M' || buff[0] == 'S')) {
-    char target[256], module[256], name[256], uuid_str[UUID_STR_LEN+1];
+    noit_http_request *req = noit_http_session_request(ctx);
+    noit_hash_table *qs;
-    noit_hash_iter iter = NOIT_HASH_ITER_ZERO;
-    const char *key;
@@ -174 +176 @@
-    ra_write(buffer, strlen(buffer));
-
-
+
+
-      if(!strcmp(key, "cb")) continue;
-      noit_hash_store(&json, key, klen, strdup(vval ?(char *)vval : "true"));
@@ -262 +265 @@
-}
-int
-
+onst c
-  int len, cnt = 0;
-
+
+
-  if(strncmp(uri, "/data/", 6)) return 0;
-  cp = uri + 6;
@@ -300 +304 @@
-  realtime_recv_ctx_t *rrctx = vctx;
-  noit_http_session_ctx *ctx = rrctx->ctx;
-ctx->dispatcher_closure
-
-atomic_dec32(&ctx->ref_cnt
+noit_http_session_dispatcher_closure(ctx)
+
+http_session_ref_dec(ctx
-    noit_http_response_end(ctx);
-    clear_realtime_context(rc);
-if(ctx->conn.e) eventer_trigger(ctx->conn.e
+noit_http_session_trigger(ctx
-  }
-  free(rrctx);
@@ -444 +448 @@
-                                   struct timeval *now) {
-  noit_http_session_ctx *ctx = closure;
-ctx->dispatcher_closure
+noit_http_session_dispatcher_closure(ctx)
-  struct realtime_tracker *node;
-
@@ -459 +463 @@
-    }
-    else
-atomic_dec32(&ctx->ref_cnt
-
-ctx->ref_cnt
+http_session_ref_dec(ctx
+
+noit_http_session_ref_cnt(ctx)
-    noit_http_response_end(ctx);
-    clear_realtime_context(rc);
-if(ctx->conn.e) eventer_trigger(ctx->conn.e
+noit_http_session_trigger(ctx
-  }
-  return 0;
@@ -471 +475 @@
-stratcon_request_dispatcher(noit_http_session_ctx *ctx) {
-  const char *key, *value;
-ctx->dispatcher_closure
+noit_http_session_dispatcher_closure(ctx)
-  int klen;
-  noit_hash_iter iter = NOIT_HASH_ITER_ZERO;
-&ctx->req
+noit_http_session_request(ctx)
-
-  if(rc->setup == RC_INITIAL) {
@@ -481 +485 @@
-    char c[1024];
-    int num_interests;
-
-
+
+
+
+
-    if(num_interests == 0) {
-      noit_http_response_status_set(ctx, 404, "OK");
@@ -491 +497 @@
-
-    noitL(noit_error, "http: %s %s %s\n",
-
-
+
+
+
-      noitL(noit_error, "http: [%s: %s]\n", key, value);
-    }
@@ -515 +522 @@
-    for(node = rc->checklist; node; node = node->next) {
-      char uuid_str[UUID_STR_LEN+1];
-atomic_inc32(&ctx->ref_cnt
+http_session_ref_inc(ctx
-      uuid_unparse_lower(node->checkid, uuid_str);
-      noitL(noit_error, "Resolving uuid: %s\n", uuid_str);
@@ -545 +552 @@
-  const char *document_domain = NULL;
-  noit_http_session_ctx *ctx = restc->http_ctx;
+  noit_http_connection *conn = noit_http_session_connection(ctx);
+  eventer_t e;
-  acceptor_closure_t *ac = restc->ac;
-
@@ -560 +569 @@
-  }
-
-&ctx->req
+noit_http_session_request(ctx)
-  /* Rewire the http context */
-
-
-
+
+
+
+
-  return stratcon_request_dispatcher(ctx);
-}