From 406b4710bc68e27bb68c0864cfb683f548f02ccc Mon Sep 17 00:00:00 2001
From: Daniel Collins <solemnwarning@solemnwarning.net>
Date: Mon, 14 Nov 2011 02:21:29 +0000
Subject: [PATCH] Log version/revision and compile time while initializing
 ipxwrapper.dll.

---
 Makefile         | 7 +++++--
 src/ipxwrapper.c | 6 ++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 2da8e72..16ac831 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,8 @@ endif
 CFLAGS := -Wall $(DBG_OPT) -I./include/
 CXXFLAGS := $(CFLAGS)
 
+VERSION := revision $(shell svn info | grep Revision | sed -e 's/.*: //')
+
 IPXWRAPPER_DEPS := src/ipxwrapper.o src/winsock.o src/ipxwrapper_stubs.o src/log.o src/common.o \
 	src/interface.o src/router.o src/ipxwrapper.def
 
@@ -40,7 +42,7 @@ all: ipxwrapper.dll wsock32.dll mswsock.dll ipxconfig.exe dpwsockx.dll ipxrouter
 
 clean:
 	rm -f ipxwrapper.dll wsock32.dll mswsock.dll ipxconfig.exe dpwsockx.dll ipxrouter.exe
-	rm -f src/*.o src/*_stubs.s
+	rm -f src/*.o src/*_stubs.s version.o
 
 dist: all
 	mkdir ipxwrapper-$(VERSION)
@@ -57,7 +59,8 @@ dist: all
 .PHONY: all clean dist
 
 ipxwrapper.dll: $(IPXWRAPPER_DEPS)
-	$(CC) $(CFLAGS) -Wl,--enable-stdcall-fixup -shared -o ipxwrapper.dll $(IPXWRAPPER_DEPS) -liphlpapi
+	echo 'const char *version_string = "$(VERSION)", *compile_time = "'`date`'";' | $(CC) -c -x c -o version.o -
+	$(CC) $(CFLAGS) -Wl,--enable-stdcall-fixup -shared -o ipxwrapper.dll $(IPXWRAPPER_DEPS) version.o -liphlpapi
 
 ipxconfig.exe: src/ipxconfig.cpp icons/ipxconfig.o
 	$(CXX) $(CXXFLAGS) -static-libgcc -static-libstdc++ -D_WIN32_IE=0x0400 -mwindows -o ipxconfig.exe $^ -liphlpapi -lcomctl32
diff --git a/src/ipxwrapper.c b/src/ipxwrapper.c
index ab1e452..377cb5c 100644
--- a/src/ipxwrapper.c
+++ b/src/ipxwrapper.c
@@ -31,6 +31,9 @@
 #include "interface.h"
 #include "router.h"
 
+extern const char *version_string;
+extern const char *compile_time;
+
 struct ipaddr_list {
 	uint32_t ipaddr;
 	struct ipaddr_list *next;
@@ -74,6 +77,9 @@ BOOL WINAPI DllMain(HINSTANCE me, DWORD why, LPVOID res) {
 	if(why == DLL_PROCESS_ATTACH) {
 		log_open("ipxwrapper.log");
 		
+		log_printf("IPXWrapper %s", version_string);
+		log_printf("Compiled at %s", compile_time);
+		
 		if(!rclient_init(&g_rclient)) {
 			return FALSE;
 		}