sr-dev

sr-dev@lists.kamailio.org

15 participants
44242 discussions

git:master: lib/srdb1 (k): add generic helper method for bulk data loading, e.g. for route infos

by Henning Westerholt

Module: sip-router Branch: master Commit: a9b939d7881696aab9d5c39099491e65b4902cee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a9b939d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Jan 8 18:26:11 2010 +0100 lib/srdb1 (k): add generic helper method for bulk data loading, e.g. for route infos - add a generic helper method for bulk data loading, e.g. for routing informations from cr, lcr, htable or other similar tasks - TODO: adapt cr (patch ready, testing needed), adapt more modules --- lib/srdb1/db.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/srdb1/db.h | 16 ++++++++++++++++ 2 files changed, 68 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/db.c b/lib/srdb1/db.c index c4bf7cf..6f85b22 100644 --- a/lib/srdb1/db.c +++ b/lib/srdb1/db.c @@ -425,3 +425,55 @@ int db_use_table(db1_con_t* _h, const str* _t) CON_TABLE(_h) = _t; return 0; } + + +/*! \brief Generic query helper for load bulk data + * + * Generic query helper method for load bulk data, e.g. lcr tables + * \param binding database module binding + * \param handle database connection + * \param name database table name + * \param cols queried columns + * \param count number of queried columns + * \param strict if set to 1 an error is returned when no data could be loaded, + otherwise just a warning is logged + * \param res database result, unchanged on failure and if no data could be found + * \return 0 if the query was run successful, -1 otherwise + */ +int db_load_bulk_data(db_func_t* binding, db1_con_t* handle, str* name, db_key_t* cols, + unsigned int count, unsigned int strict, db1_res_t* res) +{ + if (binding == NULL) { + LM_ERR("invalid database module binding\n"); + return -1; + } + + if(handle == NULL) { + LM_ERR("invalid database handle\n"); + return -1; + } + + if (binding->use_table(handle, name) < 0) { + LM_ERR("error in use_table for database\n"); + return -1; + } + + /* select the whole table and all the columns */ + if(binding->query(handle, 0, 0, 0, cols, 0, count, 0, &res) < 0) { + LM_ERR("error while querying database\n"); + return -1; + } + + if(RES_ROW_N(res) == 0) { + binding->free_result(handle, res); + if (strict == 1) { + LM_ERR("no data in the database table %.*s\n", name->len, name->s); + return -1; + } else { + LM_WARN("no data in the database table %.*s, use an empty set\n", name->len, name->s); + return 0; + } + } + + return 0; +} diff --git a/lib/srdb1/db.h b/lib/srdb1/db.h index 0429e2c..7da401b 100644 --- a/lib/srdb1/db.h +++ b/lib/srdb1/db.h @@ -398,5 +398,21 @@ int db_use_table(db1_con_t* _h, const str* _t); typedef int (*db_bind_api_f)(db_func_t *dbb); +/** + * \brief Generic query helper for load bulk data + * + * Generic query helper method for load bulk data, e.g. lcr tables + * \param binding database module binding + * \param handle database connection + * \param name database table name + * \param cols queried columns + * \param count number of queried columns + * \param strict if set to 1 an error is returned when no data could be loaded, + otherwise just a warning is logged + * \param res database result, unchanged on failure and if no data could be found + * \return 0 if the query was run successful, -1 otherwise + */ +int db_load_bulk_data(db_func_t* binding, db1_con_t* handle, str* name, db_key_t* cols, + unsigned int count, unsigned int strict, db1_res_t* res); #endif /* DB1_H */

15 years

git:kamailio_3.0: kamailio.cfg: updated cfg with sample PSTN gw routing

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: a9e4d86edeee7b2f70b33c89c91e800aefe11da0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a9e4d86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 8 17:16:28 2010 +0100 kamailio.cfg: updated cfg with sample PSTN gw routing - defined within WITH_PSTN - calls to numbers starting with + or 00 are sent to PSTN GW - use of custome cfg parameter to define GW IP - remove preloaded Route headers for initial requests --- etc/kamailio.cfg | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 77727d1..637602d 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -38,6 +38,11 @@ # - start RTPProxy: # rtpproxy -l _your_public_ip_ -s udp:localhost:7722 # +# *** To enable PSTN gateway routing execute: +# - define WITH_PSTN +# - set the value of pstn.gw_ip +# - check route[PSTN] for regexp routing condition +# # *** To enhance accounting execute: # - enable mysql # - define WITH_ACCDB @@ -88,6 +93,26 @@ port=5060 #listen=udp:10.0.0.10:5060 +####### Custom Parameters ######### + +# These parameters can be modified runtime via RPC interface +# - see the documentation of 'cfg_rpc' module. +# +# Format: group.id = value 'desc' description +# Access: $sel(cfg_get.group.id) or @cfg_get.group.id +# + +#!ifdef WITH_PSTN +# PSTN GW Routing +# +# - pstn.gw_ip: valid IP or hostname as string value, example: +# pstn.gw_ip = "10.0.0.101" desc "My PSTN GW Address" +# +# - by default is empty to avoid misrouting +pstn.gw_ip = "" desc "PSTN GW Address" +#!endif + + ####### Modules Section ######## #set module path @@ -316,6 +341,8 @@ route{ route(AUTH); # record routing for dialog forming requests (in case they are routed) + # - remove preloaded route headers + remove_hf("Route"); if (is_method("INVITE|SUBSCRIBE")) record_route(); @@ -356,6 +383,8 @@ route{ exit; } + route(PSTN); + # apply DB based aliases (uncomment to enable) ##alias_db_lookup("dbaliases"); @@ -511,6 +540,36 @@ route[RTPPROXY] { return; } +# PSTN GW routing +route[PSTN] { +#!ifdef WITH_PSTN + # check if PSTN GW IP is defined + if (strempty($sel(cfg_get.pstn.gw_ip))) { + xlog("SCRIPT: PSTN rotuing enabled but pstn.gw_ip not defined\n"); + return; + } + + # route to PSTN dialed numbers starting with '+' or '00' + # (international format) + # - update the condition to match your dialing rules for PSTN routing + if(!($rU=~"^(\+|00)[1-9][0-9]{3,20}$")) + return; + + # only local users allowed to call + if(from_uri!=myself) { + sl_send_reply("403", "Not Allowed"); + exit; + } + + $ru = "sip:" + $rU + "@" + $sel(cfg_get.pstn.gw_ip); + + route(RELAY); + exit; +#!endif + + return; +} + # Sample branch router branch_route[BRANCH_ONE] { xdbg("new branch at $ru\n");

15 years

Security incident management

by Olle E. Johansson

Friends, I know that the number of security reports for SER and Kamailio are very low, in fact so low that I can't remember any. However, it can still happen to us in the future. Do we have any policies and procedure for how to handle it? Yes, this is being negative, but also realistic. It's not only about our own code, we depend on a large number of external libraries that could release security reports that will affect our user base too, and propably should be forwarded. Any thoughts? /O

15 years

git:sr_3.0: Backport of the changes (see previous commits).

by Carsten Bock

Module: sip-router Branch: sr_3.0 Commit: c114f9fb32ebe33cd7e154975ccd615d5c2598e8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c114f9f… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Fri Jan 8 10:15:29 2010 +0100 Backport of the changes (see previous commits). Thanks to Klaus and Juha for reminding me to add the patches here as well (i am new to git and to the new structure). --- modules_k/dialog/dlg_handlers.c | 2 +- modules_k/nathelper/rtpproxy_stream.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index cd19708..f489a38 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -226,7 +226,7 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, contact = ((contact_body_t *)msg->contact->parsed)->contacts->uri; /* extract the RR parts */ - if(!msg->record_route && (parse_headers(msg,HDR_RECORDROUTE_F,0)<0) ){ + if(!msg->record_route && (parse_headers(msg,HDR_EOH_F,0)<0) ){ LM_ERR("failed to parse record route header\n"); goto error0; } diff --git a/modules_k/nathelper/rtpproxy_stream.c b/modules_k/nathelper/rtpproxy_stream.c index 437cc5c..c83bf11 100644 --- a/modules_k/nathelper/rtpproxy_stream.c +++ b/modules_k/nathelper/rtpproxy_stream.c @@ -38,7 +38,6 @@ int fixup_var_str_int(void **param, int param_no) { - unsigned long go_to; int ret; pv_elem_t *model; str s; @@ -57,10 +56,14 @@ fixup_var_str_int(void **param, int param_no) } *param = (void *)model; } else if (param_no == 2) { - go_to = str2s(*param, strlen(*param), &ret); - if (ret == 0) { - pkg_free(*param); - *param = (void *)go_to; + /* According to + * http://www.kamailio.org/docs/modules/1.5.x/nathelper.html#rtpproxy_stream2x… + * this could be -1 */ + s.s = (char *)(*param); + s.len = strlen(s.s); + if (str2sint(&s, &ret)==0) { + pkg_free(*param); + *param = (void *)ret; } else { LM_ERR("bad number <%s>\n", (char *)(*param)); return E_CFG;

15 years

git:sr_3.0: kex: documented missing functions

by Juha Heinanen

Module: sip-router Branch: sr_3.0 Commit: e69239060196f60def7807fba1f18ff9cc789f8a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e692390… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Jan 7 18:38:52 2010 +0100 kex: documented missing functions - reported by Santiago Gimeno (cherry picked from commit e97f68ebe9d909f56577b3abdc305395df9db5ba) --- 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:sr_3.0: kex: aliased avp_printf to pv_printf

by Juha Heinanen

Module: sip-router Branch: sr_3.0 Commit: 010473fea07518006e7c130d079f215f112765f5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=010473f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Jan 7 18:40:29 2010 +0100 kex: aliased avp_printf to pv_printf - backward compatibility reasons - reported by Santiago Gimeno (cherry picked from commit 0408f81197da38a9ab94c46698d3db10e01b39c1) --- 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: 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev