sr-dev September 2014

sr-dev@lists.kamailio.org

33 participants
375 discussions

git:master: presence: take in consideration send_fast_notify when sending empty NOTIFY

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 5bffcf8bdc83628aea4f5e3cda06b20ce88f659f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5bffcf8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 8 14:14:17 2014 +0200 presence: take in consideration send_fast_notify when sending empty NOTIFY - patch by Luis Azedo <luis.azedo(a)factorlusitano.com> --- modules/presence/subscribe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/presence/subscribe.c b/modules/presence/subscribe.c index a873cb6..9c9b9ac 100644 --- a/modules/presence/subscribe.c +++ b/modules/presence/subscribe.c @@ -690,7 +690,7 @@ int update_subscription(struct sip_msg* msg, subs_t* subs, int to_tag_gen, } else { - if(notify(subs, NULL, NULL, 0)< 0) + if(send_fast_notify && (notify(subs, NULL, NULL, 0)< 0)) { LM_ERR("Could not send notify\n"); goto error;

10 years, 2 months

rtpengine flags

by Peter Villeneuve

Hi, I updated kamailio to 4.2 and the new rtpengine module looks good. Are there any flags that would force rtpengine NOT to touch the ICE attributes, just passively sit there? Thanks

10 years, 2 months

git:master: dispatcher: extended the documentation for ds_is_from_list()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 37e1fb443f1243125bc1d0c09c5ad8f6d86336d6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=37e1fb4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 5 17:46:14 2014 +0200 dispatcher: extended the documentation for ds_is_from_list() --- modules/dispatcher/README | 56 +++++++++++++++++++------ modules/dispatcher/doc/dispatcher_admin.xml | 58 ++++++++++++++++++++++---- 2 files changed, 91 insertions(+), 23 deletions(-) diff --git a/modules/dispatcher/README b/modules/dispatcher/README index 50b7d1b..a6dd931 100644 --- a/modules/dispatcher/README +++ b/modules/dispatcher/README @@ -72,7 +72,7 @@ Carsten Bock 4.3. ds_next_dst() 4.4. ds_next_domain() 4.5. ds_mark_dst([state]) - 4.6. ds_is_from_list([groupid]) + 4.6. ds_is_from_list([groupid [, uri, mode] ]) 4.7. ds_load_update() 4.8. ds_load_unset() @@ -188,7 +188,7 @@ Chapter 1. Admin Guide 4.3. ds_next_dst() 4.4. ds_next_domain() 4.5. ds_mark_dst([state]) - 4.6. ds_is_from_list([groupid]) + 4.6. ds_is_from_list([groupid [, uri, mode] ]) 4.7. ds_load_update() 4.8. ds_load_unset() @@ -695,7 +695,7 @@ Note 4.3. ds_next_dst() 4.4. ds_next_domain() 4.5. ds_mark_dst([state]) - 4.6. ds_is_from_list([groupid]) + 4.6. ds_is_from_list([groupid [, uri, mode] ]) 4.7. ds_load_update() 4.8. ds_load_unset() @@ -834,25 +834,53 @@ failure_route[tryagain] { } ... -4.6. ds_is_from_list([groupid]) - - This function returns true, if the current request comes from a host in - the given group of the dispatcher-list; otherwise false. - - Parameter groupid is optional, when it is missing, then the matching - will be done against all addresses in all groups. Upon a match, the - variable specified by 'setid_pvname' parameter will be set to groupid - of matching address and the attributes will be set in variable - specified by 'attrs_pvname'. The parameter can be an integer or a - variable holding an integer value. +4.6. ds_is_from_list([groupid [, uri, mode] ]) + + This function returns true, if there is a match of source address or + uri with an address in the given group of the dispatcher-list; + otherwise false. + + Description of parameters: + * groupid (optional) - if not given or its value is -1, the matching + will be done over all addresses in all dispacher groups. Otherwise + the matching will be done only against the addresses in the + specific group id. The parameter can be an integer or a variable + holding an integer value. + * uri (optional) - if is empty or missing, the matching is done + against source IP, port and protocol. Otherwise the value has to be + a valid SIP URI, used to match against addresses in the dispatcher + list. Only IP, port and protocol are matches, any additional + parameters are ignored. The parameter can be a static or dynamic + (with variables) string. The domain part of the URI can be an IP + address or a hostname. + * mode - (optional) - a bitmask to specify how the matching should be + done. If is 0, all ip, port and proto are matched. If bit one is + set, then port is ignored. If bit two is set, then protocol is + ignored. The parameter can be an integer or a variable holding an + integer value. It must be provided if the uri parameter is + provided. + + Upon a match, the variable specified by 'setid_pvname' parameter will + be set to groupid of matching address and the attributes will be set in + variable specified by 'attrs_pvname'. + + Note that for backward compatibility mode, when no parameter is given + or only groupid is given, the matching is done only for IP address and + port (protocol is ignored). This function can be used from ANY_ROUTE. Example 1.33. ds_mark_dst usage ... +if(ds_is_from_list()) { + ... +} if(ds_is_from_list("10")) { ... } +if(ds_is_from_list("10", "sip:127.0.0.1:5080", "3")) { + ... +} ... 4.7. ds_load_update() diff --git a/modules/dispatcher/doc/dispatcher_admin.xml b/modules/dispatcher/doc/dispatcher_admin.xml index 75031f9..5177a12 100644 --- a/modules/dispatcher/doc/dispatcher_admin.xml +++ b/modules/dispatcher/doc/dispatcher_admin.xml @@ -994,19 +994,53 @@ failure_route[tryagain] { </section> <section id="dispatcher.f.ds_is_from_list"> <title> - <function moreinfo="none">ds_is_from_list([groupid])</function> + <function moreinfo="none">ds_is_from_list([groupid [, uri, mode] ])</function> </title> <para> - This function returns true, if the current request comes from a host - in the given group of the dispatcher-list; otherwise false. + This function returns true, if there is a match of source address or uri + with an address in the given group of the dispatcher-list; otherwise false. + </para> + <para>Description of parameters:</para> + <itemizedlist> + <listitem> + <para><emphasis>groupid</emphasis> (optional) - if not given or its + value is -1, the matching will be done over all addresses in + all dispacher groups. Otherwise the matching will be done only + against the addresses in the specific group id. The parameter + can be an integer or a variable holding an integer value. + </para> + </listitem> + <listitem> + <para><emphasis>uri</emphasis> (optional) - if is empty or missing, + the matching is done against source IP, port and protocol. + Otherwise the value has to be a valid SIP URI, used to match + against addresses in the dispatcher list. Only IP, port and + protocol are matches, any additional parameters are ignored. + The parameter can be a static or dynamic (with variables) + string. The domain part of the URI can be an IP address or + a hostname. + </para> + </listitem> + <listitem> + <para><emphasis>mode</emphasis> - (optional) - a bitmask to specify + how the matching should be done. If is 0, all ip, port and + proto are matched. If bit one is set, then port is ignored. + If bit two is set, then protocol is ignored. The parameter + can be an integer or a variable holding an integer value. + It must be provided if the uri parameter is provided. + </para> + </listitem> + </itemizedlist> + + <para> + Upon a match, the variable specified by 'setid_pvname' parameter will + be set to groupid of matching address and the attributes will be set in + variable specified by 'attrs_pvname'. </para> <para> - Parameter groupid is optional, when it is missing, then the matching - will be done against all addresses in all groups. Upon a match, the - variable specified by 'setid_pvname' parameter will be set to groupid - of matching address and the attributes will be set in variable - specified by 'attrs_pvname'. The parameter can be an integer or a - variable holding an integer value. + Note that for backward compatibility mode, when no parameter is given + or only groupid is given, the matching is done only for IP address + and port (protocol is ignored). </para> <para> This function can be used from ANY_ROUTE. @@ -1015,9 +1049,15 @@ failure_route[tryagain] { <title><function>ds_mark_dst</function> usage</title> <programlisting format="linespecific"> ... +if(ds_is_from_list()) { + ... +} if(ds_is_from_list("10")) { ... } +if(ds_is_from_list("10", "sip:127.0.0.1:5080", "3")) { + ... +} ... </programlisting> </example>

10 years, 2 months

git:master: dispatcher: new variant - ds_is_from_list(groupid, uri, mode)

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 6016958dfe71996689abc897baa629afb3b1c552 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6016958… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 5 17:21:40 2014 +0200 dispatcher: new variant - ds_is_from_list(groupid, uri, mode) - can match against records in dispatcher groups - if groupid==1 - will match against all groups - if uri is empty, then will match against source address (ip, port, proto). Otherwise it has to be a full SIP URI value. The matching is not taking in consideration any parameter apart of transport - mode is a bitmask to tell the matching rules - if it is 0, will match everything: ip, port and protocol - if bit one is set, will skip matching the port - if bit two is set, will skip matching the protocol --- modules/dispatcher/dispatch.c | 48 ++++++++++++++++++++++++++++++++++---- modules/dispatcher/dispatch.h | 9 ++++++- modules/dispatcher/dispatcher.c | 38 ++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 6 deletions(-) diff --git a/modules/dispatcher/dispatch.c b/modules/dispatcher/dispatch.c index 8fc6b79..120dcdd 100644 --- a/modules/dispatcher/dispatch.c +++ b/modules/dispatcher/dispatch.c @@ -332,8 +332,10 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, /* Free the hostname */ hostent2ip_addr(&dp->ip_address, he, 0); - /* Copy the Port out of the URI: */ + /* Copy the port out of the URI */ dp->port = puri.port_no; + /* Copy the proto out of the URI */ + dp->proto = puri.proto; if(sp->dlist==NULL) { @@ -2245,15 +2247,45 @@ int ds_print_list(FILE *fout) /* Checks, if the request (sip_msg *_m) comes from a host in a group * (group-id or -1 for all groups) */ -int ds_is_from_list(struct sip_msg *_m, int group) +int ds_is_addr_from_list(sip_msg_t *_m, int group, str *uri, int mode) { pv_value_t val; ds_set_t *list; int j; + struct ip_addr* pipaddr; + struct ip_addr aipaddr; + unsigned short tport; + unsigned short tproto; + sip_uri_t puri; + static char hn[256]; + struct hostent* he; memset(&val, 0, sizeof(pv_value_t)); val.flags = PV_VAL_INT|PV_TYPE_INT; + if(uri==NULL || uri->len<=0) { + pipaddr = &_m->rcv.src_ip; + tport = _m->rcv.src_port; + tproto = _m->rcv.proto; + } else { + if(parse_uri(uri->s, uri->len, &puri)!=0 || puri.host.len>255) { + LM_ERR("bad uri [%.*s]\n", uri->len, uri->s); + return -1; + } + strncpy(hn, puri.host.s, puri.host.len); + hn[puri.host.len]='\0'; + + he=resolvehost(hn); + if (he==0) { + LM_ERR("could not resolve %.*s\n", puri.host.len, puri.host.s); + return -1; + } + hostent2ip_addr(&aipaddr, he, 0); + pipaddr = &aipaddr; + tport = puri.port_no; + tproto = puri.proto; + } + for(list = _ds_list; list!= NULL; list= list->next) { // LM_ERR("list id: %d (n: %d)\n", list->id, list->nr); @@ -2262,9 +2294,11 @@ int ds_is_from_list(struct sip_msg *_m, int group) for(j=0; j<list->nr; j++) { // LM_ERR("port no: %d (%d)\n", list->dlist[j].port, j); - if (ip_addr_cmp(&_m->rcv.src_ip, &list->dlist[j].ip_address) - && (list->dlist[j].port==0 - || _m->rcv.src_port == list->dlist[j].port)) + if (ip_addr_cmp(pipaddr, &list->dlist[j].ip_address) + && ((mode&DS_MATCH_NOPORT) || list->dlist[j].port==0 + || tport == list->dlist[j].port) + && ((mode&DS_MATCH_NOPROTO) + || tproto == list->dlist[j].proto)) { if(group==-1 && ds_setid_pvname.s!=0) { @@ -2296,6 +2330,10 @@ int ds_is_from_list(struct sip_msg *_m, int group) return -1; } +int ds_is_from_list(struct sip_msg *_m, int group) +{ + return ds_is_addr_from_list(_m, group, NULL, DS_MATCH_NOPROTO); +} int ds_print_mi_list(struct mi_node* rpl) { diff --git a/modules/dispatcher/dispatch.h b/modules/dispatcher/dispatch.h index c02cf50..e0466d8 100644 --- a/modules/dispatcher/dispatch.h +++ b/modules/dispatcher/dispatch.h @@ -61,6 +61,10 @@ #define DS_PROBE_ALL 1 #define DS_PROBE_INACTIVE 2 +#define DS_MATCH_ALL 0 +#define DS_MATCH_NOPORT 1 +#define DS_MATCH_NOPROTO 2 + extern str ds_db_url; extern str ds_table_name; extern str ds_set_id_col; @@ -124,6 +128,8 @@ int ds_hash_load_init(unsigned int htsize, int expire, int initexpire); int ds_hash_load_destroy(void); int ds_is_from_list(struct sip_msg *_m, int group); +int ds_is_addr_from_list(sip_msg_t *_m, int group, str *uri, int mode); + /*! \brief * Timer for checking inactive destinations */ @@ -156,7 +162,8 @@ typedef struct _ds_dest int dload; ds_attrs_t attrs; struct ip_addr ip_address; /*!< IP-Address of the entry */ - unsigned short int port; /*!< Port of the request URI */ + unsigned short int port; /*!< Port of the URI */ + unsigned short int proto; /*!< Protocol of the URI */ int failure_count; struct _ds_dest *next; } ds_dest_t; diff --git a/modules/dispatcher/dispatcher.c b/modules/dispatcher/dispatcher.c index f551003..5356f2e 100644 --- a/modules/dispatcher/dispatcher.c +++ b/modules/dispatcher/dispatcher.c @@ -159,6 +159,8 @@ static int w_ds_load_update(struct sip_msg*, char*, char*); static int w_ds_is_from_list0(struct sip_msg*, char*, char*); static int w_ds_is_from_list1(struct sip_msg*, char*, char*); +static int w_ds_is_from_list3(struct sip_msg*, char*, char*, char*); +static int fixup_ds_is_from_list3(void** param, int param_no); static void destroy(void); @@ -190,6 +192,8 @@ static cmd_export_t cmds[]={ 0, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE}, {"ds_is_from_list", (cmd_function)w_ds_is_from_list1, 1, fixup_igp_null, 0, ANY_ROUTE}, + {"ds_is_from_list", (cmd_function)w_ds_is_from_list3, 3, + fixup_ds_is_from_list3, 0, ANY_ROUTE}, {"ds_load_unset", (cmd_function)w_ds_load_unset, 0, 0, 0, ANY_ROUTE}, {"ds_load_update", (cmd_function)w_ds_load_update, 0, @@ -840,6 +844,40 @@ static int w_ds_is_from_list1(struct sip_msg *msg, char *set, char *str2) return ds_is_from_list(msg, s); } +static int w_ds_is_from_list3(struct sip_msg *msg, char *set, char *uri, char *mode) +{ + int vset; + int vmode; + str suri; + + if(fixup_get_ivalue(msg, (gparam_t*)set, &vset)!=0) + { + LM_ERR("cannot get set id value\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t*)uri, &suri)!=0) + { + LM_ERR("cannot get uri value\n"); + return -1; + } + if(fixup_get_ivalue(msg, (gparam_t*)mode, &vmode)!=0) + { + LM_ERR("cannot get mode value\n"); + return -1; + } + + return ds_is_addr_from_list(msg, vset, &suri, vmode); +} + +static int fixup_ds_is_from_list3(void** param, int param_no) +{ + if(param_no==1 || param_no==3) + return fixup_igp_null(param, 1); + if(param_no==2) + return fixup_spve_null(param, 1); + return 0; +} + static int ds_parse_reply_codes() { param_t* params_list = NULL; param_t *pit=NULL;

10 years, 2 months

git:master: core: proper reverse order execution for net_data_out event callbacks

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 3b159696b1e418360de30b370ec61390cd0ca7e3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3b15969… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 5 16:18:38 2014 +0200 core: proper reverse order execution for net_data_out event callbacks --- events.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/events.c b/events.c index 6ee808a..6de9e2f 100644 --- a/events.c +++ b/events.c @@ -213,9 +213,10 @@ int sr_event_exec(int type, void *data) "%.*s\n+++++++++++++++++++\n", p->len, p->s); #endif /* EXTRA_DEBUG */ ret = 0; - for(i=SREV_CB_LIST_SIZE-1; - i>=0 && _sr_events_list.net_data_out[i]; i--) { - ret |= _sr_events_list.net_data_out[i](data); + for(i=0; i<SREV_CB_LIST_SIZE; i++) { + if(_sr_events_list.net_data_out[i]) { + ret |= _sr_events_list.net_data_out[i](data); + } } #ifdef EXTRA_DEBUG LM_DBG("POST-OUT ++++++++++++++++++++\n"

10 years, 2 months

git:master: core: allow up to three callback functions for net_data_in and net_data_out

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 1f1705a6b5f262e8fab88181edddd3fc5276f0a0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1f1705a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 5 16:11:51 2014 +0200 core: allow up to three callback functions for net_data_in and net_data_out - they are added normal for net_data_in and reverse for net_data_out, allowing nested execution (e.g., first module registering the two callbacks with have the first net_data_in and the last net_data_out) - allow topoh module can be used with other functionalities needed the same callbacks --- events.c | 43 +++++++++++++++++++++++++++++++------------ events.h | 5 +++-- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/events.c b/events.c index 7b7625f..6ee808a 100644 --- a/events.c +++ b/events.c @@ -95,17 +95,27 @@ void sr_event_cb_init(void) */ int sr_event_register_cb(int type, sr_event_cb_f f) { + int i; + sr_event_cb_init(); switch(type) { case SREV_NET_DATA_IN: - if(_sr_events_list.net_data_in==0) - _sr_events_list.net_data_in = f; - else return -1; + for(i=0; i<SREV_CB_LIST_SIZE; i++) { + if(_sr_events_list.net_data_in[i]==0) { + _sr_events_list.net_data_in[i] = f; + break; + } + } + if(i==SREV_CB_LIST_SIZE) return -1; break; case SREV_NET_DATA_OUT: - if(_sr_events_list.net_data_out==0) - _sr_events_list.net_data_out = f; - else return -1; + for(i=SREV_CB_LIST_SIZE-1; i>=0; i--) { + if(_sr_events_list.net_data_out[i]==0) { + _sr_events_list.net_data_out[i] = f; + break; + } + } + if(i<0) return -1; break; case SREV_CORE_STATS: if(_sr_events_list.core_stats==0) @@ -169,19 +179,24 @@ int sr_event_register_cb(int type, sr_event_cb_f f) int sr_event_exec(int type, void *data) { int ret; + int i; #ifdef EXTRA_DEBUG str *p; #endif /* EXTRA_DEBUG */ switch(type) { case SREV_NET_DATA_IN: - if(unlikely(_sr_events_list.net_data_in!=0)) + if(unlikely(_sr_events_list.net_data_in[0]!=0)) { #ifdef EXTRA_DEBUG p = (str*)data; LM_DBG("PRE-IN ++++++++++++++++++++++++++++++++\n" "%.*s\n+++++\n", p->len, p->s); #endif /* EXTRA_DEBUG */ - ret = _sr_events_list.net_data_in(data); + ret = 0; + for(i=0; i<SREV_CB_LIST_SIZE + && _sr_events_list.net_data_out[i]; i++) { + ret |= _sr_events_list.net_data_in[i](data); + } #ifdef EXTRA_DEBUG LM_DBG("POST-IN ++++++++++++++++++++++++++++++++\n" "%.*s\n+++++\n", p->len, p->s); @@ -190,14 +205,18 @@ int sr_event_exec(int type, void *data) } else return 1; break; case SREV_NET_DATA_OUT: - if(unlikely(_sr_events_list.net_data_out!=0)) + if(unlikely(_sr_events_list.net_data_out[SREV_CB_LIST_SIZE-1]!=0)) { #ifdef EXTRA_DEBUG p = (str*)data; LM_DBG("PRE-OUT ++++++++++++++++++++\n" "%.*s\n+++++++++++++++++++\n", p->len, p->s); #endif /* EXTRA_DEBUG */ - ret = _sr_events_list.net_data_out(data); + ret = 0; + for(i=SREV_CB_LIST_SIZE-1; + i>=0 && _sr_events_list.net_data_out[i]; i--) { + ret |= _sr_events_list.net_data_out[i](data); + } #ifdef EXTRA_DEBUG LM_DBG("POST-OUT ++++++++++++++++++++\n" "%.*s\n+++++++++++++++++++\n", p->len, p->s); @@ -278,9 +297,9 @@ int sr_event_enabled(int type) { switch(type) { case SREV_NET_DATA_IN: - return (_sr_events_list.net_data_in!=0)?1:0; + return (_sr_events_list.net_data_in[0]!=0)?1:0; case SREV_NET_DATA_OUT: - return (_sr_events_list.net_data_out!=0)?1:0; + return (_sr_events_list.net_data_out[SREV_CB_LIST_SIZE-1]!=0)?1:0; case SREV_CORE_STATS: return (_sr_events_list.core_stats!=0)?1:0; case SREV_CFG_RUN_ACTION: diff --git a/events.h b/events.h index df001a7..32540a0 100644 --- a/events.h +++ b/events.h @@ -36,12 +36,13 @@ #define SREV_TCP_WS_FRAME_OUT 11 #define SREV_STUN_IN 12 +#define SREV_CB_LIST_SIZE 3 typedef int (*sr_event_cb_f)(void *data); typedef struct sr_event_cb { - sr_event_cb_f net_data_in; - sr_event_cb_f net_data_out; + sr_event_cb_f net_data_in[SREV_CB_LIST_SIZE]; + sr_event_cb_f net_data_out[SREV_CB_LIST_SIZE]; sr_event_cb_f core_stats; sr_event_cb_f run_action; sr_event_cb_f pkg_update_stats;

10 years, 2 months

git:master: corex: fixed for loop in previous commit

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 072d61918c10006779123b00ab597c1c09334e1c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=072d619… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 5 16:06:00 2014 +0200 corex: fixed for loop in previous commit --- modules/corex/corex_mod.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules/corex/corex_mod.c b/modules/corex/corex_mod.c index f30163a..3d28c0e 100644 --- a/modules/corex/corex_mod.c +++ b/modules/corex/corex_mod.c @@ -232,8 +232,7 @@ static msg_iflag_name_t _msg_iflag_list[] = { static int msg_lookup_flag(str *fname) { int i; - for(i=0; i++; ) { - if(_msg_iflag_list[i].name.len <= 0) break; + for(i=0; _msg_iflag_list[i].name.len>0; i++) { if(fname->len==_msg_iflag_list[i].name.len && strncasecmp(_msg_iflag_list[i].name.s, fname->s, fname->len)==0) {

10 years, 2 months

git:master: modules/mtree: fixed return value of mt_match when mode=2

by Juha Heinanen

Module: sip-router Branch: master Commit: af69a3075ac4a7a46d72b0d60e6bc1740a56b7a7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=af69a30… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Sep 5 17:11:47 2014 +0300 modules/mtree: fixed return value of mt_match when mode=2 - initialize pv_values avp by mt_match when mode=2 - documented mt_match return value --- modules/mtree/README | 26 ++++++++++++++------------ modules/mtree/doc/mtree_admin.xml | 7 +++++-- modules/mtree/mtree.c | 12 +++++++++--- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/modules/mtree/README b/modules/mtree/README index b0a6543..28dd6d8 100644 --- a/modules/mtree/README +++ b/modules/mtree/README @@ -20,9 +20,9 @@ Juha Heinanen <jh(a)tutpro.com> - Copyright � 2010 Daniel-Constantin Mierla (asipto.com) + Copyright (c) 2010 Daniel-Constantin Mierla (asipto.com) - Copyright � 2011 Juha Heinanen + Copyright (c) 2011 Juha Heinanen __________________________________________________________________ Table of Contents @@ -275,8 +275,8 @@ modparam("mtree", "pv_value", "$var(mtval)") 3.10. pv_values (string) - The PV spec where to store the matched values when mtree is of type 0 - or 2 and mode of mt_match() call has value 2. It can be any AVP. + The AVP where to store the matched values when mtree is of type 0 or 2 + and mode of mt_match() call has value 2. Default value is "$avp(s:tvalues)". @@ -323,7 +323,7 @@ modparam("mtree", "mt_allow_duplicates", 1) 4.1. mt_match(mtree, pv, mode) -4.1. mt_match(mtree, pv, mode) +4.1. mt_match(mtree, pv, mode) Match 'pv' value against 'mtree'. If 'mtree' type is 0 or 2 and value of 'mode' is NOT 2, sets a value of the longest matching prefix to @@ -333,6 +333,8 @@ modparam("mtree", "mt_allow_duplicates", 1) matching prefix is in avp index 0. Parameter 'mode' can be an integer constant or a pseudo variable with integer value. + Returns 1 if match succeeded and -1 otherwise. + Example 1.14. mt_match usage ... mt_match("mytree", "$rU", "0"); @@ -345,7 +347,7 @@ mt_match("mytree", "$rU", "0"); 5.3. mt_summary 5.4. mt_match -5.1. mt_list +5.1. mt_list List content of a tree. @@ -359,7 +361,7 @@ mt_match("mytree", "$rU", "0"); _mtname_ _empty_line_ -5.2. mt_reload +5.2. mt_reload Reload mtree from database. @@ -374,7 +376,7 @@ mt_match("mytree", "$rU", "0"); _mtname_ _empty_line_ -5.3. mt_summary +5.3. mt_summary List usage summary for all trees. @@ -386,7 +388,7 @@ mt_match("mytree", "$rU", "0"); :mt_summary:_reply_fifo_file_ _empty_line_ -5.4. mt_match +5.4. mt_match Match prefix value against mtree. @@ -410,7 +412,7 @@ mt_match("mytree", "$rU", "0"); 6.2. mtree.reload 6.3. mtree.match -6.1. mtree.summary +6.1. mtree.summary List usage summary for all trees or for the tree whose name is given as parameter. @@ -418,7 +420,7 @@ mt_match("mytree", "$rU", "0"); Parameters: * _mtree_ - (optional) the name of the tree. -6.2. mtree.reload +6.2. mtree.reload Reload mtree from database to memory. @@ -426,7 +428,7 @@ mt_match("mytree", "$rU", "0"); * _mtree_ - name of mtree or empty string meaning all mtrees -6.3. mtree.match +6.3. mtree.match Match prefix value against mtree diff --git a/modules/mtree/doc/mtree_admin.xml b/modules/mtree/doc/mtree_admin.xml index cf91bbc..17c2c8f 100644 --- a/modules/mtree/doc/mtree_admin.xml +++ b/modules/mtree/doc/mtree_admin.xml @@ -248,8 +248,8 @@ modparam("mtree", "pv_value", "$var(mtval)") <section> <title><varname>pv_values</varname> (string)</title> <para> - The PV spec where to store the matched values when mtree is of type - 0 or 2 and mode of mt_match() call has value 2. It can be any AVP. + The AVP where to store the matched values when mtree is of type + 0 or 2 and mode of mt_match() call has value 2. </para> <para> <emphasis> @@ -344,6 +344,9 @@ modparam("mtree", "mt_allow_duplicates", 1) matching prefix is in avp index 0. Parameter 'mode' can be an integer constant or a pseudo variable with integer value. </para> + <para> + Returns 1 if match succeeded and -1 otherwise. + </para> <example> <title><function>mt_match</function> usage</title> <programlisting format="linespecific"> diff --git a/modules/mtree/mtree.c b/modules/mtree/mtree.c index 63521f5..6b6283d 100644 --- a/modules/mtree/mtree.c +++ b/modules/mtree/mtree.c @@ -336,7 +336,7 @@ is_t* mt_get_tvalue(m_tree_t *pt, str *tomatch, int *len) int mt_add_tvalues(struct sip_msg *msg, m_tree_t *pt, str *tomatch) { - int l; + int l, n; mt_node_t *itn; int_str val, values_avp_name; unsigned short values_name_type; @@ -353,7 +353,9 @@ int mt_add_tvalues(struct sip_msg *msg, m_tree_t *pt, str *tomatch) return -1; } - l = 0; + destroy_avps(values_name_type, values_avp_name, 1); + + l = n = 0; itn = pt->head; while (itn != NULL && l < tomatch->len && l < MT_MAX_DEPTH) { @@ -377,6 +379,7 @@ int mt_add_tvalues(struct sip_msg *msg, m_tree_t *pt, str *tomatch) val.s.s); add_avp(values_name_type|AVP_VAL_STR, values_avp_name, val); } + n++; tvalues = tvalues->next; } @@ -384,7 +387,10 @@ int mt_add_tvalues(struct sip_msg *msg, m_tree_t *pt, str *tomatch) l++; } - return 0; + if (n > 0) + return 0; + else + return -1; } int mt_match_prefix(struct sip_msg *msg, m_tree_t *it,

10 years, 2 months

git:master: corex: documented functions used for management of sip msg internal flags

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 36729fc15334711a22ee08616ba4dafa071479c6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=36729fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 5 15:39:56 2014 +0200 corex: documented functions used for management of sip msg internal flags --- modules/corex/README | 87 +++++++++++++++++++++++++++++------- modules/corex/doc/corex_admin.xml | 71 ++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+), 17 deletions(-) diff --git a/modules/corex/README b/modules/corex/README index 0f858dc..00a7b63 100644 --- a/modules/corex/README +++ b/modules/corex/README @@ -16,7 +16,7 @@ Muhammad Shahzad Shafi <shahzad(a)voip-demos.com> - Copyright © 2012 asipto.com + Copyright � 2012 asipto.com __________________________________________________________________ Table of Contents @@ -43,6 +43,9 @@ Muhammad Shahzad Shafi 4.3. send_tcp([ host [ :port ] ]) 4.4. send_data(uri, data) 4.5. is_incoming() + 4.6. msg_iflag_set(flagname) + 4.7. msg_iflag_reset(flagname) + 4.8. msg_iflag_is_set(flagname) 5. RPC Commands @@ -67,8 +70,11 @@ Muhammad Shahzad Shafi 1.6. send usage 1.7. send_data usage 1.8. is_incoming usage - 1.9. event_route[network:msg] use cases - 1.10. Sample PERL code for do_compress and do_uncompress + 1.9. msg_iflag_set usage + 1.10. msg_iflag_reset usage + 1.11. msg_iflag_is_set usage + 1.12. event_route[network:msg] use cases + 1.13. Sample PERL code for do_compress and do_uncompress Chapter 1. Admin Guide @@ -94,6 +100,9 @@ Chapter 1. Admin Guide 4.3. send_tcp([ host [ :port ] ]) 4.4. send_data(uri, data) 4.5. is_incoming() + 4.6. msg_iflag_set(flagname) + 4.7. msg_iflag_reset(flagname) + 4.8. msg_iflag_is_set(flagname) 5. RPC Commands @@ -155,12 +164,12 @@ Chapter 1. Admin Guide 3.1. alias_subdomains (string) - Register a domain and all its sub-domains to match the “myself” + Register a domain and all its sub-domains to match the "myself" condition. It can be set many times. Its full format is: 'proto:domain:port', allowing to set restrictions on protocol and port as well. Protocol and port are optional. - Default value is “NULL”. + Default value is "NULL". Example 1.1. Set alias_subdomains parameter ... @@ -216,8 +225,11 @@ modparam("corex", "msg_avp", "$avp(msg)") 4.3. send_tcp([ host [ :port ] ]) 4.4. send_data(uri, data) 4.5. is_incoming() + 4.6. msg_iflag_set(flagname) + 4.7. msg_iflag_reset(flagname) + 4.8. msg_iflag_is_set(flagname) -4.1. append_branch([ uri, [ q ] ]) +4.1. append_branch([ uri, [ q ] ]) Append a new branch to the destination set, useful to build the set of destination addresses for parallel forking or redirect replies. @@ -239,7 +251,7 @@ modparam("corex", "msg_avp", "$avp(msg)") append_branch("$avp(uri)", "0.5"); ... -4.2. send([ host [ :port ] ]) +4.2. send([ host [ :port ] ]) Send the original SIP message to a specific destination in stateless mode. No changes are applied to received message, no Via header is @@ -261,12 +273,12 @@ modparam("corex", "msg_avp", "$avp(msg)") send("$var(res)"); ... -4.3. send_tcp([ host [ :port ] ]) +4.3. send_tcp([ host [ :port ] ]) This function is identical to send() described above, except that it sends the SIP message using the TCP protocol instead of UDP. -4.4. send_data(uri, data) +4.4. send_data(uri, data) Send the data to address specified by uri. Both parameters can contain pseudo-variables. The uri parameter has to be a valid SIP URI. The data @@ -279,7 +291,7 @@ modparam("corex", "msg_avp", "$avp(msg)") send("sip:example.com:5070;transport=sctp", "Message at $Ts"); ... -4.5. is_incoming() +4.5. is_incoming() Returns true if contents of message buffer $mb are the data received from remote host, otherwise false indicating that the contents of $mb @@ -301,6 +313,47 @@ event_route[network:msg] { } ... +4.6. msg_iflag_set(flagname) + + Set internal SIP message flag. The parameter flagname can be: + USE_UAC_FROM, USE_UAC_TO or UAC_AUTH. + + This functions should not be used in configuration file for (re)setting + the internal flags, those are done by various functions internally, + however, in very particular cases they might be useful (e.g., changing + From/To via textops functions). + + This function can be used from ANY_ROUTE. + + Example 1.9. msg_iflag_set usage +... + msg_iflag_set("UAC_AUTH"); +... + +4.7. msg_iflag_reset(flagname) + + Reset the internal flag given as parameter. + + This function can be used from ANY_ROUTE. + + Example 1.10. msg_iflag_reset usage +... + msg_iflag_reset("UAC_AUTH"); +... + +4.8. msg_iflag_is_set(flagname) + + Test if the internal flag given as parameter is set. + + This function can be used from ANY_ROUTE. + + Example 1.11. msg_iflag_is_set usage +... + if(msg_iflag_is_set("UAC_AUTH")) { ... } +... + + - ("flagname") - ("flagname") + 5. RPC Commands 5.1. corex.list_sockets @@ -308,28 +361,28 @@ event_route[network:msg] { 5.3. corex.shm_status 5.4. corex.shm_summary -5.1. corex.list_sockets +5.1. corex.list_sockets Print the list of sockets the application is listening on. Example: kamcmd corex.list_sockets -5.2. corex.list_aliases +5.2. corex.list_aliases Print the list of hostname aliases used to match the myself condition. Example: kamcmd corex.list_aliases -5.3. corex.shm_status +5.3. corex.shm_status Trigger shm status dump to syslog. Example: kamcmd corex.shm_status -5.4. corex.shm_summary +5.4. corex.shm_summary Trigger shm summary dump to syslog. @@ -340,7 +393,7 @@ event_route[network:msg] { 6.1. event_route[network:msg] -6.1. event_route[network:msg] +6.1. event_route[network:msg] Event route block to be executed when new data is received from network or the data that is about to be sent to a remote host by a SIP worker @@ -410,7 +463,7 @@ event_route[network:msg] { Next is a basic usage example where encoding and decoding is done using PERL, - Example 1.9. event_route[network:msg] use cases + Example 1.12. event_route[network:msg] use cases ... loadmodule "app_perl.so" loadmodule "corex.so" @@ -441,7 +494,7 @@ event_route[network:msg] { } ... - Example 1.10. Sample PERL code for do_compress and do_uncompress + Example 1.13. Sample PERL code for do_compress and do_uncompress ... use strict; use warnings; diff --git a/modules/corex/doc/corex_admin.xml b/modules/corex/doc/corex_admin.xml index 3d83f1c..31ab300 100644 --- a/modules/corex/doc/corex_admin.xml +++ b/modules/corex/doc/corex_admin.xml @@ -303,6 +303,77 @@ event_route[network:msg] { </example> </section> + <section id="corex.f.msg_iflag_set"> + <title> + <function moreinfo="none">msg_iflag_set(flagname)</function> + </title> + <para> + Set internal SIP message flag. The parameter flagname can be: + USE_UAC_FROM, USE_UAC_TO or UAC_AUTH. + </para> + <para> + This functions should not be used in configuration file for + (re)setting the internal flags, those are done by various + functions internally, however, in very particular cases they + might be useful (e.g., changing From/To via textops functions). + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>msg_iflag_set</function> usage</title> + <programlisting format="linespecific"> +... + msg_iflag_set("UAC_AUTH"); +... +</programlisting> + </example> + </section> + + <section id="corex.f.msg_iflag_reset"> + <title> + <function moreinfo="none">msg_iflag_reset(flagname)</function> + </title> + <para> + Reset the internal flag given as parameter. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>msg_iflag_reset</function> usage</title> + <programlisting format="linespecific"> +... + msg_iflag_reset("UAC_AUTH"); +... +</programlisting> + </example> + </section> + + <section id="corex.f.msg_iflag_is_set"> + <title> + <function moreinfo="none">msg_iflag_is_set(flagname)</function> + </title> + <para> + Test if the internal flag given as parameter is set. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>msg_iflag_is_set</function> usage</title> + <programlisting format="linespecific"> +... + if(msg_iflag_is_set("UAC_AUTH")) { ... } +... +</programlisting> + </example> + </section> + + + - ("flagname") + - ("flagname") + </section> <section>

10 years, 2 months

git:master: dialog: documented the track_cseq_updates module parameter

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 9108218677d52c4ca2b430bcfcae72fe574c85cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9108218… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 5 15:31:30 2014 +0200 dialog: documented the track_cseq_updates module parameter --- modules/dialog/README | 89 +++++++++++++++++++++------------- modules/dialog/doc/dialog_admin.xml | 30 +++++++++++- 2 files changed, 84 insertions(+), 35 deletions(-) diff --git a/modules/dialog/README b/modules/dialog/README index 37b2bc4..1267bd1 100644 --- a/modules/dialog/README +++ b/modules/dialog/README @@ -91,6 +91,7 @@ Alex Balashov 5.48. ka_interval (int) 5.49. timeout_noreset (int) 5.50. timer_procs (int) + 5.51. track_cseq_updates (int) 6. Functions @@ -218,23 +219,24 @@ Alex Balashov 1.48. Set ka_interval parameter 1.49. Set timeout_noreset parameter 1.50. Set timeout_procs parameter - 1.51. set_dlg_profile usage - 1.52. unset_dlg_profile usage - 1.53. is_in_profile usage - 1.54. get_profile_size usage - 1.55. dlg_isflagset usage - 1.56. dlg_setflag usage - 1.57. dlg_resetflag usage - 1.58. dlg_bye usage - 1.59. dlg_refer usage - 1.60. dlg_manage usage - 1.61. dlg_bridge usage - 1.62. dlg_get usage - 1.63. is_known_dlg() usage - 1.64. dlg_set_timeout usage - 1.65. dlg_set_timeout_by_profile usage - 1.66. dlg_set_property usage - 1.67. dlg_remote_profile usage + 1.51. Set track_cseq_updates parameter + 1.52. set_dlg_profile usage + 1.53. unset_dlg_profile usage + 1.54. is_in_profile usage + 1.55. get_profile_size usage + 1.56. dlg_isflagset usage + 1.57. dlg_setflag usage + 1.58. dlg_resetflag usage + 1.59. dlg_bye usage + 1.60. dlg_refer usage + 1.61. dlg_manage usage + 1.62. dlg_bridge usage + 1.63. dlg_get usage + 1.64. is_known_dlg() usage + 1.65. dlg_set_timeout usage + 1.66. dlg_set_timeout_by_profile usage + 1.67. dlg_set_property usage + 1.68. dlg_remote_profile usage Chapter 1. Admin Guide @@ -300,6 +302,7 @@ Chapter 1. Admin Guide 5.48. ka_interval (int) 5.49. timeout_noreset (int) 5.50. timer_procs (int) + 5.51. track_cseq_updates (int) 6. Functions @@ -502,6 +505,7 @@ Chapter 1. Admin Guide 5.48. ka_interval (int) 5.49. timeout_noreset (int) 5.50. timer_procs (int) + 5.51. track_cseq_updates (int) 5.1. enable_stats (integer) @@ -1154,6 +1158,23 @@ modparam("dialog", "timeout_noreset", 1) modparam("dialog", "timer_procs", 1) ... +5.51. track_cseq_updates (int) + + Enable the callbacks for tracking if CSeq number needs to be updated. + It is the case when the INVITE has to be authenticated to downstream + provider using uac_auth() from uac module. + + This is done only for requests in downstream direction. The CSeq + difference is stored in $dlg_var(cseq_diff), be sure this variable is + not overwritten via config operation. + + Default value is "0" (disabled). + + Example 1.51. Set track_cseq_updates parameter +... +modparam("dialog", "track_cseq_updates", 1) +... + 6. Functions 6.1. set_dlg_profile(profile,[value]) @@ -1190,7 +1211,7 @@ modparam("dialog", "timer_procs", 1) This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, REPLY_ROUTE and FAILURE_ROUTE. - Example 1.51. set_dlg_profile usage + Example 1.52. set_dlg_profile usage ... set_dlg_profile("inbound_call"); set_dlg_profile("caller","$fu"); @@ -1209,7 +1230,7 @@ set_dlg_profile("caller","$fu"); This function can be used from BRANCH_ROUTE, REPLY_ROUTE and FAILURE_ROUTE. - Example 1.52. unset_dlg_profile usage + Example 1.53. unset_dlg_profile usage ... unset_dlg_profile("inbound_call"); unset_dlg_profile("caller","$fu"); @@ -1232,7 +1253,7 @@ unset_dlg_profile("caller","$fu"); This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, REPLY_ROUTE and FAILURE_ROUTE. - Example 1.53. is_in_profile usage + Example 1.54. is_in_profile usage ... if (is_in_profile("inbound_call")) { log("this request belongs to a inbound call\n"); @@ -1261,7 +1282,7 @@ if (is_in_profile("caller","XX")) { This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, REPLY_ROUTE and FAILURE_ROUTE. - Example 1.54. get_profile_size usage + Example 1.55. get_profile_size usage ... if(get_profile_size("inbound_call","$avp(size)")) xlog("currently there are $avp(size) inbound calls\n"); @@ -1280,7 +1301,7 @@ if(get_profile_size("caller","$fu","$avp(size)")) This function can be used from BRANCH_ROUTE, REQUEST_ROUTE, ONREPLY_ROUTE and FAILURE_ROUTE. - Example 1.55. dlg_isflagset usage + Example 1.56. dlg_isflagset usage ... if(dlg_isflagset("1")) { @@ -1298,7 +1319,7 @@ if(dlg_isflagset("1")) This function can be used from BRANCH_ROUTE, REQUEST_ROUTE, ONREPLY_ROUTE and FAILURE_ROUTE. - Example 1.56. dlg_setflag usage + Example 1.57. dlg_setflag usage ... dlg_setflag("1"); ... @@ -1313,7 +1334,7 @@ dlg_setflag("1"); This function can be used from BRANCH_ROUTE, REQUEST_ROUTE, ONREPLY_ROUTE and FAILURE_ROUTE. - Example 1.57. dlg_resetflag usage + Example 1.58. dlg_resetflag usage ... redlg_setflag("1"); ... @@ -1329,7 +1350,7 @@ redlg_setflag("1"); This function can be used from BRANCH_ROUTE, REQUEST_ROUTE, ONREPLY_ROUTE and FAILURE_ROUTE. - Example 1.58. dlg_bye usage + Example 1.59. dlg_bye usage ... dlg_bye("all"); ... @@ -1346,7 +1367,7 @@ dlg_bye("all"); This function can be used from BRANCH_ROUTE, REQUEST_ROUTE, ONREPLY_ROUTE and FAILURE_ROUTE. - Example 1.59. dlg_refer usage + Example 1.60. dlg_refer usage ... dlg_refer("caller", "sip:announcement@kamailio.org"); ... @@ -1359,7 +1380,7 @@ dlg_refer("caller", "sip:announcement@kamailio.org"); This function can be used from REQUEST_ROUTE. - Example 1.60. dlg_manage usage + Example 1.61. dlg_manage usage ... modparam("dialog", "default_timeout", 100) ... @@ -1387,7 +1408,7 @@ route { This function can be used from BRANCH_ROUTE, REQUEST_ROUTE, ONREPLY_ROUTE and FAILURE_ROUTE. - Example 1.61. dlg_bridge usage + Example 1.62. dlg_bridge usage ... dlg_bridge("sip:user@kamailio.org", "sip:annoucement@kamailio.org", "sip:kamailio.org:5080"); @@ -1406,7 +1427,7 @@ dlg_bridge("sip:user@kamailio.org", "sip:annoucement@kamailio.org", This function can be used from BRANCH_ROUTE, REQUEST_ROUTE, ONREPLY_ROUTE and FAILURE_ROUTE. - Example 1.62. dlg_get usage + Example 1.63. dlg_get usage ... if(dlg_get("abcdef", "123", "456")) { @@ -1430,7 +1451,7 @@ if(dlg_get("abcdef", "123", "456")) This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, REPLY_ROUTE and FAILURE_ROUTE. - Example 1.63. is_known_dlg() usage + Example 1.64. is_known_dlg() usage ... if(!uri == myself) { if(is_known_dlg()) { @@ -1454,7 +1475,7 @@ if(!uri == myself) { This function can be used from ANY_ROUTE. - Example 1.64. dlg_set_timeout usage + Example 1.65. dlg_set_timeout usage ... if(dlg_set_timeout("180", "123", "456")) { @@ -1476,7 +1497,7 @@ if(dlg_set_timeout("180", "123", "456")) This function can be used from ANY_ROUTE. - Example 1.65. dlg_set_timeout_by_profile usage + Example 1.66. dlg_set_timeout_by_profile usage ... # All dialogs belonging to user abc123 (tracked via set_dlg_profile()) # will be timed out in 3 seconds. @@ -1508,7 +1529,7 @@ dlg_set_timeout_by_profile("users", "abc123", "3"); This function can be used from ANY_ROUTE. - Example 1.66. dlg_set_property usage + Example 1.67. dlg_set_property usage ... dlg_set_property("ka-src"); dlg_set_property("ka-dst"); @@ -1536,7 +1557,7 @@ dlg_set_property("timeout-noreset"); This function can be used from ANY_ROUTE. - Example 1.67. dlg_remote_profile usage + Example 1.68. dlg_remote_profile usage ... $var(exp) = 3600 + $Ts; dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)"); diff --git a/modules/dialog/doc/dialog_admin.xml b/modules/dialog/doc/dialog_admin.xml index 3feb5f3..af46ab3 100644 --- a/modules/dialog/doc/dialog_admin.xml +++ b/modules/dialog/doc/dialog_admin.xml @@ -1269,7 +1269,7 @@ modparam("dialog", "timeout_noreset", 1) </emphasis> </para> <example> - <title>Set <varname>timeout_procs</varname> parameter</title> + <title>Set <varname>timer_procs</varname> parameter</title> <programlisting format="linespecific"> ... modparam("dialog", "timer_procs", 1) @@ -1278,6 +1278,34 @@ modparam("dialog", "timer_procs", 1) </example> </section> + <section id="dialog.p.track_cseq_updates"> + <title><varname>track_cseq_updates</varname> (int)</title> + <para> + Enable the callbacks for tracking if CSeq number needs to + be updated. It is the case when the INVITE has to be + authenticated to downstream provider using uac_auth() from + uac module. + </para> + <para> + This is done only for requests in downstream direction. The + CSeq difference is stored in $dlg_var(cseq_diff), be sure + this variable is not overwritten via config operation. + </para> + <para> + <emphasis> + Default value is <quote>0</quote> (disabled). + </emphasis> + </para> + <example> + <title>Set <varname>track_cseq_updates</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dialog", "track_cseq_updates", 1) +... +</programlisting> + </example> + </section> + </section>

10 years, 2 months

← Newer
1
...
26
27
28
29
30
31
32
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2014