sr-dev March 2011

sr-dev@lists.kamailio.org

25 participants
194 discussions

git:master: core: Set loglevel of pv_xavp_print to INFO so it matches avp_print() behaviour.

by Alex Hermann

Module: sip-router Branch: master Commit: 024e7483317939d7a08da63ca3d26a4276bfe318 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=024e748… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Mon Dec 20 23:40:31 2010 +0100 core: Set loglevel of pv_xavp_print to INFO so it matches avp_print() behaviour. --- xavp.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/xavp.c b/xavp.c index a008afd..622c058 100644 --- a/xavp.c +++ b/xavp.c @@ -468,43 +468,43 @@ void xavp_print_list_content(sr_xavp_t **head, int level) start = *head; else start=*_xavp_list_crt; - LM_DBG("+++++ start XAVP list: %p (level=%d)\n", start, level); + LM_INFO("+++++ start XAVP list: %p (level=%d)\n", start, level); avp = start; while(avp) { - LM_DBG(" *** XAVP name: %s\n", avp->name.s); - LM_DBG(" XAVP id: %u\n", avp->id); - LM_DBG(" XAVP value type: %d\n", avp->val.type); + LM_INFO(" *** XAVP name: %s\n", avp->name.s); + LM_INFO(" XAVP id: %u\n", avp->id); + LM_INFO(" XAVP value type: %d\n", avp->val.type); switch(avp->val.type) { case SR_XTYPE_NULL: - LM_DBG(" XAVP value: <null>\n"); + LM_INFO(" XAVP value: <null>\n"); break; case SR_XTYPE_INT: - LM_DBG(" XAVP value: %d\n", avp->val.v.i); + LM_INFO(" XAVP value: %d\n", avp->val.v.i); break; case SR_XTYPE_STR: - LM_DBG(" XAVP value: %s\n", avp->val.v.s.s); + LM_INFO(" XAVP value: %s\n", avp->val.v.s.s); break; case SR_XTYPE_TIME: - LM_DBG(" XAVP value: %lu\n", avp->val.v.t); + LM_INFO(" XAVP value: %lu\n", avp->val.v.t); break; case SR_XTYPE_LONG: - LM_DBG(" XAVP value: %ld\n", avp->val.v.l); + LM_INFO(" XAVP value: %ld\n", avp->val.v.l); break; case SR_XTYPE_LLONG: - LM_DBG(" XAVP value: %lld\n", avp->val.v.ll); + LM_INFO(" XAVP value: %lld\n", avp->val.v.ll); break; case SR_XTYPE_XAVP: - LM_DBG(" XAVP value: <xavp:%p>\n", avp->val.v.xavp); + LM_INFO(" XAVP value: <xavp:%p>\n", avp->val.v.xavp); xavp_print_list_content(&avp->val.v.xavp, level+1); break; case SR_XTYPE_DATA: - LM_DBG(" XAVP value: <data:%p>\n", avp->val.v.data); + LM_INFO(" XAVP value: <data:%p>\n", avp->val.v.data); break; } avp = avp->next; } - LM_DBG("----- end XAVP list: %p (level=%d)\n", start, level); + LM_INFO("----- end XAVP list: %p (level=%d)\n", start, level); } void xavp_print_list(sr_xavp_t **head)

13 years, 6 months

git:master: modules_k/pv: Add new transformations to create prefixes

by Alex Hermann

Module: sip-router Branch: master Commit: f68c308ebb8c9c0a182f92901076aee44230dae7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f68c308… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Mon Dec 20 16:49:07 2010 +0100 modules_k/pv: Add new transformations to create prefixes s.prefixes creates a string with prefixes separated by comma's s.prefixes.quoted creates a string of quoted prefixes spearated by comma's Both take a parameter to specify the max prefix length. If zero, then return upto the whole string. Examples: "1234"{s.prefixes,0} => 1,12,123,1234 "123456"{s.prefixes,4} => 1,12,123,1234 "123456"{s.prefixes.quot,4} => '1','12','123','1234' --- modules_k/pv/pv_trans.c | 79 +++++++++++++++++++++++++++++++++++++++++++++- modules_k/pv/pv_trans.h | 2 +- 2 files changed, 78 insertions(+), 3 deletions(-) diff --git a/modules_k/pv/pv_trans.c b/modules_k/pv/pv_trans.c index e568ddb..35c7fe2 100644 --- a/modules_k/pv/pv_trans.c +++ b/modules_k/pv/pv_trans.c @@ -67,7 +67,7 @@ static char _tr_buffer[TR_BUFFER_SIZE]; int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, pv_value_t *val) { - int i, j; + int i, j, max; char *p, *s; str st; pv_value_t v; @@ -452,6 +452,50 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.len -= i; break; + case TR_S_PREFIXES: + case TR_S_PREFIXES_QUOT: + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + + /* Set maximum prefix length */ + max = val->rs.len; + if(tp!=NULL) { + if(tp->type==TR_PARAM_NUMBER) { + if (tp->v.n > 0 && tp->v.n < max) + max = tp->v.n; + } else { + if(pv_get_spec_value(msg, (pv_spec_p)tp->v.data, &v)!=0 + || (!(v.flags&PV_VAL_INT))) + { + LM_ERR("prefixes cannot get max\n"); + return -1; + } + if (v.ri > 0 && v.ri < max) + max = v.ri; + } + } + + if(max * (max/2 + (subtype==TR_S_PREFIXES_QUOT ? 1 : 3)) > TR_BUFFER_SIZE-1) { + LM_ERR("prefixes buffer too short\n"); + return -1; + } + + j = 0; + for (i=1; i <= max; i++) { + if (subtype==TR_S_PREFIXES_QUOT) + _tr_buffer[j++] = '\''; + memcpy(&(_tr_buffer[j]), val->rs.s, i); + j += i; + if (subtype==TR_S_PREFIXES_QUOT) + _tr_buffer[j++] = '\''; + _tr_buffer[j++] = ','; + } + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs.s = _tr_buffer; + val->rs.len = j-1; + break; + default: LM_ERR("unknown subtype %d\n", subtype); @@ -1236,6 +1280,38 @@ char* tr_parse_string(str* in, trans_t *t) } else if(name.len==14 && strncasecmp(name.s, "unescape.param", 14)==0) { t->subtype = TR_S_UNESCAPEPARAM; goto done; + } else if(name.len==8 && strncasecmp(name.s, "prefixes", 8)==0) { + t->subtype = TR_S_PREFIXES; + if(*p!=TR_PARAM_MARKER) + goto done; + p++; + _tr_parse_nparam(p, p0, tp, spec, n, sign, in, s); + t->params = tp; + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid prefixes transformation: %.*s!!\n", + in->len, in->s); + goto error; + } + goto done; + } else if(name.len==15 && strncasecmp(name.s, "prefixes.quoted", 15)==0) { + t->subtype = TR_S_PREFIXES_QUOT; + if(*p!=TR_PARAM_MARKER) + goto done; + p++; + _tr_parse_nparam(p, p0, tp, spec, n, sign, in, s); + t->params = tp; + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid prefixes transformation: %.*s!!\n", + in->len, in->s); + goto error; + } + goto done; } else if(name.len==6 && strncasecmp(name.s, "substr", 6)==0) { t->subtype = TR_S_SUBSTR; if(*p!=TR_PARAM_MARKER) @@ -1706,4 +1782,3 @@ done: t->name = name; return p; } - diff --git a/modules_k/pv/pv_trans.h b/modules_k/pv/pv_trans.h index acd81db..1e601d8 100644 --- a/modules_k/pv/pv_trans.h +++ b/modules_k/pv/pv_trans.h @@ -39,7 +39,7 @@ enum _tr_s_subtype { TR_S_SELECT, TR_S_ENCODEHEXA, TR_S_DECODEHEXA, TR_S_ESCAPECOMMON, TR_S_UNESCAPECOMMON, TR_S_ESCAPEUSER, TR_S_UNESCAPEUSER, TR_S_ESCAPEPARAM, TR_S_UNESCAPEPARAM, TR_S_TOLOWER, TR_S_TOUPPER, - TR_S_STRIP, TR_S_STRIPTAIL + TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

13 years, 6 months

git:master: dialog(k): Fix indention in spiral detection example code (docs ).

by Timo Reimann

Module: sip-router Branch: master Commit: acca0fad60183745d8b9317f11326bfa601c5b02 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=acca0fa… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Mar 10 20:13:41 2011 +0100 dialog(k): Fix indention in spiral detection example code (docs). --- modules_k/dialog/doc/dialog_admin.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/dialog/doc/dialog_admin.xml b/modules_k/dialog/doc/dialog_admin.xml index aaed79e..9305b73 100644 --- a/modules_k/dialog/doc/dialog_admin.xml +++ b/modules_k/dialog/doc/dialog_admin.xml @@ -341,9 +341,9 @@ modparam("dialog", "dlg_match_mode", 1) <example> <title>Set <varname>detect_spirals</varname> parameter</title> <programlisting format="linespecific"> - ... - modparam("dialog", "detect_spirals", 1) - ... +... +modparam("dialog", "detect_spirals", 1) +... </programlisting> </example> </section>

13 years, 6 months

git:carstenbock/ims: - Updated Typo in the docs (thanks Klaus)

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: 5479620417f017109985ee10d485a0da85588d81 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5479620… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Mar 10 14:11:11 2011 +0100 - Updated Typo in the docs (thanks Klaus) - added a note about reg_avp behaviour. --- modules_k/registrar/doc/registrar_admin.xml | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/modules_k/registrar/doc/registrar_admin.xml b/modules_k/registrar/doc/registrar_admin.xml index 13947d1..b809338 100644 --- a/modules_k/registrar/doc/registrar_admin.xml +++ b/modules_k/registrar/doc/registrar_admin.xml @@ -660,10 +660,13 @@ modparam("registrar", "reg_avp", "$avp(i:2)") The function processes a REGISTER message. It can add, remove or modify usrloc records depending on Contact and Expires HFs in the REGISTER message. On success and when called from the REQUEST_ROUTE, - 200 OK will be returned listing all contacts that are currently in + 200 OK will be returned listing all contacts that are currently in usrloc. On an error, error message will be send with a short description in reason phrase. </para> + <para> + This function will save the AVP's for this contact. + </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem> @@ -715,6 +718,9 @@ save("location"); Same as <function>save()</function> but it accepts a set of flags for controlling its behaviour. </para> + <para> + This function will save the AVP's for this contact. + </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem> @@ -776,6 +782,9 @@ save("location","0x01"); the message (depending on append_branches parameter value). </para> <para> + This function will restore the AVP's for this contact. + </para> + <para> If the method_filtering option is enabled, the lookup function will return only the contacts that support the method of the processed request. @@ -837,7 +846,10 @@ switch ($retcode) { The function returns true if the AOR in the Request-URI is registered, false otherwise. The function does not modify the message being processed, it neither rewrites the Request-URI if a - contact is found not append branches. + contact is found nor appends branches. + </para> + <para> + This function will restore the AVP's for this contact. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -873,7 +885,10 @@ if (registered("location")) { registered, false otherwise. The function does not modify the message being processed, it neither rewrites the Request-URI if a - contact is found not append branches. + contact is found nor appends branches. + </para> + <para> + This function will restore the AVP's for this contact. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist>

13 years, 6 months

git:carstenbock/ims: - New function: is_registered("domain", "uri")

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: f440ef1a0debf9637d942922478aed478ac71d26 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f440ef1… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Wed Mar 9 15:13:51 2011 +0100 - New function: is_registered("domain", "uri") --- modules_k/registrar/doc/registrar_admin.xml | 41 ++++++++++++++++++++++++++- modules_k/registrar/lookup.c | 37 +++++++++++++++++++++++- modules_k/registrar/lookup.h | 5 +++ modules_k/registrar/reg_mod.c | 11 +++++-- modules_k/registrar/reg_mod.h | 11 +++++++ 5 files changed, 99 insertions(+), 6 deletions(-) diff --git a/modules_k/registrar/doc/registrar_admin.xml b/modules_k/registrar/doc/registrar_admin.xml index ec553ed..091e36a 100644 --- a/modules_k/registrar/doc/registrar_admin.xml +++ b/modules_k/registrar/doc/registrar_admin.xml @@ -812,7 +812,7 @@ switch ($retcode) { <para> The function returns true if the AOR in the Request-URI is registered, false otherwise. The function does not modify the - message being process, it neither rewrites the Request-URI if a + message being processed, it neither rewrites the Request-URI if a contact is found not append branches. </para> <para>Meaning of the parameters is as follows:</para> @@ -842,6 +842,45 @@ if (registered("location")) { <section> <title> + <function moreinfo="none">registered(domain, uri)</function> + </title> + <para> + The function returns true if the provided URI is + registered, false otherwise. + The function does not modify the + message being processed, it neither rewrites the Request-URI if a + contact is found not append branches. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>domain</emphasis> - Name of table that should be + used for the lookup. + </para> + <para> + <emphasis>uri</emphasis> - URI used for lookup + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + </para> + <example> + <title><function>registered</function> usage</title> + <programlisting format="linespecific"> +... +if (!registered("location", "$fu")) { + sl_send_reply("407", "You must register first"); + ... +}; +... +</programlisting> + </example> + </section> + + <section> + <title> <function moreinfo="none">add_sock_hdr(hdr_name)</function> </title> <para> diff --git a/modules_k/registrar/lookup.c b/modules_k/registrar/lookup.c index cfab8d6..4f18944 100644 --- a/modules_k/registrar/lookup.c +++ b/modules_k/registrar/lookup.c @@ -47,6 +47,8 @@ #include "lookup.h" #include "config.h" +#include "../../mod_fix.h" + #define allowed_method(_msg, _c) \ ( !method_filtering || ((_msg)->REQ_METHOD)&((_c)->methods) ) @@ -181,7 +183,7 @@ done: * it is similar to lookup but registered neither rewrites * the Request-URI nor appends branches */ -int registered(struct sip_msg* _m, char* _t, char* _s) +int r_registered(struct sip_msg* _m, char* _t, str * _uri) { str uri, aor; urecord_t* r; @@ -189,7 +191,8 @@ int registered(struct sip_msg* _m, char* _t, char* _s) int res; int_str match_callid=(int_str)0; - if (_m->new_uri.s) uri = _m->new_uri; + if (_uri) uri = *_uri; + else if (_m->new_uri.s) uri = _m->new_uri; else uri = _m->first_line.u.request.uri; if (extract_aor(&uri, &aor) < 0) { @@ -235,3 +238,33 @@ int registered(struct sip_msg* _m, char* _t, char* _s) LM_DBG("'%.*s' not found in usrloc\n", aor.len, ZSW(aor.s)); return -1; } + +/*! \brief the is_registered() function + * Return true if the AOR in the Request-URI is registered, + * it is similar to lookup but registered neither rewrites + * the Request-URI nor appends branches + */ +int registered(struct sip_msg* _m, char* _t, char* _s) +{ + return r_registered(_m, _t, 0); +} + +/*! \brief the is_registered() function + * Return true if the AOR in the second Parameter ist registered. + */ +int registered2(struct sip_msg* _m, char* _t, char* _uri) +{ + str uri; + if(fixup_get_svalue(_m, (gparam_p)_uri, &uri)!=0) + { + LM_ERR("unable to get URI\n"); + return -1; + } + if(uri.s==NULL || uri.len == 0) + { + LM_ERR("invalid URI parameter\n"); + return -1; + } + return r_registered(_m, _t, &uri); +} + diff --git a/modules_k/registrar/lookup.h b/modules_k/registrar/lookup.h index 2cafbbf..2afdfa7 100644 --- a/modules_k/registrar/lookup.h +++ b/modules_k/registrar/lookup.h @@ -49,5 +49,10 @@ int lookup(struct sip_msg* _m, udomain_t* _d); */ int registered(struct sip_msg* _m, char* _t, char* _s); +/*! \brief the is_registered() function + * Return true if the AOR in the second Parameter ist registered. + */ +int registered2(struct sip_msg* _m, char* _t, char* _uri); + #endif /* LOOKUP_H */ diff --git a/modules_k/registrar/reg_mod.c b/modules_k/registrar/reg_mod.c index db8e43f..f84a8f7 100644 --- a/modules_k/registrar/reg_mod.c +++ b/modules_k/registrar/reg_mod.c @@ -93,11 +93,13 @@ static int w_lookup(struct sip_msg* _m, char* _d, char* _p2); /*! \brief Fixup functions */ static int domain_fixup(void** param, int param_no); static int save_fixup(void** param, int param_no); -static int unreg_fixup(void** param, int param_no); +static int reg_fixup(void** param, int param_no); static int fetchc_fixup(void** param, int param_no); /*! \brief Functions */ static int add_sock_hdr(struct sip_msg* msg, char *str, char *foo); +static int reg_avp_param(modparam_t type, void* val); + int tcp_persistent_flag = -1; /*!< if the TCP connection should be kept open */ int method_filtering = 0; /*!< if the looked up contacts should be filtered based on supported methods */ int path_enabled = 0; /*!< if the Path HF should be handled */ @@ -162,9 +164,11 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE | FAILURE_ROUTE }, {"registered", (cmd_function)registered, 1, domain_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, + {"registered", (cmd_function)registered2, 2, reg_fixup, 0, + REQUEST_ROUTE | FAILURE_ROUTE }, {"add_sock_hdr", (cmd_function)add_sock_hdr, 1,fixup_str_null, 0, REQUEST_ROUTE }, - {"unregister", (cmd_function)unregister, 2, unreg_fixup, 0, + {"unregister", (cmd_function)unregister, 2, reg_fixup, 0, REQUEST_ROUTE| FAILURE_ROUTE }, {"reg_fetch_contacts", (cmd_function)pv_fetch_contacts, 3, fetchc_fixup, 0, @@ -203,6 +207,7 @@ static param_export_t params[] = { {"use_path", INT_PARAM, &path_enabled }, {"path_mode", INT_PARAM, &path_mode }, {"path_use_received", INT_PARAM, &path_use_params }, + {"reg_avp", STR_PARAM|USE_FUNC_PARAM, (void*)reg_avp_param}, {0, 0, 0} }; @@ -427,7 +432,7 @@ static int domain_fixup(void** param, int param_no) * Convert char* parameter to udomain_t* pointer * Convert char* parameter to pv_elem_t* pointer */ -static int unreg_fixup(void** param, int param_no) +static int reg_fixup(void** param, int param_no) { if (param_no == 1) { return domain_fixup(param, 1); diff --git a/modules_k/registrar/reg_mod.h b/modules_k/registrar/reg_mod.h index 7355f8b..2ac81c4 100644 --- a/modules_k/registrar/reg_mod.h +++ b/modules_k/registrar/reg_mod.h @@ -98,4 +98,15 @@ extern stat_var *rejected_registrations; extern stat_var *default_expire_stat; extern stat_var *max_expires_stat; +int_str billing_cust_limit_2_avp_name; +unsigned short billing_cust_limit_2_avp_type; + +/*! \brief Structure to handle the AVPs to be stored to a contact */ +struct reg_avp { + int_str avp_name; + unsigned short type; + struct reg_avp* next; +}; +struct reg_avp * reg_avp_list; + #endif /* REG_MOD_H */

13 years, 6 months

git:carstenbock/ims: - New Version of the PCSCF-Config, Work in prograss, not usable right now.

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: 981a32a68cd0442abf2ab01a53b100604f257f52 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=981a32a… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Mar 10 13:13:05 2011 +0100 - New Version of the PCSCF-Config, Work in prograss, not usable right now. --- modules/pcscf/pcscf.cfg | 237 ++++++----------------------------------------- 1 files changed, 30 insertions(+), 207 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=981…

13 years, 6 months

git:carstenbock/ims: - added support for storing and retrieving AVPs together with a contact.

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: 41833c83c04e8c7892f6125c8fd384dc7b25d66c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=41833c8… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Mar 10 13:11:42 2011 +0100 - added support for storing and retrieving AVPs together with a contact. --- modules_k/registrar/doc/registrar.xml | 12 +++ modules_k/registrar/doc/registrar_admin.xml | 24 ++++++ modules_k/registrar/lookup.c | 70 ++++++++++++++++++ modules_k/registrar/reg_mod.c | 47 ++++++++++++ modules_k/registrar/reg_mod.h | 2 +- modules_k/registrar/save.c | 104 +++++++++++++++++++++++++++ modules_k/usrloc/doc/usrloc.xml | 11 +++ 7 files changed, 269 insertions(+), 1 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=418…

13 years, 6 months

git:carstenbock/ims: - Add avps to the ucontact_info structure

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: 2dbadcadd64c3b434d1119ed37b35d677e5feb58 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2dbadca… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Mar 10 11:50:32 2011 +0100 - Add avps to the ucontact_info structure --- modules_k/usrloc/ucontact.c | 8 ++++++++ modules_k/usrloc/ucontact.h | 6 ++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/modules_k/usrloc/ucontact.c b/modules_k/usrloc/ucontact.c index ec177c7..c8f9a1b 100644 --- a/modules_k/usrloc/ucontact.c +++ b/modules_k/usrloc/ucontact.c @@ -47,6 +47,7 @@ #include "urecord.h" #include "ucontact.h" #include "reg_avps_db.h" +#include "../../parser/parse_uri.h" /*! * \brief Create a new contact structure @@ -68,11 +69,17 @@ ucontact_t* new_ucontact(str* _dom, str* _aor, str* _contact, ucontact_info_t* _ memset(c, 0, sizeof(ucontact_t)); if (shm_str_dup( &c->c, _contact) < 0) goto error; + if (parse_uri(c->c.s, c->c.len, &c->parsed_c) < 0) + LM_ERR("Error while parsing Contact URI\n"); + if (shm_str_dup( &c->callid, _ci->callid) < 0) goto error; if (shm_str_dup( &c->user_agent, _ci->user_agent) < 0) goto error; if (_ci->received.s && _ci->received.len) { if (shm_str_dup( &c->received, &_ci->received) < 0) goto error; + if (parse_uri(c->received.s, c->received.len, &c->parsed_received) < 0) + LM_ERR("Error while parsing Contact URI\n"); + } if (_ci->path && _ci->path->len) { if (shm_str_dup( &c->path, _ci->path) < 0) goto error; @@ -89,6 +96,7 @@ ucontact_t* new_ucontact(str* _dom, str* _aor, str* _contact, ucontact_info_t* _ c->cflags = _ci->cflags; c->methods = _ci->methods; c->last_modified = _ci->last_modified; + c->avps = _ci->avps; return c; error: diff --git a/modules_k/usrloc/ucontact.h b/modules_k/usrloc/ucontact.h index 0269719..75f7207 100644 --- a/modules_k/usrloc/ucontact.h +++ b/modules_k/usrloc/ucontact.h @@ -41,6 +41,7 @@ #include "../../qvalue.h" #include "../../str.h" #include "../../usr_avp.h" +#include "../../parser/msg_parser.h" /*! @@ -66,7 +67,11 @@ typedef struct ucontact { str* domain; /*!< Pointer to domain name (NULL terminated) */ str* aor; /*!< Pointer to the AOR string in record structure*/ str c; /*!< Contact address */ + struct sip_uri parsed_c; + /*!< Parsed Contact-address */ str received; /*!< IP+port+protocol we received the REGISTER from */ + struct sip_uri parsed_received; + /*!< received socket */ str path; /*!< Path header */ time_t expires; /*!< Expires parameter */ qvalue_t q; /*!< q parameter */ @@ -99,6 +104,7 @@ typedef struct ucontact_info { struct socket_info *sock; /*!< socket informations */ unsigned int methods; /*!< supported methods */ time_t last_modified; /*!< last modified */ + avp_t *avps; } ucontact_info_t; /*! \brief ancient time used for marking the contacts forced to expired */

13 years, 6 months

Re: [sr-dev] modules_k/dialog: no referencing to current dialog possible when using dlg_manage()

by Timo Reimann

Hey, On 10.03.2011 02:12, 侯旭光 wrote: > sorry ,it's my fault.I forgot I think it's not working because you are simply forwarding()'ing the request on the first proxy and not t_relay()'ing as you do on the second. You need to be stateful in order to track dialogs. Do that and you should be fine. Cheers, --Timo > 在 2011年3月8日下午7:57，Timo Reimann <timo.reimann(a)1und1.de> 写道： >> Hey, >> >> >> On 08.03.2011 12:37, 侯旭光 wrote: >>> I modified the source code and took the solutions in cfg file that >>> you guys suggested and no error exist. >>> >>> But my problem isn't totally solved. >>> >>> Actually when I use the dispatcher module and set the profile , in >>> case the "invite" request forwarded by ds_select_domain function , >>> then the dialog terminated. >>> dlg_list and get_profile_size get nothing. >>> >>> In detail: >>> >>> there're two proxys : server #1 192.168.1.12 and server #2 192.168.1.13 >>> >>> two users: 1012 register on 192.168.1.12 and 2013 register on > 192.168.1.13 >>> >>> when user 1012 dial 2013, server 1# use the dispatcher module, >>> forward the request to server #2 and set the profile.server #2 get >>> the invite request and set the profile too, then call user 2013,Dialog >>> Establish. >>> >>> At this time,server #2 has the dialog info,but server #1 doesn't. >>> >>> How can I trace the dialog info at both server #1 and server #2 ? >> >> Unless the dispatcher module terminates the dialog in a B2BUA fashion >> (which I think it doesn't but I am not familiar with the module), calls >> routed in the setup you described should be listed via dlg_list through >> the course of dialog lifetime. >> >> Are you 100% sure you are tracking dialogs on proxy #1? (I think >> set_dlg_profile() fails silently if the dialog isn't being tracked.) >> Maybe you want to provide the relevant configuration snippet of the >> proxy so we can double-check. >> >> >> Cheers, >> >> --Timo

13 years, 6 months

git:3.1: * modules_k/nathelper: add_contact_alias() fix

by Juha Heinanen

Module: sip-router Branch: 3.1 Commit: 971cfda1012516f446d990e335b5edf6959e065c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=971cfda… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Mar 8 09:42:18 2011 +0200 * modules_k/nathelper: add_contact_alias() fix - add_contact_alias() is now able to add alias also to contact URI, where hostpart contains a domain name instead of an IP address. (cherry picked from commit 998ae20b26360383386d5f677ec87301e6b3ba23) --- modules_k/nathelper/nathelper.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index dd737a3..2b07f38 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -775,7 +775,7 @@ fix_nated_contact_f(struct sip_msg* msg, char* str1, char* str2) #define SALIAS_LEN (sizeof(SALIAS) - 1) /* - * Adds ;alias=ip:port param to cotact uri containing received ip:port + * Adds ;alias=ip:port param to contact uri containing received ip:port * if contact uri ip:port does not match received ip:port. */ static int @@ -806,14 +806,14 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) /* Compare source ip and port against contact uri */ if ((ip = str2ip(&(uri.host))) == NULL) { - LM_ERR("contact uri host is not an ip address\n"); - return -1; - } - if (ip_addr_cmp(ip, &(msg->rcv.src_ip)) && - ((msg->rcv.src_port == uri.port_no) || - ((uri.port.len == 0) && (msg->rcv.src_port == 5060)))) { - LM_DBG("no need to add alias param\n"); - return 2; + LM_DBG("contact uri host is not an ip address\n"); + } else { + if (ip_addr_cmp(ip, &(msg->rcv.src_ip)) && + ((msg->rcv.src_port == uri.port_no) || + ((uri.port.len == 0) && (msg->rcv.src_port == 5060)))) { + LM_DBG("no need to add alias param\n"); + return 2; + } } /* Check if function has been called already */

13 years, 6 months

← Newer
1
...
10
11
12
13
14
15
16
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2011