]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-7121 change switch_events_match() to use strcmp
authorDušan Dragić <dragic.dusan@gmail.com>
Sat, 3 Jan 2015 21:56:19 +0000 (22:56 +0100)
committerDušan Dragić <dragic.dusan@gmail.com>
Sat, 3 Jan 2015 21:56:19 +0000 (22:56 +0100)
Use strcmp() in place of strstr() so switch_events_match() matches
only full event subclass name.

src/switch_event.c

index b108ac1be5822ba8febed44128e2857d5a91f7f9..9491a9f3831ba8f9925ded0c87bda80f50b8cc2a 100644 (file)
@@ -240,15 +240,15 @@ static int switch_events_match(switch_event_t *event, switch_event_node_t *node)
                        if (!strncasecmp(node->subclass_name, "file:", 5)) {
                                char *file_header;
                                if ((file_header = switch_event_get_header(event, "file")) != 0) {
-                                       match = strstr(node->subclass_name + 5, file_header) ? 1 : 0;
+                                       match = !strcmp(node->subclass_name + 5, file_header) ? 1 : 0;
                                }
                        } else if (!strncasecmp(node->subclass_name, "func:", 5)) {
                                char *func_header;
                                if ((func_header = switch_event_get_header(event, "function")) != 0) {
-                                       match = strstr(node->subclass_name + 5, func_header) ? 1 : 0;
+                                       match = !strcmp(node->subclass_name + 5, func_header) ? 1 : 0;
                                }
                        } else if (event->subclass_name && node->subclass_name) {
-                               match = strstr(event->subclass_name, node->subclass_name) ? 1 : 0;
+                               match = !strcmp(event->subclass_name, node->subclass_name) ? 1 : 0;
                        }
                } else if ((event->subclass_name && !node->subclass_name) || (!event->subclass_name && !node->subclass_name)) {
                        match = 1;