Changeset d9050a442ce49ffad4040ba933511197fe71390f

Timestamp:

01/08/10 20:04:49 (3 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[57156325b280cf0021706459de269ef44b89d8cc]

git-author:

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

Message:

this will break realtime streaming.... need to fix the javascript in the web ui now, refs #229

Files:

• src/noit_http.c (modified) (3 diffs)
• src/noit_http.h (modified) (2 diffs)
• src/stratcon_datastore.c (modified) (1 diff)
• src/stratcon_realtime_http.c (modified) (4 diffs)
• src/utils/noit_str.c (modified) (1 diff)
• src/utils/noit_str.h (modified) (1 diff)

src/noit_http.c

@@ -51 +51 @@
-static const char _hexchars[16] =
-  {'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'};
+static void inplace_urldecode(char *c) {
+  char *o = c;
+  while(*c) {
+    if(*c == '%') {
+      int i, ord = 0;
+      for(i = 0; i < 2; i++) {
+        if(c[i] >= '0' && c[i] <= '9') ord = (ord << 4) | (c[i] - '0');
+        else if (c[i] >= 'a' && c[i] <= 'f') ord = (ord << 4) | (c[i] - 'a');
+        else if (c[i] >= 'A' && c[i] <= 'F') ord = (ord << 4) | (c[i] - 'A');
+        else break;
+      }
+      if(i==2) {
+        *((unsigned char *)o++) = ord;
+        c+=3;
+        continue;
+      }
+    }
+    *o++ = *c++;
+  }
+  *o = '\0';
+}
-
-struct bchain *bchain_alloc(size_t size) {
@@ -390 +411 @@
-  return noit_true;
-}
+void
+noit_http_process_querystring(noit_http_request *req) {
+  char *cp, *copy, *interest, *brk;
+  cp = strchr(req->uri_str, '?');
+  if(!cp) return;
+  *cp++ = '\0';
+  for (interest = strtok_r(cp, "&", &brk);
+       interest;
+       interest = strtok_r(NULL, "&", &brk)) {
+    char *eq;
+    eq = strchr(interest, '=');
+    if(!eq) {
+      inplace_urldecode(interest);
+      noit_hash_store(&req->querystring, interest, strlen(interest), NULL);
+    }
+    else {
+      *eq++ = '\0';
+      inplace_urldecode(interest);
+      inplace_urldecode(eq);
+      noit_hash_store(&req->querystring, interest, strlen(interest), eq);
+    }
+  }
+}
-static noit_boolean
-noit_http_request_finalize_payload(noit_http_request *req, noit_boolean *err) {
@@ -480 +524 @@
-void
-noit_http_request_release(noit_http_session_ctx *ctx) {
+  noit_hash_destroy(&ctx->req.querystring, NULL, NULL);
-  noit_hash_destroy(&ctx->req.headers, NULL, NULL);
-  /* If we expected a payload, we expect a trailing \r\n */

src/noit_http.h

@@ -90 +90 @@
-  char *uri_str;
-  char *protocol_str;
+  noit_hash_table querystring;
-  u_int32_t opts;
-  noit_http_method method;
@@ -133 +134 @@
-API_EXPORT(void)
-  noit_http_session_ctx_release(noit_http_session_ctx *);
+API_EXPORT(void)
+  noit_http_process_querystring(noit_http_request *);
-
-API_EXPORT(int)

src/stratcon_datastore.c

@@ -406 +406 @@
-} execute_outcome_t;
-
-static char *
-__noit__strndup(const char *src, int len) {
-  int slen;
-  char *dst;
-  for(slen = 0; slen < len; slen++)
-    if(src[slen] == '\0') break;
-  dst = malloc(slen + 1);
-  memcpy(dst, src, slen);
-  dst[slen] = '\0';
-  return dst;
-}
-#define DECLARE_PARAM_STR(str, len) do { \
-__
+
-  d->paramLengths[d->nparams] = len; \
-  d->paramFormats[d->nparams] = 0; \

src/stratcon_realtime_http.c

@@ -36 +36 @@
-#include "utils/noit_hash.h"
-#include "utils/noit_log.h"
+#include "utils/noit_str.h"
-#include "jlog/jlog.h"
-#include "noit_jlog_listener.h"
@@ -110 +111 @@
-  char *scp, *ecp, *token;
-  int len;
+  void *vcb;
+  const char *v, *cb = NULL;
+  noit_hash_table json = NOIT_HASH_EMPTY;
+
+  if(noit_hash_retrieve(&ctx->req.querystring, "cb", strlen("cb"), &vcb))
+    cb = vcb;
+  for(v = cb; v && *v; v++)
+    if(!((*v >= '0' && *v <= '9') ||
+         (*v >= 'a' && *v <= 'z') ||
+         (*v >= 'A' && *v <= 'Z') ||
+         (*v == '_'))) {
+      cb = NULL;
+      break;
+    }
+  if(!cb) cb = "window.parent.plot_iframe_data";
-
-#define BAIL_HTTP_WRITE do { \
+  noit_hash_destroy(&json, NULL, free); \
-  noitL(noit_error, "javascript emit failed: %s:%s:%d\n", \
-        __FILE__, __FUNCTION__, __LINE__); \
@@ -138 +155 @@
-  PROCESS_NEXT_FIELD(token,len); /* Skip the leader */
-  if(buff[0] == 'M') {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    /* Time */
+    noit_hash_store(&json, "type", 4, strdup("M"));
-    PROCESS_NEXT_FIELD(token,len);
-
-
-
-
-
+
-    /* UUID */
-    PROCESS_NEXT_FIELD(token,len);
-
-
-
-
-
+
-    /* name */
-    PROCESS_NEXT_FIELD(token,len);
-
-
-
-
-
-
+
+
+
+
+
-    PROCESS_LAST_FIELD(token,len); /* value */
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    if(noit_http_response_flush(ctx, noit_false) == noit_false) BAIL_HTTP_WRITE;
-  }
-
+  noit_hash_destroy(&json, NULL, free);
-  return 0;
-
- bad_row:
-  BAIL_HTTP_WRITE;
-  if(0) {
-    noit_http_response_end(ctx);
-    clear_realtime_context(ctx->dispatcher_closure);
-    if(ctx->conn.e) eventer_trigger(ctx->conn.e, EVENTER_WRITE);
-    return 0;
-  }
-}
-int
@@ -468 +492 @@
-  noit_http_rest_closure_free(restc);
-
+  noit_http_process_querystring(&ctx->req);
-  /* Rewire the http context */
-  ctx->conn.e->callback = stratcon_realtime_http_handler;

src/utils/noit_str.c

@@ -69 +69 @@
-  return NULL;
-}
+
+char *
+noit__strndup(const char *src, int len) {
+  int slen;
+  char *dst;
+  for(slen = 0; slen < len; slen++)
+    if(src[slen] == '\0') break;
+  dst = malloc(slen + 1);
+  memcpy(dst, src, slen);
+  dst[slen] = '\0';
+  return dst;
+}
+
-#endif
-

src/utils/noit_str.h

@@ -40 +40 @@
-#endif
-
+API_EXPORT(char *) noit__strndup(const char *src, int len);
+
-#endif