Hello,
in about two and a half week the annual open source developer conference
FOSDEM (http://fosdem.org/2011/) takes place in Brussels. As in the last two
years we would like to meet here for a social event, probably a dinner on
Saturday evening, 6th February.
This developers already confirmed their participance:
- Daniel-Constantin Mierla
- Marius Zbihlei
- Henning Westerholt
This year we'll also be present in the Open Source Telephony room on sunday
with two talks, "Scaling location services in large SIP networks with Kamailio
from Marius and myself, and "Unifying SIP and Web worlds with Lua (Kamailio)"
from Daniel. Olivier Taylor agreed helping us again in choosing a nice place
for the evening.
Participation at the event is free of charge, everybody pays for its own
expenses. In order to organize a restaurant and do a reservation please send
me a short mail if you would like to attend.
Looking forward to see you in Brussels!
Best regards,
Henning
P.S.: Photos of the 2009 event can be found on the web site:
http://www.kamailio.org/events/2009-FOSDEM/FOSDEM2009-Album/
--
Henning Westerholt - Head of IT Operations Internet Access & Communications
1&1 Internet AG, Karlsruhe, Germany
Module: sip-router
Branch: master
Commit: 8858e0d2c3c1c64f3223ae62aa2574a54d9fbc9a
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8858e0d…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: Sat Jan 29 20:51:07 2011 +0100
acc: fixed typo in example
- updated the route types where acc_*_request() can be used
---
modules_k/acc/README | 12 ++++++------
modules_k/acc/doc/acc_admin.xml | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/modules_k/acc/README b/modules_k/acc/README
index 08ff24a..758c19f 100644
--- a/modules_k/acc/README
+++ b/modules_k/acc/README
@@ -863,7 +863,7 @@ modparam("acc", "diameter_extra", "7846=$hdr(Content-type);7847=$avp(s:email)")
Meaning of the parameters is as follows:
* comment - Comment to be appended.
- This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.
+ This function can be used from ANY_ROUTE.
Example 1.35. acc_log_request usage
...
@@ -880,12 +880,12 @@ acc_log_request("Some comment");
* comment - Comment to be appended.
* table - Database table to be used. It can include config variables.
- This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.
+ This function can be used from ANY_ROUTE.
Example 1.36. acc_db_request usage
...
-acc_log_request("Some comment", "some_table");
-acc_log_request("200 ok", "acc_cfg_$time(year)");
+acc_db_request("Some comment", "some_table");
+acc_db_request("200 ok", "acc_cfg_$time(year)");
...
6.3. acc_rad_request(comment)
@@ -896,7 +896,7 @@ acc_log_request("200 ok", "acc_cfg_$time(year)");
Meaning of the parameters is as follows:
* comment - Comment to be appended.
- This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.
+ This function can be used from ANY_ROUTE.
Example 1.37. acc_rad_request usage
...
@@ -911,7 +911,7 @@ acc_rad_request("Some comment");
Meaning of the parameters is as follows:
* comment - Comment to be appended.
- This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.
+ This function can be used from ANY_ROUTE.
Example 1.38. acc_diam_request usage
...
diff --git a/modules_k/acc/doc/acc_admin.xml b/modules_k/acc/doc/acc_admin.xml
index 05bf63e..1401e47 100644
--- a/modules_k/acc/doc/acc_admin.xml
+++ b/modules_k/acc/doc/acc_admin.xml
@@ -972,7 +972,7 @@ modparam("acc", "diameter_extra", "7846=$hdr(Content-type);7847=$avp(s:email)")
</listitem>
</itemizedlist>
<para>
- This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.
+ This function can be used from ANY_ROUTE.
</para>
<example>
<title>acc_log_request usage</title>
@@ -1006,14 +1006,14 @@ acc_log_request("Some comment");
</listitem>
</itemizedlist>
<para>
- This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.
+ This function can be used from ANY_ROUTE.
</para>
<example>
<title>acc_db_request usage</title>
<programlisting format="linespecific">
...
-acc_log_request("Some comment", "some_table");
-acc_log_request("200 ok", "acc_cfg_$time(year)");
+acc_db_request("Some comment", "some_table");
+acc_db_request("200 ok", "acc_cfg_$time(year)");
...
</programlisting>
</example>
@@ -1037,7 +1037,7 @@ acc_log_request("200 ok", "acc_cfg_$time(year)");
</listitem>
</itemizedlist>
<para>
- This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.
+ This function can be used from ANY_ROUTE.
</para>
<example>
<title>acc_rad_request usage</title>
@@ -1066,7 +1066,7 @@ acc_rad_request("Some comment");
</listitem>
</itemizedlist>
<para>
- This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.
+ This function can be used from ANY_ROUTE.
</para>
<example>
<title>acc_diam_request usage</title>
Module: sip-router
Branch: 3.1
Commit: 16fa2cdd99515160ebe4133f26dcbac584021821
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=16fa2cd…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: Fri Jan 28 16:46:47 2011 +0100
snmpstats: moved declaration of vars in .c file
(cherry picked from commit 8c26d7221cabe3c7c5b2f218b842c5886d830966)
---
modules_k/snmpstats/snmpstats.c | 72 ++++++++++++++++++++++++++++++++++++++
modules_k/snmpstats/snmpstats.h | 73 ---------------------------------------
2 files changed, 72 insertions(+), 73 deletions(-)
diff --git a/modules_k/snmpstats/snmpstats.c b/modules_k/snmpstats/snmpstats.c
index 831251b..1994876 100644
--- a/modules_k/snmpstats/snmpstats.c
+++ b/modules_k/snmpstats/snmpstats.c
@@ -84,6 +84,15 @@
#include <net-snmp/net-snmp-includes.h>
#include <net-snmp/agent/net-snmp-agent-includes.h>
+#include "../../lib/kcore/statistics.h"
+#include "../../sr_module.h"
+#include "../../dprint.h"
+#include "../../error.h"
+#include "../../ut.h"
+#include "../../script_cb.h"
+#include "../../mem/mem.h"
+#include "../../mem/shm_mem.h"
+
#include "snmpSIPRegUserTable.h"
#include "snmpSIPContactTable.h"
@@ -97,6 +106,69 @@
/* Required in every Kamailio Module. */
MODULE_VERSION
+/*! This is the first function to be called by Kamailio, to initialize the module.
+ * This call must always return a value as soon as possible. If it were not to
+ * return, then Kamailio would not be able to initialize any of the other
+ * modules. */
+static int mod_init(void);
+
+/*! This function is called when Kamailio has finished creating all instances of
+ * itself. It is at this point that we want to create our AgentX sub-agent
+ * process, and register a handler for any state changes of our child. */
+static int mod_child_init(int rank);
+
+
+/*! This function is called when Kamailio is shutting down. When this happens, we
+ * log a useful message and kill the AgentX Sub-Agent child process */
+static void mod_destroy(void);
+
+
+static proc_export_t mod_procs[] = {
+ {"SNMP AgentX", 0, 0, agentx_child, 1 },
+ {0,0,0,0,0}
+};
+
+
+/*!
+ * This structure defines the SNMPStats parameters that can be configured
+ * through the kamailio.cfg configuration file.
+ */
+static param_export_t mod_params[] =
+{
+ { "sipEntityType", STR_PARAM|USE_FUNC_PARAM,
+ (void *)handleSipEntityType },
+ { "MsgQueueMinorThreshold", INT_PARAM|USE_FUNC_PARAM,
+ (void *)set_queue_minor_threshold },
+ { "MsgQueueMajorThreshold", INT_PARAM|USE_FUNC_PARAM,
+ (void *)set_queue_major_threshold },
+ { "dlg_minor_threshold", INT_PARAM|USE_FUNC_PARAM,
+ (void *)set_dlg_minor_threshold },
+ { "dlg_major_threshold", INT_PARAM|USE_FUNC_PARAM,
+ (void *)set_dlg_major_threshold },
+ { "snmpgetPath", STR_PARAM|USE_FUNC_PARAM,
+ (void *)set_snmpget_path },
+ { "snmpCommunity", STR_PARAM|USE_FUNC_PARAM,
+ (void *)set_snmp_community },
+ { 0,0,0 }
+};
+
+
+struct module_exports exports =
+{
+ SNMPSTATS_MODULE_NAME, /* module's name */
+ DEFAULT_DLFLAGS, /* dlopen flags */
+ 0, /* exported functions */
+ mod_params, /* param exports */
+ 0, /* exported statistics */
+ 0, /* MI Functions */
+ 0, /* pseudo-variables */
+ mod_procs, /* extra processes */
+ mod_init, /* module initialization function */
+ 0, /* reply processing function */
+ mod_destroy, /* Destroy function */
+ mod_child_init /* per-child init function */
+};
+
/*!
* The module will fork off a child process to run an snmp command via execve().
* We need a customized handler to ignore the SIGCHLD when the execve()
diff --git a/modules_k/snmpstats/snmpstats.h b/modules_k/snmpstats/snmpstats.h
index 75a0160..6b76a2d 100644
--- a/modules_k/snmpstats/snmpstats.h
+++ b/modules_k/snmpstats/snmpstats.h
@@ -65,81 +65,8 @@
#ifndef _SNMP_STATS_
#define _SNMP_STATS_
-#include "../../lib/kcore/statistics.h"
-#include "../../sr_module.h"
-#include "../../dprint.h"
-#include "../../error.h"
-#include "../../ut.h"
-#include "../../script_cb.h"
-#include "../../mem/mem.h"
-#include "../../mem/shm_mem.h"
-#include "snmpstats_globals.h"
-#include "sub_agent.h"
-
#define SNMPSTATS_MODULE_NAME "snmpstats"
#define SYSUPTIME_OID ".1.3.6.1.2.1.1.3.0"
-/*! This is the first function to be called by Kamailio, to initialize the module.
- * This call must always return a value as soon as possible. If it were not to
- * return, then Kamailio would not be able to initialize any of the other
- * modules. */
-static int mod_init(void);
-
-/*! This function is called when Kamailio has finished creating all instances of
- * itself. It is at this point that we want to create our AgentX sub-agent
- * process, and register a handler for any state changes of our child. */
-static int mod_child_init(int rank);
-
-
-/*! This function is called when Kamailio is shutting down. When this happens, we
- * log a useful message and kill the AgentX Sub-Agent child process */
-static void mod_destroy(void);
-
-
-static proc_export_t mod_procs[] = {
- {"SNMP AgentX", 0, 0, agentx_child, 1 },
- {0,0,0,0,0}
-};
-
-
-/*!
- * This structure defines the SNMPStats parameters that can be configured
- * through the kamailio.cfg configuration file.
- */
-static param_export_t mod_params[] =
-{
- { "sipEntityType", STR_PARAM|USE_FUNC_PARAM,
- (void *)handleSipEntityType },
- { "MsgQueueMinorThreshold", INT_PARAM|USE_FUNC_PARAM,
- (void *)set_queue_minor_threshold },
- { "MsgQueueMajorThreshold", INT_PARAM|USE_FUNC_PARAM,
- (void *)set_queue_major_threshold },
- { "dlg_minor_threshold", INT_PARAM|USE_FUNC_PARAM,
- (void *)set_dlg_minor_threshold },
- { "dlg_major_threshold", INT_PARAM|USE_FUNC_PARAM,
- (void *)set_dlg_major_threshold },
- { "snmpgetPath", STR_PARAM|USE_FUNC_PARAM,
- (void *)set_snmpget_path },
- { "snmpCommunity", STR_PARAM|USE_FUNC_PARAM,
- (void *)set_snmp_community },
- { 0,0,0 }
-};
-
-
-struct module_exports exports =
-{
- SNMPSTATS_MODULE_NAME, /* module's name */
- DEFAULT_DLFLAGS, /* dlopen flags */
- 0, /* exported functions */
- mod_params, /* param exports */
- 0, /* exported statistics */
- 0, /* MI Functions */
- 0, /* pseudo-variables */
- mod_procs, /* extra processes */
- mod_init, /* module initialization function */
- 0, /* reply processing function */
- mod_destroy, /* Destroy function */
- mod_child_init /* per-child init function */
-};
#endif