vici: Make IP-TFS mode configurable

diff --git a/src/libcharon/plugins/vici/vici_config.c b/src/libcharon/plugins/vici/vici_config.c
index a85cccd9d5543b5d244afe28dbe86fcb5c826ae3..6ea239f0a189454b73514be2f25160084c918d58 100644 (file)
--- a/src/libcharon/plugins/vici/vici_config.c
+++ b/src/libcharon/plugins/vici/vici_config.c
@@ -904,6 +904,7 @@ CALLBACK(parse_mode, bool,
                { "tunnel",                             MODE_TUNNEL             },
                { "transport",                  MODE_TRANSPORT  },
                { "transport_proxy",    MODE_TRANSPORT  },
+               { "iptfs",                              MODE_IPTFS              },
                { "beet",                               MODE_BEET               },
                { "drop",                               MODE_DROP               },
                { "pass",                               MODE_PASS               },

diff --git a/src/swanctl/swanctl.opt b/src/swanctl/swanctl.opt
index cabc90f8c97fe5ca45a69063f7195ee4396a5730..b13ef9b60dbd80d5bad02b7555f3b6db05316764 100644 (file)
--- a/src/swanctl/swanctl.opt
+++ b/src/swanctl/swanctl.opt
@@ -920,12 +920,13 @@ connections.<conn>.children.<child>.hostaccess = no
        Hostaccess variable to pass to **updown** script.
 
 connections.<conn>.children.<child>.mode = tunnel
-       IPsec Mode to establish (_tunnel_, _transport_, _transport_proxy_, _beet_,
-       _pass_ or _drop_).
+       IPsec Mode to establish (_tunnel_, _transport_, _transport_proxy_, _iptfs_,
+       _beet_, _pass_ or _drop_).
 
        IPsec Mode to establish CHILD_SA with. _tunnel_ negotiates the CHILD_SA
        in IPsec Tunnel Mode, whereas _transport_ uses IPsec Transport Mode.
        _transport_proxy_ signifying the special Mobile IPv6 Transport Proxy Mode.
+       _iptfs_ is IP-TFS tunnel mode with aggregation and fragmentation,
        _beet_ is the Bound End to End Tunnel mixture mode, working with fixed inner
        addresses without the need to include them in each packet.