Merge pull request #11485 from AbhishekNR/ipv6_mld_todo

[mirror_frr.git] / lib / log_filter.c

diff --git a/lib/log_filter.c b/lib/log_filter.c
index 721e57a62804cdd1678f2b30b623ded72bd43867..df74a8c9badcb1d87891a72c0c778a2f69411c5e 100644 (file)
--- a/lib/log_filter.c
+++ b/lib/log_filter.c
@@ -43,14 +43,14 @@ static int zlog_filter_lookup(const char *lookup)
 
 void zlog_filter_clear(void)
 {
-       frr_with_mutex(&logfilterlock) {
+       frr_with_mutex (&logfilterlock) {
                zlog_filter_count = 0;
        }
 }
 
 int zlog_filter_add(const char *filter)
 {
-       frr_with_mutex(&logfilterlock) {
+       frr_with_mutex (&logfilterlock) {
                if (zlog_filter_count >= ZLOG_FILTERS_MAX)
                        return 1;
 
@@ -74,7 +74,7 @@ int zlog_filter_add(const char *filter)
 
 int zlog_filter_del(const char *filter)
 {
-       frr_with_mutex(&logfilterlock) {
+       frr_with_mutex (&logfilterlock) {
                int found_idx = zlog_filter_lookup(filter);
                int last_idx = zlog_filter_count - 1;
 
@@ -96,7 +96,7 @@ int zlog_filter_dump(char *buf, size_t max_size)
 {
        int len = 0;
 
-       frr_with_mutex(&logfilterlock) {
+       frr_with_mutex (&logfilterlock) {
                for (int i = 0; i < zlog_filter_count; i++) {
                        int ret;
 
@@ -111,13 +111,14 @@ int zlog_filter_dump(char *buf, size_t max_size)
        return len;
 }
 
-static int search_buf(const char *buf)
+static int search_buf(const char *buf, size_t len)
 {
        char *found = NULL;
 
-       frr_with_mutex(&logfilterlock) {
+       frr_with_mutex (&logfilterlock) {
                for (int i = 0; i < zlog_filter_count; i++) {
-                       found = strstr(buf, zlog_filters[i]);
+                       found = memmem(buf, len, zlog_filters[i],
+                                      strlen(zlog_filters[i]));
                        if (found != NULL)
                                return 0;
                }
@@ -131,12 +132,15 @@ static void zlog_filterfile_fd(struct zlog_target *zt, struct zlog_msg *msgs[],
 {
        struct zlog_msg *msgfilt[nmsgs];
        size_t i, o = 0;
+       const char *text;
+       size_t text_len;
 
        for (i = 0; i < nmsgs; i++) {
-               if (zlog_msg_prio(msgs[i]) >= LOG_DEBUG
-                   && search_buf(zlog_msg_text(msgs[i], NULL)) < 0)
-                       continue;
-
+               if (zlog_msg_prio(msgs[i]) >= LOG_DEBUG) {
+                       text = zlog_msg_text(msgs[i], &text_len);
+                       if (search_buf(text, text_len) < 0)
+                               continue;
+               }
                msgfilt[o++] = msgs[i];
        }