handling of datatypes and optional fields improved

TinoWildenhain · TinoWildenhain · commit 09e237aa6f1c · 2016-08-12T21:31:48.000+02:00
diff --git a/src/functions.h b/src/functions.h
@@ -3,42 +3,42 @@
  * value to the calling entity.
  */
 
-static const char *extract_remote_host(request_rec *r, char *a)
+static const json_object *extract_remote_host(request_rec *r, char *a)
 {
-	return (char *) ap_get_remote_host(r->connection, r->per_dir_config, REMOTE_NAME, NULL);
+	return json_object_new_string(ap_get_remote_host(r->connection, r->per_dir_config, REMOTE_NAME, NULL));
 }
 
-static const char *extract_remote_address(request_rec *r, char *a) __attribute__((unused));
+static const json_object *extract_remote_address(request_rec *r, char *a) __attribute__((unused));
 
-static const char *extract_remote_address(request_rec *r, char *a)
+static const json_object *extract_remote_address(request_rec *r, char *a)
 {
     #ifdef WITH_APACHE22
-    return r->connection->remote_ip;
+    return json_object_new_string(r->connection->remote_ip);
     #else
-    return r->connection->client_ip;
+    return json_object_new_string(r->connection->client_ip);
     #endif
 }
 
-static const char *extract_local_address(request_rec *r, char *a) __attribute__((unused));
+static const json_object *extract_local_address(request_rec *r, char *a) __attribute__((unused));
 
-static const char *extract_local_address(request_rec *r, char *a)
+static const json_object *extract_local_address(request_rec *r, char *a)
 {
-    return r->connection->local_ip;
+    return json_object_new_string(r->connection->local_ip);
 }
 
-static const char *extract_remote_logname(request_rec *r, char *a)
+static const json_object *extract_remote_logname(request_rec *r, char *a)
 {
   const char *rlogin = ap_get_remote_logname(r);
   if (rlogin == NULL) {
-    rlogin = "-";
+    return NULL;
   } else if (strlen(rlogin) == 0) {
     rlogin = "\"\"";
   }
 
-	return rlogin;
+	return json_object_new_string(rlogin);
 }
 
-static const char *extract_remote_user(request_rec *r, char *a)
+static const json_object *extract_remote_user(request_rec *r, char *a)
 {
 	#ifdef WITH_APACHE13
 	char *rvalue = r->connection->user;
@@ -50,76 +50,77 @@ static const char *extract_remote_user(request_rec *r, char *a)
 	} else if (strlen(rvalue) == 0) {
 		rvalue = "\"\"";
 	}
-	return rvalue;
+	return json_object_new_string(rvalue);
 }
 
-static const char *extract_request_line(request_rec *r, char *a)
+static const json_object *extract_request_line(request_rec *r, char *a)
 {
 	/* Upddated to mod_log_config logic */
 	/* NOTE: If the original request contained a password, we
 	 * re-write the request line here to contain XXXXXX instead:
 	 * (note the truncation before the protocol string for HTTP/0.9 requests)
 	 * (note also that r->the_request contains the unmodified request)
 	 */
-	return (r->parsed_uri.password)
+	return json_object_new_string(
+		    (r->parsed_uri.password)
 				? apr_pstrcat(r->pool, r->method, " ",
 					apr_uri_unparse(r->pool,
 						&r->parsed_uri, 0),
 					r->assbackwards ? NULL : " ",
 					r->protocol, NULL)
-				: r->the_request;
+				: r->the_request);
 }
 
-static const char *extract_request_file(request_rec *r, char *a)
+static const json_object *extract_request_file(request_rec *r, char *a)
 {
-	return r->filename;
+	return json_object_new_string(r->filename);
 }
 
-static const char *extract_request_uri(request_rec *r, char *a)
+static const json_object *extract_request_uri(request_rec *r, char *a)
 {
-	return r->uri;
+	return json_object_new_string(r->uri);
 }
 
-static const char *extract_request_method(request_rec *r, char *a)
+static const json_object *extract_request_method(request_rec *r, char *a)
 {
-	return r->method;
+	return json_object_new_string(r->method);
 }
 
-static const char *extract_request_protocol(request_rec *r, char *a)
+static const json_object *extract_request_protocol(request_rec *r, char *a)
 {
-	return r->protocol;
+	return json_object_new_string(r->protocol);
 }
 
-static const char *extract_request_query(request_rec *r, char *a)
+static const json_object *extract_request_query(request_rec *r, char *a)
 {
-	return (r->args) ? apr_pstrcat(r->pool, "?",
+	return json_object_new_string((r->args) ? apr_pstrcat(r->pool, "?",
 						r->args, NULL)
-					 : "";
+					 : "");
 }
 
-static const char *extract_status(request_rec *r, char *a)
+static const json_object *extract_status(request_rec *r, char *a)
 {
 	if (r->status <= 0) {
-		return "-";
+		return NULL;
 	} else {
-		return apr_psprintf(r->pool, "%d", r->status);
+		return json_object_new_int(r->status);
 	}
 }
 
-static const char *extract_virtual_host(request_rec *r, char *a)
+static const json_object *extract_virtual_host(request_rec *r, char *a)
 {
-    return r->server->server_hostname;
+    return json_object_new_string(r->server->server_hostname);
 }
 
-static const char *extract_server_name(request_rec *r, char *a)
+static const json_object *extract_server_name(request_rec *r, char *a)
 {
-    return ap_get_server_name(r);
+    return json_object_new_string(ap_get_server_name(r));
 }
 
-static const char *extract_server_port(request_rec *r, char *a)
+static const json_object *extract_server_port(request_rec *r, char *a)
 {
-    return apr_psprintf(r->pool, "%u",
-                        r->server->port ? r->server->port : ap_default_port(r));
+    return json_object_new_string(apr_psprintf(r->pool, "%u",
+                        r->server->port ? r->server->port : ap_default_port(r)));
 }
 
 /* This respects the setting of UseCanonicalName so that
@@ -131,63 +132,63 @@ static const char *log_server_name(request_rec *r, char *a)
     return ap_get_server_name(r);
 }
 
-static const char *extract_child_pid(request_rec *r, char *a)
+static const json_object *extract_child_pid(request_rec *r, char *a)
 {
     if (*a == '\0' || !strcmp(a, "pid")) {
-        return apr_psprintf(r->pool, "%" APR_PID_T_FMT, getpid());
+        return json_object_new_string(apr_psprintf(r->pool, "%" APR_PID_T_FMT, getpid()));
     }
     else if (!strcmp(a, "tid")) {
 #if APR_HAS_THREADS
         apr_os_thread_t tid = apr_os_thread_current();
 #else
         int tid = 0; /* APR will format "0" anyway but an arg is needed */
 #endif
-        return apr_psprintf(r->pool, "%pT", &tid);
+        return json_object_new_string(apr_psprintf(r->pool, "%pT", &tid));
     }
     /* bogus format */
-    return a;
+    return json_object_new_string(a);
 }
 
-static const char *extract_header(request_rec *r, char *a)
+static const json_object *extract_header(request_rec *r, char *a)
 {
 	const char *tempref;
 
 	tempref = apr_table_get(r->headers_in, a);
 	if (!tempref)
 	{
-		return "-";
+		return NULL;
 	} else {
-		return tempref;
+		return json_object_new_string(tempref);
 	}
 }
 
-static const char *extract_referer(request_rec *r, char *a)
+static const json_object *extract_referer(request_rec *r, char *a)
 {
 	const char *tempref;
 
 	tempref = apr_table_get(r->headers_in, "Referer");
 	if (!tempref)
 	{
-		return "-";
+		return NULL;
 	} else {
-		return tempref;
+		return json_object_new_string(tempref);
 	}
 }
 
-static const char *extract_agent(request_rec *r, char *a)
+static const json_object *extract_agent(request_rec *r, char *a)
 {
     const char *tempag;
 
     tempag = apr_table_get(r->headers_in, "User-Agent");
     if (!tempag)
     {
-        return "-";
+        return NULL;
     } else {
-        return tempag;
+        return json_object_new_string(tempag);
     }
 }
 
-static const char *extract_specific_cookie(request_rec *r, char *a)
+static const json_object *extract_specific_cookie(request_rec *r, char *a)
 {
   const char *cookiestr;
   char *cookieend;
@@ -215,7 +216,7 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
 			    cookieend = ap_strchr(cookiebuf, ';');
 			    if (cookieend != NULL)
 			       *cookieend = '\0';
-			  	return cookiebuf;
+			  	return json_object_new_string(cookiebuf);
 			}
 		}
 
@@ -230,7 +231,7 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
 			    cookieend = ap_strchr(cookiebuf, ';');
 			    if (cookieend != NULL)
 			       *cookieend = '\0';
-			  	return cookiebuf;
+			  	return json_object_new_string(cookiebuf);
 			}
 		}
 
@@ -245,10 +246,10 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
 			    cookieend = ap_strchr(cookiebuf, ';');
 			    if (cookieend != NULL)
 			       *cookieend = '\0';
-			  	return cookiebuf;
+			  	return json_object_new_string(cookiebuf);
 			}
 		}
 	}
 
-	return "-";
+	return NULL;
 }
diff --git a/src/functions20.h b/src/functions20.h
@@ -1,19 +1,19 @@
-static const char *extract_bytes_sent(request_rec *r, char *a)
+static const json_object *extract_bytes_sent(request_rec *r, char *a)
 {
 	if (!r->sent_bodyct || !r->bytes_sent) {
-		return "-";
+		return NULL;
 	} else {
-		return apr_psprintf(r->pool, "%" APR_OFF_T_FMT, r->bytes_sent);
+		return json_object_new_int(r->bytes_sent);
 	}
 }
 
-static const char *extract_request_time_custom(request_rec *r, char *a,
+static const json_object *extract_request_time_custom(request_rec *r, char *a,
                                            apr_time_exp_t *xt)
 {
     apr_size_t retcode;
     char tstr[MAX_STRING_LEN];
     apr_strftime(tstr, &retcode, sizeof(tstr), a, xt);
-    return apr_pstrdup(r->pool, tstr);
+    return json_object_new_string(apr_pstrdup(r->pool, tstr));
 }
 
 #define DEFAULT_REQUEST_TIME_SIZE 32
@@ -27,7 +27,7 @@ typedef struct {
 #define TIME_CACHE_MASK 3
 static cached_request_time request_time_cache[TIME_CACHE_SIZE];
 
-static const char *extract_request_time(request_rec *r, char *a)
+static const json_object *extract_request_time(request_rec *r, char *a)
 {
 	apr_time_exp_t xt;
 
@@ -78,26 +78,26 @@ static const char *extract_request_time(request_rec *r, char *a)
             memcpy(&(request_time_cache[i]), cached_time,
                    sizeof(*cached_time));
 		}
-		return cached_time->timestr;
+		return json_object_new_string(cached_time->timestr);
 	}
 }
 
-static const char *extract_request_duration(request_rec *r, char *a)
+static const json_object *extract_request_duration(request_rec *r, char *a)
 {
 	apr_time_t duration = apr_time_now() - r->request_time;
-	return apr_psprintf(r->pool, "%ld", apr_time_usec(duration));
+	return json_object_new_int(apr_time_usec(duration));
 }
 
-static const char *extract_connection_status(request_rec *r, char *a) __attribute__((unused));
-static const char *extract_connection_status(request_rec *r, char *a)
+static const json_object *extract_connection_status(request_rec *r, char *a) __attribute__((unused));
+static const json_object *extract_connection_status(request_rec *r, char *a)
 {
     if (r->connection->aborted)
-        return "X";
+        return json_object_new_string("X");
 
     if (r->connection->keepalive == AP_CONN_KEEPALIVE &&
         (!r->server->keep_alive_max ||
          (r->server->keep_alive_max - r->connection->keepalives) > 0)) {
-        return "+";
+        return json_object_new_string("+");
     }
-    return "-";
+    return NULL;
 }
diff --git a/src/mod_log_gelf.c b/src/mod_log_gelf.c
@@ -457,7 +457,8 @@ char * log_gelf_make_json(request_rec *request) {
   /* attach field pairs to json root */
   json_add_string(object, "version", "1.1");
   json_add_string(object, "host", config->source);
-  json_add_string(object, "short_message", extract_request_line(request, NULL));
+  // json_add_string(object, "short_message", extract_request_line(request, NULL));
+  json_object_object_add(object, "short_message", extract_request_line(request, NULL));
   json_add_string(object, "facility", config->facility);
   json_add_int(object, "level", 6); /*0=Emerg, 1=Alert, 2=Crit, 3=Error, 4=Warn, 5=Notice, 6=Info */
   json_add_double(object, "timestamp", log_gelf_get_timestamp());
@@ -466,11 +467,13 @@ char * log_gelf_make_json(request_rec *request) {
   length = strlen(config->fields);
   for (i = 0; i<length; i++) {
     log_item *item = config->parsed_fields[i];
+    json_object* fval;
     if (item != NULL) {
-      if (item->arg)
-        json_add_string(object, item->field_name, item->func(request, (char*)item->arg));
-      else
-        json_add_string(object, item->field_name, item->func(request, ""));
+      fval = item->func(request, (char*)item->arg);
+      if (fval != NULL) {
+	json_object_object_add(object, item->field_name, fval);
+      }
+
     }
   }
 
diff --git a/src/mod_log_gelf.h b/src/mod_log_gelf.h
@@ -1,4 +1,4 @@
-typedef const char *item_func(request_rec *r, char *a);
+typedef const json_object* item_func(request_rec *r, char *a);
 typedef struct transferDataS {
     void * data;
     int size;

Original file line number	Diff line number	Diff line change
`@@ -3,42 +3,42 @@`
`3`	`3`	`* value to the calling entity.`
`4`	`4`	`*/`
`5`	`5`
`6`		`-static const char extract_remote_host(request_rec r, char *a)`
	`6`	`+static const json_object extract_remote_host(request_rec r, char *a)`
`7`	`7`	`{`
`8`		`- return (char *) ap_get_remote_host(r->connection, r->per_dir_config, REMOTE_NAME, NULL);`
	`8`	`+ return json_object_new_string(ap_get_remote_host(r->connection, r->per_dir_config, REMOTE_NAME, NULL));`
`9`	`9`	`}`
`10`	`10`
`11`		`-static const char extract_remote_address(request_rec r, char *a) __attribute__((unused));`
	`11`	`+static const json_object extract_remote_address(request_rec r, char *a) __attribute__((unused));`
`12`	`12`
`13`		`-static const char extract_remote_address(request_rec r, char *a)`
	`13`	`+static const json_object extract_remote_address(request_rec r, char *a)`
`14`	`14`	`{`
`15`	`15`	`#ifdef WITH_APACHE22`
`16`		`- return r->connection->remote_ip;`
	`16`	`+ return json_object_new_string(r->connection->remote_ip);`
`17`	`17`	`#else`
`18`		`- return r->connection->client_ip;`
	`18`	`+ return json_object_new_string(r->connection->client_ip);`
`19`	`19`	`#endif`
`20`	`20`	`}`
`21`	`21`
`22`		`-static const char extract_local_address(request_rec r, char *a) __attribute__((unused));`
	`22`	`+static const json_object extract_local_address(request_rec r, char *a) __attribute__((unused));`
`23`	`23`
`24`		`-static const char extract_local_address(request_rec r, char *a)`
	`24`	`+static const json_object extract_local_address(request_rec r, char *a)`
`25`	`25`	`{`
`26`		`- return r->connection->local_ip;`
	`26`	`+ return json_object_new_string(r->connection->local_ip);`
`27`	`27`	`}`
`28`	`28`
`29`		`-static const char extract_remote_logname(request_rec r, char *a)`
	`29`	`+static const json_object extract_remote_logname(request_rec r, char *a)`
`30`	`30`	`{`
`31`	`31`	`const char *rlogin = ap_get_remote_logname(r);`
`32`	`32`	`if (rlogin == NULL) {`
`33`		`- rlogin = "-";`
	`33`	`+ return NULL;`
`34`	`34`	`} else if (strlen(rlogin) == 0) {`
`35`	`35`	`rlogin = "\"\"";`
`36`	`36`	`}`
`37`	`37`
`38`		`- return rlogin;`
	`38`	`+ return json_object_new_string(rlogin);`
`39`	`39`	`}`
`40`	`40`
`41`		`-static const char extract_remote_user(request_rec r, char *a)`
	`41`	`+static const json_object extract_remote_user(request_rec r, char *a)`
`42`	`42`	`{`
`43`	`43`	`#ifdef WITH_APACHE13`
`44`	`44`	`char *rvalue = r->connection->user;`
`@@ -50,76 +50,77 @@ static const char extract_remote_user(request_rec r, char *a)`
`50`	`50`	`} else if (strlen(rvalue) == 0) {`
`51`	`51`	`rvalue = "\"\"";`
`52`	`52`	`}`
`53`		`- return rvalue;`
	`53`	`+ return json_object_new_string(rvalue);`
`54`	`54`	`}`
`55`	`55`
`56`		`-static const char extract_request_line(request_rec r, char *a)`
	`56`	`+static const json_object extract_request_line(request_rec r, char *a)`
`57`	`57`	`{`
`58`	`58`	`/* Upddated to mod_log_config logic */`
`59`	`59`	`/* NOTE: If the original request contained a password, we`
`60`	`60`	`* re-write the request line here to contain XXXXXX instead:`
`61`	`61`	`* (note the truncation before the protocol string for HTTP/0.9 requests)`
`62`	`62`	`* (note also that r->the_request contains the unmodified request)`
`63`	`63`	`*/`
`64`		`- return (r->parsed_uri.password)`
	`64`	`+ return json_object_new_string(`
	`65`	`+ (r->parsed_uri.password)`
`65`	`66`	`? apr_pstrcat(r->pool, r->method, " ",`
`66`	`67`	`apr_uri_unparse(r->pool,`
`67`	`68`	`&r->parsed_uri, 0),`
`68`	`69`	`r->assbackwards ? NULL : " ",`
`69`	`70`	`r->protocol, NULL)`
`70`		`- : r->the_request;`
	`71`	`+ : r->the_request);`
`71`	`72`	`}`
`72`	`73`
`73`		`-static const char extract_request_file(request_rec r, char *a)`
	`74`	`+static const json_object extract_request_file(request_rec r, char *a)`
`74`	`75`	`{`
`75`		`- return r->filename;`
	`76`	`+ return json_object_new_string(r->filename);`
`76`	`77`	`}`
`77`	`78`
`78`		`-static const char extract_request_uri(request_rec r, char *a)`
	`79`	`+static const json_object extract_request_uri(request_rec r, char *a)`
`79`	`80`	`{`
`80`		`- return r->uri;`
	`81`	`+ return json_object_new_string(r->uri);`
`81`	`82`	`}`
`82`	`83`
`83`		`-static const char extract_request_method(request_rec r, char *a)`
	`84`	`+static const json_object extract_request_method(request_rec r, char *a)`
`84`	`85`	`{`
`85`		`- return r->method;`
	`86`	`+ return json_object_new_string(r->method);`
`86`	`87`	`}`
`87`	`88`
`88`		`-static const char extract_request_protocol(request_rec r, char *a)`
	`89`	`+static const json_object extract_request_protocol(request_rec r, char *a)`
`89`	`90`	`{`
`90`		`- return r->protocol;`
	`91`	`+ return json_object_new_string(r->protocol);`
`91`	`92`	`}`
`92`	`93`
`93`		`-static const char extract_request_query(request_rec r, char *a)`
	`94`	`+static const json_object extract_request_query(request_rec r, char *a)`
`94`	`95`	`{`
`95`		`- return (r->args) ? apr_pstrcat(r->pool, "?",`
	`96`	`+ return json_object_new_string((r->args) ? apr_pstrcat(r->pool, "?",`
`96`	`97`	`r->args, NULL)`
`97`		`- : "";`
	`98`	`+ : "");`
`98`	`99`	`}`
`99`	`100`
`100`		`-static const char extract_status(request_rec r, char *a)`
	`101`	`+static const json_object extract_status(request_rec r, char *a)`
`101`	`102`	`{`
`102`	`103`	`if (r->status <= 0) {`
`103`		`- return "-";`
	`104`	`+ return NULL;`
`104`	`105`	`} else {`
`105`		`- return apr_psprintf(r->pool, "%d", r->status);`
	`106`	`+ return json_object_new_int(r->status);`
`106`	`107`	`}`
`107`	`108`	`}`
`108`	`109`
`109`		`-static const char extract_virtual_host(request_rec r, char *a)`
	`110`	`+static const json_object extract_virtual_host(request_rec r, char *a)`
`110`	`111`	`{`
`111`		`- return r->server->server_hostname;`
	`112`	`+ return json_object_new_string(r->server->server_hostname);`
`112`	`113`	`}`
`113`	`114`
`114`		`-static const char extract_server_name(request_rec r, char *a)`
	`115`	`+static const json_object extract_server_name(request_rec r, char *a)`
`115`	`116`	`{`
`116`		`- return ap_get_server_name(r);`
	`117`	`+ return json_object_new_string(ap_get_server_name(r));`
`117`	`118`	`}`
`118`	`119`
`119`		`-static const char extract_server_port(request_rec r, char *a)`
	`120`	`+static const json_object extract_server_port(request_rec r, char *a)`
`120`	`121`	`{`
`121`		`- return apr_psprintf(r->pool, "%u",`
`122`		`- r->server->port ? r->server->port : ap_default_port(r));`
	`122`	`+ return json_object_new_string(apr_psprintf(r->pool, "%u",`
	`123`	`+ r->server->port ? r->server->port : ap_default_port(r)));`
`123`	`124`	`}`
`124`	`125`
`125`	`126`	`/* This respects the setting of UseCanonicalName so that`
`@@ -131,63 +132,63 @@ static const char log_server_name(request_rec r, char *a)`
`131`	`132`	`return ap_get_server_name(r);`
`132`	`133`	`}`
`133`	`134`
`134`		`-static const char extract_child_pid(request_rec r, char *a)`
	`135`	`+static const json_object extract_child_pid(request_rec r, char *a)`
`135`	`136`	`{`
`136`	`137`	`if (*a == '\0' \|\| !strcmp(a, "pid")) {`
`137`		`- return apr_psprintf(r->pool, "%" APR_PID_T_FMT, getpid());`
	`138`	`+ return json_object_new_string(apr_psprintf(r->pool, "%" APR_PID_T_FMT, getpid()));`
`138`	`139`	`}`
`139`	`140`	`else if (!strcmp(a, "tid")) {`
`140`	`141`	`#if APR_HAS_THREADS`
`141`	`142`	`apr_os_thread_t tid = apr_os_thread_current();`
`142`	`143`	`#else`
`143`	`144`	`int tid = 0; /* APR will format "0" anyway but an arg is needed */`
`144`	`145`	`#endif`
`145`		`- return apr_psprintf(r->pool, "%pT", &tid);`
	`146`	`+ return json_object_new_string(apr_psprintf(r->pool, "%pT", &tid));`
`146`	`147`	`}`
`147`	`148`	`/* bogus format */`
`148`		`- return a;`
	`149`	`+ return json_object_new_string(a);`
`149`	`150`	`}`
`150`	`151`
`151`		`-static const char extract_header(request_rec r, char *a)`
	`152`	`+static const json_object extract_header(request_rec r, char *a)`
`152`	`153`	`{`
`153`	`154`	`const char *tempref;`
`154`	`155`
`155`	`156`	`tempref = apr_table_get(r->headers_in, a);`
`156`	`157`	`if (!tempref)`
`157`	`158`	`{`
`158`		`- return "-";`
	`159`	`+ return NULL;`
`159`	`160`	`} else {`
`160`		`- return tempref;`
	`161`	`+ return json_object_new_string(tempref);`
`161`	`162`	`}`
`162`	`163`	`}`
`163`	`164`
`164`		`-static const char extract_referer(request_rec r, char *a)`
	`165`	`+static const json_object extract_referer(request_rec r, char *a)`
`165`	`166`	`{`
`166`	`167`	`const char *tempref;`
`167`	`168`
`168`	`169`	`tempref = apr_table_get(r->headers_in, "Referer");`
`169`	`170`	`if (!tempref)`
`170`	`171`	`{`
`171`		`- return "-";`
	`172`	`+ return NULL;`
`172`	`173`	`} else {`
`173`		`- return tempref;`
	`174`	`+ return json_object_new_string(tempref);`
`174`	`175`	`}`
`175`	`176`	`}`
`176`	`177`
`177`		`-static const char extract_agent(request_rec r, char *a)`
	`178`	`+static const json_object extract_agent(request_rec r, char *a)`
`178`	`179`	`{`
`179`	`180`	`const char *tempag;`
`180`	`181`
`181`	`182`	`tempag = apr_table_get(r->headers_in, "User-Agent");`
`182`	`183`	`if (!tempag)`
`183`	`184`	`{`
`184`		`- return "-";`
	`185`	`+ return NULL;`
`185`	`186`	`} else {`
`186`		`- return tempag;`
	`187`	`+ return json_object_new_string(tempag);`
`187`	`188`	`}`
`188`	`189`	`}`
`189`	`190`
`190`		`-static const char extract_specific_cookie(request_rec r, char *a)`
	`191`	`+static const json_object extract_specific_cookie(request_rec r, char *a)`
`191`	`192`	`{`
`192`	`193`	`const char *cookiestr;`
`193`	`194`	`char *cookieend;`
`@@ -215,7 +216,7 @@ static const char extract_specific_cookie(request_rec r, char *a)`
`215`	`216`	`cookieend = ap_strchr(cookiebuf, ';');`
`216`	`217`	`if (cookieend != NULL)`
`217`	`218`	`*cookieend = '\0';`
`218`		`- return cookiebuf;`
	`219`	`+ return json_object_new_string(cookiebuf);`
`219`	`220`	`}`
`220`	`221`	`}`
`221`	`222`
`@@ -230,7 +231,7 @@ static const char extract_specific_cookie(request_rec r, char *a)`
`230`	`231`	`cookieend = ap_strchr(cookiebuf, ';');`
`231`	`232`	`if (cookieend != NULL)`
`232`	`233`	`*cookieend = '\0';`
`233`		`- return cookiebuf;`
	`234`	`+ return json_object_new_string(cookiebuf);`
`234`	`235`	`}`
`235`	`236`	`}`
`236`	`237`
`@@ -245,10 +246,10 @@ static const char extract_specific_cookie(request_rec r, char *a)`
`245`	`246`	`cookieend = ap_strchr(cookiebuf, ';');`
`246`	`247`	`if (cookieend != NULL)`
`247`	`248`	`*cookieend = '\0';`
`248`		`- return cookiebuf;`
	`249`	`+ return json_object_new_string(cookiebuf);`
`249`	`250`	`}`
`250`	`251`	`}`
`251`	`252`	`}`
`252`	`253`
`253`		`- return "-";`
	`254`	`+ return NULL;`
`254`	`255`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,19 @@`
`1`		`-static const char extract_bytes_sent(request_rec r, char *a)`
	`1`	`+static const json_object extract_bytes_sent(request_rec r, char *a)`
`2`	`2`	`{`
`3`	`3`	`if (!r->sent_bodyct \|\| !r->bytes_sent) {`
`4`		`- return "-";`
	`4`	`+ return NULL;`
`5`	`5`	`} else {`
`6`		`- return apr_psprintf(r->pool, "%" APR_OFF_T_FMT, r->bytes_sent);`
	`6`	`+ return json_object_new_int(r->bytes_sent);`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`
`10`		`-static const char extract_request_time_custom(request_rec r, char *a,`
	`10`	`+static const json_object extract_request_time_custom(request_rec r, char *a,`
`11`	`11`	`apr_time_exp_t *xt)`
`12`	`12`	`{`
`13`	`13`	`apr_size_t retcode;`
`14`	`14`	`char tstr[MAX_STRING_LEN];`
`15`	`15`	`apr_strftime(tstr, &retcode, sizeof(tstr), a, xt);`
`16`		`- return apr_pstrdup(r->pool, tstr);`
	`16`	`+ return json_object_new_string(apr_pstrdup(r->pool, tstr));`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`#define DEFAULT_REQUEST_TIME_SIZE 32`
`@@ -27,7 +27,7 @@ typedef struct {`
`27`	`27`	`#define TIME_CACHE_MASK 3`
`28`	`28`	`static cached_request_time request_time_cache[TIME_CACHE_SIZE];`
`29`	`29`
`30`		`-static const char extract_request_time(request_rec r, char *a)`
	`30`	`+static const json_object extract_request_time(request_rec r, char *a)`
`31`	`31`	`{`
`32`	`32`	`apr_time_exp_t xt;`
`33`	`33`
`@@ -78,26 +78,26 @@ static const char extract_request_time(request_rec r, char *a)`
`78`	`78`	`memcpy(&(request_time_cache[i]), cached_time,`
`79`	`79`	`sizeof(*cached_time));`
`80`	`80`	`}`
`81`		`- return cached_time->timestr;`
	`81`	`+ return json_object_new_string(cached_time->timestr);`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
`85`		`-static const char extract_request_duration(request_rec r, char *a)`
	`85`	`+static const json_object extract_request_duration(request_rec r, char *a)`
`86`	`86`	`{`
`87`	`87`	`apr_time_t duration = apr_time_now() - r->request_time;`
`88`		`- return apr_psprintf(r->pool, "%ld", apr_time_usec(duration));`
	`88`	`+ return json_object_new_int(apr_time_usec(duration));`
`89`	`89`	`}`
`90`	`90`
`91`		`-static const char extract_connection_status(request_rec r, char *a) __attribute__((unused));`
`92`		`-static const char extract_connection_status(request_rec r, char *a)`
	`91`	`+static const json_object extract_connection_status(request_rec r, char *a) __attribute__((unused));`
	`92`	`+static const json_object extract_connection_status(request_rec r, char *a)`
`93`	`93`	`{`
`94`	`94`	`if (r->connection->aborted)`
`95`		`- return "X";`
	`95`	`+ return json_object_new_string("X");`
`96`	`96`
`97`	`97`	`if (r->connection->keepalive == AP_CONN_KEEPALIVE &&`
`98`	`98`	`(!r->server->keep_alive_max \|\|`
`99`	`99`	`(r->server->keep_alive_max - r->connection->keepalives) > 0)) {`
`100`		`- return "+";`
	`100`	`+ return json_object_new_string("+");`
`101`	`101`	`}`
`102`		`- return "-";`
	`102`	`+ return NULL;`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-typedef const char item_func(request_rec r, char *a);`
	`1`	`+typedef const json_object* item_func(request_rec r, char a);`
`2`	`2`	`typedef struct transferDataS {`
`3`	`3`	`void * data;`
`4`	`4`	`int size;`