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

update 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@158 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2005-12-15 20:20:57 +00:00
parent 48e62491e1
commit b09fedf7e0
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/switch_event.h
View File

@ -60,6 +60,8 @@ struct switch_event_node {
struct switch_event_node *next;
};
#define SWITCH_EVENT_SUBCLASS_ANY NULL
SWITCH_DECLARE(switch_status) switch_event_shutdown(void);
SWITCH_DECLARE(switch_status) switch_event_init(switch_memory_pool *pool);
SWITCH_DECLARE(switch_status) switch_event_fire_subclass(switch_event_t event, char *subclass_name, char *data);

6
src/mod/mod_event_test/mod_event_test.c
View File

@ -61,7 +61,11 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_load(switch_loadable_module_inte
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Couldn't register subclass!");
return SWITCH_STATUS_GENERR;
}
switch_event_bind((char *)modname, SWITCH_EVENT_ALL, NULL, event_handler, NULL);
if (switch_event_bind((char *)modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) {
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Couldn't bind!\n");
return SWITCH_STATUS_GENERR;
}
/* indicate that the module should continue to be loaded */
return SWITCH_STATUS_SUCCESS;

19
src/switch_event.c
View File

@ -64,22 +64,25 @@ static int switch_events_match(switch_event *event, switch_event_node *node)
if (node->event == SWITCH_EVENT_ALL) {
return 1;
match++;
if (!node->subclass) {
return match;
}
}
if (event->event == node->event) {
if (match || event->event == node->event) {
if (node->subclass) {
match = (event->subclass && strstr(event->subclass->name, node->subclass->name));
} else if (event->subclass) {
if (event->subclass && node->subclass) {
match = strstr(event->subclass->name, node->subclass->name) ? 1 : 0;
} else if (event->subclass && !node->subclass) {
match = 1;
} else {
match = 0;
}
}
return match;
}
static void * SWITCH_THREAD_FUNC switch_event_thread(switch_thread *thread, void *obj)