GitList
Browse code

- modules can register pseudo-variables via export structure - a null terminated list with PVs is now part of module's exports { pv-name, pv-function, pv-type, pv-parameter } - the old function to register PV can be still used - small tlsops updates: module name in exports aligned with external name and old TLS pseudo-variables moved to new structure (some by Klaus Darilion)

git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@1266 689a6050-402a-0410-94f2-e92a70836424

Daniel-Constantin Mierla authored on 23/11/2006 21:57:20
Showing 61 changed files
modules_k/acc/acc_mod.c
History View file @ 71c26efde0
... ... 
@@ -236,6 +236,7 @@ struct module_exports exports= {
236 236 
 	params,     /* exported params */
237 237 
 	0,          /* exported statistics */
238 238 
 	0,          /* exported MI functions */
239 
+	0,          /* exported pseudo-variables */
239 240 
 	mod_init,   /* initialization module */
240 241 
 	0,          /* response function */
241 242 
 	destroy,    /* destroy function */
modules_k/alias_db/alias_db.c
History View file @ 71c26efde0
... ... 
@@ -100,6 +100,7 @@ struct module_exports exports = {
100 100 
 	params,     /* Exported parameters */
101 101 
 	0,          /* exported statistics */
102 102 
 	0,          /* exported MI functions */
103 
+	0,          /* exported pseudo-variables */
103 104 
 	mod_init,   /* module initialization function */
104 105 
 	0,          /* response function */
105 106 
 	destroy,    /* destroy function */
modules_k/auth/auth_mod.c
History View file @ 71c26efde0
... ... 
@@ -153,6 +153,7 @@ struct module_exports exports = {
153 153 
 	params,
154 154 
 	0,          /* exported statistics */
155 155 
 	0,          /* exported MI functions */
156 
+	0,          /* exported pseudo-variables */
156 157 
 	mod_init,   /* module initialization function */
157 158 
 	0,          /* response function */
158 159 
 	destroy,    /* destroy function */
modules_k/auth_db/authdb_mod.c
History View file @ 71c26efde0
... ... 
@@ -147,6 +147,7 @@ struct module_exports exports = {
147 147 
 	params,     /* Exported parameters */
148 148 
 	0,          /* exported statistics */
149 149 
 	0,          /* exported MI functions */
150 
+	0,          /* exported pseudo-variables */
150 151 
 	mod_init,   /* module initialization function */
151 152 
 	0,          /* response function */
152 153 
 	destroy,    /* destroy function */
modules_k/auth_diameter/auth_diameter.c
History View file @ 71c26efde0
... ... 
@@ -105,6 +105,7 @@ struct module_exports exports = {
105 105 
 	params,        /* Exported parameters */
106 106 
 	0,             /* exported statistics */
107 107 
 	0,             /* exported MI functions */
108 
+	0,             /* exported pseudo-variables */
108 109 
 	mod_init,      /* module initialization function */
109 110 
 	0,             /* response function */
110 111 
 	0,             /* destroy function */
modules_k/auth_radius/authrad_mod.c
History View file @ 71c26efde0
... ... 
@@ -95,6 +95,7 @@ struct module_exports exports = {
95 95 
 	params,     /* Exported parameters */
96 96 
 	0,          /* exported statistics */
97 97 
 	0,          /* exported MI functions */
98 
+	0,          /* exported pseudo-variables */
98 99 
 	mod_init,   /* module initialization function */
99 100 
 	0,          /* response function */
100 101 
 	0,          /* destroy function */
modules_k/avp_radius/avp_radius.c
History View file @ 71c26efde0
... ... 
@@ -99,6 +99,7 @@ struct module_exports exports = {
99 99 
 	params,    /* Exported parameters */
100 100 
 	0,         /* exported statistics */
101 101 
 	0,         /* exported MI functions */
102 
+	0,         /* exported pseudo-variables */
102 103 
 	mod_init,  /* module initialization function */
103 104 
 	0,         /* response function*/
104 105 
 	0,         /* destroy function */
modules_k/avpops/avpops.c
History View file @ 71c26efde0
... ... 
@@ -156,6 +156,7 @@ struct module_exports exports = {
156 156 
 	params,     /* Exported parameters */
157 157 
 	0,          /* exported statistics */
158 158 
 	0,          /* exported MI functions */
159 
+	0,          /* exported pseudo-variables */
159 160 
 	avpops_init,/* Module initialization function */
160 161 
 	(response_function) 0,
161 162 
 	(destroy_function) 0,
modules_k/cpl-c/cpl.c
History View file @ 71c26efde0
... ... 
@@ -170,6 +170,7 @@ struct module_exports exports = {
170 170 
 	params,   /* Exported parameters */
171 171 
 	0,        /* exported statistics */
172 172 
 	mi_cmds,  /* exported MI functions */
173 
+	0,        /* exported pseudo-variables */
173 174 
 	cpl_init, /* Module initialization function */
174 175 
 	(response_function) 0,
175 176 
 	(destroy_function) cpl_exit,
modules_k/dbtext/dbtext.c
History View file @ 71c26efde0
... ... 
@@ -73,6 +73,7 @@ struct module_exports exports = {
73 73 
 	params,   /* Exported parameters */
74 74 
 	0,        /* exported statistics */
75 75 
 	0,        /* exported MI functions */
76 
+	0,        /* exported pseudo-variables */
76 77 
 	mod_init, /* module initialization function */
77 78 
 	0,        /* response function*/
78 79 
 	destroy,  /* destroy function */
modules_k/dialog/dialog.c
History View file @ 71c26efde0
... ... 
@@ -112,6 +112,7 @@ struct module_exports exports= {
112 112 
 	mod_params,      /* param exports */
113 113 
 	mod_stats,       /* exported statistics */
114 114 
 	mi_cmds,         /* exported MI functions */
115 
+	0,               /* exported pseudo-variables */
115 116 
 	mod_init,        /* module initialization function */
116 117 
 	0,               /* reply processing function */
117 118 
 	mod_destroy,
modules_k/dispatcher/dispatcher.c
History View file @ 71c26efde0
... ... 
@@ -113,6 +113,7 @@ struct module_exports exports= {
113 113 
 	params,
114 114 
 	0,          /* exported statistics */
115 115 
 	mi_cmds,    /* exported MI functions */
116 
+	0,          /* exported pseudo-variables */
116 117 
 	mod_init,   /* module initialization function */
117 118 
 	(response_function) 0,
118 119 
 	(destroy_function) destroy,
modules_k/diversion/diversion.c
History View file @ 71c26efde0
... ... 
@@ -84,6 +84,7 @@ struct module_exports exports = {
84 84 
 	params,     /* Exported parameters */
85 85 
 	0,          /* exported statistics */
86 86 
 	0,          /* exported MI functions */
87 
+	0,          /* exported pseudo-variables */
87 88 
 	mod_init,   /* module initialization function */
88 89 
 	0,          /* response function */
89 90 
 	0,          /* destroy function */
modules_k/domain/domain_mod.c
History View file @ 71c26efde0
... ... 
@@ -131,6 +131,7 @@ struct module_exports exports = {
131 131 
 	params,    /* Exported parameters */
132 132 
 	0,         /* exported statistics */
133 133 
 	mi_cmds,   /* exported MI functions */
134 
+	0,         /* exported pseudo-variables */
134 135 
 	mod_init,  /* module initialization function */
135 136 
 	0,         /* response function*/
136 137 
 	destroy,   /* destroy function */
modules_k/domainpolicy/domainpolicy_mod.c
History View file @ 71c26efde0
... ... 
@@ -139,6 +139,7 @@ struct module_exports exports = {
139 139 
 	params,    /* exported parameters */
140 140 
 	0,         /* exported statistics */
141 141 
 	0,         /* exported MI functions */
142 
+	0,         /* exported pseudo-variables */
142 143 
 	mod_init,  /* module initialization function */
143 144 
 	0,         /* response function*/
144 145 
 	destroy,   /* destroy function */
modules_k/enum/enum_mod.c
History View file @ 71c26efde0
... ... 
@@ -116,6 +116,7 @@ struct module_exports exports = {
116 116 
 	params,   /* Exported parameters */
117 117 
 	0,        /* exported statistics */
118 118 
 	0,        /* exported MI functions */
119 
+	0,        /* exported pseudo-variables */
119 120 
 	mod_init, /* module initialization function */
120 121 
 	0,        /* response function*/
121 122 
 	0,        /* destroy function */
modules_k/exec/exec_mod.c
History View file @ 71c26efde0
... ... 
@@ -84,6 +84,7 @@ struct module_exports exports= {
84 84 
 	params,         /* Exported parameters */
85 85 
 	0,              /* exported statistics */
86 86 
 	0,              /* exported MI functions */
87 
+	0,          /* exported pseudo-variables */
87 88 
 	mod_init, 	/* initialization module */
88 89 
 	0,		/* response function */
89 90 
 	exec_shutdown,	/* destroy function */
modules_k/flatstore/flatstore_mod.c
History View file @ 71c26efde0
... ... 
@@ -103,6 +103,7 @@ struct module_exports exports = {
103 103 
 	params,      /*  module parameters */
104 104 
 	0,           /* exported statistics */
105 105 
 	mi_cmds,     /* exported MI functions */
106 
+	0,           /* exported pseudo-variables */
106 107 
 	mod_init,    /* module initialization function */
107 108 
 	0,           /* response function*/
108 109 
 	mod_destroy, /* destroy function */
modules_k/gflags/gflags.c
History View file @ 71c26efde0
... ... 
@@ -110,6 +110,7 @@ struct module_exports exports = {
110 110 
 	params,      /* exported parameters */
111 111 
 	0,           /* exported statistics */
112 112 
 	mi_cmds,     /* exported MI functions */
113 
+	0,           /* exported pseudo-variables */
113 114 
 	mod_init,    /* module initialization function */
114 115 
 	0,           /* response function*/
115 116 
 	mod_destroy, /* destroy function */
modules_k/group/group_mod.c
History View file @ 71c26efde0
... ... 
@@ -158,6 +158,7 @@ struct module_exports exports = {
158 158 
 	params,     /* Exported parameters */
159 159 
 	0,          /* exported statistics */
160 160 
 	0,          /* exported MI functions */
161 
+	0,          /* exported pseudo-variables */
161 162 
 	mod_init,   /* module initialization function */
162 163 
 	0,          /* response function */
163 164 
 	destroy,    /* destroy function */
modules_k/group_radius/grouprad_mod.c
History View file @ 71c26efde0
... ... 
@@ -85,6 +85,7 @@ struct module_exports exports = {
85 85 
 	params,     /* Exported parameters */
86 86 
 	0,          /* exported statistics */
87 87 
 	0,          /* exported MI functions */
88 
+	0,          /* exported pseudo-variables */
88 89 
 	mod_init,   /* module initialization function */
89 90 
 	0,          /* response function */
90 91 
 	0,          /* destroy function */
modules_k/imc/imc.c
History View file @ 71c26efde0
... ... 
@@ -148,6 +148,7 @@ struct module_exports exports= {
148 148 
 	0,          /* exported statistics */
149 149 
 #endif
150 150 
 	mi_cmds,    /* exported MI functions */
151 
+	0,          /* exported pseudo-variables */
151 152 
 	mod_init,   /* mod init */
152 153 
 	(response_function) 0,       /* response handler */
153 154 
 	(destroy_function) destroy,  /* destroy function */
modules_k/jabber/jabber.c
History View file @ 71c26efde0
... ... 
@@ -172,6 +172,7 @@ struct module_exports exports= {
172 172 
 	params,     /* Exported parameters */
173 173 
 	0,          /* exported statistics */
174 174 
 	0,          /* exported MI functions */
175 
+	0,          /* exported pseudo-variables */
175 176 
 	mod_init,   /* module initialization function */
176 177 
 	(response_function) 0,
177 178 
 	(destroy_function) destroy,
modules_k/lcr/lcr_mod.c
History View file @ 71c26efde0
... ... 
@@ -309,6 +309,7 @@ struct module_exports exports = {
309 309 
 	params,    /* Exported parameters */
310 310 
 	0,         /* exported statistics */
311 311 
 	mi_cmds,   /* exported MI functions */
312 
+	0,         /* exported pseudo-variables */
312 313 
 	mod_init,  /* module initialization function */
313 314 
 	0,         /* response function */
314 315 
 	destroy,   /* destroy function */
modules_k/mangler/mangler.c
History View file @ 71c26efde0
... ... 
@@ -112,6 +112,7 @@ struct module_exports exports = {
112 112 
 	params,			/* Exported parameters */
113 113 
 	0,				/* exported statistics */
114 114 
 	0,				/* exported MI functions */
115 
+	0,              /* exported pseudo-variables */
115 116 
 	mod_init,		/* module initialization function */
116 117 
 	0,				/* response function */
117 118 
 	destroy,		/* destroy function */
modules_k/maxfwd/maxfwd.c
History View file @ 71c26efde0
... ... 
@@ -82,6 +82,7 @@ struct module_exports exports= {
82 82 
 	params,
83 83 
 	0,          /* exported statistics */
84 84 
 	0,          /* exported MI functions */
85 
+	0,          /* exported pseudo-variables */
85 86 
 	mod_init,
86 87 
 	(response_function) 0,
87 88 
 	(destroy_function) 0,
modules_k/mediaproxy/mediaproxy.c
History View file @ 71c26efde0
... ... 
@@ -220,6 +220,7 @@ struct module_exports exports = {
220 220 
     parameters,   // module exported parameters
221 221 
     NULL,         // exported statistics
222 222 
     NULL,         /* exported MI functions */
223 
+	NULL,         /* exported pseudo-variables */
223 224 
     mod_init,     // module init (before any kid is created. kids will inherit)
224 225 
     NULL,         // reply processing
225 226 
     NULL,         // destroy function
modules_k/mi_fifo/mi_fifo.c
History View file @ 71c26efde0
... ... 
@@ -86,6 +86,7 @@ struct module_exports exports = {
86 86 
 	mi_params,                     /* exported parameters */
87 87 
 	0,                             /* exported statistics */
88 88 
 	0,                             /* exported MI functions */
89 
+	0,                             /* exported pseudo-variables */
89 90 
 	mi_mod_init,                   /* module initialization function */
90 91 
 	(response_function) 0,         /* response handling function */
91 92 
 	(destroy_function) mi_destroy, /* destroy function */
modules_k/msilo/msilo.c
History View file @ 71c26efde0
... ... 
@@ -229,6 +229,7 @@ struct module_exports exports= {
229 229 
 	0,          /* exported statistics */
230 230 
 #endif
231 231 
 	0,          /* exported MI functions */
232 
+	0,          /* exported pseudo-variables */
232 233 
 	mod_init,   /* module initialization function */
233 234 
 	(response_function) 0,       /* response handler */
234 235 
 	(destroy_function) destroy,  /* module destroy function */
modules_k/nathelper/nathelper.c
History View file @ 71c26efde0
... ... 
@@ -356,6 +356,7 @@ struct module_exports exports = {
356 356 
 	params,
357 357 
 	0, /* exported statistics */
358 358 
 	0, /* exported MI functions */
359 
+	0, /* exported pseudo-variables */
359 360 
 	mod_init,
360 361 
 	0, /* reply processing */
361 362 
 	0, /* destroy function */
modules_k/options/mod_options.c
History View file @ 71c26efde0
... ... 
@@ -76,6 +76,7 @@ struct module_exports exports = {
76 76 
 	params,          /* Exported parameters */
77 77 
 	0,               /* exported statistics */
78 78 
 	0,               /* exported MI functions */
79 
+	0,               /* exported pseudo-variables */
79 80 
 	mod_init,        /* Initialization function */
80 81 
 	0,               /* Response function */
81 82 
 	0,               /* Destroy function */
modules_k/osp/osp_mod.c
History View file @ 71c26efde0
... ... 
@@ -116,6 +116,7 @@ struct module_exports exports = {
116 116 
     params,
117 117 
     0,            /* exported statistics */
118 118 
     0,            /* exported MI functions */
119 
+	0,            /* exported pseudo-variables */
119 120 
     ospInitMod,   /* module initialization function */
120 121 
     0,            /* response function*/
121 122 
     ospDestMod,   /* destroy function */
modules_k/pa/pa_mod.c
History View file @ 71c26efde0
... ... 
@@ -131,6 +131,7 @@ struct module_exports exports = {
131 131 
 	params,      /* Exported parameters */
132 132 
 	0,           /* exported statistics */
133 133 
 	0,           /* exported MI functions */
134 
+	0,           /* exported pseudo-variables */
134 135 
 	pa_mod_init, /* module initialization function */
135 136 
 	0,           /* response function*/
136 137 
 	pa_destroy,  /* destroy function */
modules_k/path/path_mod.c
History View file @ 71c26efde0
... ... 
@@ -98,6 +98,7 @@ struct module_exports exports = {
98 98 
 	params,     /* Exported parameters */
99 99 
 	0,          /* exported statistics */
100 100 
 	0,          /* exported MI functions */
101 
+	0,          /* exported pseudo-variables */
101 102 
 	mod_init,   /* module initialization function */
102 103 
 	0,          /* response function */
103 104 
 	destroy,    /* destroy function */
modules_k/pdt/pdt.c
History View file @ 71c26efde0
... ... 
@@ -141,6 +141,7 @@ struct module_exports exports = {
141 141 
 	params,
142 142 
 	0,
143 143 
 	mi_cmds,        /* exported MI functions */
144 
+	0,              /* exported pseudo-variables */
144 145 
 	mod_init,       /* module initialization function */
145 146 
 	0,              /* response function */
146 147 
 	mod_destroy,    /* destroy function */
modules_k/permissions/permissions.c
History View file @ 71c26efde0
... ... 
@@ -189,6 +189,7 @@ struct module_exports exports = {
189 189 
 	params,    /* Exported parameters */
190 190 
 	0,         /* exported statistics */
191 191 
 	mi_cmds,   /* exported MI functions */
192 
+	0,         /* exported pseudo-variables */
192 193 
 	mod_init,  /* module initialization function */
193 194 
 	0,         /* response function */
194 195 
 	mod_exit,  /* destroy function */
modules_k/pike/pike.c
History View file @ 71c26efde0
... ... 
@@ -87,6 +87,7 @@ struct module_exports exports= {
87 87 
 	params,
88 88 
 	0,           /* exported statistics */
89 89 
 	0,           /* exported MI functions */
90 
+	0,           /* exported pseudo-variables */
90 91 
 	pike_init,   /* module initialization function */
91 92 
 	(response_function) 0,
92 93 
 	(destroy_function) pike_exit,   /* module exit function */
modules_k/postgres/db_mod.c
History View file @ 71c26efde0
... ... 
@@ -62,6 +62,7 @@ struct module_exports exports = {
62 62 
 	0,   /*  module parameters */
63 63 
 	0,   /* exported statistics */
64 64 
 	0,   /* exported MI functions */
65 
+	0,        /* exported pseudo-variables */
65 66 
 	mod_init, /* module initialization function */
66 67 
 	0,        /* response function*/
67 68 
 	0,        /* destroy function */
modules_k/presence/presence.c
History View file @ 71c26efde0
... ... 
@@ -126,6 +126,7 @@ struct module_exports exports= {
126 126 
 	params,     /* exported parameters */
127 127 
 	0,          /* exported statistics */
128 128 
 	0  ,        /* exported MI functions */
129 
+	0,          /* exported pseudo-variables */
129 130 
 	mod_init,   /* module initialization function */
130 131 
 	(response_function) 0,      /* response handling function */
131 132 
 	(destroy_function) destroy, /* destroy function */
modules_k/registrar/reg_mod.c
History View file @ 71c26efde0
... ... 
@@ -186,6 +186,7 @@ struct module_exports exports = {
186 186 
 	params,      /* Exported parameters */
187 187 
 	0,           /* exported statistics */
188 188 
 	0,           /* exported MI functions */
189 
+	0,           /* exported pseudo-variables */
189 190 
 	mod_init,    /* module initialization function */
190 191 
 	0,
191 192 
 	mod_destroy, /* destroy function */
modules_k/rr/rr_mod.c
History View file @ 71c26efde0
... ... 
@@ -125,6 +125,7 @@ struct module_exports exports = {
125 125 
 	params,      /* Exported parameters */
126 126 
 	0,           /* exported statistics */
127 127 
 	0,           /* exported MI functions */
128 
+	0,           /* exported pseudo-variables */
128 129 
 	mod_init,    /* initialize module */
129 130 
 	0,           /* response function*/
130 131 
 	mod_destroy, /* destroy function */
modules_k/siptrace/siptrace.c
History View file @ 71c26efde0
... ... 
@@ -161,6 +161,7 @@ struct module_exports exports = {
161 161 
 	0,          /* exported statistics */
162 162 
 #endif
163 163 
 	mi_cmds,    /* exported MI functions */
164 
+	0,          /* exported pseudo-variables */
164 165 
 	mod_init,   /* module initialization function */
165 166 
 	0,          /* response function */
166 167 
 	destroy,    /* destroy function */
modules_k/sl/sl.c
History View file @ 71c26efde0
... ... 
@@ -112,6 +112,7 @@ struct module_exports exports= {
112 112 
 	mod_params,   /* param exports */
113 113 
 	mod_stats,    /* exported statistics */
114 114 
 	0,            /* exported MI functions */
115 
+	0,            /* exported pseudo-variables */
115 116 
 	mod_init,     /* module initialization function */
116 117 
 	0,            /* reply processing function */
117 118 
 	mod_destroy,
modules_k/sms/sms.c
History View file @ 71c26efde0
... ... 
@@ -107,6 +107,7 @@ struct module_exports exports= {
107 107 
 	params,
108 108 
 	0,          /* exported statistics */
109 109 
 	0,          /* exported MI functions */
110 
+	0,          /* exported pseudo-variables */
110 111 
 	sms_init,   /* module initialization function */
111 112 
 	(response_function) 0,
112 113 
 	(destroy_function) sms_exit,   /* module exit function */
modules_k/speeddial/speeddial.c
History View file @ 71c26efde0
... ... 
@@ -100,6 +100,7 @@ struct module_exports exports = {
100 100 
 	params,     /* Exported parameters */
101 101 
 	0,          /* exported statistics */
102 102 
 	0,          /* exported MI functions */
103 
+	0,          /* exported pseudo-variables */
103 104 
 	mod_init,   /* module initialization function */
104 105 
 	0,          /* response function */
105 106 
 	destroy,    /* destroy function */
modules_k/sst/sst.c
History View file @ 71c26efde0
... ... 
@@ -120,6 +120,7 @@ struct module_exports exports= {
120 120 
 	mod_params,   /* param exports */
121 121 
 	mod_stats,    /* exported statistics */
122 122 
 	0,            /* exported MI functions */
123 
+	0,            /* exported pseudo-variables */
123 124 
 	mod_init,     /* module initialization function */
124 125 
 	0,            /* reply processing function */
125 126 
 	0,            /* Destroy function */
modules_k/statistics/statistics.c
History View file @ 71c26efde0
... ... 
@@ -67,6 +67,7 @@ struct module_exports exports= {
67 67 
 	mod_params,   /* param exports */
68 68 
 	0,            /* exported statistics */
69 69 
 	0,            /* exported MI functions */
70 
+	0,            /* exported pseudo-variables */
70 71 
 	mod_init,     /* module initialization function */
71 72 
 	0,            /* reply processing function */
72 73 
 	0,            /* module destroy function */
modules_k/textops/textops.c
History View file @ 71c26efde0
... ... 
@@ -177,6 +177,7 @@ struct module_exports exports= {
177 177 
 	0,          /* module parameters */
178 178 
 	0,          /* exported statistics */
179 179 
 	0,          /* exported MI functions */
180 
+	0,          /* exported pseudo-variables */
180 181 
 	mod_init,   /* module initialization function */
181 182 
 	0,          /* response function */
182 183 
 	0,          /* destroy function */
modules_k/tlsops/tls_select.c
History View file @ 71c26efde0
... ... 
@@ -3,9 +3,10 @@
3 3 
  *
4 4 
  * TLS module - select interface
5 5 
  *
6 
- * Copyright (C) 2001-2003 FhG FOKUS
7 
- * Copyright (C) 2004,2005 Free Software Foundation, Inc.
8 
- * Copyright (C) 2006 enum.at
6 
+ * Copyright (C)  2001-2003 FhG FOKUS
7 
+ * Copyright (C)  2004,2005 Free Software Foundation, Inc.
8 
+ * Copyright (C)  2005 iptelorg GmbH
9 
+ * Copyright (C)  2006 enum.at
9 10 
  *
10 11 
  * This file is part of openser, a free SIP server.
11 12 
  *
modules_k/tlsops/tlsops.c
History View file @ 71c26efde0
... ... 
@@ -41,6 +41,7 @@
41 41 
 #include "../../tcp_conn.h"    /* struct tcp_connection */
42 42 
 #include "../../tcp_server.h"  /* tcpconn_get() */
43 43 
 #include "../../sr_module.h"
44 
+#include "../../items.h"
44 45
45 46 
 MODULE_VERSION
46 47
... ... 
@@ -76,75 +77,126 @@ static param_export_t params[] = {
76 76 
 /*
77 77 
  *  pseudo variables
78 78 
  */
79 
-static pseudo_export_t pseudos[] = {
79 
+static item_export_t mod_items[] = {
80 80 
 	/* TLS session parameters */
81 
-	{"tls_version",      tlsops_version  , 0},
82 
-	{"tls_description",  tlsops_desc     , 0},
83 
-	{"tls_cipher_info",  tlsops_cipher   , 0},
84 
-	{"tls_cipher_bits",  tlsops_bits     , 0},
81 
+	{"tls_version",      tlsops_version,           0,
82 
+		{{0, 0}, 0} },
83 
+	{"tls_description",  tlsops_desc,              0,
84 
+		{{0, 0}, 0} },
85 
+	{"tls_cipher_info",  tlsops_cipher,            0,
86 
+		{{0, 0}, 0} },
87 
+	{"tls_cipher_bits",  tlsops_bits,              0,
88 
+		{{0, 0}, 0} },
85 89 
 	/* general certificate parameters for peer and local */
86 
-	{"tls_peer_version", tlsops_cert_version, CERT_PEER  },
87 
-	{"tls_my_version",   tlsops_cert_version, CERT_LOCAL },
88 
-	{"tls_peer_serial",  tlsops_sn, CERT_PEER  },
89 
-	{"tls_my_serial",    tlsops_sn, CERT_LOCAL },
90 
+	{"tls_peer_version", tlsops_cert_version,      0,
91 
+		{{0, 0}, CERT_PEER}  },
92 
+	{"tls_my_version",   tlsops_cert_version,      0,
93 
+		{{0, 0}, CERT_LOCAL} },
94 
+	{"tls_peer_serial",  tlsops_sn,                0,
95 
+		{{0, 0}, CERT_PEER}  },
96 
+	{"tls_my_serial",    tlsops_sn,                0,
97 
+		{{0, 0}, CERT_LOCAL} },
90 98 
 	/* certificate parameters for peer and local, for subject and issuer*/
91 
-	{"tls_peer_subject", tlsops_comp     , CERT_PEER  | CERT_SUBJECT },
92 
-	{"tls_peer_issuer",  tlsops_comp     , CERT_PEER  | CERT_ISSUER  },
93 
-	{"tls_my_subject",   tlsops_comp     , CERT_LOCAL | CERT_SUBJECT },
94 
-	{"tls_my_issuer",    tlsops_comp     , CERT_LOCAL | CERT_ISSUER  },
95 
-	{"tls_peer_subject_cn", tlsops_comp     , CERT_PEER  | CERT_SUBJECT | COMP_CN },
96 
-	{"tls_peer_issuer_cn",  tlsops_comp     , CERT_PEER  | CERT_ISSUER  | COMP_CN },
97 
-	{"tls_my_subject_cn",   tlsops_comp     , CERT_LOCAL | CERT_SUBJECT | COMP_CN },
98 
-	{"tls_my_issuer_cn",    tlsops_comp     , CERT_LOCAL | CERT_ISSUER  | COMP_CN },
99 
-	{"tls_peer_subject_locality", tlsops_comp     , CERT_PEER  | CERT_SUBJECT | COMP_L },
100 
-	{"tls_peer_issuer_locality",  tlsops_comp     , CERT_PEER  | CERT_ISSUER  | COMP_L },
101 
-	{"tls_my_subject_locality",   tlsops_comp     , CERT_LOCAL | CERT_SUBJECT | COMP_L },
102 
-	{"tls_my_issuer_locality",    tlsops_comp     , CERT_LOCAL | CERT_ISSUER  | COMP_L },
103 
-	{"tls_peer_subject_country", tlsops_comp     , CERT_PEER  | CERT_SUBJECT | COMP_C },
104 
-	{"tls_peer_issuer_country",  tlsops_comp     , CERT_PEER  | CERT_ISSUER  | COMP_C },
105 
-	{"tls_my_subject_country",   tlsops_comp     , CERT_LOCAL | CERT_SUBJECT | COMP_C },
106 
-	{"tls_my_issuer_country",    tlsops_comp     , CERT_LOCAL | CERT_ISSUER  | COMP_C },
107 
-	{"tls_peer_subject_state", tlsops_comp     , CERT_PEER  | CERT_SUBJECT | COMP_ST },
108 
-	{"tls_peer_issuer_state",  tlsops_comp     , CERT_PEER  | CERT_ISSUER  | COMP_ST },
109 
-	{"tls_my_subject_state",   tlsops_comp     , CERT_LOCAL | CERT_SUBJECT | COMP_ST },
110 
-	{"tls_my_issuer_state",    tlsops_comp     , CERT_LOCAL | CERT_ISSUER  | COMP_ST },
111 
-	{"tls_peer_subject_organization", tlsops_comp     , CERT_PEER  | CERT_SUBJECT | COMP_O },
112 
-	{"tls_peer_issuer_organization",  tlsops_comp     , CERT_PEER  | CERT_ISSUER  | COMP_O },
113 
-	{"tls_my_subject_organization",   tlsops_comp     , CERT_LOCAL | CERT_SUBJECT | COMP_O },
114 
-	{"tls_my_issuer_organization",    tlsops_comp     , CERT_LOCAL | CERT_ISSUER  | COMP_O },
115 
-	{"tls_peer_subject_unit", tlsops_comp     , CERT_PEER  | CERT_SUBJECT | COMP_OU },
116 
-	{"tls_peer_issuer_unit",  tlsops_comp     , CERT_PEER  | CERT_ISSUER  | COMP_OU },
117 
-	{"tls_my_subject_unit",   tlsops_comp     , CERT_LOCAL | CERT_SUBJECT | COMP_OU },
118 
-	{"tls_my_issuer_unit",    tlsops_comp     , CERT_LOCAL | CERT_ISSUER  | COMP_OU },
99 
+	{"tls_peer_subject", tlsops_comp,              0,
100 
+		{{0, 0}, CERT_PEER  | CERT_SUBJECT} },
101 
+	{"tls_peer_issuer",  tlsops_comp,              0,
102 
+		{{0, 0}, CERT_PEER  | CERT_ISSUER}  },
103 
+	{"tls_my_subject",   tlsops_comp,              0,
104 
+		{{0, 0}, CERT_LOCAL | CERT_SUBJECT} },
105 
+	{"tls_my_issuer",    tlsops_comp,              0,
106 
+		{{0, 0}, CERT_LOCAL | CERT_ISSUER}  },
107 
+	{"tls_peer_subject_cn", tlsops_comp,           0,
108 
+		{{0, 0}, CERT_PEER  | CERT_SUBJECT | COMP_CN} },
109 
+	{"tls_peer_issuer_cn",  tlsops_comp,           0,
110 
+		{{0, 0}, CERT_PEER  | CERT_ISSUER  | COMP_CN} },
111 
+	{"tls_my_subject_cn",   tlsops_comp,           0,
112 
+		{{0, 0}, CERT_LOCAL | CERT_SUBJECT | COMP_CN} },
113 
+	{"tls_my_issuer_cn",    tlsops_comp,           0,
114 
+		{{0, 0}, CERT_LOCAL | CERT_ISSUER  | COMP_CN} },
115 
+	{"tls_peer_subject_locality", tlsops_comp,     0,
116 
+		{{0, 0}, CERT_PEER  | CERT_SUBJECT | COMP_L} },
117 
+	{"tls_peer_issuer_locality",  tlsops_comp,     0,
118 
+		{{0, 0}, CERT_PEER  | CERT_ISSUER  | COMP_L} },
119 
+	{"tls_my_subject_locality",   tlsops_comp,     0,
120 
+		{{0, 0}, CERT_LOCAL | CERT_SUBJECT | COMP_L} },
121 
+	{"tls_my_issuer_locality",    tlsops_comp,     0,
122 
+		{{0, 0}, CERT_LOCAL | CERT_ISSUER  | COMP_L} },
123 
+	{"tls_peer_subject_country", tlsops_comp,      0,
124 
+		{{0, 0}, CERT_PEER  | CERT_SUBJECT | COMP_C} },
125 
+	{"tls_peer_issuer_country",  tlsops_comp,      0,
126 
+		{{0, 0}, CERT_PEER  | CERT_ISSUER  | COMP_C} },
127 
+	{"tls_my_subject_country",   tlsops_comp,      0,
128 
+		{{0, 0}, CERT_LOCAL | CERT_SUBJECT | COMP_C} },
129 
+	{"tls_my_issuer_country",    tlsops_comp,      0,
130 
+		{{0, 0}, CERT_LOCAL | CERT_ISSUER  | COMP_C} },
131 
+	{"tls_peer_subject_state", tlsops_comp,        0,
132 
+		{{0, 0}, CERT_PEER  | CERT_SUBJECT | COMP_ST} },
133 
+	{"tls_peer_issuer_state",  tlsops_comp,        0,
134 
+		{{0, 0}, CERT_PEER  | CERT_ISSUER  | COMP_ST} },
135 
+	{"tls_my_subject_state",   tlsops_comp,        0,
136 
+		{{0, 0}, CERT_LOCAL | CERT_SUBJECT | COMP_ST} },
137 
+	{"tls_my_issuer_state",    tlsops_comp,        0,
138 
+		{{0, 0}, CERT_LOCAL | CERT_ISSUER  | COMP_ST} },
139 
+	{"tls_peer_subject_organization", tlsops_comp, 0,
140 
+		{{0, 0}, CERT_PEER  | CERT_SUBJECT | COMP_O} },
141 
+	{"tls_peer_issuer_organization",  tlsops_comp, 0,
142 
+		{{0, 0}, CERT_PEER  | CERT_ISSUER  | COMP_O} },
143 
+	{"tls_my_subject_organization",   tlsops_comp, 0,
144 
+		{{0, 0}, CERT_LOCAL | CERT_SUBJECT | COMP_O} },
145 
+	{"tls_my_issuer_organization",    tlsops_comp, 0,
146 
+		{{0, 0}, CERT_LOCAL | CERT_ISSUER  | COMP_O} },
147 
+	{"tls_peer_subject_unit", tlsops_comp,         0,
148 
+		{{0, 0}, CERT_PEER  | CERT_SUBJECT | COMP_OU} },
149 
+	{"tls_peer_issuer_unit",  tlsops_comp,         0,
150 
+		{{0, 0}, CERT_PEER  | CERT_ISSUER  | COMP_OU} },
151 
+	{"tls_my_subject_unit",   tlsops_comp,         0,
152 
+		{{0, 0}, CERT_LOCAL | CERT_SUBJECT | COMP_OU} },
153 
+	{"tls_my_issuer_unit",    tlsops_comp,         0,
154 
+		{{0, 0}, CERT_LOCAL | CERT_ISSUER  | COMP_OU} },
119 155 
 	/* subject alternative name parameters for peer and local */
120 
-	{"tls_peer_san_email",    tlsops_alt, CERT_PEER  | COMP_E },
121 
-	{"tls_my_san_email",      tlsops_alt, CERT_LOCAL | COMP_E },
122 
-	{"tls_peer_san_hostname", tlsops_alt, CERT_PEER  | COMP_HOST },
123 
-	{"tls_my_san_hostname",   tlsops_alt, CERT_LOCAL | COMP_HOST },
124 
-	{"tls_peer_san_uri",      tlsops_alt, CERT_PEER  | COMP_URI },
125 
-	{"tls_my_san_uri",        tlsops_alt, CERT_LOCAL | COMP_URI },
126 
-	{"tls_peer_san_ip",       tlsops_alt, CERT_PEER  | COMP_IP },
127 
-	{"tls_my_san_ip",         tlsops_alt, CERT_LOCAL | COMP_IP },
156 
+	{"tls_peer_san_email",    tlsops_alt,          0,
157 
+		{{0, 0}, CERT_PEER  | COMP_E} },
158 
+	{"tls_my_san_email",      tlsops_alt,          0,
159 
+		{{0, 0}, CERT_LOCAL | COMP_E} },
160 
+	{"tls_peer_san_hostname", tlsops_alt,          0,
161 
+		{{0, 0}, CERT_PEER  | COMP_HOST} },
162 
+	{"tls_my_san_hostname",   tlsops_alt,          0,
163 
+		{{0, 0}, CERT_LOCAL | COMP_HOST} },
164 
+	{"tls_peer_san_uri",      tlsops_alt,          0,
165 
+		{{0, 0}, CERT_PEER  | COMP_URI} },
166 
+	{"tls_my_san_uri",        tlsops_alt,          0,
167 
+		{{0, 0}, CERT_LOCAL | COMP_URI} },
168 
+	{"tls_peer_san_ip",       tlsops_alt,          0,
169 
+		{{0, 0}, CERT_PEER  | COMP_IP} },
170 
+	{"tls_my_san_ip",         tlsops_alt,          0,
171 
+		{{0, 0}, CERT_LOCAL | COMP_IP} },
128 172 
 	/* peer certificate validation parameters */
129 
-	{"tls_peer_verified",   tlsops_check_cert, CERT_VERIFIED },
130 
-	{"tls_peer_revoked",    tlsops_check_cert, CERT_REVOKED },
131 
-	{"tls_peer_expired",    tlsops_check_cert, CERT_EXPIRED },
132 
-	{"tls_peer_selfsigned", tlsops_check_cert, CERT_SELFSIGNED },
133 
-	{"tls_peer_notBefore", tlsops_validity, CERT_NOTBEFORE },
134 
-	{"tls_peer_notAfter",  tlsops_validity, CERT_NOTAFTER },
173 
+	{"tls_peer_verified",   tlsops_check_cert,     0,
174 
+		{{0, 0}, CERT_VERIFIED} },
175 
+	{"tls_peer_revoked",    tlsops_check_cert,     0,
176 
+		{{0, 0}, CERT_REVOKED} },
177 
+	{"tls_peer_expired",    tlsops_check_cert,     0,
178 
+		{{0, 0}, CERT_EXPIRED} },
179 
+	{"tls_peer_selfsigned", tlsops_check_cert,     0,
180 
+		{{0, 0}, CERT_SELFSIGNED} },
181 
+	{"tls_peer_notBefore", tlsops_validity,        0,
182 
+		{{0, 0}, CERT_NOTBEFORE} },
183 
+	{"tls_peer_notAfter",  tlsops_validity,        0,
184 
+		{{0, 0}, CERT_NOTAFTER} },
135 185
136 
-	{0,0,0}
186 
+	{0,0,0,{{0, 0},0}}
137 187 
 };
138 188
139 189 
 /*
140 190 
  * Module interface
141 191 
  */
142 192 
 struct module_exports exports = {
143 
-	"tls",
193 
+	"tlsops",
144 194 
 	cmds,        /* Exported functions */
145 195 
 	params,      /* Exported parameters */
146 196 
 	0,           /* exported statistics */
147 197 
 	0,           /* exported MI functions */
198 
+	mod_items,   /* exported pseudo-variables */
148 199 
 	mod_init,    /* module initialization function */
149 200 
 	0,           /* response function */
150 201 
 	mod_destroy, /* destroy function */
... ... 
@@ -153,22 +205,8 @@ struct module_exports exports = {
153 153
154 154 
 static int mod_init(void)
155 155 
 {
156 
-	pseudo_export_t *pseudo;
157 156 
 	DBG("%s module - initializing...\n", exports.name);
158 157
159 
-	pseudo = &pseudos[0];
160 
-	while (pseudo->name) {
161 
-		xl_param_t param;
162 
-		param.ind = pseudo->flags;
163 
-		if(xl_add_extra(pseudo->name, pseudo->function, 0, &param)!=0) {
164 
-			LOG(L_ERR,"ERROR:tlsops:mod_init: failed to register pvar '%s'\n",
165 
-					pseudo->name);
166 
-			return -1;
167 
-		}
168 
-		pseudo++;
169 
-	}
170 
-
171 
-	DBG("%s module - initializing...done\n", exports.name);
172 158 
 	return 0;
173 159 
 }
174 160
... ... 
@@ -176,7 +214,6 @@ static int mod_init(void)
176 176 
 static void mod_destroy(void)
177 177 
 {
178 178 
 	DBG("%s module - shutting down...\n", exports.name);
179 
-	DBG("%s module - shutting down...done\n", exports.name);
180 179 
 }
181 180
182 181
modules_k/tlsops/tlsops.h
History View file @ 71c26efde0
... ... 
@@ -26,15 +26,4 @@
26 26 
 #include "../../parser/msg_parser.h"
27 27 
 #include "tls_select.h"
28 28
29 
-typedef  int (*pseudo_function)(struct sip_msg *msg, xl_value_t *res, xl_param_t *param, int flags);
30 
-
31 
-
32 
-struct pseudo_export_ {
33 
-	char *name;
34 
-	pseudo_function function;
35 
-	int flags;
36 
-};
37 
-
38 
-typedef struct pseudo_export_ pseudo_export_t;
39 
-
40 29 
 #endif
modules_k/tm/tm.c
History View file @ 71c26efde0
... ... 
@@ -243,6 +243,17 @@ stat_export_t mod_stats[] = {
243 243 
 };
244 244
245 245
246 
+/**
247 
+ * pseudo-variables exported by TM module
248 
+ *   { name, function, type, xl_param_t}
249 
+ *   type: can be 0 if you do not want to use it in identifying the PV
250 
+ *   xl_param_t: is given as parameter to 'function'
251 
+ */
252 
+item_export_t mod_items[] = {
253 
+	{ "T_branch_idx", it_get_tm_branch_idx, 100, {{0, 0}, 0} },
254 
+	{ 0, 0, 0, {{0, 0}, 0} }
255 
+};
256 
+
246 257 
 #ifdef STATIC_TM
247 258 
 struct module_exports tm_exports = {
248 259 
 #else
... ... 
@@ -253,6 +264,7 @@ struct module_exports exports= {
253 253 
 	params,    /* exported variables */
254 254 
 	mod_stats, /* exported statistics */
255 255 
 	0,         /* exported MI functions */
256 
+	mod_items, /* exported pseudo-variables */
256 257 
 	mod_init,  /* module initialization function */
257 258 
 	(response_function) reply_received,
258 259 
 	(destroy_function) tm_shutdown,
... ... 
@@ -630,12 +642,6 @@ static int mod_init(void)
630 630 
 		return -1;
631 631 
 	}
632 632
633 
-	if(xl_add_extra("T_branch_idx", it_get_tm_branch_idx, 100, NULL)!=0)
634 
-	{
635 
-		LOG(L_ERR,"ERROR:tm:mod_init: failed to register pvar "
636 
-			"[T_branch_idx]\n");
637 
-		return -1;
638 
-	}
639 633 
 	return 0;
640 634 
 }
641 635
modules_k/uac/uac.c
History View file @ 71c26efde0
... ... 
@@ -113,6 +113,7 @@ struct module_exports exports= {
113 113 
 	params,     /* param exports */
114 114 
 	0,          /* exported statistics */
115 115 
 	0,          /* exported MI functions */
116 
+	0,          /* exported pseudo-variables */
116 117 
 	mod_init,   /* module initialization function */
117 118 
 	(response_function) 0,
118 119 
 	mod_destroy,
modules_k/uac_redirect/redirect.c
History View file @ 71c26efde0
... ... 
@@ -95,6 +95,7 @@ struct module_exports exports = {
95 95 
 	params,   /* Exported parameters */
96 96 
 	0,        /* exported statistics */
97 97 
 	0,        /* exported MI functions */
98 
+	0,        /* exported pseudo-variables */
98 99 
 	redirect_init, /* Module initialization function */
99 100 
 	(response_function) 0,
100 101 
 	(destroy_function) 0,
modules_k/unixodbc/db_mod.c
History View file @ 71c26efde0
... ... 
@@ -71,6 +71,7 @@ struct module_exports exports = {
71 71 
 	params,     /*  module parameters */
72 72 
 	0,          /* exported statistics */
73 73 
 	0,          /* exported MI functions */
74 
+	0,          /* exported pseudo-variables */
74 75 
 	0,          /* module initialization function */
75 76 
 	0,          /* response function*/
76 77 
 	0,          /* destroy function */
modules_k/uri/uri_mod.c
History View file @ 71c26efde0
... ... 
@@ -86,6 +86,7 @@ struct module_exports exports = {
86 86 
 	params,    /* Exported parameters */
87 87 
 	0,         /* exported statistics */
88 88 
 	0,         /* exported MI functions */
89 
+	0,         /* exported pseudo-variables */
89 90 
 	0,         /* module initialization function */
90 91 
 	0,         /* response function */
91 92 
 	0,         /* destroy function */
modules_k/uri_db/uridb_mod.c
History View file @ 71c26efde0
... ... 
@@ -135,6 +135,7 @@ struct module_exports exports = {
135 135 
 	params,    /* Exported parameters */
136 136 
 	0,         /* exported statistics */
137 137 
 	0 ,        /* exported MI functions */
138 
+	0,         /* exported pseudo-variables */
138 139 
 	mod_init,  /* module initialization function */
139 140 
 	0,         /* response function */
140 141 
 	destroy,   /* destroy function */
modules_k/uri_radius/urirad_mod.c
History View file @ 71c26efde0
... ... 
@@ -79,6 +79,7 @@ struct module_exports exports = {
79 79 
 	params,     /* Exported parameters */
80 80 
 	0,          /* exported statistics */
81 81 
 	0,          /* exported MI functions */
82 
+	0,          /* exported pseudo-variables */
82 83 
 	mod_init,   /* module initialization function */
83 84 
 	0,          /* response function */
84 85 
 	0,          /* destroy function */
modules_k/usrloc/ul_mod.c
History View file @ 71c26efde0
... ... 
@@ -190,6 +190,7 @@ struct module_exports exports = {
190 190 
 	params,     /* Export parameters */
191 191 
 	0,          /* exported statistics */
192 192 
 	0,          /* exported MI functions */
193 
+	0,          /* exported pseudo-variables */
193 194 
 	mod_init,   /* Module initialization function */
194 195 
 	0,          /* Response function */
195 196 
 	destroy,    /* Destroy function */
modules_k/xlog/xlog.c
History View file @ 71c26efde0
... ... 
@@ -83,6 +83,7 @@ struct module_exports exports= {
83 83 
 	params,
84 84 
 	0,          /* exported statistics */
85 85 
 	0  ,        /* exported MI functions */
86 
+	0,          /* exported pseudo-variables */
86 87 
 	mod_init,   /* module initialization function */
87 88 
 	(response_function) 0,
88 89 
 	(destroy_function) destroy,
modules_k/xmpp/xmpp.c
History View file @ 71c26efde0
... ... 
@@ -160,6 +160,7 @@ struct module_exports exports = {
160 160 
 	params,          /* Exported parameters */
161 161 
 	0,               /* exported statistics */
162 162 
 	0,               /* exported MI functions */
163 
+	0,               /* exported pseudo-variables */
163 164 
 	mod_init,        /* Initialization function */
164 165 
 	0,               /* Response function */
165 166 
 	destroy,         /* Destroy function */