diff --git a/iPDC/inc/Attack_detect.h b/iPDC/inc/Attack_detect.h index 79d2563..9d42732 100644 --- a/iPDC/inc/Attack_detect.h +++ b/iPDC/inc/Attack_detect.h @@ -4,5 +4,6 @@ /* function declared */ gboolean attack_detect_freq(struct data_frame *df); -gboolean attack_detect_vol(struct data_frame *df) +gboolean attack_detect_vol(struct data_frame *df); +gboolean attack_detect_freq_vol(struct data_frame *df); /* pavan changes */ \ No newline at end of file diff --git a/iPDC/src/Attack_detect.c b/iPDC/src/Attack_detect.c index fec5cf2..40e5c07 100644 --- a/iPDC/src/Attack_detect.c +++ b/iPDC/src/Attack_detect.c @@ -5,6 +5,7 @@ #include #include #include "parser.h" +#include "Attack_detect.h" struct freqlist { @@ -163,4 +164,11 @@ gboolean attack_detect_vol(struct data_frame *df) } } +gboolean attack_detect_freq_vol(struct data_frame *df) +{ + return attack_detect_freq(df) && attack_detect_vol(df); +} + + + /* pavan changes */ \ No newline at end of file diff --git a/iPDC/src/Dynamic_time_warping.c b/iPDC/src/Dynamic_time_warping.c index 2147791..700b81a 100644 --- a/iPDC/src/Dynamic_time_warping.c +++ b/iPDC/src/Dynamic_time_warping.c @@ -295,4 +295,9 @@ int DTWvolDistance(struct data_frame *df) } return temp->result; } +} + +int DTWfreqvolDistance(struct data_frame *df) +{ + return DTWfreqDistance(df) && DTWfreqvolDistance(df); } \ No newline at end of file