summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin/conf/mrl.conf22
-rw-r--r--src/mrl.sobin0 -> 109416 bytes
-rw-r--r--src/mrl_main.c14
3 files changed, 18 insertions, 18 deletions
diff --git a/bin/conf/mrl.conf b/bin/conf/mrl.conf
index 5c16f3f..53ce767 100644
--- a/bin/conf/mrl.conf
+++ b/bin/conf/mrl.conf
@@ -22,19 +22,19 @@ ht_slot_size=1048576
ht_max_element_num=0
ht_mutex_num=5
[VXLAN_INFO]
-vxlan_local_mac=e4:95:6e:20:0d:0a
-vxlan_local_ip=192.168.1.10
-vxlan_local_port=50710
+vxlan_local_mac=24:6e:96:c8:1a:e2
+vxlan_local_ip=10.4.33.2
+vxlan_local_port=10000
-vxlan_link_dir=1
-vxlan_vpn_id=112
+vxlan_link_dir=0
+vxlan_vpn_id=120
vxlan_gdev_num=1
-vxlan_gdev_mac=00:1e:73:6c:fa:43
-vxlan_gdev_ip=10.1.1.1
-vxlan_gdev_port=4789;4788
+vxlan_gdev_mac=34:0a:98:2f:a8:05
+vxlan_gdev_ip=10.4.127.2
+vxlan_gdev_port=4789
vxlan_link_id_num=1
-vxlan_link_id=1
-vxlan_inner_smac=7c:2a:31:a3:44:9a
-vxlan_inner_dmac=e8:61:1f:13:70:7a \ No newline at end of file
+vxlan_link_id=2
+vxlan_inner_smac=00:24:dc:46:5f:c7
+vxlan_inner_dmac=3c:61:04:a5:bb:f5 \ No newline at end of file
diff --git a/src/mrl.so b/src/mrl.so
new file mode 100644
index 0000000..0ba3b72
--- /dev/null
+++ b/src/mrl.so
Binary files differ
diff --git a/src/mrl_main.c b/src/mrl_main.c
index 2a2bcaf..6639d4f 100644
--- a/src/mrl_main.c
+++ b/src/mrl_main.c
@@ -434,7 +434,7 @@ extern "C" char mrl_tcpall_entry(struct streaminfo *a_tcp,void **pme, int thread
{
global_stat.recv_ir_pkts ++;
mrl_send_to_mgw(raw_packet, thread_seq);
- ret = APP_STATE_GIVEME;//��ָ��faw��drop���ȡ�ĸ�������
+ ret = APP_STATE_GIVEME |APP_STATE_DROPPKT;//��ָ��faw��drop���ȡ�ĸ�������
}
else
{
@@ -445,7 +445,7 @@ extern "C" char mrl_tcpall_entry(struct streaminfo *a_tcp,void **pme, int thread
case OP_STATE_DATA:
global_stat.recv_ir_pkts ++;
mrl_send_to_mgw(raw_packet, thread_seq);
- ret = APP_STATE_GIVEME;
+ ret = APP_STATE_GIVEME|APP_STATE_DROPPKT;
break;
case OP_STATE_CLOSE:
@@ -454,7 +454,7 @@ extern "C" char mrl_tcpall_entry(struct streaminfo *a_tcp,void **pme, int thread
global_stat.recv_ir_pkts ++;
mrl_send_to_mgw(raw_packet, thread_seq);
}
- ret = APP_STATE_DROPME;
+ ret = APP_STATE_DROPME|APP_STATE_DROPPKT;
break;
default:
@@ -477,13 +477,13 @@ extern "C" char mrl_udp_entry(struct streaminfo *a_udp, void **pme, int thread_
{
global_stat.recv_ir_pkts ++;
mrl_send_to_mgw(raw_packet, thread_seq);
- ret = APP_STATE_GIVEME;
+ ret = APP_STATE_GIVEME|APP_STATE_DROPPKT;
}
else
{
if(mrl_identify_nominee(a_udp))
{
- ret =APP_STATE_GIVEME;
+ ret =APP_STATE_GIVEME|APP_STATE_DROPPKT;
}
else
{
@@ -494,7 +494,7 @@ extern "C" char mrl_udp_entry(struct streaminfo *a_udp, void **pme, int thread_
case OP_STATE_DATA:
global_stat.recv_ir_pkts ++;
mrl_send_to_mgw(raw_packet, thread_seq);
- ret = APP_STATE_GIVEME;
+ ret = APP_STATE_GIVEME|APP_STATE_DROPPKT;
break;
case OP_STATE_CLOSE:
@@ -503,7 +503,7 @@ extern "C" char mrl_udp_entry(struct streaminfo *a_udp, void **pme, int thread_
global_stat.recv_ir_pkts ++;
mrl_send_to_mgw(raw_packet, thread_seq);
}
- ret = APP_STATE_DROPME;
+ ret = APP_STATE_DROPME|APP_STATE_DROPPKT;
break;
default: