sr-dev

sr-dev@lists.kamailio.org

18 participants
44296 discussions

git:kamailio_3.0: auth_diameter(k): remove redundant declaration of find_credentials, now in core

by Henning Westerholt

Module: sip-router Branch: kamailio_3.0 Commit: 009339a4d040ca0bdc6c98441281addc523d7ba0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=009339a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jan 5 11:27:34 2010 +0100 auth_diameter(k): remove redundant declaration of find_credentials, now in core (cherry picked from commit fc323d03688bc93560a56cec9b2713c57a72389c) --- modules_k/auth_diameter/authorize.c | 82 ----------------------------------- modules_k/auth_diameter/authorize.h | 3 - 2 files changed, 0 insertions(+), 85 deletions(-) diff --git a/modules_k/auth_diameter/authorize.c b/modules_k/auth_diameter/authorize.c index d8b738c..a8c32d4 100644 --- a/modules_k/auth_diameter/authorize.c +++ b/modules_k/auth_diameter/authorize.c @@ -147,88 +147,6 @@ int get_realm(struct sip_msg* m, int hftype, struct sip_uri* u) return 0; } -/* Find credentials with given realm in a SIP message header */ -int find_credentials(struct sip_msg* _m, str* _realm, int _hftype, - struct hdr_field** _h) -{ - struct hdr_field** hook, *ptr, *prev; - int res; - hdr_flags_t hdr_flags; - str* r; - - switch(_hftype) - { - case HDR_AUTHORIZATION_T: - hook = &(_m->authorization); - hdr_flags=HDR_AUTHORIZATION_F; - break; - case HDR_PROXYAUTH_T: - hook = &(_m->proxy_auth); - hdr_flags=HDR_PROXYAUTH_F; - break; - default: - hook = &(_m->authorization); - hdr_flags=HDR_T2F(_hftype); - break; - } - - /* If the credentials haven't been parsed yet, do it now */ - if (*hook == 0) - if (parse_headers(_m, hdr_flags, 0) == -1) - { - LM_ERR("failed to parse headers\n"); - return -1; - } - - ptr = *hook; - - /* Iterate through the credentials of the message to find - credentials with given realm - */ - while(ptr) - { - res = parse_credentials(ptr); - if (res < 0) - { - LM_ERR("failed to parse credentials\n"); - return (res == -1) ? -2 : -3; - } - else - if (res == 0) - { - r = &(((auth_body_t*)(ptr->parsed))->digest.realm); - - if (r->len == _realm->len) - { - if (!strncasecmp(_realm->s, r->s, r->len)) - { - *_h = ptr; - return 0; - } - } - } - - prev = ptr; - if (parse_headers(_m, hdr_flags, 1) == -1) - { - LM_ERR("failed to parse headers\n"); - return -4; - } - else - { - if (prev != _m->last_header) - { - if (_m->last_header->type == _hftype) ptr = _m->last_header; - else break; - } - else break; - } - } - - /* Credentials with given realm not found */ - return 1; -} - auth_result_t diam_pre_auth(struct sip_msg* _m, str* _realm, int _hftype, struct hdr_field** _h) diff --git a/modules_k/auth_diameter/authorize.h b/modules_k/auth_diameter/authorize.h index bc9ba73..c3f96fb 100644 --- a/modules_k/auth_diameter/authorize.h +++ b/modules_k/auth_diameter/authorize.h @@ -45,9 +45,6 @@ int get_realm(struct sip_msg* m, int hftype, struct sip_uri* u); auth_result_t diam_pre_auth(struct sip_msg* m, str* realm, int hftype, struct hdr_field** h); -int find_credentials(struct sip_msg* m, str* realm, int hftype, - struct hdr_field** h); - int authorize(struct sip_msg* msg, pv_elem_t* realm, int hftype); int diameter_authorize(struct hdr_field* cred, str* p_method,

15 years

git:sr_3.0: Merge branch 'sr_3.0' of ssh://henning@git.sip-router.org/ sip-router into backport-tmp

by Henning Westerholt

Module: sip-router Branch: sr_3.0 Commit: e5f0ed558e642b69cfbac40a925a4d2f02153242 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e5f0ed5… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Jan 7 18:56:32 2010 +0100 Merge branch 'sr_3.0' of ssh://henning@git.sip-router.org/sip-router into backport-tmp * 'sr_3.0' of ssh://henning@git.sip-router.org/sip-router: - fix bug in encode_contact() - fix bug when RURI was changed before and newuri will be used - remove unused code ---

15 years

git:sr_3.0: auth_diameter(k): remove redundant declaration of find_credentials, now in core

by Henning Westerholt

Module: sip-router Branch: sr_3.0 Commit: 7508fe2a9135eac131643c2350fc047588799800 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7508fe2… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jan 5 11:27:34 2010 +0100 auth_diameter(k): remove redundant declaration of find_credentials, now in core (cherry picked from commit fc323d03688bc93560a56cec9b2713c57a72389c) --- modules_k/auth_diameter/authorize.c | 82 ----------------------------------- modules_k/auth_diameter/authorize.h | 3 - 2 files changed, 0 insertions(+), 85 deletions(-) diff --git a/modules_k/auth_diameter/authorize.c b/modules_k/auth_diameter/authorize.c index d8b738c..a8c32d4 100644 --- a/modules_k/auth_diameter/authorize.c +++ b/modules_k/auth_diameter/authorize.c @@ -147,88 +147,6 @@ int get_realm(struct sip_msg* m, int hftype, struct sip_uri* u) return 0; } -/* Find credentials with given realm in a SIP message header */ -int find_credentials(struct sip_msg* _m, str* _realm, int _hftype, - struct hdr_field** _h) -{ - struct hdr_field** hook, *ptr, *prev; - int res; - hdr_flags_t hdr_flags; - str* r; - - switch(_hftype) - { - case HDR_AUTHORIZATION_T: - hook = &(_m->authorization); - hdr_flags=HDR_AUTHORIZATION_F; - break; - case HDR_PROXYAUTH_T: - hook = &(_m->proxy_auth); - hdr_flags=HDR_PROXYAUTH_F; - break; - default: - hook = &(_m->authorization); - hdr_flags=HDR_T2F(_hftype); - break; - } - - /* If the credentials haven't been parsed yet, do it now */ - if (*hook == 0) - if (parse_headers(_m, hdr_flags, 0) == -1) - { - LM_ERR("failed to parse headers\n"); - return -1; - } - - ptr = *hook; - - /* Iterate through the credentials of the message to find - credentials with given realm - */ - while(ptr) - { - res = parse_credentials(ptr); - if (res < 0) - { - LM_ERR("failed to parse credentials\n"); - return (res == -1) ? -2 : -3; - } - else - if (res == 0) - { - r = &(((auth_body_t*)(ptr->parsed))->digest.realm); - - if (r->len == _realm->len) - { - if (!strncasecmp(_realm->s, r->s, r->len)) - { - *_h = ptr; - return 0; - } - } - } - - prev = ptr; - if (parse_headers(_m, hdr_flags, 1) == -1) - { - LM_ERR("failed to parse headers\n"); - return -4; - } - else - { - if (prev != _m->last_header) - { - if (_m->last_header->type == _hftype) ptr = _m->last_header; - else break; - } - else break; - } - } - - /* Credentials with given realm not found */ - return 1; -} - auth_result_t diam_pre_auth(struct sip_msg* _m, str* _realm, int _hftype, struct hdr_field** _h) diff --git a/modules_k/auth_diameter/authorize.h b/modules_k/auth_diameter/authorize.h index bc9ba73..c3f96fb 100644 --- a/modules_k/auth_diameter/authorize.h +++ b/modules_k/auth_diameter/authorize.h @@ -45,9 +45,6 @@ int get_realm(struct sip_msg* m, int hftype, struct sip_uri* u); auth_result_t diam_pre_auth(struct sip_msg* m, str* realm, int hftype, struct hdr_field** h); -int find_credentials(struct sip_msg* m, str* realm, int hftype, - struct hdr_field** h); - int authorize(struct sip_msg* msg, pv_elem_t* realm, int hftype); int diameter_authorize(struct hdr_field* cred, str* p_method,

15 years

git:kamailio_3.0: kex: aliased avp_printf to pv_printf

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 0408f81197da38a9ab94c46698d3db10e01b39c1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0408f81… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 7 18:40:29 2010 +0100 kex: aliased avp_printf to pv_printf - backward compatibility reasons - reported by Santiago Gimeno --- modules_k/kex/kex_mod.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules_k/kex/kex_mod.c b/modules_k/kex/kex_mod.c index d481d77..bc35656 100644 --- a/modules_k/kex/kex_mod.c +++ b/modules_k/kex/kex_mod.c @@ -76,6 +76,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"pv_printf", (cmd_function)w_pv_printf, 2, pv_printf_fixup, 0, ANY_ROUTE }, + {"avp_printf", (cmd_function)w_pv_printf, 2, pv_printf_fixup, + 0, ANY_ROUTE }, {0,0,0,0,0,0} };

15 years

git:kamailio_3.0: kex: documented missing functions

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: e97f68ebe9d909f56577b3abdc305395df9db5ba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e97f68e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 7 18:38:52 2010 +0100 kex: documented missing functions - reported by Santiago Gimeno --- modules_k/kex/README | 77 ++++++++++++++++++++++++++++++ modules_k/kex/doc/kex_admin.xml | 100 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+), 0 deletions(-) diff --git a/modules_k/kex/README b/modules_k/kex/README index b5e1986..99ab563 100644 --- a/modules_k/kex/README +++ b/modules_k/kex/README @@ -33,6 +33,10 @@ Daniel-Constantin Mierla 3.5. isbflagset(flag [, branch]) 3.6. resetsflag(flag [, branch]) 3.7. km_append_branch([uri]) + 3.8. setdsturi(uri) + 3.9. resetdsturi() + 3.10. isdsturiset() + 3.11. pv_printf(var, str) 4. Exported MI Functions @@ -52,6 +56,10 @@ Daniel-Constantin Mierla 1.5. setbflag usage 1.6. resetsflag usage 1.7. km_append_branch usage + 1.8. >setdsturi usage + 1.9. >resetdsturi usage + 1.10. >isdsturiset usage + 1.11. >pv_printf usage Chapter 1. Admin Guide @@ -72,6 +80,10 @@ Chapter 1. Admin Guide 3.5. isbflagset(flag [, branch]) 3.6. resetsflag(flag [, branch]) 3.7. km_append_branch([uri]) + 3.8. setdsturi(uri) + 3.9. resetdsturi() + 3.10. isdsturiset() + 3.11. pv_printf(var, str) 4. Exported MI Functions @@ -113,6 +125,10 @@ Chapter 1. Admin Guide 3.5. isbflagset(flag [, branch]) 3.6. resetsflag(flag [, branch]) 3.7. km_append_branch([uri]) + 3.8. setdsturi(uri) + 3.9. resetdsturi() + 3.10. isdsturiset() + 3.11. pv_printf(var, str) 3.1. setsflag(flag) @@ -243,6 +259,67 @@ km_append_branch(); km_append_branch("sip:alice@sip-router.org"); ... +3.8. setdsturi(uri) + + Set the destination address URI (outbound proxy address). + + Meaning of the parameters is as follows: + * uri - Valid SIP URI representing the address where to send the + request. It must be a static string, no variables are evaluated at + runtime. If you need to set outbound proxy address via a variable, + use assginment to $du. + + This function can be used from ANY_ROUTE. + + Example 1.8. >setdsturi usage +... +setdsturi("sip:10.0.0.10"); +... + +3.9. resetdsturi() + + Reset the destination address URI (outbound proxy address). + + This function can be used from ANY_ROUTE. + + Example 1.9. >resetdsturi usage +... +resetdsturi(); +... + +3.10. isdsturiset() + + Check if the destination address URI (outbound proxy address) is set. + + This function can be used from ANY_ROUTE. + + Example 1.10. >isdsturiset usage +... +if(isdsturiset()) +{ + ... +} +... + +3.11. pv_printf(var, str) + + Evalues the str and sets the resulted value to variable var. For + backward compatibility reasons, same function can be executed via + 'avp_printf(var, str)'. + + Meaning of the parameters is as follows: + * var - name of a writable variable + * str - string that may contain variables which will be evaluated at + runtime. + + This function can be used from ANY_ROUTE. + + Example 1.11. >pv_printf usage +... +pv_printf("$ru", "sip:$rU@$fd"); +pv_printf("$avp(x)", "From: $fU - To: $tU"); +... + 4. Exported MI Functions 4.1. arg diff --git a/modules_k/kex/doc/kex_admin.xml b/modules_k/kex/doc/kex_admin.xml index 7fff6a3..2a82593 100644 --- a/modules_k/kex/doc/kex_admin.xml +++ b/modules_k/kex/doc/kex_admin.xml @@ -277,6 +277,106 @@ km_append_branch("sip:alice@sip-router.org"); </programlisting> </example> </section> + <section> + <title><function moreinfo="none">setdsturi(uri)</function></title> + <para> + Set the destination address URI (outbound proxy address). + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>uri</emphasis> - Valid SIP URI representing the + address where to send the request. It must be a static string, + no variables are evaluated at runtime. If you need to set + outbound proxy address via a variable, use assginment to $du. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>>setdsturi</function> usage</title> + <programlisting format="linespecific"> +... +setdsturi("sip:10.0.0.10"); +... +</programlisting> + </example> + </section> + <section> + <title><function moreinfo="none">resetdsturi()</function></title> + <para> + Reset the destination address URI (outbound proxy address). + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>>resetdsturi</function> usage</title> + <programlisting format="linespecific"> +... +resetdsturi(); +... +</programlisting> + </example> + </section> + <section> + <title><function moreinfo="none">isdsturiset()</function></title> + <para> + Check if the destination address URI (outbound proxy address) + is set. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>>isdsturiset</function> usage</title> + <programlisting format="linespecific"> +... +if(isdsturiset()) +{ + ... +} +... +</programlisting> + </example> + </section> + <section> + <title><function moreinfo="none">pv_printf(var, str)</function></title> + <para> + Evalues the str and sets the resulted value to variable var. For + backward compatibility reasons, same function can be executed via + 'avp_printf(var, str)'. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>var</emphasis> - name of a writable variable + </para> + </listitem> + <listitem> + <para> + <emphasis>str</emphasis> - string that may contain variables + which will be evaluated at runtime. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>>pv_printf</function> usage</title> + <programlisting format="linespecific"> +... +pv_printf("$ru", "sip:$rU@$fd"); +pv_printf("$avp(x)", "From: $fU - To: $tU"); +... +</programlisting> + </example> + </section> </section> <section>

15 years

git:master: - fix bug when RURI was changed before and newuri will be used

by Klaus Darilion

Module: sip-router Branch: master Commit: bd8a8dc848f45d7dc40ae9620ffb606f6c781808 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd8a8dc… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Wed Dec 30 13:51:24 2009 +0000 - fix bug when RURI was changed before and newuri will be used (cherry picked from commit 1e663ffa8129c4b24f21563c09a5bea4ecd65784) --- modules_k/siputils/contact_ops.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules_k/siputils/contact_ops.c b/modules_k/siputils/contact_ops.c index 666332c..5a786cb 100644 --- a/modules_k/siputils/contact_ops.c +++ b/modules_k/siputils/contact_ops.c @@ -173,6 +173,10 @@ decode_contact (struct sip_msg *msg,char *unused1,char *unused2) if (uri.s == NULL) return -1; } + else + { + uri = msg->new_uri; + } res = decode_uri (uri, separator, &newUri);

15 years

git:master: - fix bug in encode_contact()

by Klaus Darilion

Module: sip-router Branch: master Commit: fabc704cc8ffe3f7943e588e58f158c47a0249ed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fabc704… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Wed Dec 30 15:53:12 2009 +0000 - fix bug in encode_contact() - fix and extend documentation about contact encoding/decoding (cherry picked from commit 8929913f5edb519b7ed280a12728376ed872ec53) --- modules_k/siputils/README | 392 ++++++++++++++++------------- modules_k/siputils/contact_ops.c | 5 +- modules_k/siputils/doc/siputils_admin.xml | 42 ++-- 3 files changed, 252 insertions(+), 187 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=fab…

15 years

git:master: - remove unused code

by Klaus Darilion

Module: sip-router Branch: master Commit: 673f3cd3d1ae721f54d1a911e92321c6733ce7f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=673f3cd… Author: root <root(a)relay.labs.nic.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Wed Dec 30 13:25:01 2009 +0000 - remove unused code - correct indention and make code more readable (cherry picked from commit 9eacaacb45fe700615ac94cc3944824f1b22fdc4) --- modules_k/siputils/contact_ops.c | 46 +++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 25 deletions(-) diff --git a/modules_k/siputils/contact_ops.c b/modules_k/siputils/contact_ops.c index 82fcd35..666332c 100644 --- a/modules_k/siputils/contact_ops.c +++ b/modules_k/siputils/contact_ops.c @@ -168,40 +168,36 @@ decode_contact (struct sip_msg *msg,char *unused1,char *unused2) separator = contact_flds_separator[0]; if ((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) - { + { uri = msg->first_line.u.request.uri; - if (uri.s == NULL) return -1; - } + if (uri.s == NULL) + return -1; + } - res = decode_uri (uri, separator, &newUri); + res = decode_uri (uri, separator, &newUri); #ifdef DEBUG - if (res == 0) fprintf (stdout, "newuri.s=[%.*s]\n", newUri.len, newUri.s); + if (res == 0) + fprintf (stdout, "newuri.s=[%.*s]\n", newUri.len, newUri.s); #endif - if (res != 0) - { - LM_ERR("failed decoding contact.Code %d\n", res); + if (res != 0) + { + LM_ERR("failed decoding contact.Code %d\n", res); #ifdef STRICT_CHECK - return res; + return res; #endif - } + } + else + { + /* we do not modify the original first line */ + if ((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) + msg->new_uri = newUri; else - /* we do not modify the original first line */ - if ((msg->new_uri.s == NULL) || (msg->new_uri.len == 0)) msg->new_uri = newUri; - else - { - pkg_free(msg->new_uri.s); - msg->new_uri = newUri; - } - - - /* - if (patch (msg, uri.s, uri.len, newUri.s, newUri.len) < 0) { - LM_ERR("lumping failed in mangling port \n"); - return -2; - } - */ + pkg_free(msg->new_uri.s); + msg->new_uri = newUri; + } + } return 1; }

15 years

git:sr_3.0: - fix bug in encode_contact()

by Klaus Darilion

Module: sip-router Branch: sr_3.0 Commit: 52cbb75af5e3965deed41ddd2d80ad2d615b843f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=52cbb75… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Wed Dec 30 15:53:12 2009 +0000 - fix bug in encode_contact() - fix and extend documentation about contact encoding/decoding (cherry picked from commit 8929913f5edb519b7ed280a12728376ed872ec53) --- modules_k/siputils/README | 392 ++++++++++++++++------------- modules_k/siputils/contact_ops.c | 5 +- modules_k/siputils/doc/siputils_admin.xml | 42 ++-- 3 files changed, 252 insertions(+), 187 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=52c…

15 years

git:sr_3.0: - fix bug when RURI was changed before and newuri will be used

by Klaus Darilion

Module: sip-router Branch: sr_3.0 Commit: 9d38adf7320503ebac28b7ba27ce629e150e3506 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d38adf… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Wed Dec 30 13:51:24 2009 +0000 - fix bug when RURI was changed before and newuri will be used (cherry picked from commit 1e663ffa8129c4b24f21563c09a5bea4ecd65784) --- modules_k/siputils/contact_ops.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules_k/siputils/contact_ops.c b/modules_k/siputils/contact_ops.c index f0d0dbb..5911f8c 100644 --- a/modules_k/siputils/contact_ops.c +++ b/modules_k/siputils/contact_ops.c @@ -165,6 +165,10 @@ decode_contact (struct sip_msg *msg,char *unused1,char *unused2) if (uri.s == NULL) return -1; } + else + { + uri = msg->new_uri; + } res = decode_uri (uri, separator, &newUri);

15 years

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev