encoding of MODE_TUNNEL changed

diff --git a/src/libcharon/plugins/sql/mysql.sql b/src/libcharon/plugins/sql/mysql.sql
index ea4b7e7..f4a62a6 100644 (file)
--- a/src/libcharon/plugins/sql/mysql.sql
+++ b/src/libcharon/plugins/sql/mysql.sql
@@ -19,7 +19,7 @@ CREATE TABLE `child_configs` (
   `jitter` mediumint(8) unsigned NOT NULL default '60',
   `updown` varchar(128) collate utf8_unicode_ci default NULL,
   `hostaccess` tinyint(1) unsigned NOT NULL default '0',
-  `mode` tinyint(4) unsigned NOT NULL default '1',
+  `mode` tinyint(4) unsigned NOT NULL default '2',
   `dpd_action` tinyint(4) unsigned NOT NULL default '0',
   `close_action` tinyint(4) unsigned NOT NULL default '0',
   `ipcomp` tinyint(4) unsigned NOT NULL default '0',

diff --git a/src/libcharon/plugins/sql/sqlite.sql b/src/libcharon/plugins/sql/sqlite.sql
index a036eee..55e34e5 100644 (file)
--- a/src/libcharon/plugins/sql/sqlite.sql
+++ b/src/libcharon/plugins/sql/sqlite.sql
@@ -18,7 +18,7 @@ CREATE TABLE child_configs (
   jitter INTEGER NOT NULL DEFAULT '60',
   updown TEXT DEFAULT NULL,
   hostaccess INTEGER NOT NULL DEFAULT '0',
-  mode INTEGER NOT NULL DEFAULT '1',
+  mode INTEGER NOT NULL DEFAULT '2',
   dpd_action INTEGER NOT NULL DEFAULT '0',
   close_action INTEGER NOT NULL DEFAULT '0',
   ipcomp INTEGER NOT NULL DEFAULT '0'

diff --git a/testing/hosts/default/etc/ipsec.d/tables.sql b/testing/hosts/default/etc/ipsec.d/tables.sql
index 0e88082..b768c6e 100644 (file)
--- a/testing/hosts/default/etc/ipsec.d/tables.sql
+++ b/testing/hosts/default/etc/ipsec.d/tables.sql
@@ -17,7 +17,7 @@ CREATE TABLE child_configs (
   jitter INTEGER NOT NULL DEFAULT '180',
   updown TEXT DEFAULT NULL,
   hostaccess INTEGER NOT NULL DEFAULT '0',
-  mode INTEGER NOT NULL DEFAULT '1',
+  mode INTEGER NOT NULL DEFAULT '2',
   dpd_action INTEGER NOT NULL DEFAULT '0',
   close_action INTEGER NOT NULL DEFAULT '0',
   ipcomp INTEGER NOT NULL DEFAULT '0'
@@ -197,9 +197,9 @@ CREATE TABLE ike_sas (
   id INTEGER NOT NULL,
   initiator INTEGER NOT NULL,
   local_id_type INTEGER NOT NULL,
-  local_id_data BLOB DEFAULT NULL,
+  local_id_data BLOB NOT NULL,
   remote_id_type INTEGER NOT NULL,
-  remote_id_data BLOB DEFAULT NULL,
+  remote_id_data BLOB NOT NULL,
   host_family INTEGER NOT NULL,
   local_host_data BLOB NOT NULL,
   remote_host_data BLOB NOT NULL,