sr-dev August 2014

sr-dev@lists.kamailio.org

25 participants
196 discussions

rfc: distributing dialog profiles
by Daniel-Constantin Mierla 28 Aug '14

28 Aug '14

Hello, if you are on sr-dev list, you should have seen the last commits to dialog module, which add support for remote profiles. As most of you know (or at least the users of dialog module), profiles are used to group active calls, their main purposes being counting dialogs belonging to a profile for implementing active call limits (e.g., all calls in the system, call from/to a specif user/address). It was working on a single Kamailio instance, but one could use other meanings to interact with other kamailio instance to get the number of calls across multiple instances. The purpose of remote profiles is to make the whole process easier and more transparent for config file, simplifying the maintenance. A remote profile is an item stored in local profile list not bound to a local dialog. At this moment, dialog module in master branch exports a function dlg_remote_profile() that allows to add/remove a remote profile. The next step is to build the notification system between kamailio instances. There are couple of options, as well as questions, that I want to discuss before going to implement the mechanism. There are two major aspects to care of: A) Distribution, I thought of two options for it: 1) using dmq module to publish the operations done with local profiles (add/remove) -- this seems to be the natural choice right now, Charles Chance is also willing to put effort in this direction This will be coded inside the module, so config won't be affected much (eventually some extra parameters of dialog flags). 2) add event routes for adding/removing a local profile. The attributes of the profile can be made available via some PV, then in config use what so ever option (e.g., http query, json rpc, etc) for distributing the information. This will require changes in config file and might not be trivial for new users B) Persistence, with the options: 1) store remote profiles in local database. It is good for restart, but if there is big downtime, then some notifications can be lost and the list of remote profiles might be inaccurate 2) keep in memory only and at startup send a 'request-for-update' to the other instances -- these instances will send the list of their local profiles. It can take a bit between request-for-update and receiving data from the other servers -- during this interval, the checks of overall call limits might not give the desired answer Of course, there can be enhancements/combinations, but it has to be analysed if the benefit worth the complexity. For 1), store also the IP of each remote profile and then interrogate for each profile to see if its still active. For 2), add a mechanism to reject new calls until the request-for-update is completed. Anyone having other ideas or comments to the above? Note that each profile got a unique id, so if you upgrade your dialog module, profiles for existing active calls will not be loaded. Also, the code was barely tested, report here any issue you have with dialog from master branch. Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Next Kamailio Advanced Trainings 2014 - http://www.asipto.com Sep 22-25, Berlin, Germany ::: Oct 15-17, San Francisco, USA

4 9

git:master: modules/ims_registrar_pcscf: new module function lookup_transport
by Jason Penton 27 Aug '14

27 Aug '14

Module: sip-router Branch: master Commit: 9f7fec41c065af9608f6547b2ed0d43614c5a284 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9f7fec4… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Wed Aug 27 14:56:30 2014 +0200 modules/ims_registrar_pcscf: new module function lookup_transport - this allows terminating P-CSCF to check(and possibly) change the transport for the request before relaying/fwding to terminating UE --- modules/ims_registrar_pcscf/lookup.c | 106 +++++++++++++++++++++++++++++++++ modules/ims_registrar_pcscf/lookup.h | 59 ++++++++++++++++++ modules/ims_registrar_pcscf/reg_mod.c | 41 +++++++++---- modules/ims_registrar_pcscf/reg_mod.h | 2 + 4 files changed, 195 insertions(+), 13 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=9f7…

1 0

rtpengine missing media-address flag?
by Juha Heinanen 27 Aug '14

27 Aug '14

if trust-address flag is not set in rtpengine_offer, "the RTP proxy ignores address in the SDP and uses source address of the SIP message as media address which is passed to the RTP proxy". if there is another, e.g. a loadbalancer, proxy in front of the proxy, source address of SIP message is not correct media address. it thus looks to me that a new media-address= flag would be needed, where media address is taken from if the flag is present. any comments? it is ok if i try to add media-address= flag? -- juha

2 4

registrar: fix expires distribution
by Alekzander Spiridonov 26 Aug '14

26 Aug '14

Hi list, I've figured out that in master expires distribution works only with Expires header, not with per-contact expires value. So quick fix attached. -- Best regards, Alekzander Spiridonov

2 2

git:master: registrar: reset indentation to use tabs
by Daniel-Constantin Mierla 26 Aug '14

26 Aug '14

Module: sip-router Branch: master Commit: e7f714f48285ef5ee6ff03759dfbecae5e51b609 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e7f714f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 26 13:03:33 2014 +0200 registrar: reset indentation to use tabs - follow up to previous commit --- modules/registrar/sip_msg.c | 74 +++++++++++++++++++++--------------------- 1 files changed, 37 insertions(+), 37 deletions(-) diff --git a/modules/registrar/sip_msg.c b/modules/registrar/sip_msg.c index f5a84f2..6ccfd5b 100644 --- a/modules/registrar/sip_msg.c +++ b/modules/registrar/sip_msg.c @@ -50,12 +50,12 @@ static struct hdr_field* act_contact; */ static inline int randomize_expires( int expires, int range ) { - /* if no range is given just return expires */ - if(range == 0) return expires; + /* if no range is given just return expires */ + if(range == 0) return expires; - int range_min = expires - (float)range/100 * expires; + int range_min = expires - (float)range/100 * expires; - return range_min + (float)(rand()%100)/100 * ( expires - range_min ); + return range_min + (float)(rand()%100)/100 * ( expires - range_min ); } @@ -71,10 +71,10 @@ static inline int get_expires_hf(struct sip_msg* _m) if (_m->expires) { p = (exp_body_t*)_m->expires->parsed; if (p->valid) { - return p->val; + return p->val; } } - return -1; + return -1; } @@ -85,13 +85,13 @@ static inline int get_expires_hf(struct sip_msg* _m) int parse_message(struct sip_msg* _m) { struct hdr_field* ptr; - + if (parse_headers(_m, HDR_EOH_F, 0) == -1) { rerrno = R_PARSE; LM_ERR("failed to parse headers\n"); return -1; } - + if (!_m->to) { rerrno = R_TO_MISS; LM_ERR("To not found\n"); @@ -115,7 +115,7 @@ int parse_message(struct sip_msg* _m) LM_ERR("failed to parse expires body\n"); return -5; } - + if (_m->contact) { ptr = _m->contact; while(ptr) { @@ -129,7 +129,7 @@ int parse_message(struct sip_msg* _m) ptr = ptr->next; } } - + return 0; } @@ -143,11 +143,11 @@ int check_contacts(struct sip_msg* _m, int* _s) { struct hdr_field* p; contact_t* c; - + *_s = 0; /* Message without contacts is OK */ if (_m->contact == 0) return 0; - + if (((contact_body_t*)_m->contact->parsed)->star == 1) { /* The first Contact HF is star */ /* Expires must be zero */ @@ -155,13 +155,13 @@ int check_contacts(struct sip_msg* _m, int* _s) rerrno = R_STAR_EXP; return 1; } - + /* Message must contain no contacts */ if (((contact_body_t*)_m->contact->parsed)->contacts) { rerrno = R_STAR_CONT; return 1; } - + /* Message must contain no other Contact HFs */ p = _m->contact->next; while(p) { @@ -171,7 +171,7 @@ int check_contacts(struct sip_msg* _m, int* _s) } p = p->next; } - + *_s = 1; } else { /* The first Contact HF is not star */ /* Message must contain no star Contact HF */ @@ -185,7 +185,7 @@ int check_contacts(struct sip_msg* _m, int* _s) /* check also the lenght of all contacts */ for(c=((contact_body_t*)p->parsed)->contacts ; c ; c=c->next) { if (c->uri.len > CONTACT_MAX_SIZE - || (c->received && c->received->len>RECEIVED_MAX_SIZE) ) { + || (c->received && c->received->len>RECEIVED_MAX_SIZE) ) { rerrno = R_CONTACT_LEN; return 1; } @@ -194,7 +194,7 @@ int check_contacts(struct sip_msg* _m, int* _s) p = p->next; } } - + return 0; } @@ -205,7 +205,7 @@ int check_contacts(struct sip_msg* _m, int* _s) contact_t* get_first_contact(struct sip_msg* _m) { if (_m->contact == 0) return 0; - + act_contact = _m->contact; return (((contact_body_t*)_m->contact->parsed)->contacts); } @@ -244,39 +244,39 @@ contact_t* get_next_contact(contact_t* _c) */ void calc_contact_expires(struct sip_msg* _m, param_t* _ep, int* _e) { - int range = 0; + int range = 0; if (!_ep || !_ep->body.len) { - *_e = get_expires_hf(_m); - - if ( *_e < 0 ) { - *_e = cfg_get(registrar, registrar_cfg, default_expires); - range = cfg_get(registrar, registrar_cfg, default_expires_range); - } else { - range = cfg_get(registrar, registrar_cfg, expires_range); - } + *_e = get_expires_hf(_m); + + if ( *_e < 0 ) { + *_e = cfg_get(registrar, registrar_cfg, default_expires); + range = cfg_get(registrar, registrar_cfg, default_expires_range); + } else { + range = cfg_get(registrar, registrar_cfg, expires_range); + } } else { if (str2int(&_ep->body, (unsigned int*)_e) < 0) { *_e = cfg_get(registrar, registrar_cfg, default_expires); range = cfg_get(registrar, registrar_cfg, default_expires_range); } else { - range = cfg_get(registrar, registrar_cfg, expires_range); + range = cfg_get(registrar, registrar_cfg, expires_range); } } if ( *_e != 0 ) { - *_e = randomize_expires( *_e, range ); + *_e = randomize_expires( *_e, range ); - if (*_e < cfg_get(registrar, registrar_cfg, min_expires)) { - *_e = cfg_get(registrar, registrar_cfg, min_expires); - } + if (*_e < cfg_get(registrar, registrar_cfg, min_expires)) { + *_e = cfg_get(registrar, registrar_cfg, min_expires); + } - if (cfg_get(registrar, registrar_cfg, max_expires) && (*_e > cfg_get(registrar, registrar_cfg, max_expires))) { - *_e = cfg_get(registrar, registrar_cfg, max_expires); - } + if (cfg_get(registrar, registrar_cfg, max_expires) && (*_e > cfg_get(registrar, registrar_cfg, max_expires))) { + *_e = cfg_get(registrar, registrar_cfg, max_expires); + } - /* Convert to absolute value */ - *_e += act_time; + /* Convert to absolute value */ + *_e += act_time; } }

1 0

git:master: dispatcher: fixed warning on unsigned compared with <0
by Daniel-Constantin Mierla 26 Aug '14

26 Aug '14

Module: sip-router Branch: master Commit: 76473abd05503e4dffb63cf5ddc1d39c5170238d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=76473ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Aug 26 13:01:42 2014 +0200 dispatcher: fixed warning on unsigned compared with <0 - added in previous commit - reset indentation for dispacher.c file --- modules/dispatcher/dispatcher.c | 111 ++++++++++++++++++++------------------- 1 files changed, 56 insertions(+), 55 deletions(-) diff --git a/modules/dispatcher/dispatcher.c b/modules/dispatcher/dispatcher.c index fedde7c..f551003 100644 --- a/modules/dispatcher/dispatcher.c +++ b/modules/dispatcher/dispatcher.c @@ -172,12 +172,12 @@ static int mi_child_init(void); static cmd_export_t cmds[]={ {"ds_select_dst", (cmd_function)w_ds_select_dst, 2, fixup_igp_igp, 0, REQUEST_ROUTE|FAILURE_ROUTE}, - {"ds_select_dst", (cmd_function)w_ds_select_dst_limit, 3, - fixup_igp_null, 0, REQUEST_ROUTE|FAILURE_ROUTE}, + {"ds_select_dst", (cmd_function)w_ds_select_dst_limit, 3, + fixup_igp_null, 0, REQUEST_ROUTE|FAILURE_ROUTE}, {"ds_select_domain", (cmd_function)w_ds_select_domain, 2, fixup_igp_igp, 0, REQUEST_ROUTE|FAILURE_ROUTE}, - {"ds_select_domain", (cmd_function)w_ds_select_domain_limit, 3, - fixup_igp_null, 0, REQUEST_ROUTE|FAILURE_ROUTE}, + {"ds_select_domain", (cmd_function)w_ds_select_domain_limit, 3, + fixup_igp_null, 0, REQUEST_ROUTE|FAILURE_ROUTE}, {"ds_next_dst", (cmd_function)w_ds_next_dst, 0, ds_warn_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE}, {"ds_next_domain", (cmd_function)w_ds_next_domain, 0, @@ -535,28 +535,28 @@ static void destroy(void) */ int ds_parse_flags( char* flag_str, int flag_len ) { - int flag = 0; - int i; - - for ( i=0; i<flag_len; i++) - { - if(flag_str[i]=='a' || flag_str[i]=='A') { - flag &= ~(DS_STATES_ALL); - } else if(flag_str[i]=='i' || flag_str[i]=='I') { - flag |= DS_INACTIVE_DST; - } else if(flag_str[i]=='d' || flag_str[i]=='D') { - flag |= DS_DISABLED_DST; - } else if(flag_str[i]=='t' || flag_str[i]=='T') { - flag |= DS_TRYING_DST; - } else if(flag_str[i]=='p' || flag_str[i]=='P') { - flag |= DS_PROBING_DST; - } else { - flag = -1; - break; - } - } - - return flag; + int flag = 0; + int i; + + for ( i=0; i<flag_len; i++) + { + if(flag_str[i]=='a' || flag_str[i]=='A') { + flag &= ~(DS_STATES_ALL); + } else if(flag_str[i]=='i' || flag_str[i]=='I') { + flag |= DS_INACTIVE_DST; + } else if(flag_str[i]=='d' || flag_str[i]=='D') { + flag |= DS_DISABLED_DST; + } else if(flag_str[i]=='t' || flag_str[i]=='T') { + flag |= DS_TRYING_DST; + } else if(flag_str[i]=='p' || flag_str[i]=='P') { + flag |= DS_PROBING_DST; + } else { + flag = -1; + break; + } + } + + return flag; } /** @@ -589,18 +589,18 @@ static int w_ds_select(struct sip_msg* msg, char* set, char* alg, char* limit, i return -1; } - if (limit) { - GET_VALUE("limit", limit, l, s_limit, limit_flags); - if (!(limit_flags&PARAM_INT)) { - if (limit_flags&PARAM_STR) - LM_ERR("unable to get dst number limit from [%.*s]\n", s_limit.len, s_limit.s); - else - LM_ERR("unable to get dst number limit\n"); - return -1; - } - } else { - l = -1; /* will be casted to a rather big unsigned value */ - } + if (limit) { + GET_VALUE("limit", limit, l, s_limit, limit_flags); + if (!(limit_flags&PARAM_INT)) { + if (limit_flags&PARAM_STR) + LM_ERR("unable to get dst number limit from [%.*s]\n", s_limit.len, s_limit.s); + else + LM_ERR("unable to get dst number limit\n"); + return -1; + } + } else { + l = -1; /* will be casted to a rather big unsigned value */ + } return ds_select_dst_limit(msg, s, a, (unsigned int)l, mode); } @@ -617,7 +617,7 @@ static int w_ds_select_dst(struct sip_msg* msg, char* set, char* alg) */ static int w_ds_select_dst_limit(struct sip_msg* msg, char* set, char* alg, char* limit) { - return w_ds_select(msg, set, alg, limit /* limit number of dst*/, 0 /*set dst uri*/); + return w_ds_select(msg, set, alg, limit /* limit number of dst*/, 0 /*set dst uri*/); } /** @@ -633,7 +633,7 @@ static int w_ds_select_domain(struct sip_msg* msg, char* set, char* alg) */ static int w_ds_select_domain_limit(struct sip_msg* msg, char* set, char* alg, char* limit) { - return w_ds_select(msg, set, alg, limit /* limit number of dst*/, 1 /*set host port*/); + return w_ds_select(msg, set, alg, limit /* limit number of dst*/, 1 /*set host port*/); } /** @@ -680,8 +680,8 @@ static int w_ds_mark_dst1(struct sip_msg *msg, char *str1, char *str2) if ( state < 0 ) { - LM_WARN("Failed to parse flag: %s", str1 ); - return -1; + LM_WARN("Failed to parse flag: %s", str1 ); + return -1; } return ds_mark_dst(msg, state); @@ -727,7 +727,8 @@ static struct mi_root* ds_mi_set(struct mi_root* cmd_tree, void* param) { str sp; int ret; - unsigned int group, state; + unsigned int group; + int state; struct mi_node* node; node = cmd_tree->node.kids; @@ -1079,29 +1080,29 @@ static void dispatcher_rpc_list(rpc_t* rpc, void* ctx) if (list->dlist[j].attrs.body.s) { if(rpc->struct_add(vh, "Ssd{", - "URI", &list->dlist[j].uri, - "FLAGS", c, - "PRIORITY", list->dlist[j].priority, - "ATTRS", &wh)<0) + "URI", &list->dlist[j].uri, + "FLAGS", c, + "PRIORITY", list->dlist[j].priority, + "ATTRS", &wh)<0) { rpc->fault(ctx, 500, "Internal error creating dest struct"); return; } if(rpc->struct_add(wh, "SSdd", - "BODY", &(list->dlist[j].attrs.body), - "DUID", (list->dlist[j].attrs.duid.s)? - &(list->dlist[j].attrs.duid):&data, - "MAXLOAD", list->dlist[j].attrs.maxload, - "WEIGHT", list->dlist[j].attrs.weight)<0) + "BODY", &(list->dlist[j].attrs.body), + "DUID", (list->dlist[j].attrs.duid.s)? + &(list->dlist[j].attrs.duid):&data, + "MAXLOAD", list->dlist[j].attrs.maxload, + "WEIGHT", list->dlist[j].attrs.weight)<0) { rpc->fault(ctx, 500, "Internal error creating attrs struct"); return; } } else { if(rpc->struct_add(vh, "Ssd", - "URI", &list->dlist[j].uri, - "FLAGS", c, - "PRIORITY", list->dlist[j].priority)<0) + "URI", &list->dlist[j].uri, + "FLAGS", c, + "PRIORITY", list->dlist[j].priority)<0) { rpc->fault(ctx, 500, "Internal error creating dest struct"); return;

1 0

git:master: registrar: randomize expires value received from UAC
by Daniel-Constantin Mierla 26 Aug '14

26 Aug '14

Module: sip-router Branch: master Commit: ba0cf0014908645e6b17b6e305e2e1ae4235a94f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ba0cf00… Author: Alekzander Spiridonov <sipidronov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 22 05:20:42 2014 -0700 registrar: randomize expires value received from UAC --- modules/registrar/doc/registrar_admin.xml | 11 ++-- modules/registrar/sip_msg.c | 77 ++++++++++++++++------------- 2 files changed, 48 insertions(+), 40 deletions(-) diff --git a/modules/registrar/doc/registrar_admin.xml b/modules/registrar/doc/registrar_admin.xml index 4cd2053..992e5fb 100644 --- a/modules/registrar/doc/registrar_admin.xml +++ b/modules/registrar/doc/registrar_admin.xml @@ -157,10 +157,9 @@ modparam("registrar", "default_expires", 1800) <title><varname>default_expires_range</varname> (integer)</title> <para> This parameter specifies that the expiry used for newly created usrloc records - are not fixed(when <quote>default_expires</quote> applies), but a random value in the interval - <quote>[default_expires-default_expires_range%, default_expires+default_expires_range%]</quote>. - The value is between 0 and 100 and represent the maximim percentage from default_expires that - will be substracted or added when computing the value. Default in 0, meaning default_expires + are not fixed, but a random value in the interval <quote>[default_expires-default_expires_range%, default_expires]</quote>. + The value is between 0 and 100 and represent the maximim percentage from expires that + will be substracted when computing the value. Default in 0, meaning default_expires is left unmodified. This parameter can be modified via ser config framework. </para> <para> @@ -181,8 +180,8 @@ modparam("registrar", "default_expires_range", 30) # +- 30% from default_expires <title><varname>expires_range</varname> (integer)</title> <para> Similar to default_expires_range, but it applies to the incoming expires - value and it only lowers the value. Default in 0, meaning the expires - is left unmodified. This parameter can be modified via config framework. + value. Default in 0, meaning the expires is left unmodified. + This parameter can be modified via config framework. </para> <para> <emphasis> diff --git a/modules/registrar/sip_msg.c b/modules/registrar/sip_msg.c index 19ea3df..f5a84f2 100644 --- a/modules/registrar/sip_msg.c +++ b/modules/registrar/sip_msg.c @@ -44,45 +44,37 @@ static struct hdr_field* act_contact; -/*! \brief - * Return an expire value in the range [ default_expires - range%, default_expires + range% ] +/* \brief + * Return randomized expires between expires-range% and expires. + * RFC allows only value less or equal to the one provided by UAC. */ -static inline int get_expire_val(void) +static inline int randomize_expires( int expires, int range ) { - int expires = cfg_get(registrar, registrar_cfg, default_expires); - int range = cfg_get(registrar, registrar_cfg, default_expires_range); - /* if no range is given just return default_expires */ - if(range == 0) return expires; - /* select a random value in the range */ - return expires - (float)range/100 * expires + (float)(rand()%100)/100 * 2 * (float)range/100 * expires; + /* if no range is given just return expires */ + if(range == 0) return expires; + + int range_min = expires - (float)range/100 * expires; + + return range_min + (float)(rand()%100)/100 * ( expires - range_min ); } /*! \brief * Return value of Expires header field - * if the HF exists converted to absolute - * time, if the HF doesn't exist, returns - * default value; + * if the HF exists, if the HF doesn't exist, + * returns -1; */ static inline int get_expires_hf(struct sip_msg* _m) { exp_body_t* p; - int range; + if (_m->expires) { p = (exp_body_t*)_m->expires->parsed; if (p->valid) { - if (p->val != 0) { - range = cfg_get(registrar, registrar_cfg, default_expires_range); - if(likely(range==0)) - return p->val + act_time; - return p->val + act_time - (float)range/100 * p->val - + ((float)(rand()%100)/100) * ((float)range/100 * p->val); - } else return 0; - } else { - return act_time + get_expire_val(); + return p->val; } - } else - return act_time + get_expire_val(); + } + return -1; } @@ -159,7 +151,7 @@ int check_contacts(struct sip_msg* _m, int* _s) if (((contact_body_t*)_m->contact->parsed)->star == 1) { /* The first Contact HF is star */ /* Expires must be zero */ - if (get_expires_hf(_m) > 0) { + if (get_expires_hf(_m) != 0) { rerrno = R_STAR_EXP; return 1; } @@ -252,22 +244,39 @@ contact_t* get_next_contact(contact_t* _c) */ void calc_contact_expires(struct sip_msg* _m, param_t* _ep, int* _e) { + int range = 0; if (!_ep || !_ep->body.len) { - *_e = get_expires_hf(_m); + *_e = get_expires_hf(_m); + + if ( *_e < 0 ) { + *_e = cfg_get(registrar, registrar_cfg, default_expires); + range = cfg_get(registrar, registrar_cfg, default_expires_range); + } else { + range = cfg_get(registrar, registrar_cfg, expires_range); + } } else { if (str2int(&_ep->body, (unsigned int*)_e) < 0) { - *_e = get_expire_val(); + *_e = cfg_get(registrar, registrar_cfg, default_expires); + range = cfg_get(registrar, registrar_cfg, default_expires_range); + } else { + range = cfg_get(registrar, registrar_cfg, expires_range); } - /* Convert to absolute value */ - if (*_e != 0) *_e += act_time; } - if ((*_e != 0) && ((*_e - act_time) < cfg_get(registrar, registrar_cfg, min_expires))) { - *_e = cfg_get(registrar, registrar_cfg, min_expires) + act_time; - } + if ( *_e != 0 ) + { + *_e = randomize_expires( *_e, range ); + + if (*_e < cfg_get(registrar, registrar_cfg, min_expires)) { + *_e = cfg_get(registrar, registrar_cfg, min_expires); + } + + if (cfg_get(registrar, registrar_cfg, max_expires) && (*_e > cfg_get(registrar, registrar_cfg, max_expires))) { + *_e = cfg_get(registrar, registrar_cfg, max_expires); + } - if ((*_e != 0) && cfg_get(registrar, registrar_cfg, max_expires) && ((*_e - act_time) > cfg_get(registrar, registrar_cfg, max_expires))) { - *_e = cfg_get(registrar, registrar_cfg, max_expires) + act_time; + /* Convert to absolute value */ + *_e += act_time; } }

1 0

git:master: dispatcher: fix ds_mark_dst parameter parsing
by Daniel-Constantin Mierla 26 Aug '14

26 Aug '14

Module: sip-router Branch: master Commit: 499fb7b7d58c812dd8c867adbbed27e0c61f26d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=499fb7b… Author: Alekzander Spiridonov <sipidronov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Aug 25 04:05:48 2014 -0700 dispatcher: fix ds_mark_dst parameter parsing --- modules/dispatcher/dispatcher.c | 72 +++++++++++++++++++++----------------- 1 files changed, 40 insertions(+), 32 deletions(-) diff --git a/modules/dispatcher/dispatcher.c b/modules/dispatcher/dispatcher.c index 0ec3338..fedde7c 100644 --- a/modules/dispatcher/dispatcher.c +++ b/modules/dispatcher/dispatcher.c @@ -529,6 +529,36 @@ static void destroy(void) } \ }while(0) +/*! \brief + * parses string to dispatcher dst flags set + * returns <0 on failure or int with flag on success. + */ +int ds_parse_flags( char* flag_str, int flag_len ) +{ + int flag = 0; + int i; + + for ( i=0; i<flag_len; i++) + { + if(flag_str[i]=='a' || flag_str[i]=='A') { + flag &= ~(DS_STATES_ALL); + } else if(flag_str[i]=='i' || flag_str[i]=='I') { + flag |= DS_INACTIVE_DST; + } else if(flag_str[i]=='d' || flag_str[i]=='D') { + flag |= DS_DISABLED_DST; + } else if(flag_str[i]=='t' || flag_str[i]=='T') { + flag |= DS_TRYING_DST; + } else if(flag_str[i]=='p' || flag_str[i]=='P') { + flag |= DS_PROBING_DST; + } else { + flag = -1; + break; + } + } + + return flag; +} + /** * */ @@ -642,24 +672,18 @@ static int w_ds_mark_dst0(struct sip_msg *msg, char *str1, char *str2) static int w_ds_mark_dst1(struct sip_msg *msg, char *str1, char *str2) { int state; - int len; if(str1==NULL) return w_ds_mark_dst0(msg, NULL, NULL); - len = strlen(str1); - state = 0; - if (len>1 && (str1[1]=='p' || str1[1]=='P')) - state |= DS_PROBING_DST; + state = ds_parse_flags( str1, strlen(str1) ); + + if ( state < 0 ) + { + LM_WARN("Failed to parse flag: %s", str1 ); + return -1; + } - if(str1[0]=='i' || str1[0]=='I') - state |= DS_INACTIVE_DST; - else if(str1[0]=='t' || str1[0]=='T') - state |= DS_TRYING_DST; - else if(str1[0]=='d' || str1[0]=='D') - state = DS_DISABLED_DST; - else if(str1[0]=='p' || str1[0]=='P') - state = DS_INACTIVE_DST|DS_PROBING_DST; return ds_mark_dst(msg, state); } @@ -716,25 +740,9 @@ static struct mi_root* ds_mi_set(struct mi_root* cmd_tree, void* param) return init_mi_tree(500, "bad state value", 15); } - state = 0; - if(sp.s[0]=='0' || sp.s[0]=='I' || sp.s[0]=='i') { - /* set inactive */ - state |= DS_INACTIVE_DST; - if((sp.len>1) && (sp.s[1]=='P' || sp.s[1]=='p')) - state |= DS_PROBING_DST; - } else if(sp.s[0]=='1' || sp.s[0]=='A' || sp.s[0]=='a') { - /* set active */ - if((sp.len>1) && (sp.s[1]=='P' || sp.s[1]=='p')) - state |= DS_PROBING_DST; - } else if(sp.s[0]=='2' || sp.s[0]=='D' || sp.s[0]=='d') { - /* set disabled */ - state |= DS_DISABLED_DST; - } else if(sp.s[0]=='3' || sp.s[0]=='T' || sp.s[0]=='t') { - /* set trying */ - state |= DS_TRYING_DST; - if((sp.len>1) && (sp.s[1]=='P' || sp.s[1]=='p')) - state |= DS_PROBING_DST; - } else { + state = ds_parse_flags(sp.s, sp.len); + if( state < 0 ) + { LM_ERR("unknow state value\n"); return init_mi_tree(500, "unknown state value", 19); }

1 0

dispatcher: limit a number of dst to failover to
by Alekzander Spiridonov 26 Aug '14

26 Aug '14

Hi list, I'd like to propose a patch that allows user to limit the number of items that appears in dst_avp after ds_select_dst or ds_select_domain call. There are some use cases when one could have couple of dst sets and would like to failover from the first to another without checking all items but have just 3 or 4 of them dead in a row. What do you think about that? -- Best regards, Alekzander Spiridonov

2 9

AUTH_UAC(): <null>
by Yuriy Gorlichenko 26 Aug '14

26 Aug '14

Hello. I have construction Asterisk --> Kamailio --> Providers My provisers registered with UAC modure and stored at UACREG table. Problem scenario is: I ring from asterisk to provider Asterisk --> Kamailio --> Providers Call from asterisk come to kamailio with furi(Asterisk_clinet_local_number@asterisk) turi(external_number@kamailio) Then, to forward INVITE to provider that Needed I use some manipulations to choose provider (it does not matter, it is only sql_queryes to some tables), and then modify invite with this code: #$var(prov) - my.provider.ip #$var(trunk) - name_of_trunk uac_replace_from("sip:$var(trunk)@$var(prov)"); $rd=$var(prov); $rp="5060"; $td=$var(prov); remove_hf("Contact"); append_hf("Contact:<$var(trunk)@my.kamailio.domain:5068>\n","Contact"); #Then I get from database varibles to set it at failure route whet it needs to auth #modparam("uac","auth_realm_avp","$avp(s:realm)") #modparam("uac","auth_username_avp","avp(s:uname)") #modparam("uac","auth_password_avp","$avp(s:passwd))") sql_pvquery("ca","select auth_username, auth_password, realm from uacreg where auth_username='$var(trunk)'","$avp(uname), $avp(passwd), $avp(realm)"); So -after this manipulation I have write packet, that goes to my provider. Then Provier sends me 407 answer and packet goes to failure_route if (t_check_status("401|407")){ xlog("L_INFO", "Reply from provider on failure: $rs"); pv_printf("$avp(s:uname)","$var(uname)"); pv_printf("$avp(s:passwd)","$var(passwd)"); pv_printf("$avp(s:realm)","$var(realm)"); avp_print(); uac_auth(); xlog("L_INFO", "UAC_AUTH(): $rs"); t_relay(); } After that Call fails. When I look at at syslog I see that avp parametrs succesfull sets: INFO: avpops [avpops_impl.c:1484]: ops_print_avp(): p=0x7f63acec0650, flags=0x0113 INFO: avpops [avpops_impl.c:1488]: ops_print_avp(): #011#011#011name=<realm> INFO: avpops [avpops_impl.c:1496]: ops_print_avp(): #011#011#011val_str=<0 / 1> INFO: avpops [avpops_impl.c:1484]: ops_print_avp(): p=0x7f63acebe1a8, flags=0x0113 INFO: avpops [avpops_impl.c:1488]: ops_print_avp(): #011#011#011name=<passwd> INFO: avpops [avpops_impl.c:1496]: ops_print_avp(): #011#011#011val_str=<0 / 1> INFO: avpops [avpops_impl.c:1484]: ops_print_avp(): p=0x7f63ace697a8, flags=0x0113 INFO: avpops [avpops_impl.c:1488]: ops_print_avp(): #011#011#011name=<uname> INFO: avpops [avpops_impl.c:1496]: ops_print_avp(): #011#011#011val_str=<0 / 1> INFO: avpops [avpops_impl.c:1484]: ops_print_avp(): p=0x7f63acec0240, flags=0x0113 INFO: avpops [avpops_impl.c:1488]: ops_print_avp(): #011#011#011name=<realm> INFO: avpops [avpops_impl.c:1496]: ops_print_avp(): #011#011#011val_str=<my.provider.com / 15> INFO: avpops [avpops_impl.c:1484]: ops_print_avp(): p=0x7f63acec0308, flags=0x0113 INFO: avpops [avpops_impl.c:1488]: ops_print_avp(): #011#011#011name=<passwd> INFO: avpops [avpops_impl.c:1496]: ops_print_avp(): #011#011#011val_str=<mYPa$$wd / 8> INFO: avpops [avpops_impl.c:1484]: ops_print_avp(): p=0x7f63acea3d40, flags=0x0113 INFO: avpops [avpops_impl.c:1488]: ops_print_avp(): #011#011#011name=<uname> INFO: avpops [avpops_impl.c:1496]: ops_print_avp(): #011#011#011val_str=<myTrunk/ 16> But Next I see: ERROR <script> : AUTH_UAC(): <null> As I see AUTH_UAC() don`t want to set Auth parameters. My question is Why? Thanks!

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2014