sr-dev August 2009

sr-dev@lists.kamailio.org

20 participants
75 discussions

git:master: core & avpops: fix overlapping avp flag

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 67ae0865fbdc175b0e72eadb6a098325e9168a70 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=67ae086… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 31 13:01:46 2009 +0300 core & avpops: fix overlapping avp flag - k avpops uses a flag to mark whether a loaded avp from db has changed, in order to decide if worth to update db - the value was overlapping with flags defined in sr core - reported by Juha Heinanen --- modules/avpops/avpops_impl.h | 2 +- usr_avp.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/avpops/avpops_impl.h b/modules/avpops/avpops_impl.h index 37afb6d..6e38007 100644 --- a/modules/avpops/avpops_impl.h +++ b/modules/avpops/avpops_impl.h @@ -41,7 +41,7 @@ /* flags used inside avps */ /* IMPORTANT: flagss 0-4 are reserved by core; 8-15 by script */ -#define AVP_IS_IN_DB (1<<7) +#define AVP_IS_IN_DB (1<<12) /* DB flags */ #define AVPOPS_DB_NAME_INT (1<<1) diff --git a/usr_avp.h b/usr_avp.h index 324bad4..b40ccdb 100644 --- a/usr_avp.h +++ b/usr_avp.h @@ -153,7 +153,11 @@ typedef struct avp_spec { #define AVP_INDEX_BACKWARD (1<<11) #define AVP_INDEX_ALL (AVP_INDEX_FORWARD | AVP_INDEX_BACKWARD) -#define AVP_CUSTOM_FLAGS 12 +/* AVP DB flag used by avpops module - defined in avpops + * - kept here for reference */ +// #define AVP_IS_IN_DB (1<<12) + +#define AVP_CUSTOM_FLAGS 13 #define GALIAS_CHAR_MARKER '$'

14 years, 8 months

SF.net SVN: openser:[5915] branches/1.5/modules/lcr

by Juha Heinanen

Revision: 5915 http://openser.svn.sourceforge.net/openser/?rev=5915&view=rev Author: juhe Date: 2009-08-27 17:17:37 +0000 (Thu, 27 Aug 2009) Log Message: ----------- * Restored disappeared documentation related to pinging of gateways. Modified Paths: -------------- branches/1.5/modules/lcr/README branches/1.5/modules/lcr/doc/lcr_admin.xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

14 years, 8 months

custom module and variables

by liran tal

Hey list, Due to technical reasons we are running openser1.0.1 on a tiny embedded system. I am exploring the way to pass a PV's value into the exported function from my module, and returning back a value from the function via the use of some other PV or a newly added AVP. I am not sure how to follow this, as basic avpops operations aren't working for me in the config file itself (without introducing my custom module at all). Could someone explain or provide an example as to how this would work? I have taken a look at http://www.asipto.com/pub/openser-devel-guide/ regarding adding a new module but I'm not quite sure as to the details regarding avops and such. Regards.

14 years, 8 months

git:master: modules/lcr: added checks on validity of lcr_id parameter.

by Juha Heinanen

Module: sip-router Branch: master Commit: b1a941a21c7404c6a21df45b988b40695efcb347 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b1a941a… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Aug 28 20:40:05 2009 +0300 modules/lcr: added checks on validity of lcr_id parameter. --- modules/lcr/lcr_mod.c | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 4ad08a7..26cfa48 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -448,7 +448,7 @@ static int mod_init(void) /* Check value of lcr_count */ if (lcr_count < 1) { - LM_ERR("invalid lcr_count value <%d>\n", lcr_count); + LM_ERR("invalid lcr_count module parameter value <%d>\n", lcr_count); return -1; } @@ -953,7 +953,7 @@ int reload_gws_and_lcrs(int lcr_id) struct gw_grp gw_grps[MAX_NO_OF_GWS]; struct gw_info *gws, *gwtp_tmp; struct lcr_info **lcrs, **lcrtp_tmp; - + key_cols[0] = &lcr_id_col; op[0] = OP_EQ; VAL_TYPE(vals) = DB1_INT; @@ -1704,13 +1704,13 @@ static int load_gws(struct sip_msg* _m, char *_lcr_id, char *_from_uri) struct lcr_info **lcrs, *lcr_rec, *pl; struct gw_info *gws; - /* Get parameter values */ + /* Get and check parameter values */ if (get_int_fparam(&lcr_id, _m, (fparam_t *)_lcr_id) != 0) { LM_ERR("no lcr_id param value\n"); return -1; } - if ((lcr_id < 1) && (lcr_id > lcr_count)) { - LM_ERR("invalid lcr_id param value\n"); + if ((lcr_id < 1) || (lcr_id > lcr_count)) { + LM_ERR("invalid lcr_id parameter value %d\n", lcr_id); return -1; } @@ -2096,7 +2096,7 @@ static int do_from_gw(struct sip_msg* _m, unsigned int lcr_id, { struct gw_info *res, *gws; int_str val; - + /* Use gws with index lcr_id */ gws = gwtp[lcr_id]; @@ -2126,19 +2126,20 @@ static int from_gw_1(struct sip_msg* _m, char* _lcr_id, char* _s2) int lcr_id; unsigned int src_addr; - /* Get parameter values */ + /* Get and check parameter value */ if (get_int_fparam(&lcr_id, _m, (fparam_t *)_lcr_id) != 0) { LM_ERR("no lcr_id param value\n"); return -1; } - if ((lcr_id < 1) && (lcr_id > lcr_count)) { - LM_ERR("invalid lcr_id param value\n"); + if ((lcr_id < 1) || (lcr_id > lcr_count)) { + LM_ERR("invalid lcr_id parameter value %d\n", lcr_id); return -1; } /* Get source address */ src_addr = _m->rcv.src_ip.u.addr32[0]; + /* Do test */ return do_from_gw(_m, lcr_id, src_addr); } @@ -2153,15 +2154,16 @@ static int from_gw_2(struct sip_msg* _m, char* _lcr_id, char* _addr) pv_value_t pv_val; struct ip_addr *ip; - /* Get parameter values */ + /* Get and check parameter values */ if (get_int_fparam(&lcr_id, _m, (fparam_t *)_lcr_id) != 0) { LM_ERR("no lcr_id param value\n"); return -1; } - if ((lcr_id < 1) && (lcr_id > lcr_count)) { - LM_ERR("invalid lcr_id param value\n"); + if ((lcr_id < 1) || (lcr_id > lcr_count)) { + LM_ERR("invalid lcr_id parameter value %d\n", lcr_id); return -1; } + if (_addr && (pv_get_spec_value(_m, (pv_spec_t *)_addr, &pv_val) == 0)) { if (pv_val.flags & PV_VAL_INT) { src_addr = pv_val.ri; @@ -2280,13 +2282,13 @@ static int to_gw_1(struct sip_msg* _m, char* _lcr_id, char* _s2) unsigned int dst_addr; struct ip_addr *ip; - /* Get parameter value */ + /* Get and check parameter value */ if (get_int_fparam(&lcr_id, _m, (fparam_t *)_lcr_id) != 0) { LM_ERR("no lcr_id param value\n"); return -1; } - if ((lcr_id < 1) && (lcr_id > lcr_count)) { - LM_ERR("invalid lcr_id param value\n"); + if ((lcr_id < 1) || (lcr_id > lcr_count)) { + LM_ERR("invalid lcr_id parameter value %d\n", lcr_id); return -1; } @@ -2323,15 +2325,16 @@ static int to_gw_2(struct sip_msg* _m, char* _lcr_id, char* _addr) pv_value_t pv_val; struct ip_addr *ip; - /* Get parameter values */ + /* Get and check parameter values */ if (get_int_fparam(&lcr_id, _m, (fparam_t *)_lcr_id) != 0) { LM_ERR("no lcr_id param value\n"); return -1; } - if ((lcr_id < 1) && (lcr_id > lcr_count)) { - LM_ERR("invalid lcr_id param value\n"); + if ((lcr_id < 1) || (lcr_id > lcr_count)) { + LM_ERR("invalid lcr_id parameter value %d\n", lcr_id); return -1; } + if (_addr && (pv_get_spec_value(_m, (pv_spec_t *)_addr, &pv_val) == 0)) { if (pv_val.flags & PV_VAL_INT) { dst_addr = pv_val.ri;

14 years, 8 months

sl modules update

by Daniel-Constantin Mierla

Hello, I extended kamailio sl module to export similar API exported by ser version of the module. This was the easy way to make all modules work internally with one version of sl module -- the modules_k/sl. Shortly, modules like modules_s/xmlrpc, modules_s/auth_db, modules_s/registrar ... should work even if you use modules_k/sl. A full integration would require a more laborious process, since each version has its own way of dealing with parameters of the functions exported in config. Therefore, the config syntax is still depending of which version of the module you use -- see the readme for each module. A proper time to get to a single version would be when we unify the module parameter format. Juha, could you test and see if xmlrpc works ok now (I saw you are using it with k sl module)? I removed the define that selected between sl module versions, so it should work out of the bx no matter which version of sl is used. Cheers, Daniel -- Daniel-Constantin Mierla * http://www.asipto.com/

14 years, 8 months

git:master: xmlrpc(s): remove the K sl define

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 0658a37570683eaec57f138e5a07feb59f4bfbaf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0658a37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 28 11:44:37 2009 +0300 xmlrpc(s): remove the K sl define - no more needed - the modules should work the same with any version of sl module --- modules_s/xmlrpc/Makefile | 7 ------- modules_s/xmlrpc/xmlrpc.c | 27 +-------------------------- 2 files changed, 1 insertions(+), 33 deletions(-) diff --git a/modules_s/xmlrpc/Makefile b/modules_s/xmlrpc/Makefile index 93651a6..efcbf38 100644 --- a/modules_s/xmlrpc/Makefile +++ b/modules_s/xmlrpc/Makefile @@ -3,9 +3,6 @@ # # WARNING: do not run this directly, it should be run by the master Makefile -# Set to true if you want to use K sl module API -USE_K_SL_API=false - include ../../Makefile.defs auto_gen= NAME=xmlrpc.so @@ -14,8 +11,4 @@ LIBS +=-lxml2 DEFS+=-DSER_MOD_INTERFACE -ifeq ($(USE_K_SL_API),true) -DEFS+=-DUSE_K_SL_API -endif - include ../../Makefile.modules diff --git a/modules_s/xmlrpc/xmlrpc.c b/modules_s/xmlrpc/xmlrpc.c index 4f82b12..c140626 100644 --- a/modules_s/xmlrpc/xmlrpc.c +++ b/modules_s/xmlrpc/xmlrpc.c @@ -55,11 +55,7 @@ #include "../../msg_translator.h" #include "../../select.h" #include "../../receive.h" /* needed by process_rpc / receive_msg() */ -#ifdef USE_K_SL_API -#include "../../modules_k/sl/sl_api.h" -#else #include "../sl/sl.h" -#endif #include "../../nonsip_hooks.h" #include "../../action.h" /* run_actions */ #include "../../script_cb.h" /* exec_*_script_cb */ @@ -382,11 +378,7 @@ static char* xmlrpc_route=0; /* default is the main route */ /** Reference to the sl (stateless replies) module of SER The sl module of SER * is needed so that the xmlrpc SER module can send replies back to clients */ -#ifdef USE_K_SL_API -struct sl_binds sl; -#else sl_api_t sl; -#endif static int xmlrpc_route_no=DEFAULT_RT; /* if set, try autoconverting to the requested type if possible @@ -743,20 +735,10 @@ static int send_reply(sip_msg_t* msg, str* body) return -1; } -#ifdef USE_K_SL_API - str s; - s.s = "OK"; - s.len = 2; - if (sl.send_reply(msg, 200, &s) == -1) { - ERR("Error while sending reply\n"); - return -1; - } -#else if (sl.reply(msg, 200, "OK") == -1) { ERR("Error while sending reply\n"); return -1; } -#endif return 0; } @@ -2214,20 +2196,13 @@ static int mod_init(void) * We will need sl_send_reply from stateless * module for sending replies */ -#ifdef USE_K_SL_API - if (load_sl_api(&sl)!=0) { - ERR("This module requires sl module\n"); - return -1; - } -#else - bind_sl_t bind_sl; + bind_sl_t bind_sl; bind_sl = (bind_sl_t)find_export("bind_sl", 0, 0); if (!bind_sl) { ERR("This module requires sl module\n"); return -1; } if (bind_sl(&sl) < 0) return -1; -#endif func_param.send = (rpc_send_f)rpc_send; func_param.fault = (rpc_fault_f)rpc_fault;

14 years, 8 months

git:master: sl(s): move typedef of sl_send_reply_f in sl.h

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 974722abe961b7833ca06292f8032737fe2a479e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=974722a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 28 11:38:14 2009 +0300 sl(s): move typedef of sl_send_reply_f in sl.h - modules_s/sl/sl.h is included by modules_k/sl/sl.h to export ser-like SL API in kamailio sl module - allow using ser modules dependent of sl with k-sl module --- modules_s/sl/sl.h | 4 +++- modules_s/sl/sl_funcs.h | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules_s/sl/sl.h b/modules_s/sl/sl.h index d5703c6..43fe1e6 100644 --- a/modules_s/sl/sl.h +++ b/modules_s/sl/sl.h @@ -27,7 +27,9 @@ #ifndef _SL_H #define _SL_H -#include "sl_funcs.h" +#include "../../parser/msg_parser.h" + +typedef int (*sl_send_reply_f)(struct sip_msg* msg, int code, char* reason); typedef struct sl_api { sl_send_reply_f reply; /* Send stateless reply */ diff --git a/modules_s/sl/sl_funcs.h b/modules_s/sl/sl_funcs.h index 8892382..9a2e899 100644 --- a/modules_s/sl/sl_funcs.h +++ b/modules_s/sl/sl_funcs.h @@ -39,7 +39,6 @@ int sl_startup(); int sl_shutdown(); -typedef int (*sl_send_reply_f)(struct sip_msg* msg, int code, char* reason); int sl_send_reply(struct sip_msg* msg, int code, char* reason); int sl_filter_ACK(struct sip_msg*, unsigned int flags, void *bar );

14 years, 8 months

git:master: sl(k): implement ser-like SL api

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 91c1f6c8b9731d0c6d760e93cd5477f7b4cf938a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=91c1f6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 28 11:40:35 2009 +0300 sl(k): implement ser-like SL api - SER modules dependent of sl module can work now with k-sl - exported sl_send_reply() ser function takes the reason as charz while k version is str - conflict was resolved since SER does the export via sl_api_t structure and bind_sl() function, kamailio does via sl_binds structure and load_sl() function - both are now included in k-sl module --- modules_k/sl/sl.c | 24 ++++++++++++++++++++++-- modules_k/sl/sl.h | 21 +++------------------ modules_k/sl/sl_api.h | 4 ++-- modules_k/sl/sl_funcs.c | 26 ++++++++++++++++++++++++++ modules_k/sl/sl_funcs.h | 1 + 5 files changed, 54 insertions(+), 22 deletions(-) diff --git a/modules_k/sl/sl.c b/modules_k/sl/sl.c index 2c863a3..6fbf7b6 100644 --- a/modules_k/sl/sl.c +++ b/modules_k/sl/sl.c @@ -62,6 +62,7 @@ #include "sl_funcs.h" #include "sl_api.h" +#include "sl.h" #include "sl_cb.h" MODULE_VERSION @@ -70,6 +71,7 @@ MODULE_VERSION static int w_sl_send_reply(struct sip_msg* msg, char* str1, char* str2); static int w_send_reply(struct sip_msg* msg, char* str1, char* str2); static int w_sl_reply_error(struct sip_msg* msg, char* str1, char* str2); +static int bind_sl(sl_api_t* api); static int fixup_sl_send_reply(void** param, int param_no); static int mod_init(void); static void mod_destroy(void); @@ -105,6 +107,8 @@ static cmd_export_t cmds[]={ {"load_sl", (cmd_function)load_sl, 0, 0, 0, 0}, + {"bind_sl", (cmd_function)bind_sl, 0, 0, 0, 0}, + {"api_sl_reply", (cmd_function)sl_send_reply_sz, 2, 0, 0, 0}, {0,0,0,0,0,0} }; @@ -378,9 +382,25 @@ int load_sl( struct sl_binds *slb) slb->reply = sl_send_reply; slb->reply_dlg = sl_send_reply_dlg; slb->sl_get_reply_totag = sl_get_reply_totag; - slb->send_reply = send_reply; - slb->get_reply_totag = get_reply_totag; + slb->send_reply = send_reply; + slb->get_reply_totag = get_reply_totag; return 1; } + +static int bind_sl(sl_api_t* api) +{ + if (!api) { + ERR("Invalid parameter value\n"); + return -1; + } + + api->reply = (sl_send_reply_f)find_export("api_sl_reply", 2, 0); + if (api->reply == 0) { + ERR("Can't bind sl_reply functionn"); + return -1; + } + + return 0; +} diff --git a/modules_k/sl/sl.h b/modules_k/sl/sl.h index 3cb70d0..90c5cee 100644 --- a/modules_k/sl/sl.h +++ b/modules_k/sl/sl.h @@ -31,24 +31,9 @@ * - Module: \ref sl */ -#ifndef _SL_H_ -#define _SL_H_ - -#include "../../lib/kcore/statistics.h" - -/* module parameter */ -extern int sl_enable_stats; - -/* statistic variables */ -extern stat_var *tx_1xx_rpls; -extern stat_var *tx_2xx_rpls; -extern stat_var *tx_3xx_rpls; -extern stat_var *tx_4xx_rpls; -extern stat_var *tx_5xx_rpls; -extern stat_var *tx_6xx_rpls; -extern stat_var *sent_rpls; -extern stat_var *sent_err_rpls; -extern stat_var *rcv_acks; +#ifndef _SL_K_H_ +#define _SL_K_H_ +#include "../../modules_s/sl/sl.h" #endif diff --git a/modules_k/sl/sl_api.h b/modules_k/sl/sl_api.h index a7b8ebe..fc34e46 100644 --- a/modules_k/sl/sl_api.h +++ b/modules_k/sl/sl_api.h @@ -36,13 +36,13 @@ typedef int (*get_reply_totag_f)(struct sip_msg *msg, str *tag); typedef int (*send_reply_f)(struct sip_msg *msg, int code, str *reason); typedef int (*sl_get_reply_totag_f)(struct sip_msg *msg, str *tag); -typedef int (*sl_send_reply_f)(struct sip_msg *msg, int code, str *reason); +typedef int (*sl_send_reply_str_f)(struct sip_msg *msg, int code, str *reason); typedef int (*sl_send_reply_dlg_f)(struct sip_msg *msg, int code, str *reason, str *tag); /*! SL API bindings */ struct sl_binds { - sl_send_reply_f reply; + sl_send_reply_str_f reply; sl_send_reply_dlg_f reply_dlg; sl_get_reply_totag_f sl_get_reply_totag; send_reply_f send_reply; diff --git a/modules_k/sl/sl_funcs.c b/modules_k/sl/sl_funcs.c index 9a1df21..f93e059 100644 --- a/modules_k/sl/sl_funcs.c +++ b/modules_k/sl/sl_funcs.c @@ -67,6 +67,23 @@ #include "sl_cb.h" #include "../../usr_avp.h" #include <string.h> +#include "../../lib/kcore/statistics.h" + +/* module parameter */ +extern int sl_enable_stats; + +/* statistic variables */ +extern stat_var *tx_1xx_rpls; +extern stat_var *tx_2xx_rpls; +extern stat_var *tx_3xx_rpls; +extern stat_var *tx_4xx_rpls; +extern stat_var *tx_5xx_rpls; +extern stat_var *tx_6xx_rpls; +extern stat_var *sent_rpls; +extern stat_var *sent_err_rpls; +extern stat_var *rcv_acks; + + /* to-tag including pre-calculated and fixed part */ static char sl_tag_buf[TOTAG_VALUE_LEN]; static str sl_tag = {sl_tag_buf,TOTAG_VALUE_LEN}; @@ -256,6 +273,15 @@ int sl_send_reply(struct sip_msg *msg ,int code, str *text) return sl_send_reply_helper(msg, code, text, 0); } +/*! small wrapper around sl_send_reply_helper */ +int sl_send_reply_sz(struct sip_msg *msg ,int code, char *text) +{ + str r; + r.s = text; + r.len = strlen(text); + return sl_send_reply_helper(msg, code, &r, 0); +} + /*! small wrapper around sl_send_reply_helper */ int sl_send_reply_dlg(struct sip_msg *msg ,int code, str *text, str *tag) diff --git a/modules_k/sl/sl_funcs.h b/modules_k/sl/sl_funcs.h index 3f5f13f..f6124a7 100644 --- a/modules_k/sl/sl_funcs.h +++ b/modules_k/sl/sl_funcs.h @@ -39,6 +39,7 @@ int sl_startup(void); int sl_shutdown(void); int sl_send_reply( struct sip_msg *msg, int code, str *reason); +int sl_send_reply_sz( struct sip_msg *msg, int code, char *reason); int sl_send_reply_dlg( struct sip_msg *msg, int code, str *reason, str *tag); int sl_filter_ACK( struct sip_msg *msg, unsigned int flags, void *foo ); int sl_reply_error( struct sip_msg *msg );

14 years, 8 months

git:master: modules_s: include sr_module.h

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c29222b15340f6b86b839811b322e4953b020041 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c29222b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 28 11:46:31 2009 +0300 modules_s: include sr_module.h - some modules updated to include sr_module.h as they need access to fparam_t - previously that was inherited from modules_s/sl/sl_funcs.h which was included by modules_s/sl/sl.h - modules_s/sl/sl.h became simple API definition being included by modules_k/sl/sl.h in order to export same API in K version --- modules_s/auth_db/authorize.c | 1 + modules_s/registrar/lookup.c | 1 + modules_s/registrar/save.c | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules_s/auth_db/authorize.c b/modules_s/auth_db/authorize.c index ea9fc34..e93e39f 100644 --- a/modules_s/auth_db/authorize.c +++ b/modules_s/auth_db/authorize.c @@ -49,6 +49,7 @@ #include "../../mem/mem.h" #include "../../config.h" #include "../../id.h" +#include "../../sr_module.h" #include "../auth/api.h" #include "authdb_mod.h" diff --git a/modules_s/registrar/lookup.c b/modules_s/registrar/lookup.c index 163ca8b..45fc577 100644 --- a/modules_s/registrar/lookup.c +++ b/modules_s/registrar/lookup.c @@ -44,6 +44,7 @@ #include "../usrloc/usrloc.h" #include "../../error.h" #include "../../id.h" +#include "../../sr_module.h" #include "common.h" #include "regtime.h" #include "reg_mod.h" diff --git a/modules_s/registrar/save.c b/modules_s/registrar/save.c index a6be258..27d134c 100644 --- a/modules_s/registrar/save.c +++ b/modules_s/registrar/save.c @@ -46,6 +46,7 @@ #include "../../qvalue.h" #include "../../id.h" #include "../../globals.h" +#include "../../sr_module.h" #include "common.h" #include "sip_msg.h" #include "rerrno.h"

14 years, 8 months

git:master: core: callback function support for myself check

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 1dfc197d38672eac079ad2a93238cb5642c6c253 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1dfc197… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 27 11:22:10 2009 +0300 core: callback function support for myself check - modules can register callback functions for myself check condition - domain module is one candidate, resulting in coherent handling of local domains via check myself operation - callback functions must have same prototype and return codes as check_self(...) function from core --- forward.c | 40 +++++++++++++++++++++++++++++++++++++++- forward.h | 3 +++ 2 files changed, 42 insertions(+), 1 deletions(-) diff --git a/forward.c b/forward.c index 3080b1d..dea7584 100644 --- a/forward.c +++ b/forward.c @@ -301,7 +301,44 @@ not_forced: return send_sock; } +static struct _check_self_func { + check_self_f fself; + struct _check_self_func *next; +} *_check_self_func_list = NULL; + +/* register a function to be called when matching for myself + * - return 0 on success, -1 on error + * - f must have same prototype as check_self() and return same kind of values + */ +int register_check_self_func(check_self_f f) +{ + struct _check_self_func *nf = 0; + nf=(struct _check_self_func*)pkg_malloc(sizeof(struct _check_self_func)); + if(nf==0) + { + LM_ERR("no more pkg\n"); + return -1; + } + nf->fself = f; + nf->next = _check_self_func_list; + _check_self_func_list = nf; + return 0; +} +/* run registered check self functions + * returns 1 if true, 0 if false + */ +int run_check_self_func(str* host, unsigned short port, unsigned short proto) +{ + struct _check_self_func *sf = 0; + + if(_check_self_func_list==NULL) + return 0; + for(sf=_check_self_func_list; sf; sf=sf->next) + if(sf->fself(host, port, proto)==1) + return 1; + return 0; +} /* checks if the proto: host:port is one of the address we listen on; * if port==0, the port number is ignored @@ -316,7 +353,8 @@ int check_self(str* host, unsigned short port, unsigned short proto) /* try to look into the aliases*/ if (grep_aliases(host->s, host->len, port, proto)==0){ DBG("check_self: host != me\n"); - return 0; + return (_check_self_func_list==NULL)?0:run_check_self_func(host, + port, proto); } found: return 1; diff --git a/forward.h b/forward.h index 0a5750a..12ce134 100644 --- a/forward.h +++ b/forward.h @@ -83,6 +83,9 @@ inline static struct socket_info* get_send_socket(struct sip_msg* msg, struct socket_info* get_out_socket(union sockaddr_union* to, int proto); +typedef int (*check_self_f)(str* host, unsigned short port, + unsigned short proto); +int register_check_self_func(check_self_f f); int check_self(str* host, unsigned short port, unsigned short proto); int check_self_port(unsigned short port, unsigned short proto); int forward_request( struct sip_msg* msg, str* dst, unsigned short port,

14 years, 8 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2009