p2pd: show Git SHA and no version in plugin constructor

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>

diff --git a/lib/p2pd/src/olsrd_plugin.c b/lib/p2pd/src/olsrd_plugin.c
index da2d9c0..c97947b 100644 (file)
--- a/lib/p2pd/src/olsrd_plugin.c
+++ b/lib/p2pd/src/olsrd_plugin.c
@@ -49,6 +49,8 @@
 #include "scheduler.h"          /* olsr_start_timer() */
 #include "olsr_cfg.h"           /* olsr_cnf() */
 #include "olsr_cookie.h"        /* olsr_alloc_cookie() */
+#include "olsr.h"
+#include "builddata.h"
 
 /* P2PD includes */
 #include "p2pd.h"               /* InitP2pd(), CloseP2pd() */
@@ -145,7 +147,7 @@ static void
 my_init(void)
 {
   /* Print plugin info to stdout */
-  printf("%s\n", MOD_DESC);
+  olsr_printf(0, "%s (%s)\n", PLUGIN_NAME, git_descriptor);
 
   return;
 }

diff --git a/lib/p2pd/src/p2pd.h b/lib/p2pd/src/p2pd.h
index ba14167..d1a0d25 100644 (file)
--- a/lib/p2pd/src/p2pd.h
+++ b/lib/p2pd/src/p2pd.h
@@ -57,11 +57,10 @@
 #define P2PD_VALID_TIME           180          /* seconds */
 
 /* P2PD plugin data */
-#define PLUGIN_NAME               "OLSRD P2PD plugin"
-#define PLUGIN_NAME_SHORT         "OLSRD P2PD"
-#define PLUGIN_VERSION            "0.1.0 (" __DATE__ " " __TIME__ ")"
-#define MOD_DESC PLUGIN_NAME      " " PLUGIN_VERSION
+#define PLUGIN_NAME               "OLSRD p2pd plugin"
+#define PLUGIN_NAME_SHORT         "P2PD"
 #define PLUGIN_INTERFACE_VERSION  5
+
 #define IPHDR_FRAGMENT_MASK       0xC000
 
 /* Forward declaration of OLSR interface type */