kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-15 17:27:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modules: Make ast_module_info->self available to auxiliary sources.

Browse Source 
ast_module_info->self is often needed to register items with the core.  Many
modules have ad-hoc code to make this pointer available to auxiliary sources.
This change updates the module build process to make the needed information
available to all sources in a module.

ASTERISK-25056 #close
Reported by: Corey Farrell

Change-Id: I18c8cd58fbcb1b708425f6757becaeca9fa91815
This commit is contained in:
Corey Farrell
2015-05-04 15:26:37 -04:00
parent ce21776aae
commit a8bfa9e104
34 changed files with 82 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main/parking.c
View File

@@ -134,8 +134,8 @@ int ast_parking_park_bridge_channel(struct ast_bridge_channel *parkee, const cha
return -1;
}
if (table->module_info) {
SCOPED_MODULE_USE(table->module_info->self);
if (table->module) {
SCOPED_MODULE_USE(table->module);
return table->parking_park_bridge_channel(parkee, parkee_uuid, parker_uuid, app_data);
}
@@ -153,8 +153,8 @@ int ast_parking_blind_transfer_park(struct ast_bridge_channel *parker,
return -1;
}
if (table->module_info) {
SCOPED_MODULE_USE(table->module_info->self);
if (table->module) {
SCOPED_MODULE_USE(table->module);
return table->parking_blind_transfer_park(parker, context, exten, parked_channel_cb, parked_channel_data);
}
@@ -170,8 +170,8 @@ int ast_parking_park_call(struct ast_bridge_channel *parker, char *exten, size_t
return -1;
}
if (table->module_info) {
SCOPED_MODULE_USE(table->module_info->self);
if (table->module) {
SCOPED_MODULE_USE(table->module);
return table->parking_park_call(parker, exten, length);
}
@@ -187,8 +187,8 @@ int ast_parking_is_exten_park(const char *context, const char *exten)
return -1;
}
if (table->module_info) {
SCOPED_MODULE_USE(table->module_info->self);
if (table->module) {
SCOPED_MODULE_USE(table->module);
return table->parking_is_exten_park(context, exten);
}