增加MRZCPD在firewall容器中的集成。

2 files changed, 10 insertions, 21 deletions

diff --git a/config/mrzcpd/etc/mrglobal.conf b/config/mrzcpd/etc/mrglobal.conf
index 75b3599..83f6c04 100644
--- a/config/mrzcpd/etc/mrglobal.conf
+++ b/config/mrzcpd/etc/mrglobal.conf
@@ -1,34 +1,23 @@
 [device]
-device=eth0,vxlan_user,vxlan_fwd
-sz_tunnel=8192
-sz_buffer=0
-
-[device:eth0]
-jumbo_frame=1
-max_rx_pkt_len=15360
-clear_tx_flags=1
-promisc=1
+device=virtio_user0
+virtio_user=virtio_user0
 
 [service]
 # lcore id for i/o service, use comma to split
-iocore=46,47
+iocore=1,2,3,4
 distmode=2
 hashmode=0
 
 [eal]
 virtaddr=0x7f40c4a00000
 loglevel=7
+no-pci=1
 
 [keepalive]
-check_spinlock=0
-
-[ctrlzone]
-ctrlzone0=tunnat,64
+check_spinlock=1
 
 [pool]
 create_mode=3
-sz_direct_pktmbuf=4194304
+sz_direct_pktmbuf=65536
 sz_indirect_pktmbuf=8192
 sz_cache=256
-sz_data=4096
-
diff --git a/config/sapp_run/etc/sapp.toml b/config/sapp_run/etc/sapp.toml
index 40f5522..a3e165b 100644
--- a/config/sapp_run/etc/sapp.toml
+++ b/config/sapp_run/etc/sapp.toml
@@ -11,7 +11,7 @@ instance_name = "sapp_v4.0"
 [CPU]
 worker_threads=4
 ### note, bind_mask, if you do not want to bind thread to special CPU core, keep it empty as []
-bind_mask=[1,2,3,4]
+bind_mask=[5,6,7,8]
 [MEM]
 dictator_enable=1
 
@@ -23,12 +23,12 @@ dictator_enable=1
 #inject_mode_inline_device_sport=54789
 ### note, depolyment.mode options: [mirror, inline, transparent, dumpfile]
   [packet_io.depolyment]
-  mode=mirror
+  mode=inline
 
 ### note, interface.type options: [pag,pcap,marsio]
   [packet_io.internal.interface]
-  type=pcap
-  name=eth0
+  type=marsio
+  name=virtio_user0
 
   [packet_io.external.interface]
   type=pcap