mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 18:55:19 +00:00 
			
		
		
		
	merge new_loader_completion branch, including (at least):
- restructured build tree and makefiles to eliminate recursion problems - support for embedded modules - support for static builds - simpler cross-compilation support - simpler module/loader interface (no exported symbols) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		| @@ -44,8 +44,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") | ||||
| #include "asterisk/app.h" | ||||
| #include "asterisk/options.h" | ||||
|  | ||||
| static char *tdesc = "Image Transmission Application"; | ||||
|  | ||||
| static char *app = "SendImage"; | ||||
|  | ||||
| static char *synopsis = "Send an image file"; | ||||
| @@ -61,12 +59,11 @@ static char *descrip = | ||||
| "	SENDIMAGESTATUS		The status is the result of the attempt as a text string, one of\n" | ||||
| "		OK | NOSUPPORT \n";			 | ||||
|  | ||||
| LOCAL_USER_DECL; | ||||
|  | ||||
| static int sendimage_exec(struct ast_channel *chan, void *data) | ||||
| { | ||||
| 	int res = 0; | ||||
| 	struct localuser *u; | ||||
| 	struct ast_module_user *u; | ||||
| 	char *parse; | ||||
| 	int priority_jump = 0; | ||||
| 	AST_DECLARE_APP_ARGS(args, | ||||
| @@ -74,7 +71,7 @@ static int sendimage_exec(struct ast_channel *chan, void *data) | ||||
| 		AST_APP_ARG(options); | ||||
| 	); | ||||
| 	 | ||||
| 	LOCAL_USER_ADD(u); | ||||
| 	u = ast_module_user_add(chan); | ||||
|  | ||||
| 	parse = ast_strdupa(data); | ||||
|  | ||||
| @@ -95,7 +92,7 @@ static int sendimage_exec(struct ast_channel *chan, void *data) | ||||
| 		if (priority_jump || ast_opt_priority_jumping) | ||||
| 			ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 101); | ||||
| 		pbx_builtin_setvar_helper(chan, "SENDIMAGESTATUS", "NOSUPPORT"); | ||||
| 		LOCAL_USER_REMOVE(u); | ||||
| 		ast_module_user_remove(u); | ||||
| 		return 0; | ||||
| 	} | ||||
|  | ||||
| @@ -104,35 +101,25 @@ static int sendimage_exec(struct ast_channel *chan, void *data) | ||||
| 	if (!res) | ||||
| 		pbx_builtin_setvar_helper(chan, "SENDIMAGESTATUS", "OK"); | ||||
| 	 | ||||
| 	LOCAL_USER_REMOVE(u); | ||||
| 	ast_module_user_remove(u); | ||||
| 	 | ||||
| 	return res; | ||||
| } | ||||
|  | ||||
| static int unload_module(void *mod) | ||||
| static int unload_module(void) | ||||
| { | ||||
| 	int res; | ||||
|  | ||||
| 	res = ast_unregister_application(app); | ||||
|  | ||||
| 	STANDARD_HANGUP_LOCALUSERS; | ||||
| 	ast_module_user_hangup_all(); | ||||
|  | ||||
| 	return res;  | ||||
| } | ||||
|  | ||||
| static int load_module(void *mod) | ||||
| static int load_module(void) | ||||
| { | ||||
| 	return ast_register_application(app, sendimage_exec, synopsis, descrip); | ||||
| } | ||||
|  | ||||
| static const char *description(void) | ||||
| { | ||||
| 	return tdesc; | ||||
| } | ||||
|  | ||||
| static const char *key(void) | ||||
| { | ||||
| 	return ASTERISK_GPL_KEY; | ||||
| } | ||||
|  | ||||
| STD_MOD1; | ||||
| AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Image Transmission Application"); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user