From 59aa0419c91cb032c668e94362c1f6517631f24d Mon Sep 17 00:00:00 2001 From: zhengchao Date: Fri, 7 Jul 2017 20:51:55 +0800 Subject: [PATCH] =?UTF-8?q?Command=E6=8E=A5=E5=8F=A3=E4=B8=AD=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=9B=B8=E4=BC=BC=E6=80=A7=E5=8C=B9=E9=85=8D=E8=A7=84?= =?UTF-8?q?=E5=88=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inc/Maat_command.h | 4 ++-- src/entry/Maat_command.cpp | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/inc/Maat_command.h b/inc/Maat_command.h index 43f226b..3102222 100644 --- a/inc/Maat_command.h +++ b/inc/Maat_command.h @@ -84,8 +84,8 @@ struct Maat_rgn_digest_t }; struct Maat_rgn_sim_t { - char* target_string; - short confidence_degree; + char* target; + short threshold; }; struct Maat_region_t { diff --git a/src/entry/Maat_command.cpp b/src/entry/Maat_command.cpp index 63b01f7..1f86503 100644 --- a/src/entry/Maat_command.cpp +++ b/src/entry/Maat_command.cpp @@ -276,7 +276,11 @@ void serialize_region(const struct Maat_region_t* p,int group_id, char* buff,int ,p->digest_rule.confidence_degree); break; case REGION_SIMILARITY://not support yet - assert(0); + ret=snprintf(buff,size,"%d\t%d\t%s\t%hd\t1" + ,p->region_id + ,group_id + ,p->similarity_rule.target + ,p->similarity_rule.threshold); break; default: assert(0); @@ -852,7 +856,7 @@ void _maat_copy_region(struct Maat_region_t* dst,const struct Maat_region_t* src dst->digest_rule.digest_string=_maat_strdup(src->digest_rule.digest_string); break; case REGION_SIMILARITY: - assert(0); + dst->similarity_rule.target=_maat_strdup(src->similarity_rule.target); break; default: assert(0); @@ -881,7 +885,7 @@ void _maat_empty_region(struct Maat_region_t* p) free((char*)p->digest_rule.digest_string); break; case REGION_SIMILARITY: - assert(0); + free((char*)p->similarity_rule.target); break; default: assert(0);