[SR-Dev] git:master: Switch to the openser module interface version
Jan Janak
jan at iptel.org
Fri Mar 27 18:50:08 CET 2009
Module: sip-router
Branch: master
Commit: 7c0dd0275e94eb2c9ad787241952dcfc1c3e4ed9
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7c0dd0275e94eb2c9ad787241952dcfc1c3e4ed9
Author: Jan Janak <jan at iptel.org>
Committer: Jan Janak <jan at iptel.org>
Date: Fri Mar 27 18:36:18 2009 +0100
Switch to the openser module interface version
We need to switch the tls module to the openser version of module
interface in order to make all the tls related pseudo-variables
available.
This comes with a price, we won't be able to use the TLS rpc
commands temporarily because they can only be exported through
the SER version of the module interface. But there are only two
functions available through the rpc interface anyway and not
having them harms less than not having the pseudo-variables.
---
modules/tls/Makefile | 2 +-
modules/tls/tls_mod.c | 21 ++++++++++++---------
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/modules/tls/Makefile b/modules/tls/Makefile
index 8c2671b..30dacf4 100644
--- a/modules/tls/Makefile
+++ b/modules/tls/Makefile
@@ -17,6 +17,6 @@ LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl -lcrypto \
# E.g.: make TLS_HOOKS=1 TLS_EXTRA_LIBS="-lz -lkrb5"
-DEFS+=-DSER_MOD_INTERFACE
+DEFS+=-DOPENSER_MOD_INTERFACE
include ../../Makefile.modules
diff --git a/modules/tls/tls_mod.c b/modules/tls/tls_mod.c
index 7c1b56a..8e45043 100644
--- a/modules/tls/tls_mod.c
+++ b/modules/tls/tls_mod.c
@@ -220,15 +220,18 @@ static param_export_t params[] = {
* Module interface
*/
struct module_exports exports = {
- "tls",
- cmds, /* Exported functions */
- tls_rpc, /* RPC methods */
- params, /* Exported parameters */
- mod_init, /* module initialization function */
- 0, /* response function*/
- destroy, /* destroy function */
- 0, /* cancel function */
- mod_child /* per-child init function */
+ "tlsops",
+ DEFAULT_DLFLAGS, /* dlopen flags */
+ cmds, /* Exported functions */
+ params, /* Exported parameters */
+ 0, /* exported statistics */
+ 0, /* exported MI functions */
+ tls_pv, /* exported pseudo-variables */
+ 0, /* extra processes */
+ mod_init, /* module initialization function */
+ 0, /* response function */
+ destroy, /* destroy function */
+ mod_child /* child initialization function */
};
More information about the sr-dev
mailing list