@@ -236,6 +236,7 @@ struct module_exports exports= {

 	params,     /* exported params */

 	0,          /* exported statistics */

 	0,          /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	mod_init,   /* initialization module */

 	0,          /* response function */

 	destroy,    /* destroy function */

@@ -100,6 +100,7 @@ struct module_exports exports = {

 	params,     /* Exported parameters */

 	0,          /* exported statistics */

 	0,          /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	mod_init,   /* module initialization function */

 	0,          /* response function */

 	destroy,    /* destroy function */

@@ -153,6 +153,7 @@ struct module_exports exports = {

 	params,

 	0,          /* exported statistics */

 	0,          /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	mod_init,   /* module initialization function */

 	0,          /* response function */

 	destroy,    /* destroy function */

@@ -147,6 +147,7 @@ struct module_exports exports = {

 	params,     /* Exported parameters */

 	0,          /* exported statistics */

 	0,          /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	mod_init,   /* module initialization function */

 	0,          /* response function */

 	destroy,    /* destroy function */

@@ -105,6 +105,7 @@ struct module_exports exports = {

 	params,        /* Exported parameters */

 	0,             /* exported statistics */

 	0,             /* exported MI functions */

+	0,             /* exported pseudo-variables */

 	mod_init,      /* module initialization function */

 	0,             /* response function */

 	0,             /* destroy function */

@@ -95,6 +95,7 @@ struct module_exports exports = {

 	params,     /* Exported parameters */

 	0,          /* exported statistics */

 	0,          /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	mod_init,   /* module initialization function */

 	0,          /* response function */

 	0,          /* destroy function */

@@ -99,6 +99,7 @@ struct module_exports exports = {

 	params,    /* Exported parameters */

 	0,         /* exported statistics */

 	0,         /* exported MI functions */

+	0,         /* exported pseudo-variables */

 	mod_init,  /* module initialization function */

 	0,         /* response function*/

 	0,         /* destroy function */

@@ -156,6 +156,7 @@ struct module_exports exports = {

 	params,     /* Exported parameters */

 	0,          /* exported statistics */

 	0,          /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	avpops_init,/* Module initialization function */

 	(response_function) 0,

 	(destroy_function) 0,

@@ -170,6 +170,7 @@ struct module_exports exports = {

 	params,   /* Exported parameters */

 	0,        /* exported statistics */

 	mi_cmds,  /* exported MI functions */

+	0,        /* exported pseudo-variables */

 	cpl_init, /* Module initialization function */

 	(response_function) 0,

 	(destroy_function) cpl_exit,

@@ -73,6 +73,7 @@ struct module_exports exports = {

 	params,   /* Exported parameters */

 	0,        /* exported statistics */

 	0,        /* exported MI functions */

+	0,        /* exported pseudo-variables */

 	mod_init, /* module initialization function */

 	0,        /* response function*/

 	destroy,  /* destroy function */

@@ -112,6 +112,7 @@ struct module_exports exports= {

 	mod_params,      /* param exports */

 	mod_stats,       /* exported statistics */

 	mi_cmds,         /* exported MI functions */

+	0,               /* exported pseudo-variables */

 	mod_init,        /* module initialization function */

 	0,               /* reply processing function */

 	mod_destroy,

@@ -113,6 +113,7 @@ struct module_exports exports= {

 	params,

 	0,          /* exported statistics */

 	mi_cmds,    /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	mod_init,   /* module initialization function */

 	(response_function) 0,

 	(destroy_function) destroy,

@@ -84,6 +84,7 @@ struct module_exports exports = {

 	params,     /* Exported parameters */

 	0,          /* exported statistics */

 	0,          /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	mod_init,   /* module initialization function */

 	0,          /* response function */

 	0,          /* destroy function */

@@ -131,6 +131,7 @@ struct module_exports exports = {

 	params,    /* Exported parameters */

 	0,         /* exported statistics */

 	mi_cmds,   /* exported MI functions */

+	0,         /* exported pseudo-variables */

 	mod_init,  /* module initialization function */

 	0,         /* response function*/

 	destroy,   /* destroy function */

@@ -139,6 +139,7 @@ struct module_exports exports = {

 	params,    /* exported parameters */

 	0,         /* exported statistics */

 	0,         /* exported MI functions */

+	0,         /* exported pseudo-variables */

 	mod_init,  /* module initialization function */

 	0,         /* response function*/

 	destroy,   /* destroy function */

@@ -116,6 +116,7 @@ struct module_exports exports = {

 	params,   /* Exported parameters */

 	0,        /* exported statistics */

 	0,        /* exported MI functions */

+	0,        /* exported pseudo-variables */

 	mod_init, /* module initialization function */

 	0,        /* response function*/

 	0,        /* destroy function */

@@ -84,6 +84,7 @@ struct module_exports exports= {

 	params,         /* Exported parameters */

 	0,              /* exported statistics */

 	0,              /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	mod_init, 	/* initialization module */

 	0,		/* response function */

 	exec_shutdown,	/* destroy function */

@@ -103,6 +103,7 @@ struct module_exports exports = {

 	params,      /*  module parameters */

 	0,           /* exported statistics */

 	mi_cmds,     /* exported MI functions */

+	0,           /* exported pseudo-variables */

 	mod_init,    /* module initialization function */

 	0,           /* response function*/

 	mod_destroy, /* destroy function */

@@ -110,6 +110,7 @@ struct module_exports exports = {

 	params,      /* exported parameters */

 	0,           /* exported statistics */

 	mi_cmds,     /* exported MI functions */

+	0,           /* exported pseudo-variables */

 	mod_init,    /* module initialization function */

 	0,           /* response function*/

 	mod_destroy, /* destroy function */

@@ -158,6 +158,7 @@ struct module_exports exports = {

 	params,     /* Exported parameters */

 	0,          /* exported statistics */

 	0,          /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	mod_init,   /* module initialization function */

 	0,          /* response function */

 	destroy,    /* destroy function */

@@ -85,6 +85,7 @@ struct module_exports exports = {

 	params,     /* Exported parameters */

 	0,          /* exported statistics */

 	0,          /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	mod_init,   /* module initialization function */

 	0,          /* response function */

 	0,          /* destroy function */

@@ -148,6 +148,7 @@ struct module_exports exports= {

 	0,          /* exported statistics */

 #endif

 	mi_cmds,    /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	mod_init,   /* mod init */

 	(response_function) 0,       /* response handler */

 	(destroy_function) destroy,  /* destroy function */

@@ -172,6 +172,7 @@ struct module_exports exports= {

 	params,     /* Exported parameters */

 	0,          /* exported statistics */

 	0,          /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	mod_init,   /* module initialization function */

 	(response_function) 0,

 	(destroy_function) destroy,

@@ -309,6 +309,7 @@ struct module_exports exports = {

 	params,    /* Exported parameters */

 	0,         /* exported statistics */

 	mi_cmds,   /* exported MI functions */

+	0,         /* exported pseudo-variables */

 	mod_init,  /* module initialization function */

 	0,         /* response function */

 	destroy,   /* destroy function */

@@ -112,6 +112,7 @@ struct module_exports exports = {

 	params,			/* Exported parameters */

 	0,				/* exported statistics */

 	0,				/* exported MI functions */

+	0,              /* exported pseudo-variables */

 	mod_init,		/* module initialization function */

 	0,				/* response function */

 	destroy,		/* destroy function */

@@ -82,6 +82,7 @@ struct module_exports exports= {

 	params,

 	0,          /* exported statistics */

 	0,          /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	mod_init,

 	(response_function) 0,

 	(destroy_function) 0,

@@ -220,6 +220,7 @@ struct module_exports exports = {

     parameters,   // module exported parameters

     NULL,         // exported statistics

     NULL,         /* exported MI functions */

+	NULL,         /* exported pseudo-variables */

     mod_init,     // module init (before any kid is created. kids will inherit)

     NULL,         // reply processing

     NULL,         // destroy function

@@ -86,6 +86,7 @@ struct module_exports exports = {

 	mi_params,                     /* exported parameters */

 	0,                             /* exported statistics */

 	0,                             /* exported MI functions */

+	0,                             /* exported pseudo-variables */

 	mi_mod_init,                   /* module initialization function */

 	(response_function) 0,         /* response handling function */

 	(destroy_function) mi_destroy, /* destroy function */

@@ -229,6 +229,7 @@ struct module_exports exports= {

 	0,          /* exported statistics */

 #endif

 	0,          /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	mod_init,   /* module initialization function */

 	(response_function) 0,       /* response handler */

 	(destroy_function) destroy,  /* module destroy function */

@@ -356,6 +356,7 @@ struct module_exports exports = {

 	params,

 	0, /* exported statistics */

 	0, /* exported MI functions */

+	0, /* exported pseudo-variables */

 	mod_init,

 	0, /* reply processing */

 	0, /* destroy function */

@@ -76,6 +76,7 @@ struct module_exports exports = {

 	params,          /* Exported parameters */

 	0,               /* exported statistics */

 	0,               /* exported MI functions */

+	0,               /* exported pseudo-variables */

 	mod_init,        /* Initialization function */

 	0,               /* Response function */

 	0,               /* Destroy function */

@@ -116,6 +116,7 @@ struct module_exports exports = {

     params,

     0,            /* exported statistics */

     0,            /* exported MI functions */

+	0,            /* exported pseudo-variables */

     ospInitMod,   /* module initialization function */

     0,            /* response function*/

     ospDestMod,   /* destroy function */

@@ -131,6 +131,7 @@ struct module_exports exports = {

 	params,      /* Exported parameters */

 	0,           /* exported statistics */

 	0,           /* exported MI functions */

+	0,           /* exported pseudo-variables */

 	pa_mod_init, /* module initialization function */

 	0,           /* response function*/

 	pa_destroy,  /* destroy function */

@@ -98,6 +98,7 @@ struct module_exports exports = {

 	params,     /* Exported parameters */

 	0,          /* exported statistics */

 	0,          /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	mod_init,   /* module initialization function */

 	0,          /* response function */

 	destroy,    /* destroy function */

@@ -141,6 +141,7 @@ struct module_exports exports = {

 	params,

 	0,

 	mi_cmds,        /* exported MI functions */

+	0,              /* exported pseudo-variables */

 	mod_init,       /* module initialization function */

 	0,              /* response function */

 	mod_destroy,    /* destroy function */

@@ -189,6 +189,7 @@ struct module_exports exports = {

 	params,    /* Exported parameters */

 	0,         /* exported statistics */

 	mi_cmds,   /* exported MI functions */

+	0,         /* exported pseudo-variables */

 	mod_init,  /* module initialization function */

 	0,         /* response function */

 	mod_exit,  /* destroy function */

@@ -87,6 +87,7 @@ struct module_exports exports= {

 	params,

 	0,           /* exported statistics */

 	0,           /* exported MI functions */

+	0,           /* exported pseudo-variables */

 	pike_init,   /* module initialization function */

 	(response_function) 0,

 	(destroy_function) pike_exit,   /* module exit function */

@@ -62,6 +62,7 @@ struct module_exports exports = {

 	0,   /*  module parameters */

 	0,   /* exported statistics */

 	0,   /* exported MI functions */

+	0,        /* exported pseudo-variables */

 	mod_init, /* module initialization function */

 	0,        /* response function*/

 	0,        /* destroy function */

@@ -126,6 +126,7 @@ struct module_exports exports= {

 	params,     /* exported parameters */

 	0,          /* exported statistics */

 	0  ,        /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	mod_init,   /* module initialization function */

 	(response_function) 0,      /* response handling function */

 	(destroy_function) destroy, /* destroy function */

@@ -186,6 +186,7 @@ struct module_exports exports = {

 	params,      /* Exported parameters */

 	0,           /* exported statistics */

 	0,           /* exported MI functions */

+	0,           /* exported pseudo-variables */

 	mod_init,    /* module initialization function */

 	0,

 	mod_destroy, /* destroy function */

@@ -125,6 +125,7 @@ struct module_exports exports = {

 	params,      /* Exported parameters */

 	0,           /* exported statistics */

 	0,           /* exported MI functions */

+	0,           /* exported pseudo-variables */

 	mod_init,    /* initialize module */

 	0,           /* response function*/

 	mod_destroy, /* destroy function */

@@ -161,6 +161,7 @@ struct module_exports exports = {

 	0,          /* exported statistics */

 #endif

 	mi_cmds,    /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	mod_init,   /* module initialization function */

 	0,          /* response function */

 	destroy,    /* destroy function */

@@ -112,6 +112,7 @@ struct module_exports exports= {

 	mod_params,   /* param exports */

 	mod_stats,    /* exported statistics */

 	0,            /* exported MI functions */

+	0,            /* exported pseudo-variables */

 	mod_init,     /* module initialization function */

 	0,            /* reply processing function */

 	mod_destroy,

@@ -107,6 +107,7 @@ struct module_exports exports= {

 	params,

 	0,          /* exported statistics */

 	0,          /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	sms_init,   /* module initialization function */

 	(response_function) 0,

 	(destroy_function) sms_exit,   /* module exit function */

@@ -100,6 +100,7 @@ struct module_exports exports = {

 	params,     /* Exported parameters */

 	0,          /* exported statistics */

 	0,          /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	mod_init,   /* module initialization function */

 	0,          /* response function */

 	destroy,    /* destroy function */

@@ -120,6 +120,7 @@ struct module_exports exports= {

 	mod_params,   /* param exports */

 	mod_stats,    /* exported statistics */

 	0,            /* exported MI functions */

+	0,            /* exported pseudo-variables */

 	mod_init,     /* module initialization function */

 	0,            /* reply processing function */

 	0,            /* Destroy function */

@@ -67,6 +67,7 @@ struct module_exports exports= {

 	mod_params,   /* param exports */

 	0,            /* exported statistics */

 	0,            /* exported MI functions */

+	0,            /* exported pseudo-variables */

 	mod_init,     /* module initialization function */

 	0,            /* reply processing function */

 	0,            /* module destroy function */

@@ -177,6 +177,7 @@ struct module_exports exports= {

 	0,          /* module parameters */

 	0,          /* exported statistics */

 	0,          /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	mod_init,   /* module initialization function */

 	0,          /* response function */

 	0,          /* destroy function */

@@ -3,9 +3,10 @@

  *

  * TLS module - select interface

  *

- * Copyright (C) 2001-2003 FhG FOKUS

- * Copyright (C) 2004,2005 Free Software Foundation, Inc.

- * Copyright (C) 2006 enum.at

+ * Copyright (C)  2001-2003 FhG FOKUS

+ * Copyright (C)  2004,2005 Free Software Foundation, Inc.

+ * Copyright (C)  2005 iptelorg GmbH

+ * Copyright (C)  2006 enum.at

  *

  * This file is part of openser, a free SIP server.

  *

@@ -41,6 +41,7 @@

 #include "../../tcp_conn.h"    /* struct tcp_connection */

 #include "../../tcp_server.h"  /* tcpconn_get() */

 #include "../../sr_module.h"

+#include "../../items.h"

 MODULE_VERSION

@@ -76,75 +77,126 @@ static param_export_t params[] = {

 /*

  *  pseudo variables

  */

-static pseudo_export_t pseudos[] = {

+static item_export_t mod_items[] = {

 	/* TLS session parameters */

-	{"tls_version",      tlsops_version  , 0},

-	{"tls_description",  tlsops_desc     , 0},

-	{"tls_cipher_info",  tlsops_cipher   , 0},

-	{"tls_cipher_bits",  tlsops_bits     , 0},

+	{"tls_version",      tlsops_version,           0,

+		{{0, 0}, 0} },

+	{"tls_description",  tlsops_desc,              0,

+		{{0, 0}, 0} },

+	{"tls_cipher_info",  tlsops_cipher,            0,

+		{{0, 0}, 0} },

+	{"tls_cipher_bits",  tlsops_bits,              0,

+		{{0, 0}, 0} },

 	/* general certificate parameters for peer and local */

-	{"tls_peer_version", tlsops_cert_version, CERT_PEER  },

-	{"tls_my_version",   tlsops_cert_version, CERT_LOCAL },

-	{"tls_peer_serial",  tlsops_sn, CERT_PEER  },

-	{"tls_my_serial",    tlsops_sn, CERT_LOCAL },

+	{"tls_peer_version", tlsops_cert_version,      0,

+		{{0, 0}, CERT_PEER}  },

+	{"tls_my_version",   tlsops_cert_version,      0,

+		{{0, 0}, CERT_LOCAL} },

+	{"tls_peer_serial",  tlsops_sn,                0,

+		{{0, 0}, CERT_PEER}  },

+	{"tls_my_serial",    tlsops_sn,                0,

+		{{0, 0}, CERT_LOCAL} },

 	/* certificate parameters for peer and local, for subject and issuer*/	

-	{"tls_peer_subject", tlsops_comp     , CERT_PEER  | CERT_SUBJECT },

-	{"tls_peer_issuer",  tlsops_comp     , CERT_PEER  | CERT_ISSUER  },

-	{"tls_my_subject",   tlsops_comp     , CERT_LOCAL | CERT_SUBJECT },

-	{"tls_my_issuer",    tlsops_comp     , CERT_LOCAL | CERT_ISSUER  },

-	{"tls_peer_subject_cn", tlsops_comp     , CERT_PEER  | CERT_SUBJECT | COMP_CN },

-	{"tls_peer_issuer_cn",  tlsops_comp     , CERT_PEER  | CERT_ISSUER  | COMP_CN },

-	{"tls_my_subject_cn",   tlsops_comp     , CERT_LOCAL | CERT_SUBJECT | COMP_CN },

-	{"tls_my_issuer_cn",    tlsops_comp     , CERT_LOCAL | CERT_ISSUER  | COMP_CN },

-	{"tls_peer_subject_locality", tlsops_comp     , CERT_PEER  | CERT_SUBJECT | COMP_L },

-	{"tls_peer_issuer_locality",  tlsops_comp     , CERT_PEER  | CERT_ISSUER  | COMP_L },

-	{"tls_my_subject_locality",   tlsops_comp     , CERT_LOCAL | CERT_SUBJECT | COMP_L },

-	{"tls_my_issuer_locality",    tlsops_comp     , CERT_LOCAL | CERT_ISSUER  | COMP_L },

-	{"tls_peer_subject_country", tlsops_comp     , CERT_PEER  | CERT_SUBJECT | COMP_C },

-	{"tls_peer_issuer_country",  tlsops_comp     , CERT_PEER  | CERT_ISSUER  | COMP_C },

-	{"tls_my_subject_country",   tlsops_comp     , CERT_LOCAL | CERT_SUBJECT | COMP_C },

-	{"tls_my_issuer_country",    tlsops_comp     , CERT_LOCAL | CERT_ISSUER  | COMP_C },

-	{"tls_peer_subject_state", tlsops_comp     , CERT_PEER  | CERT_SUBJECT | COMP_ST },

-	{"tls_peer_issuer_state",  tlsops_comp     , CERT_PEER  | CERT_ISSUER  | COMP_ST },

-	{"tls_my_subject_state",   tlsops_comp     , CERT_LOCAL | CERT_SUBJECT | COMP_ST },

-	{"tls_my_issuer_state",    tlsops_comp     , CERT_LOCAL | CERT_ISSUER  | COMP_ST },

-	{"tls_peer_subject_organization", tlsops_comp     , CERT_PEER  | CERT_SUBJECT | COMP_O },

-	{"tls_peer_issuer_organization",  tlsops_comp     , CERT_PEER  | CERT_ISSUER  | COMP_O },

-	{"tls_my_subject_organization",   tlsops_comp     , CERT_LOCAL | CERT_SUBJECT | COMP_O },

-	{"tls_my_issuer_organization",    tlsops_comp     , CERT_LOCAL | CERT_ISSUER  | COMP_O },

-	{"tls_peer_subject_unit", tlsops_comp     , CERT_PEER  | CERT_SUBJECT | COMP_OU },

-	{"tls_peer_issuer_unit",  tlsops_comp     , CERT_PEER  | CERT_ISSUER  | COMP_OU },

-	{"tls_my_subject_unit",   tlsops_comp     , CERT_LOCAL | CERT_SUBJECT | COMP_OU },

-	{"tls_my_issuer_unit",    tlsops_comp     , CERT_LOCAL | CERT_ISSUER  | COMP_OU },

+	{"tls_peer_subject", tlsops_comp,              0,

+		{{0, 0}, CERT_PEER  | CERT_SUBJECT} },

+	{"tls_peer_issuer",  tlsops_comp,              0,

+		{{0, 0}, CERT_PEER  | CERT_ISSUER}  },

+	{"tls_my_subject",   tlsops_comp,              0,

+		{{0, 0}, CERT_LOCAL | CERT_SUBJECT} },

+	{"tls_my_issuer",    tlsops_comp,              0,

+		{{0, 0}, CERT_LOCAL | CERT_ISSUER}  },

+	{"tls_peer_subject_cn", tlsops_comp,           0,

+		{{0, 0}, CERT_PEER  | CERT_SUBJECT | COMP_CN} },

+	{"tls_peer_issuer_cn",  tlsops_comp,           0,

+		{{0, 0}, CERT_PEER  | CERT_ISSUER  | COMP_CN} },

+	{"tls_my_subject_cn",   tlsops_comp,           0,

+		{{0, 0}, CERT_LOCAL | CERT_SUBJECT | COMP_CN} },

+	{"tls_my_issuer_cn",    tlsops_comp,           0,

+		{{0, 0}, CERT_LOCAL | CERT_ISSUER  | COMP_CN} },

+	{"tls_peer_subject_locality", tlsops_comp,     0,

+		{{0, 0}, CERT_PEER  | CERT_SUBJECT | COMP_L} },

+	{"tls_peer_issuer_locality",  tlsops_comp,     0,

+		{{0, 0}, CERT_PEER  | CERT_ISSUER  | COMP_L} },

+	{"tls_my_subject_locality",   tlsops_comp,     0,

+		{{0, 0}, CERT_LOCAL | CERT_SUBJECT | COMP_L} },

+	{"tls_my_issuer_locality",    tlsops_comp,     0,

+		{{0, 0}, CERT_LOCAL | CERT_ISSUER  | COMP_L} },

+	{"tls_peer_subject_country", tlsops_comp,      0,

+		{{0, 0}, CERT_PEER  | CERT_SUBJECT | COMP_C} },

+	{"tls_peer_issuer_country",  tlsops_comp,      0,

+		{{0, 0}, CERT_PEER  | CERT_ISSUER  | COMP_C} },

+	{"tls_my_subject_country",   tlsops_comp,      0,

+		{{0, 0}, CERT_LOCAL | CERT_SUBJECT | COMP_C} },

+	{"tls_my_issuer_country",    tlsops_comp,      0,

+		{{0, 0}, CERT_LOCAL | CERT_ISSUER  | COMP_C} },

+	{"tls_peer_subject_state", tlsops_comp,        0,

+		{{0, 0}, CERT_PEER  | CERT_SUBJECT | COMP_ST} },

+	{"tls_peer_issuer_state",  tlsops_comp,        0,

+		{{0, 0}, CERT_PEER  | CERT_ISSUER  | COMP_ST} },

+	{"tls_my_subject_state",   tlsops_comp,        0,

+		{{0, 0}, CERT_LOCAL | CERT_SUBJECT | COMP_ST} },

+	{"tls_my_issuer_state",    tlsops_comp,        0,

+		{{0, 0}, CERT_LOCAL | CERT_ISSUER  | COMP_ST} },

+	{"tls_peer_subject_organization", tlsops_comp, 0,

+		{{0, 0}, CERT_PEER  | CERT_SUBJECT | COMP_O} },

+	{"tls_peer_issuer_organization",  tlsops_comp, 0,

+		{{0, 0}, CERT_PEER  | CERT_ISSUER  | COMP_O} },

+	{"tls_my_subject_organization",   tlsops_comp, 0,

+		{{0, 0}, CERT_LOCAL | CERT_SUBJECT | COMP_O} },

+	{"tls_my_issuer_organization",    tlsops_comp, 0,

+		{{0, 0}, CERT_LOCAL | CERT_ISSUER  | COMP_O} },

+	{"tls_peer_subject_unit", tlsops_comp,         0,

+		{{0, 0}, CERT_PEER  | CERT_SUBJECT | COMP_OU} },

+	{"tls_peer_issuer_unit",  tlsops_comp,         0,

+		{{0, 0}, CERT_PEER  | CERT_ISSUER  | COMP_OU} },

+	{"tls_my_subject_unit",   tlsops_comp,         0,

+		{{0, 0}, CERT_LOCAL | CERT_SUBJECT | COMP_OU} },

+	{"tls_my_issuer_unit",    tlsops_comp,         0,

+		{{0, 0}, CERT_LOCAL | CERT_ISSUER  | COMP_OU} },

 	/* subject alternative name parameters for peer and local */	

-	{"tls_peer_san_email",    tlsops_alt, CERT_PEER  | COMP_E },

-	{"tls_my_san_email",      tlsops_alt, CERT_LOCAL | COMP_E },

-	{"tls_peer_san_hostname", tlsops_alt, CERT_PEER  | COMP_HOST },

-	{"tls_my_san_hostname",   tlsops_alt, CERT_LOCAL | COMP_HOST },

-	{"tls_peer_san_uri",      tlsops_alt, CERT_PEER  | COMP_URI },

-	{"tls_my_san_uri",        tlsops_alt, CERT_LOCAL | COMP_URI },

-	{"tls_peer_san_ip",       tlsops_alt, CERT_PEER  | COMP_IP },

-	{"tls_my_san_ip",         tlsops_alt, CERT_LOCAL | COMP_IP },

+	{"tls_peer_san_email",    tlsops_alt,          0,

+		{{0, 0}, CERT_PEER  | COMP_E} },

+	{"tls_my_san_email",      tlsops_alt,          0,

+		{{0, 0}, CERT_LOCAL | COMP_E} },

+	{"tls_peer_san_hostname", tlsops_alt,          0,

+		{{0, 0}, CERT_PEER  | COMP_HOST} },

+	{"tls_my_san_hostname",   tlsops_alt,          0,

+		{{0, 0}, CERT_LOCAL | COMP_HOST} },

+	{"tls_peer_san_uri",      tlsops_alt,          0,

+		{{0, 0}, CERT_PEER  | COMP_URI} },

+	{"tls_my_san_uri",        tlsops_alt,          0,

+		{{0, 0}, CERT_LOCAL | COMP_URI} },

+	{"tls_peer_san_ip",       tlsops_alt,          0,

+		{{0, 0}, CERT_PEER  | COMP_IP} },

+	{"tls_my_san_ip",         tlsops_alt,          0,

+		{{0, 0}, CERT_LOCAL | COMP_IP} },

 	/* peer certificate validation parameters */		

-	{"tls_peer_verified",   tlsops_check_cert, CERT_VERIFIED },

-	{"tls_peer_revoked",    tlsops_check_cert, CERT_REVOKED },

-	{"tls_peer_expired",    tlsops_check_cert, CERT_EXPIRED },

-	{"tls_peer_selfsigned", tlsops_check_cert, CERT_SELFSIGNED },

-	{"tls_peer_notBefore", tlsops_validity, CERT_NOTBEFORE },

-	{"tls_peer_notAfter",  tlsops_validity, CERT_NOTAFTER },

+	{"tls_peer_verified",   tlsops_check_cert,     0,

+		{{0, 0}, CERT_VERIFIED} },

+	{"tls_peer_revoked",    tlsops_check_cert,     0,

+		{{0, 0}, CERT_REVOKED} },

+	{"tls_peer_expired",    tlsops_check_cert,     0,

+		{{0, 0}, CERT_EXPIRED} },

+	{"tls_peer_selfsigned", tlsops_check_cert,     0,

+		{{0, 0}, CERT_SELFSIGNED} },

+	{"tls_peer_notBefore", tlsops_validity,        0,

+		{{0, 0}, CERT_NOTBEFORE} },

+	{"tls_peer_notAfter",  tlsops_validity,        0,

+		{{0, 0}, CERT_NOTAFTER} },

-	{0,0,0}

+	{0,0,0,{{0, 0},0}}

 }; 

 /*

  * Module interface

  */

 struct module_exports exports = {

-	"tls", 

+	"tlsops", 

 	cmds,        /* Exported functions */

 	params,      /* Exported parameters */

 	0,           /* exported statistics */

 	0,           /* exported MI functions */

+	mod_items,   /* exported pseudo-variables */

 	mod_init,    /* module initialization function */

 	0,           /* response function */

 	mod_destroy, /* destroy function */

@@ -153,22 +205,8 @@ struct module_exports exports = {

 static int mod_init(void)

 {

-	pseudo_export_t *pseudo;

 	DBG("%s module - initializing...\n", exports.name);

-	pseudo = &pseudos[0];

-	while (pseudo->name) {

-		xl_param_t param;

-		param.ind = pseudo->flags;

-		if(xl_add_extra(pseudo->name, pseudo->function, 0, &param)!=0) {

-			LOG(L_ERR,"ERROR:tlsops:mod_init: failed to register pvar '%s'\n",

-					pseudo->name);

-			return -1;

-		}

-		pseudo++;

-	}

-	

-	DBG("%s module - initializing...done\n", exports.name);

 	return 0;

 }

@@ -176,7 +214,6 @@ static int mod_init(void)

 static void mod_destroy(void)

 {

 	DBG("%s module - shutting down...\n", exports.name);

-	DBG("%s module - shutting down...done\n", exports.name);

 }

@@ -26,15 +26,4 @@

 #include "../../parser/msg_parser.h"

 #include "tls_select.h"

-typedef  int (*pseudo_function)(struct sip_msg *msg, xl_value_t *res, xl_param_t *param, int flags);

-

-

-struct pseudo_export_ {

-	char *name;

-	pseudo_function function;

-	int flags;

-};

-

-typedef struct pseudo_export_ pseudo_export_t;

-

 #endif

@@ -243,6 +243,17 @@ stat_export_t mod_stats[] = {

 };

+/**

+ * pseudo-variables exported by TM module

+ *   { name, function, type, xl_param_t}

+ *   type: can be 0 if you do not want to use it in identifying the PV

+ *   xl_param_t: is given as parameter to 'function'

+ */

+item_export_t mod_items[] = {

+	{ "T_branch_idx", it_get_tm_branch_idx, 100, {{0, 0}, 0} },

+	{ 0, 0, 0, {{0, 0}, 0} }

+};

+

 #ifdef STATIC_TM

 struct module_exports tm_exports = {

 #else

@@ -253,6 +264,7 @@ struct module_exports exports= {

 	params,    /* exported variables */

 	mod_stats, /* exported statistics */

 	0,         /* exported MI functions */

+	mod_items, /* exported pseudo-variables */

 	mod_init,  /* module initialization function */

 	(response_function) reply_received,

 	(destroy_function) tm_shutdown,

@@ -630,12 +642,6 @@ static int mod_init(void)

 		return -1;

 	}

-	if(xl_add_extra("T_branch_idx", it_get_tm_branch_idx, 100, NULL)!=0)

-	{

-		LOG(L_ERR,"ERROR:tm:mod_init: failed to register pvar "

-			"[T_branch_idx]\n");

-		return -1;

-	}

 	return 0;

 }

@@ -113,6 +113,7 @@ struct module_exports exports= {

 	params,     /* param exports */

 	0,          /* exported statistics */

 	0,          /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	mod_init,   /* module initialization function */

 	(response_function) 0,

 	mod_destroy,

@@ -95,6 +95,7 @@ struct module_exports exports = {

 	params,   /* Exported parameters */

 	0,        /* exported statistics */

 	0,        /* exported MI functions */

+	0,        /* exported pseudo-variables */

 	redirect_init, /* Module initialization function */

 	(response_function) 0,

 	(destroy_function) 0,

@@ -71,6 +71,7 @@ struct module_exports exports = {

 	params,     /*  module parameters */

 	0,          /* exported statistics */

 	0,          /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	0,          /* module initialization function */

 	0,          /* response function*/

 	0,          /* destroy function */

@@ -86,6 +86,7 @@ struct module_exports exports = {

 	params,    /* Exported parameters */

 	0,         /* exported statistics */

 	0,         /* exported MI functions */

+	0,         /* exported pseudo-variables */

 	0,         /* module initialization function */

 	0,         /* response function */

 	0,         /* destroy function */

@@ -135,6 +135,7 @@ struct module_exports exports = {

 	params,    /* Exported parameters */

 	0,         /* exported statistics */

 	0 ,        /* exported MI functions */

+	0,         /* exported pseudo-variables */

 	mod_init,  /* module initialization function */

 	0,         /* response function */

 	destroy,   /* destroy function */

@@ -79,6 +79,7 @@ struct module_exports exports = {

 	params,     /* Exported parameters */

 	0,          /* exported statistics */

 	0,          /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	mod_init,   /* module initialization function */

 	0,          /* response function */

 	0,          /* destroy function */

@@ -190,6 +190,7 @@ struct module_exports exports = {

 	params,     /* Export parameters */

 	0,          /* exported statistics */

 	0,          /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	mod_init,   /* Module initialization function */

 	0,          /* Response function */

 	destroy,    /* Destroy function */

@@ -83,6 +83,7 @@ struct module_exports exports= {

 	params,

 	0,          /* exported statistics */

 	0  ,        /* exported MI functions */

+	0,          /* exported pseudo-variables */

 	mod_init,   /* module initialization function */

 	(response_function) 0,

 	(destroy_function) destroy,

@@ -160,6 +160,7 @@ struct module_exports exports = {

 	params,          /* Exported parameters */

 	0,               /* exported statistics */

 	0,               /* exported MI functions */

+	0,               /* exported pseudo-variables */

 	mod_init,        /* Initialization function */

 	0,               /* Response function */

 	destroy,         /* Destroy function */