mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 02:37:10 +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:
		| @@ -45,8 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") | ||||
|  | ||||
| static char *synopsis = "Wait for Ring Application"; | ||||
|  | ||||
| static char *tdesc = "Waits until first ring after time"; | ||||
|  | ||||
| static char *desc = "  WaitForRing(timeout)\n" | ||||
| "Returns 0 after waiting at least timeout seconds. and\n" | ||||
| "only after the next ring has completed.  Returns 0 on\n" | ||||
| @@ -54,11 +52,10 @@ static char *desc = "  WaitForRing(timeout)\n" | ||||
|  | ||||
| static char *app = "WaitForRing"; | ||||
|  | ||||
| LOCAL_USER_DECL; | ||||
|  | ||||
| static int waitforring_exec(struct ast_channel *chan, void *data) | ||||
| { | ||||
| 	struct localuser *u; | ||||
| 	struct ast_module_user *u; | ||||
| 	struct ast_frame *f; | ||||
| 	int res = 0; | ||||
| 	int ms; | ||||
| @@ -68,7 +65,7 @@ static int waitforring_exec(struct ast_channel *chan, void *data) | ||||
| 		return 0; | ||||
| 	} | ||||
|  | ||||
| 	LOCAL_USER_ADD(u); | ||||
| 	u = ast_module_user_add(chan); | ||||
|  | ||||
| 	ms *= 1000; | ||||
| 	while(ms > 0) { | ||||
| @@ -115,35 +112,25 @@ static int waitforring_exec(struct ast_channel *chan, void *data) | ||||
| 			} | ||||
| 		} | ||||
| 	} | ||||
| 	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, waitforring_exec, synopsis, desc); | ||||
| } | ||||
|  | ||||
| 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, "Waits until first ring after time"); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user