diff options
| author | lijia <[email protected]> | 2020-10-16 19:22:56 +0800 |
|---|---|---|
| committer | lijia <[email protected]> | 2020-10-16 19:22:56 +0800 |
| commit | b8f6ea45d90e0267025e7795f5ce3844f9a9e3ec (patch) | |
| tree | ccab79c01db20291a41d50d355de169759e07f56 | |
| parent | 2ac3b46da821a4f247acdf106619ab76bd5743b5 (diff) | |
修复arp转发BUG.v4.1.12
| -rw-r--r-- | src/inner_plug/sapp_assistant.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/inner_plug/sapp_assistant.cpp b/src/inner_plug/sapp_assistant.cpp index a6b00de..8d041a9 100644 --- a/src/inner_plug/sapp_assistant.cpp +++ b/src/inner_plug/sapp_assistant.cpp @@ -31,13 +31,13 @@ extern int MESA_get_dev_ipv4(const char *device, int *ip_add); extern int MESA_get_dev_mac(const char *device, unsigned char mac[6]); #if IOMODE_MARSIO -void * (*dl_marsio_buff_ctrlzone)(void *m, uint8_t id); +//void * (*dl_marsio_buff_ctrlzone)(void *m, uint8_t id); extern void * (*ptr_marsio_buff_ctrlzone)(marsio_buff_t *m, uint8_t id); #endif static int sapp_identify_broad_multicast_init(void) { -#if IOMODE_MARSIO +#if 0 void *io_lib_handle; if(CAP_MODEL_MARSIOV4 == g_packet_io_cap_mode){ @@ -69,8 +69,8 @@ int sapp_identify_tunnel_inner_pkt(const raw_pkt_t *raw_pkt) #if IOMODE_MARSIO if(CAP_MODEL_MARSIOV4 == g_packet_io_cap_mode){ const struct mr_tunnat_ctrlzone *mr_ctzone; - if(dl_marsio_buff_ctrlzone){ - mr_ctzone = (const struct mr_tunnat_ctrlzone *)((*dl_marsio_buff_ctrlzone)((void *)raw_pkt->io_lib_pkt_reference, 0)); + if(ptr_marsio_buff_ctrlzone){ + mr_ctzone = (const struct mr_tunnat_ctrlzone *)((*ptr_marsio_buff_ctrlzone)((void *)raw_pkt->io_lib_pkt_reference, 0)); if(mr_ctzone->action & TUNNAT_CZ_ACTION_FORWARD){ return 1; } @@ -850,7 +850,7 @@ int sapp_assistant_init(void) { sapp_fs2_init(); //sapp_line_protocol_init(); - sapp_identify_broad_multicast_init(); + pthread_mutex_init(&g_plug_Independent_thread_mutex, NULL); if(sapp_global_val->config.cpu.send_only_threads_max_num > 0){ |