Lagopus 0.1.1

lagopus · Oct 8, 2014 · cb6cb41 · cb6cb41
2 parents be60ac5 + 33e1ab5
commit cb6cb41
Show file tree

Hide file tree

Showing 88 changed files with 4,850 additions and 3,752 deletions.
diff --git a/configure b/configure
@@ -18020,7 +18020,7 @@ if test "x$?" != "x0"; then
 fi
 
 # emit.
-ac_config_files="$ac_config_files mk/vars.mk mk/doxygen.conf Makefile src/include/Makefile src/include/lagopus_platform.h src/lib/Makefile src/lib/test/Makefile src/lib/check/Makefile src/agent/Makefile src/agent/test/Makefile src/agent/check/Makefile src/cmds/Makefile src/dataplane/Makefile src/dataplane/dpdk/Makefile src/dataplane/dpdk/test/Makefile src/dataplane/sock/Makefile src/dataplane/ofproto/test/Makefile src/dataplane/ofproto/test/lib/Makefile src/dataplane/mgr/test/Makefile tools/Makefile tools/unity/src/Makefile src/config/Makefile src/config/cli/Makefile src/config/cli/libedit/Makefile debian/Makefile debian/control debian/copyright debian/lagopus-DATAPLANE.install"
+ac_config_files="$ac_config_files mk/vars.mk mk/doxygen.conf Makefile src/include/Makefile src/include/lagopus_platform.h src/lib/Makefile src/lib/test/Makefile src/lib/check/Makefile src/agent/Makefile src/agent/test/Makefile src/agent/check/Makefile src/cmds/Makefile src/dataplane/Makefile src/dataplane/dpdk/test/Makefile src/dataplane/ofproto/test/Makefile src/dataplane/ofproto/test/lib/Makefile src/dataplane/mgr/test/Makefile tools/Makefile tools/unity/src/Makefile src/config/Makefile src/config/cli/Makefile src/config/cli/libedit/Makefile debian/Makefile debian/control debian/copyright debian/lagopus-DATAPLANE.install"
 
 
 # emit and set executable attribute.
@@ -19133,9 +19133,7 @@ do
     "src/agent/check/Makefile") CONFIG_FILES="$CONFIG_FILES src/agent/check/Makefile" ;;
     "src/cmds/Makefile") CONFIG_FILES="$CONFIG_FILES src/cmds/Makefile" ;;
     "src/dataplane/Makefile") CONFIG_FILES="$CONFIG_FILES src/dataplane/Makefile" ;;
-    "src/dataplane/dpdk/Makefile") CONFIG_FILES="$CONFIG_FILES src/dataplane/dpdk/Makefile" ;;
     "src/dataplane/dpdk/test/Makefile") CONFIG_FILES="$CONFIG_FILES src/dataplane/dpdk/test/Makefile" ;;
-    "src/dataplane/sock/Makefile") CONFIG_FILES="$CONFIG_FILES src/dataplane/sock/Makefile" ;;
     "src/dataplane/ofproto/test/Makefile") CONFIG_FILES="$CONFIG_FILES src/dataplane/ofproto/test/Makefile" ;;
     "src/dataplane/ofproto/test/lib/Makefile") CONFIG_FILES="$CONFIG_FILES src/dataplane/ofproto/test/lib/Makefile" ;;
     "src/dataplane/mgr/test/Makefile") CONFIG_FILES="$CONFIG_FILES src/dataplane/mgr/test/Makefile" ;;

diff --git a/configure.ac b/configure.ac
@@ -500,9 +500,7 @@ AC_CONFIG_FILES(
 	src/agent/check/Makefile
 	src/cmds/Makefile
 	src/dataplane/Makefile
-	src/dataplane/dpdk/Makefile
 	src/dataplane/dpdk/test/Makefile
-	src/dataplane/sock/Makefile
 	src/dataplane/ofproto/test/Makefile
 	src/dataplane/ofproto/test/lib/Makefile
 	src/dataplane/mgr/test/Makefile

diff --git a/src/agent/agent_config.c b/src/agent/agent_config.c
@@ -17,6 +17,7 @@
 
 /* OpenFlow agent configuration. */
 #include "lagopus_apis.h"
+#include "lagopus_version.h"
 #include "confsys.h"
 #include "agent_config.h"
 #include "lagopus/dpmgr.h"
@@ -73,13 +74,15 @@ agent_initialize_config_tree(void) {
   agent_check_certificates_set_config_file(value);
 }
 
-
+
 CALLBACK(show_version_func) {
-  int i;
   ARG_USED();
-  for (i = 0; i < 1000; i++) {
-    show(confsys, "Version %d\n", i);
-  }
+  show(confsys, "%s version %d.%d.%d%s\n",
+                LAGOPUS_PRODUCT_NAME,
+                LAGOPUS_VERSION_MAJOR,
+                LAGOPUS_VERSION_MINOR,
+                LAGOPUS_VERSION_PATCH,
+                LAGOPUS_VERSION_RELEASE);
   return CONFIG_SUCCESS;
 }
 
@@ -211,7 +214,6 @@ CALLBACK(bridge_domain_dpid_func) {
 }
 
 CALLBACK(bridge_domain_fail_secure_mode_func) {
-  lagopus_result_t result;
   struct bridge *bridge;
   ARG_USED();