Protocolary updates for release 4.0.0-rc5

NICMx · Jan 9, 2019 · 798d2e1 · 798d2e1
1 parent a9d118b
commit 798d2e1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.68])
-AC_INIT([Jool], [3.5.7.203], [[email protected]])
+AC_INIT([Jool], [3.255.5], [[email protected]])
 AC_CONFIG_SRCDIR([src/common/xlat.h])
 AM_INIT_AUTOMAKE([subdir-objects])
 

diff --git a/src/common/xlat.h b/src/common/xlat.h
@@ -13,9 +13,9 @@
  * relocate them, please make sure to also update dkms.conf accordingly.
  */
 #define JOOL_VERSION_MAJOR 3
-#define JOOL_VERSION_MINOR 5
-#define JOOL_VERSION_REV 7
-#define JOOL_VERSION_DEV 203
+#define JOOL_VERSION_MINOR 255
+#define JOOL_VERSION_REV 5
+#define JOOL_VERSION_DEV 0
 
 /** See http://stackoverflow.com/questions/195975 */
 #define STR_VALUE(arg) #arg

diff --git a/src/usr/common/argp/session.c b/src/usr/common/argp/session.c
@@ -108,7 +108,6 @@ int handle_session_display(char *iname, int argc, char **argv, void *arg)
 		return error;
 
 	if (!dargs.csv.value) {
-		printf("%s:\n", l4proto_to_string(dargs.proto.proto));
 		printf("---------------------------------\n");
 	} else if (show_csv_header(dargs.no_headers.value, dargs.csv.value)) {
 		printf("Protocol,");

diff --git a/test/graybox/test-suite/xlat/siit.sh b/test/graybox/test-suite/xlat/siit.sh
@@ -21,5 +21,5 @@ iptables  -t mangle -A PREROUTING -d 192.0.2.33            -j JOOL_SIIT
 # pool6791 test
 jool_siit eamt add 2001:db8:3::/120 1.0.0.0/24
 jool_siit eamt add 2001:db8:2::/120 10.0.0.0/24
-jool_siit global update pool6791v4 203.0.113.8
+jool_siit global update rfc6791v4-prefix 203.0.113.8
 ip route add 2001:db8:3::/120 via 2001:db8:1c0:2:21::