Added a Wirego version string (in addition to API version string). (#33)

Switching to v2.1

Co-authored-by: Neb <bgirard@quarkslab.com>

Author: NothNoth

wirego_bridge/version.h

@@ -1,8 +1,14 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-// Note: must match the ones defined in ../wirego/version.go
+//Wirego ZMQ API version
+//Note: must match the ones defined in language packages (../wirego_remote/go/wirego/version.go and ../wirego_remote/python/wirego.py)
+#define WIREGO_API_VERSION_MAJOR 2
+#define WIREGO_API_VERSION_MINOR 0
+
+
+//Wirego plugin version
 #define WIREGO_VERSION_MAJOR 2
-#define WIREGO_VERSION_MINOR 0
+#define WIREGO_VERSION_MINOR 1
 
 #endif

wirego_bridge/wirego.c

@@ -62,7 +62,7 @@ void proto_register_wirego(void) {
   wirego_h.proto_wirego = -1;
   wirego_h.fields_mapping = NULL;
 
-  ws_warning("Wirego starting with czmq %d.%d\n", ZMQ_VERSION_MAJOR, ZMQ_VERSION_MINOR);
+  ws_warning("Wirego (v%d.%d) starting with czmq %d.%d\n", WIREGO_VERSION_MAJOR, WIREGO_VERSION_MINOR, ZMQ_VERSION_MAJOR, ZMQ_VERSION_MINOR);
 
   //Register preferences menu (used to set the ZMQ endpoint)
   register_preferences_menu();
@@ -119,9 +119,9 @@ void proto_register_wirego(void) {
     ws_warning("Wirego: failed to retrieve remote version");
     return;
   }
-  ws_warning("Wirego bridge version: %d.%d", WIREGO_VERSION_MAJOR, WIREGO_VERSION_MINOR);
+  ws_warning("Wirego bridge version: %d.%d", WIREGO_API_VERSION_MAJOR, WIREGO_API_VERSION_MINOR);
   ws_warning("Wirego remote version: %d.%d", vmajor, vminor);
-  if ((vmajor != WIREGO_VERSION_MAJOR) || (vminor != WIREGO_VERSION_MINOR)) {
+  if ((vmajor != WIREGO_API_VERSION_MAJOR) || (vminor != WIREGO_API_VERSION_MINOR)) {
     ws_warning("Wirego versions differs, aborting.");
     return;
   }