sr-dev August 2011

sr-dev@lists.kamailio.org

33 participants
291 discussions

Re: [sr-dev] Timer warning whenever PUA sends a request

by Juha Heinanen

Peter Dunkley wrote: The warning I am seeing is: 14(6323) WARNING: <core> [timer_funcs.h:119]: WARNING: timer: add_timeout: 0 expire timer added I have started to get the same warning. -- Juha

13 years, 4 months

git:master: modules/app_lua, modules_k/presence: Added support for the exported function pres_auth_status() to app_lua

by Peter Dunkley

Module: sip-router Branch: master Commit: abc175ad51767f8607b77b0478878149a1a39131 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=abc175a… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Aug 18 16:47:13 2011 +0100 modules/app_lua, modules_k/presence: Added support for the exported function pres_auth_status() to app_lua --- modules/app_lua/app_lua_exp.c | 67 ++++++++++++++++++++++++++++++++++++ modules_k/presence/bind_presence.c | 1 + modules_k/presence/bind_presence.h | 14 +++++++ modules_k/presence/presence.c | 26 +++++++++----- modules_k/presence/presence.h | 1 + 5 files changed, 100 insertions(+), 9 deletions(-) diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index 3a69ff7..be8d22d 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -42,6 +42,7 @@ #include "../../modules_k/dispatcher/api.h" #include "../../modules/xhttp/api.h" #include "../../modules/sdpops/api.h" +#include "../../modules_k/presence/bind_presence.h" #include "app_lua_api.h" @@ -56,6 +57,7 @@ #define SR_LUA_EXP_MOD_DISPATCHER (1<<8) #define SR_LUA_EXP_MOD_XHTTP (1<<9) #define SR_LUA_EXP_MOD_SDPOPS (1<<10) +#define SR_LUA_EXP_MOD_PRESENCE (1<<11) /** * @@ -119,6 +121,11 @@ static xhttp_api_t _lua_xhttpb; static sdpops_api_t _lua_sdpopsb; /** + * presence + */ +static presence_api_t _lua_presenceb; + +/** * */ static int lua_sr_sl_send_reply (lua_State *L) @@ -1339,6 +1346,51 @@ static const luaL_reg _sr_sdpops_Map [] = { {NULL, NULL} }; +/** + * + */ +static int lua_sr_pres_auth_status(lua_State *L) +{ + str param[2]; + int ret; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_PRESENCE)) + { + LM_WARN("weird: presence function executed but module not registered\n"); + return app_lua_return_error(L); + } + + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_error(L); + } + + if(lua_gettop(L)!=2) + { + LM_ERR("incorrect number of arguments\n"); + return app_lua_return_error(L); + } + + param[0].s = (char *) lua_tostring(L, -2); + param[0].len = strlen(param[0].s); + param[1].s = (char *) lua_tostring(L, -1); + param[1].len = strlen(param[1].s); + + ret = _lua_presenceb.pres_auth_status(env_L->msg, param[0], param[1]); + return app_lua_return_int(L, ret); +} + +/** + * + */ +static const luaL_reg _sr_presence_Map [] = { + {"pres_auth_status", lua_sr_pres_auth_status}, + {NULL, NULL} +}; /** * @@ -1461,6 +1513,16 @@ int lua_sr_exp_init_mod(void) } LM_DBG("loaded sdpops api\n"); } + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_PRESENCE) + { + /* bind the PRESENCE API */ + if (presence_load_api(&_lua_presenceb) < 0) + { + LM_ERR("cannot bind to PRESENCE API\n"); + return -1; + } + LM_DBG("loaded presence api\n"); + } return 0; } @@ -1507,6 +1569,9 @@ int lua_sr_exp_register_mod(char *mname) } else if(len==6 && strcmp(mname, "sdpops")==0) { _sr_lua_exp_reg_mods |= SR_LUA_EXP_MOD_SDPOPS; return 0; + } else if(len==8 && strcmp(mname, "presence")==0) { + _sr_lua_exp_reg_mods |= SR_LUA_EXP_MOD_PRESENCE; + return 0; } return -1; @@ -1539,5 +1604,7 @@ void lua_sr_exp_openlibs(lua_State *L) luaL_openlib(L, "sr.xhttp", _sr_xhttp_Map, 0); if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SDPOPS) luaL_openlib(L, "sr.sdpops", _sr_sdpops_Map, 0); + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_PRESENCE) + luaL_openlib(L, "sr.presence", _sr_presence_Map, 0); } diff --git a/modules_k/presence/bind_presence.c b/modules_k/presence/bind_presence.c index 8a89d1e..f606d82 100644 --- a/modules_k/presence/bind_presence.c +++ b/modules_k/presence/bind_presence.c @@ -66,6 +66,7 @@ int bind_presence(presence_api_t* api) api->get_sphere= get_sphere; api->get_presentity= get_p_notify_body; api->free_presentity= free_notify_body; + api->pres_auth_status= pres_auth_status; return 0; } diff --git a/modules_k/presence/bind_presence.h b/modules_k/presence/bind_presence.h index afc1a77..7f2ce4e 100644 --- a/modules_k/presence/bind_presence.h +++ b/modules_k/presence/bind_presence.h @@ -38,10 +38,12 @@ #include "event_list.h" #include "hash.h" #include "presentity.h" +#include "../../sr_module.h" typedef int (*update_watchers_t)(str pres_uri, pres_ev_t* ev, str* rules_doc); typedef str* (*pres_get_presentity_t)(str pres_uri, pres_ev_t *ev, str *etag, str *contact); typedef void (*pres_free_presentity_t)(str *presentity, pres_ev_t *ev); +typedef int (*pres_auth_status_t)(struct sip_msg* msg, str watcher_uri, str presentity_uri); typedef struct presence_api { add_event_t add_event; @@ -62,11 +64,23 @@ typedef struct presence_api { pres_get_sphere_t get_sphere; pres_get_presentity_t get_presentity; pres_free_presentity_t free_presentity; + pres_auth_status_t pres_auth_status; } presence_api_t; int bind_presence(presence_api_t* api); typedef int (*bind_presence_t)(presence_api_t* api); +inline static int presence_load_api(presence_api_t *api) +{ + bind_presence_t bind_presence_exports; + if (!(bind_presence_exports = (bind_presence_t)find_export("bind_presence", 1, 0))) + { + LM_ERR("Failed to import bind_presence\n"); + return -1; + } + return bind_presence_exports(api); +} + #endif diff --git a/modules_k/presence/presence.c b/modules_k/presence/presence.c index 8dd866c..1bb6c9b 100644 --- a/modules_k/presence/presence.c +++ b/modules_k/presence/presence.c @@ -116,7 +116,7 @@ static int update_pw_dialogs(subs_t* subs, unsigned int hash_code, subs_t** subs_array); int update_watchers_status(str pres_uri, pres_ev_t* ev, str* rules_doc); static int mi_child_init(void); -static int pres_auth_status(struct sip_msg* _msg, char* _sp1, char* _sp2); +static int w_pres_auth_status(struct sip_msg* _msg, char* _sp1, char* _sp2); static int w_pres_refresh_watchers(struct sip_msg *msg, char *puri, char *pevent, char *ptype); static int w_pres_update_watchers(struct sip_msg *msg, char *puri, @@ -150,7 +150,7 @@ static cmd_export_t cmds[]= fixup_presence, 0, REQUEST_ROUTE}, {"handle_subscribe", (cmd_function)handle_subscribe, 0, fixup_subscribe,0, REQUEST_ROUTE}, - {"pres_auth_status", (cmd_function)pres_auth_status, 2, + {"pres_auth_status", (cmd_function)w_pres_auth_status, 2, fixup_pvar_pvar, fixup_free_pvar_pvar, REQUEST_ROUTE}, {"pres_refresh_watchers", (cmd_function)w_pres_refresh_watchers, 3, fixup_refresh_watchers, 0, ANY_ROUTE}, @@ -1131,16 +1131,11 @@ static int update_pw_dialogs(subs_t* subs, unsigned int hash_code, subs_t** subs return 0; } -static int pres_auth_status(struct sip_msg* _msg, char* _sp1, char* _sp2) +static int w_pres_auth_status(struct sip_msg* _msg, char* _sp1, char* _sp2) { pv_spec_t *sp; pv_value_t pv_val; - str watcher_uri, presentity_uri, event; - struct sip_uri uri; - pres_ev_t* ev; - str* rules_doc = NULL; - subs_t subs; - int res; + str watcher_uri, presentity_uri; sp = (pv_spec_t *)_sp1; @@ -1178,6 +1173,19 @@ static int pres_auth_status(struct sip_msg* _msg, char* _sp1, char* _sp2) return -1; } + return pres_auth_status(_msg, watcher_uri, presentity_uri); +} + + +int pres_auth_status(struct sip_msg* msg, str watcher_uri, str presentity_uri) +{ + str event; + struct sip_uri uri; + pres_ev_t* ev; + str* rules_doc = NULL; + subs_t subs; + int res; + event.s = "presence"; event.len = 8; diff --git a/modules_k/presence/presence.h b/modules_k/presence/presence.h index 16e5177..7d4ba08 100644 --- a/modules_k/presence/presence.h +++ b/modules_k/presence/presence.h @@ -83,5 +83,6 @@ extern int phtable_size; extern phtable_t* pres_htable; int update_watchers_status(str pres_uri, pres_ev_t* ev, str* rules_doc); +int pres_auth_status(struct sip_msg* msg, str watcher_uri, str presentity_uri); #endif /* PA_MOD_H */

13 years, 4 months

git:master: modules/app_lua, modules/sdpops: Fixed a couple of small issues with sdpops in app_lua

by Peter Dunkley

Module: sip-router Branch: master Commit: bedf2c75669a27ccaf4195ef705312277fc5e090 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bedf2c7… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Aug 18 16:35:51 2011 +0100 modules/app_lua, modules/sdpops: Fixed a couple of small issues with sdpops in app_lua --- modules/app_lua/app_lua_exp.c | 18 ++++++++++++++++++ modules/sdpops/api.h | 2 +- modules/sdpops/sdpops_mod.c | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index 0893089..3a69ff7 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -1305,6 +1305,24 @@ static int lua_sr_sdpops_with_media(lua_State *L) env_L = sr_lua_env_get(); + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SDPOPS)) + { + LM_WARN("weird: sdpops function executed but module not registered\n"); + return app_lua_return_error(L); + } + + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_error(L); + } + + if(lua_gettop(L)!=1) + { + LM_ERR("incorrect number of arguments\n"); + return app_lua_return_error(L); + } + media.s = (char*)lua_tostring(L, -1); media.len = strlen(media.s); diff --git a/modules/sdpops/api.h b/modules/sdpops/api.h index 215dcce..c6a6f23 100644 --- a/modules/sdpops/api.h +++ b/modules/sdpops/api.h @@ -15,7 +15,7 @@ int bind_sdpops(struct sdpops_binds*); inline static int sdpops_load_api(sdpops_api_t *sob) { bind_sdpops_f bind_sdpops_exports; - if (!(bind_sdpops_exports = (bind_sdpops_f)find_export("bind_sdpops", 0, 0))) + if (!(bind_sdpops_exports = (bind_sdpops_f)find_export("bind_sdpops", 1, 0))) { LM_ERR("Failed to import bind_sdpops\n"); return -1; diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c index 1212053..9e47a0c 100644 --- a/modules/sdpops/sdpops_mod.c +++ b/modules/sdpops/sdpops_mod.c @@ -56,7 +56,7 @@ static cmd_export_t cmds[] = { {"sdp_print", (cmd_function)w_sdp_print, 1, fixup_igp_null, 0, ANY_ROUTE}, {"bind_sdpops", (cmd_function)bind_sdpops, - 0, 0, 0, 0}, + 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0} };

13 years, 4 months

Regarding SER

by Sayantan Laha

Hello Sir, I am newer to SER and keen to know about it. How to count usage of voip using SER? Please help. Thanks & Regards, Sayantan Laha Senior Software Engineer MasterCom TechServices Pvt. Ltd Mob:-+91-9869321411

13 years, 4 months

git:master: modules_k/textops: Fix backwards incompatibility in re.subst

by Alex Hermann

Module: sip-router Branch: master Commit: c64bc01063c7f221445c2d60af9714ec12e649f7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c64bc01… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Aug 18 16:00:17 2011 +0200 modules_k/textops: Fix backwards incompatibility in re.subst The commit to add pvar suppott to re.subst inadvertently removed support for embedded linebreaks and tabs in the regular expression. --- modules_k/textops/txt_var.c | 117 ++++++++++++++++++++++--------------------- 1 files changed, 59 insertions(+), 58 deletions(-) diff --git a/modules_k/textops/txt_var.c b/modules_k/textops/txt_var.c index adcb860..c63e3a0 100644 --- a/modules_k/textops/txt_var.c +++ b/modules_k/textops/txt_var.c @@ -123,64 +123,14 @@ error: return -1; } -#define _tr_parse_sparam(_p, _p0, _tp, _spec, _ps, _in, _s) \ - while(is_in_str(_p, _in) && (*_p==' ' || *_p=='\t' || *_p=='\n')) _p++; \ - if(*_p==PV_MARKER) \ - { /* pseudo-variable */ \ - _spec = (pv_spec_t*)pkg_malloc(sizeof(pv_spec_t)); \ - if(_spec==NULL) \ - { \ - LM_ERR("no more private memory!\n"); \ - goto error; \ - } \ - _s.s = _p; _s.len = _in->s + _in->len - _p; \ - _p0 = pv_parse_spec(&_s, _spec); \ - if(_p0==NULL) \ - { \ - LM_ERR("invalid spec in substr transformation: %.*s!\n", \ - _in->len, _in->s); \ - goto error; \ - } \ - _p = _p0; \ - _tp = (tr_param_t*)pkg_malloc(sizeof(tr_param_t)); \ - if(_tp==NULL) \ - { \ - LM_ERR("no more private memory!\n"); \ - goto error; \ - } \ - memset(_tp, 0, sizeof(tr_param_t)); \ - _tp->type = TR_PARAM_SPEC; \ - _tp->v.data = (void*)_spec; \ - } else { /* string */ \ - _ps = _p; \ - while(is_in_str(_p, _in) && *_p!='\t' && *_p!='\n' \ - && *_p!=TR_PARAM_MARKER && *_p!=TR_RBRACKET) \ - _p++; \ - if(*_p=='\0') \ - { \ - LM_ERR("invalid param in transformation: %.*s!!\n", \ - _in->len, _in->s); \ - goto error; \ - } \ - _tp = (tr_param_t*)pkg_malloc(sizeof(tr_param_t)); \ - if(_tp==NULL) \ - { \ - LM_ERR("no more private memory!\n"); \ - goto error; \ - } \ - memset(_tp, 0, sizeof(tr_param_t)); \ - _tp->type = TR_PARAM_STRING; \ - _tp->v.s.s = _ps; \ - _tp->v.s.len = _p - _ps; \ - } - char* tr_txt_parse_re(str *in, trans_t *t) { - char *p, *p0, *ps; + char *p; str name; - str s; + str tok; struct subst_expr *se = NULL; tr_param_t *tp = NULL; + int n; pv_spec_t *spec = NULL; @@ -205,11 +155,62 @@ char* tr_txt_parse_re(str *in, trans_t *t) if(*p!=TR_PARAM_MARKER) goto error; p++; - /* get parameter */ - _tr_parse_sparam(p, p0, tp, spec, ps, in, s); - if (tp->type == TR_PARAM_STRING) { - /* precompile static regexp */ - se=subst_parser(&tp->v.s); + if(*p==PV_MARKER) { + spec = (pv_spec_t*)pkg_malloc(sizeof(pv_spec_t)); + if(spec==NULL) + { + LM_ERR("no more private memory!\n"); + return 0; + } + tok.s = p; tok.len = in->s + in->len - p; + p = pv_parse_spec(&tok, spec); + if(p==NULL) + { + LM_ERR("invalid pv spec in transformation: %.*s!\n", + in->len, in->s); + pkg_free(spec); + return 0; + } + + tp = (tr_param_t*)pkg_malloc(sizeof(tr_param_t)); + if(tp==NULL) + { + LM_ERR("no more private memory!\n"); + pkg_free(spec); + goto error; + } + tp->type = TR_PARAM_SPEC; + tp->v.data = (void*)spec; + } else { + /* get trans here */ + n = 0; + tok.s = p; + while(is_in_str(p, in)) + { + if(*p==TR_RBRACKET) + { + if(n==0) + break; + n--; + } + if(*p == TR_LBRACKET) + n++; + p++; + } + if(!is_in_str(p, in)) + goto error; + if(p==tok.s) + goto error; + tok.len = p - tok.s; + tp = (tr_param_t*)pkg_malloc(sizeof(tr_param_t)); + if(tp==NULL) + { + LM_ERR("no more private memory!\n"); + goto error; + } + + se=subst_parser(&tok); + if (se==0) goto error; tp->type = TR_PARAM_SUBST;

13 years, 4 months

git:master: modules_k/presence_xml: Modified pres_check_activities() to return -2 when part of the XML tree is not present

by Peter Dunkley

Module: sip-router Branch: master Commit: a078f2d1dd19d83a9e740834403f48fdf6088d2b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a078f2d… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Aug 18 15:12:33 2011 +0100 modules_k/presence_xml: Modified pres_check_activities() to return -2 when part of the XML tree is not present - This is needed because some presence UAs (such as pua_usrloc) only fill in the basic part of the tree. This change enables you to distinguish between not having a particular activity set (by a client that supports that) and not having any activities at all (by clients that only support basic presence). --- modules_k/presence_xml/README | 4 +++- modules_k/presence_xml/doc/presence_xml_admin.xml | 9 ++++++++- modules_k/presence_xml/pres_check.c | 10 ++++++---- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/modules_k/presence_xml/README b/modules_k/presence_xml/README index 8756ea8..59099eb 100644 --- a/modules_k/presence_xml/README +++ b/modules_k/presence_xml/README @@ -320,11 +320,13 @@ modparam("presence_xml", "passive_mode", 1) Return code: * 1 - if a match is found. * -1 - if a match is not found. + * -2 - if /presence/person or /presence/person/activity do not exist. Example 1.12. pres_check_activities usage ... if (pres_check_basic("$ru", "open")) { - if (pres_check_activities("$ru", "unknown") || !is_method("INVITE")) + pres_check_activities("$ru", "unknown"); + if ($retcode || $retcode == -2 || !is_method("INVITE")) t_relay(); else send_reply("486", "Busy Here"); diff --git a/modules_k/presence_xml/doc/presence_xml_admin.xml b/modules_k/presence_xml/doc/presence_xml_admin.xml index 059bb97..7bfe201 100644 --- a/modules_k/presence_xml/doc/presence_xml_admin.xml +++ b/modules_k/presence_xml/doc/presence_xml_admin.xml @@ -381,6 +381,12 @@ modparam("presence_xml", "passive_mode", 1) <emphasis> -1 - if a match is not found</emphasis>. </para> </listitem> + <listitem> + <para> + <emphasis> -2 - if /presence/person or /presence/person/activity do not exist</emphasis>. + </para> + </listitem> + </itemizedlist> </para> <example> @@ -388,7 +394,8 @@ modparam("presence_xml", "passive_mode", 1) <programlisting format="linespecific"> ... if (pres_check_basic("$ru", "open")) { - if (pres_check_activities("$ru", "unknown") || !is_method("INVITE")) + pres_check_activities("$ru", "unknown"); + if ($retcode || $retcode == -2 || !is_method("INVITE")) t_relay(); else send_reply("486", "Busy Here"); diff --git a/modules_k/presence_xml/pres_check.c b/modules_k/presence_xml/pres_check.c index 40ce7fb..fea420b 100644 --- a/modules_k/presence_xml/pres_check.c +++ b/modules_k/presence_xml/pres_check.c @@ -98,7 +98,7 @@ int presxml_check_basic(struct sip_msg *msg, char *presentity_uri, char *status) goto error; } - while (tuple->next != NULL) + while (tuple != NULL) { if (xmlStrcasecmp(tuple->name, (unsigned char *) "tuple") == 0) { @@ -189,17 +189,19 @@ int presxml_check_activities(struct sip_msg *msg, char *presentity_uri, char *ac if ((person = xmlDocGetNodeByName(xmlDoc, "person", NULL)) == NULL) { - LM_ERR("unable to extract 'person'\n"); + LM_DBG("unable to extract 'person'\n"); + retval = -2; goto error; } - while (person->next != NULL) + while (person != NULL) { if (xmlStrcasecmp(person->name, (unsigned char *) "person") == 0) { if ((activitiesNode = xmlNodeGetNodeByName(person, "activities", NULL)) == NULL) { - LM_ERR("while extracting 'actvities' node\n"); + LM_DBG("unable to extract 'actvities' node\n"); + retval = -2; goto error; }

13 years, 4 months

git:master: modules_k/acc: Fix typo.

by Timo Reimann

Module: sip-router Branch: master Commit: 8573ebdc4acfc220a0e76b7e185cd41912ea5eb1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8573ebd… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Aug 18 15:04:33 2011 +0200 modules_k/acc: Fix typo. --- modules_k/acc/acc_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/acc/acc_mod.c b/modules_k/acc/acc_mod.c index 0f796cb..d64610f 100644 --- a/modules_k/acc/acc_mod.c +++ b/modules_k/acc/acc_mod.c @@ -525,7 +525,7 @@ static int mod_init( void ) if( cdr_enable < 0 || cdr_enable > 1) { - LM_ERR("cdr_enable is out of rage\n"); + LM_ERR("cdr_enable is out of range\n"); return -1; }

13 years, 4 months

git:master: modules_k/rls: Remove definitions of CONT_COPY{, _1} as they are

by Timo Reimann

Module: sip-router Branch: master Commit: bdfdf6b7e35db04dd3fd48924082dba4dd4a63d5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bdfdf6b… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Wed Aug 17 18:05:55 2011 +0200 modules_k/rls: Remove definitions of CONT_COPY{,_1} as they are not used within the module and produce compiler warnings. --- modules_k/rls/resource_notify.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index 254cf74..f472902 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -48,19 +48,6 @@ * */ static str su_200_rpl = str_init("OK"); -#define CONT_COPY(buf, dest, source)\ - dest.s= (char*)buf+ size;\ - memcpy(dest.s, source.s, source.len);\ - dest.len= source.len;\ - size+= source.len; - - -#define CONT_COPY_1 (buf, dest_s, dest_len, source_s, source_len)\ - dest_s= (char*)buf+ size;\ - memcpy(dest_s, source_s, source_len);\ - dest_len= source_len;\ - size+= source_len; - int parse_rlsubs_did(char* str_did, str* callid, str* from_tag, str* to_tag) { char* smc= NULL;

13 years, 4 months

git:master: modules_k/xcap_server: Do not define xcaps_str_appsexml for the

by Timo Reimann

Module: sip-router Branch: master Commit: 8929a642a55a5346c9cec3ec004c25d2eb369fd1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8929a64… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Wed Aug 17 18:08:09 2011 +0200 modules_k/xcap_server: Do not define xcaps_str_appsexml for the moment as it seems unused and produces compiler warnings. --- modules_k/xcap_server/xcap_server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/xcap_server/xcap_server.c b/modules_k/xcap_server/xcap_server.c index 33718ed..be98fb4 100644 --- a/modules_k/xcap_server/xcap_server.c +++ b/modules_k/xcap_server/xcap_server.c @@ -415,11 +415,11 @@ static str xcaps_str_apprsxml = {"application/rls-services+xml", 28}; #if 0 static str xcaps_str_nocontent = {"No content", 10}; static str xcaps_str_appxcxml = {"application/xcap-caps+xml", 25}; +static str xcaps_str_appsexml = {"application/vnd.oma.search+xml", 30}; #endif static str xcaps_str_appapxml = {"application/auth-policy+xml", 27}; static str xcaps_str_appupxml = {"application/vnd.oma.user-profile+xml", 36}; static str xcaps_str_apppcxml = {"application/vnd.oma.pres-content+xml", 36}; -static str xcaps_str_appsexml = {"application/vnd.oma.search+xml", 30}; /**

13 years, 4 months

git:master: dmq: fixed missing tags in xml docs

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 24d30bd0f9fd378c9f34829bfffdd725b3b57edf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=24d30bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 18 10:46:48 2011 +0200 dmq: fixed missing tags in xml docs - added README to GIT repository --- modules_k/dmq/README | 135 +++++++++++++++++++++++++++++++++++++++ modules_k/dmq/doc/dmq_admin.xml | 3 + 2 files changed, 138 insertions(+), 0 deletions(-) diff --git a/modules_k/dmq/README b/modules_k/dmq/README new file mode 100644 index 0000000..f363ae7 --- /dev/null +++ b/modules_k/dmq/README @@ -0,0 +1,135 @@ +Distributed Message Queue Module + +Marius Ovidiu Bucur + +Edited by + +Marius Ovidiu Bucur + + Copyright � 2011 Marius Bucur + __________________________________________________________________ + + Table of Contents + + 1. Admin Guide + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Exported Parameters + + 3.1. dmq_server_address(str) + 3.2. dmq_notification_address(str) + + 2. Developer Guide + + 1. dmq_load_api(dmq_api_t* api) + + List of Examples + + 1.1. Set dmq_server_address parameter + 1.2. Set dmq_notification_address parameter + 2.1. dmq_api_t structure + +Chapter 1. Admin Guide + + Table of Contents + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Exported Parameters + + 3.1. dmq_server_address(str) + 3.2. dmq_notification_address(str) + +1. Overview + + The DMQ module implements a distributed message passing system on top + of Kamailio. The DMQ nodes within the system are grouped in a logical + entity called DMQ bus and are able to communicate with each others by + sending/receiving messages (either by broadcast or sending a DMQ + message to a specific node). The system transparently deals with node + discovery, node consistency within the DMQ bus, retransmissions, etc. + +2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + +2.1. Kamailio Modules + + The following modules must be loaded before this module: + * sl. + * tm. + +2.2. External Libraries or Applications + + * Each peer needs to use its own serialization mechanism. Some + examples are libtpl, protobuf. . + +3. Exported Parameters + + 3.1. dmq_server_address(str) + 3.2. dmq_notification_address(str) + +3.1. dmq_server_address(str) + + The local server address. + + The modules needs it to know on which interface the DMQ engine should + send and receive messages. + + Default value is "NULL". + + Example 1.1. Set dmq_server_address parameter +... +modparam("dmq", "dmq_server_address", "mysql://openser:openserrw@localhost/opens +er") +... + +3.2. dmq_notification_address(str) + + The address of the DMQ node from which the local node should retrieve + initial information. + + Default value is "NULL". + + Example 1.2. Set dmq_notification_address parameter +... +modparam("dmq", "dmq_notification_address", "mysql://openser:openserrw@localhost +/openser") +... + +Chapter 2. Developer Guide + + Table of Contents + + 1. dmq_load_api(dmq_api_t* api) + + The module provides the following functions that can be used in other + Kamailio modules. + +1. dmq_load_api(dmq_api_t* api) + + This function binds the dmq modules and fills the structure with the + exported functions -> register_dmq_peer - registers an entity as a DMQ + peer which permits receiving/sending messages between nodes which + support the same peer, -> bcast_message - broadcast a DMQ message to + all peers available in the DMQ bus, -> send_message - sends a DMQ + message to a specific peer in the local DMQ bus. + + Example 2.1. dmq_api_t structure +... +typedef struct dmq_api { + register_dmq_peer_t register_dmq_peer; + bcast_message_t bcast_message; + send_message_t send_message; +} dmq_api_t; +... diff --git a/modules_k/dmq/doc/dmq_admin.xml b/modules_k/dmq/doc/dmq_admin.xml index 9692d4f..b986899 100644 --- a/modules_k/dmq/doc/dmq_admin.xml +++ b/modules_k/dmq/doc/dmq_admin.xml @@ -58,7 +58,9 @@ </listitem> </itemizedlist> </section> + </section> + <section> <title>Exported Parameters</title> <section> <title><varname>dmq_server_address</varname>(str)</title> @@ -99,5 +101,6 @@ modparam("dmq", "dmq_notification_address", "&defaultdb;") </programlisting> </example> </section> + </section> </chapter>

13 years, 4 months

← Newer
1
...
9
10
11
12
13
14
15
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2011