Send proxy version in logs

Author: joelwurtz

Diff for: Makefile

@@ -3,10 +3,12 @@ SRC=src/mod_redirectionio.c \
 	src/json.c \
 	src/redirectionio_protocol.c
 
+PROXY_VERSION ?= libapache2-mod-redirectionio:dev
+
 all: src/mod_redirectionio.la
 
 src/mod_redirectionio.la: $(SRC) src/mod_redirectionio.h src/json.h src/redirectionio_protocol.h
-	apxs -Wc,"-std=c99  " -Wl,"" -lm -Wc,-Wall -Wc,-g -c $(SRC)
+	apxs -Wc,"-std=c99 -DPROXY_VERSION=$(PROXY_VERSION)  " -Wl,"" -lm -Wc,-Wall -Wc,-g -c $(SRC)
 
 .PHONY:	install
 install: src/mod_redirectionio.la

Diff for: src/mod_redirectionio.h

@@ -17,6 +17,13 @@
 #define UNIX 0
 #define TCP 1
 
+#ifndef PROXY_VERSION
+#define PROXY_VERSION libapache2-mod-redirectionio:dev
+#endif
+
+#define STRINGIZE(x) #x
+#define PROXY_VERSION_STR(x) STRINGIZE(x)
+
 #define RIO_TIMEOUT 100000 // Timeout in microseconds
 #define RIO_RECONNECT_INTERVAL 0
 #define RIO_MIN_CONNECTIONS 1

Diff for: src/redirectionio_protocol.c

@@ -11,7 +11,7 @@ static char errbuf[1024];
 const char COMMAND_MATCH_NAME[] = "MATCH_WITH_RESPONSE";
 const char COMMAND_MATCH_QUERY[] = "{ \"project_id\": \"%s\", \"request_uri\": \"%s\", \"host\": \"%s\" }";
 const char COMMAND_LOG_NAME[] = "LOG";
-const char COMMAND_LOG_QUERY[] = "{ \"project_id\": \"%s\", \"request_uri\": \"%s\", \"host\": \"%s\", \"rule_id\": \"%s\", \"target\": \"%s\", \"status_code\": %d, \"user_agent\": \"%s\", \"referer\": \"%s\", \"method\": \"%s\" }";
+const char COMMAND_LOG_QUERY[] = "{ \"project_id\": \"%s\", \"request_uri\": \"%s\", \"host\": \"%s\", \"rule_id\": \"%s\", \"target\": \"%s\", \"status_code\": %d, \"user_agent\": \"%s\", \"referer\": \"%s\", \"method\": \"%s\", \"proxy\": \"%s\" }";
 const char COMMAND_FILTER_HEADER_NAME[] = "FILTER_HEADER";
 const char COMMAND_FILTER_BODY_NAME[] = "FILTER_BODY";
 
@@ -130,7 +130,8 @@ apr_status_t redirectionio_protocol_log(redirectionio_connection *conn, redirect
         + strlen(user_agent)
         + strlen(referer)
         + strlen(r->method)
-        - 18 // 9 * 2 (%x) characters replaced with values
+        + strlen(PROXY_VERSION_STR(PROXY_VERSION))
+        - 20 // 10 * 2 (%x) characters replaced with values
     ;
 
     dst = (char *) apr_palloc(r->pool, wlen);
@@ -146,7 +147,8 @@ apr_status_t redirectionio_protocol_log(redirectionio_connection *conn, redirect
         r->status,
         user_agent,
         referer,
-        r->method
+        r->method,
+        PROXY_VERSION_STR(PROXY_VERSION)
     );
 
     clen = sizeof(COMMAND_LOG_NAME);