From 2aa222c7cf42679674febd1b7a86afc39bbc0105 Mon Sep 17 00:00:00 2001 From: liuxueli Date: Fri, 12 Jun 2020 11:52:35 +0800 Subject: [PATCH] =?UTF-8?q?IPv6=E7=9B=AE=E7=9A=84IP=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=BD=BF=E7=94=A8=E9=94=99=E8=AF=AF=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E4=BC=9A=E5=AF=BC=E8=87=B4=E8=8E=B7=E5=8F=96=E7=9A=84?= =?UTF-8?q?IP=E5=BD=92=E5=B1=9E=E5=9C=B0=E4=BF=A1=E6=81=AF=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tsg_entry.cpp | 2 +- src/tsg_rule.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tsg_entry.cpp b/src/tsg_entry.cpp index b92da1b..3ee9402 100644 --- a/src/tsg_entry.cpp +++ b/src/tsg_entry.cpp @@ -42,7 +42,7 @@ static __attribute__((__used__)) const char * GIT_VERSION_UNKNOWN = NULL; #endif -char TSG_MASTER_VERSION_20200609=0; +char TSG_MASTER_VERSION_20200612=0; const char *tsg_conffile="tsgconf/main.conf"; g_tsg_para_t g_tsg_para; diff --git a/src/tsg_rule.cpp b/src/tsg_rule.cpp index c346eb6..6f0e25a 100644 --- a/src/tsg_rule.cpp +++ b/src/tsg_rule.cpp @@ -672,7 +672,7 @@ int tsg_get_ip_asn(const struct streaminfo *a_stream, int table_id, MAAT_PLUGIN_ memcpy((char *)(source_ip.ipv6), a_stream->addr.tuple4_v6->saddr, IPV6_ADDR_LEN); dest_ip.ip_type=6; - memcpy((char *)(source_ip.ipv6), a_stream->addr.tuple4_v6->daddr, IPV6_ADDR_LEN); + memcpy((char *)(dest_ip.ipv6), a_stream->addr.tuple4_v6->daddr, IPV6_ADDR_LEN); break; default: return 0; @@ -711,7 +711,7 @@ int tsg_get_ip_location(const struct streaminfo *a_stream, int table_id, MAAT_PL memcpy((char *)(source_ip.ipv6), a_stream->addr.tuple4_v6->saddr, IPV6_ADDR_LEN); dest_ip.ip_type=6; - memcpy((char *)(source_ip.ipv6), a_stream->addr.tuple4_v6->daddr, IPV6_ADDR_LEN); + memcpy((char *)(dest_ip.ipv6), a_stream->addr.tuple4_v6->daddr, IPV6_ADDR_LEN); break; default: return 0;