diff options
| author | 杨威 <[email protected]> | 2022-06-08 17:36:00 +0800 |
|---|---|---|
| committer | 杨威 <[email protected]> | 2022-06-08 17:36:00 +0800 |
| commit | b831e1c5b00d916aef08ae289fd5665861936ebd (patch) | |
| tree | c40e76942bd95914d7fc77ee93257c82321b857b | |
| parent | 02968b4e64c88e769a4f8a84e8eb91837ea2a3ab (diff) | |
✨ feat(l2_l3_tunnel_support): 默认l2_l3_tunnel_support=1，并从模板toml中移除配置项v4.2.85
| -rw-r--r-- | bin/etc/sapp.toml | 4 | ||||
| -rw-r--r-- | src/config/config_parse.cpp | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/bin/etc/sapp.toml b/bin/etc/sapp.toml index 6df09db..7676f49 100644 --- a/bin/etc/sapp.toml +++ b/bin/etc/sapp.toml @@ -22,10 +22,6 @@ [PACKET_IO] [overlay_tunnel_definition] -### note, since 2020-10-01, L2-L3 tunnel(VLAN,MPLS,PPPOE,etc.) is process and offload by mrtunnat, -### after 2020-10-01, sapp support L2-L3 tunnel(VLAN,MPLS,PPPOE,etc.) without mrtunnat. - l2_l3_tunnel_support=0 - ### note, optional value is [none, vxlan] overlay_mode=none diff --git a/src/config/config_parse.cpp b/src/config/config_parse.cpp index d761e67..a93af63 100644 --- a/src/config/config_parse.cpp +++ b/src/config/config_parse.cpp @@ -1765,7 +1765,7 @@ int sapp_parse_config(void) /******************************* packet_io.overlay_tunnel_definition ******************************/ - tomlc99_wrap_load_int_def(ABBR_CFG_FILE_MAIN_ENTRY, (char *)"overlay_tunnel_definition", (char *)"l2_l3_tunnel_support", &pconfig->packet_io.packet_io_tunnel.l2_l3_tunnel_support, 0); + tomlc99_wrap_load_int_def(ABBR_CFG_FILE_MAIN_ENTRY, (char *)"overlay_tunnel_definition", (char *)"l2_l3_tunnel_support", &pconfig->packet_io.packet_io_tunnel.l2_l3_tunnel_support, 1); tomlc99_wrap_load_string_def(ABBR_CFG_FILE_MAIN_ENTRY, (char *)"overlay_tunnel_definition", (char *)"overlay_mode", pconfig->packet_io.packet_io_tunnel.overlay_mode_string, NAME_MAX, "none"); |