kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-8928: flag a bidning error when using EventConsumer::bind with invalid event name instead of blindly using custom

This commit is contained in:
Michael Jerris 2016-03-17 12:51:35 -05:00
parent f5050b1c40
commit 94d28e0fd6
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/switch_cpp.cpp
View File

@ -67,12 +67,15 @@ SWITCH_DECLARE_CONSTRUCTOR EventConsumer::EventConsumer(const char *event_name,
SWITCH_DECLARE(int) EventConsumer::bind(const char *event_name, const char *subclass_name) SWITCH_DECLARE(int) EventConsumer::bind(const char *event_name, const char *subclass_name)
{ {
switch_event_types_t event_id = SWITCH_EVENT_CUSTOM; switch_event_types_t event_id = SWITCH_EVENT_CUSTOM;
switch_name_event(event_name, &event_id);
if (!ready) { if (!ready) {
return 0; return 0;
} }
if (switch_name_event(event_name, &event_id) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't bind to %s, event not found\n", event_name);
return 0;
}
if (zstr(subclass_name)) { if (zstr(subclass_name)) {
subclass_name = NULL; subclass_name = NULL;
@ -83,10 +86,10 @@ SWITCH_DECLARE(int) EventConsumer::bind(const char *event_name, const char *subc
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "bound to %s %s\n", event_name, switch_str_nil(subclass_name)); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "bound to %s %s\n", event_name, switch_str_nil(subclass_name));
node_index++; node_index++;
return 1; return 1;
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot bind to %s %s\n", event_name, switch_str_nil(subclass_name));
return 0;
} }
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot bind to %s %s\n", event_name, switch_str_nil(subclass_name));
return 0;
} }