sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix menuselect display for stasis modules. 

The menuselect parser is very simple.  It looks for AST_MODULE_INFO and
uses any quoted string on that line as the module summary display.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392777 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett 2013-06-24 21:40:52 +00:00
parent 463470bb6e
commit b5f18d1677
26 changed files with 33 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app_stasis.c
View File

@ -106,9 +106,7 @@ static int unload_module(void)
return r;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY,
AST_MODFLAG_DEFAULT,
"Stasis dialplan application",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Stasis dialplan application",
.load = load_module,
.unload = unload_module,
.nonoptreq = "res_stasis",

4
res/res_chan_stats.c
View File

@ -179,9 +179,7 @@ static int unload_module(void)
return 0;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY,
AST_MODFLAG_DEFAULT,
"Example of how to use Stasis",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Example of how to use Stasis",
.load = load_module,
.unload = unload_module,
.nonoptreq = "res_statsd"

8
res/res_stasis.c
View File

@ -1018,7 +1018,7 @@ static int unload_module(void)
return r;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS,
"Stasis application support",
.load = load_module,
.unload = unload_module);
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis application support",
.load = load_module,
.unload = unload_module,
);

3
res/res_stasis_answer.c
View File

@ -75,8 +75,7 @@ static int unload_module(void)
return 0;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS,
"Stasis application answer support",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis application answer support",
.load = load_module,
.unload = unload_module,
.nonoptreq = "res_stasis");

3
res/res_stasis_bridge_add.c
View File

@ -66,8 +66,7 @@ static int unload_module(void)
return 0;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS,
"Stasis application bridge add channel support",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis application bridge add channel support",
.load = load_module,
.unload = unload_module,
.nonoptreq = "res_stasis");

4
res/res_stasis_http.c
View File

@ -937,9 +937,7 @@ static int reload_module(void)
return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY,
AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER,
"Stasis HTTP bindings",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis HTTP bindings",
.load = load_module,
.unload = unload_module,
.reload = reload_module,

3
res/res_stasis_http_asterisk.c
View File

@ -99,8 +99,7 @@ static int unload_module(void)
return 0;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT,
"RESTful API module - Asterisk resources",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Asterisk resources",
.load = load_module,
.unload = unload_module,
.nonoptreq = "res_stasis_http,res_stasis",

3
res/res_stasis_http_bridges.c
View File

@ -287,8 +287,7 @@ static int unload_module(void)
return 0;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT,
"RESTful API module - Bridge resources",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Bridge resources",
.load = load_module,
.unload = unload_module,
.nonoptreq = "res_stasis_http,res_stasis",

3
res/res_stasis_http_channels.c
View File

@ -521,8 +521,7 @@ static int unload_module(void)
return 0;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT,
"RESTful API module - Channel resources",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Channel resources",
.load = load_module,
.unload = unload_module,
.nonoptreq = "res_stasis_http,res_stasis",

3
res/res_stasis_http_endpoints.c
View File

@ -150,8 +150,7 @@ static int unload_module(void)
return 0;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT,
"RESTful API module - Endpoint resources",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Endpoint resources",
.load = load_module,
.unload = unload_module,
.nonoptreq = "res_stasis_http,res_stasis",

3
res/res_stasis_http_events.c
View File

@ -91,8 +91,7 @@ static int unload_module(void)
return 0;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT,
"RESTful API module - WebSocket resource",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - WebSocket resource",
.load = load_module,
.unload = unload_module,
.nonoptreq = "res_stasis_http,res_stasis",

3
res/res_stasis_http_playback.c
View File

@ -160,8 +160,7 @@ static int unload_module(void)
return 0;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT,
"RESTful API module - Playback control resources",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Playback control resources",
.load = load_module,
.unload = unload_module,
.nonoptreq = "res_stasis_http,res_stasis",

3
res/res_stasis_http_recordings.c
View File

@ -394,8 +394,7 @@ static int unload_module(void)
return 0;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT,
"RESTful API module - Recording resources",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Recording resources",
.load = load_module,
.unload = unload_module,
.nonoptreq = "res_stasis_http,res_stasis",

3
res/res_stasis_http_sounds.c
View File

@ -126,8 +126,7 @@ static int unload_module(void)
return 0;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT,
"RESTful API module - Sound resources",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Sound resources",
.load = load_module,
.unload = unload_module,
.nonoptreq = "res_stasis_http,res_stasis",

3
res/res_stasis_json_asterisk.c
View File

@ -52,8 +52,7 @@ static int unload_module(void)
return 0;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER,
"Stasis JSON Generators and Validators - Asterisk resources",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis JSON Generators and Validators - Asterisk resources",
.load = load_module,
.unload = unload_module,
.load_pri = AST_MODPRI_DEFAULT,

3
res/res_stasis_json_bridges.c
View File

@ -52,8 +52,7 @@ static int unload_module(void)
return 0;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER,
"Stasis JSON Generators and Validators - Bridge resources",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis JSON Generators and Validators - Bridge resources",
.load = load_module,
.unload = unload_module,
.load_pri = AST_MODPRI_DEFAULT,

3
res/res_stasis_json_channels.c
View File

@ -52,8 +52,7 @@ static int unload_module(void)
return 0;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER,
"Stasis JSON Generators and Validators - Channel resources",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis JSON Generators and Validators - Channel resources",
.load = load_module,
.unload = unload_module,
.load_pri = AST_MODPRI_DEFAULT,

3
res/res_stasis_json_endpoints.c
View File

@ -52,8 +52,7 @@ static int unload_module(void)
return 0;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER,
"Stasis JSON Generators and Validators - Endpoint resources",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis JSON Generators and Validators - Endpoint resources",
.load = load_module,
.unload = unload_module,
.load_pri = AST_MODPRI_DEFAULT,

3
res/res_stasis_json_events.c
View File

@ -811,8 +811,7 @@ static int unload_module(void)
return 0;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER,
"Stasis JSON Generators and Validators - WebSocket resource",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis JSON Generators and Validators - WebSocket resource",
.load = load_module,
.unload = unload_module,
.load_pri = AST_MODPRI_DEFAULT,

3
res/res_stasis_json_playback.c
View File

@ -52,8 +52,7 @@ static int unload_module(void)
return 0;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER,
"Stasis JSON Generators and Validators - Playback control resources",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis JSON Generators and Validators - Playback control resources",
.load = load_module,
.unload = unload_module,
.load_pri = AST_MODPRI_DEFAULT,

3
res/res_stasis_json_recordings.c
View File

@ -52,8 +52,7 @@ static int unload_module(void)
return 0;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER,
"Stasis JSON Generators and Validators - Recording resources",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis JSON Generators and Validators - Recording resources",
.load = load_module,
.unload = unload_module,
.load_pri = AST_MODPRI_DEFAULT,

3
res/res_stasis_json_sounds.c
View File

@ -52,8 +52,7 @@ static int unload_module(void)
return 0;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER,
"Stasis JSON Generators and Validators - Sound resources",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis JSON Generators and Validators - Sound resources",
.load = load_module,
.unload = unload_module,
.load_pri = AST_MODPRI_DEFAULT,

3
res/res_stasis_playback.c
View File

@ -480,8 +480,7 @@ static int unload_module(void)
return 0;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS,
"Stasis application playback support",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis application playback support",
.load = load_module,
.unload = unload_module,
.nonoptreq = "res_stasis");

9
res/res_stasis_test.c
View File

@ -103,8 +103,9 @@ struct stasis_message_sink *stasis_message_sink_create(void)
* Why the roundabout way of exposing this via stasis_message_sink_cb()? Well,
* it has to do with how we load modules.
*
* Modules have their own metadata compiled into them in the AST_MODULE_INFO()
* block. This includes dependency information in the \c nonoptreq field.
* Modules have their own metadata compiled into them in the module info block
* at the end of the file. This includes dependency information in the
* \c nonoptreq field.
*
* Asterisk loads the module, inspects the field, then loads any needed
* dependencies. This works because Asterisk passes \c RTLD_LAZY to the initial
@ -274,9 +275,7 @@ static int load_module(void)
return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY,
AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER,
"Stasis test utilities",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis test utilities",
.load = load_module,
.unload = unload_module,
.load_pri = AST_MODPRI_APP_DEPEND,

5
res/res_stasis_websocket.c
View File

@ -285,10 +285,9 @@ static int unload_module(void)
return r;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER,
"Stasis HTTP bindings",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Stasis HTTP bindings",
.load = load_module,
.unload = unload_module,
.nonoptreq = "res_stasis,res_http_websocket",
.load_pri = AST_MODPRI_APP_DEPEND,
);
);

4
res/res_statsd.c
View File

@ -316,9 +316,7 @@ static int reload_module(void)
/* The priority of this module is set to be as low as possible, since it could
* be used by any other sort of module.
*/
AST_MODULE_INFO(ASTERISK_GPL_KEY,
AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER,
"Statsd client support",
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Statsd client support",
.load = load_module,
.unload = unload_module,
.reload = reload_module,