diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-08-21 02:11:39 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-08-21 02:11:39 +0000 |
| commit | 0a27d8bfe5fa36d8cb600b5b520f9b5c7fbf0ed6 (patch) | |
| tree | 270b9c46c1e644483d6d2a35b509f43218ba3252 /res/res_crypto.c | |
| parent | f60ada0be22cd646454278e102d384a5dbaf7d59 (diff) | |
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
Diffstat (limited to 'res/res_crypto.c')
| -rw-r--r-- | res/res_crypto.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/res/res_crypto.c b/res/res_crypto.c index b9b973eea..3fab770e6 100644 --- a/res/res_crypto.c +++ b/res/res_crypto.c @@ -1,7 +1,7 @@ /* * Asterisk -- An open source telephony toolkit. * - * Copyright (C) 1999 - 2005, Digium, Inc. + * Copyright (C) 1999 - 2006, Digium, Inc. * * Mark Spencer <markster@digium.com> * @@ -585,13 +585,13 @@ static int crypto_init(void) return 0; } -static int reload(void *mod) +static int reload(void) { crypto_load(-1, -1); return 0; } -static int load_module(void *mod) +static int load_module(void) { crypto_init(); if (ast_opt_init_keys) @@ -601,21 +601,15 @@ static int load_module(void *mod) return 0; } -static int unload_module(void *mod) +static int unload_module(void) { /* Can't unload this once we're loaded */ return -1; } -static const char *description(void) -{ - return "Cryptographic Digital Signatures"; -} - -static const char *key(void) -{ - return ASTERISK_GPL_KEY; -} - -STD_MOD(MOD_0 | NO_USECOUNT | NO_UNLOAD, reload, NULL, NULL); - +/* needs usecount semantics defined */ +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Cryptographic Digital Signatures", + .load = load_module, + .unload = unload_module, + .reload = reload + ); |