sr-dev May 2012

sr-dev@lists.kamailio.org

29 participants
174 discussions

git:master: modules_k/rls: Use non-pooled connections when in DB only mode (where supported)
by Peter Dunkley 13 May '12

13 May '12

Module: sip-router Branch: master Commit: aedf75c6a0a0d9253479530b3ad50783f12efd58 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aedf75c… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun May 13 01:13:36 2012 +0100 modules_k/rls: Use non-pooled connections when in DB only mode (where supported) - This helps with databases (such as PostgreSQL which is the only one that currently supports specifying non-pooled connections) that create a server process per client connection. - Fixed a couple of (end|abort)_transaction cases where dbmode was not checked. --- modules_k/rls/notify.c | 25 ++++++++++--------------- modules_k/rls/resource_notify.c | 6 +++--- modules_k/rls/rls.c | 24 ++++++++++++++++++++---- 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index fd99b5a..82324a9 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -944,7 +944,7 @@ void rls_notify_callback( struct cell *t, int type, struct tmcb_params *ps) db_val_t db_vals[2]; unsigned int hash_code; subs_t subs; - + memset(&subs, 0, sizeof(subs_t)); subs.to_tag= ((dialog_id_t*)(*ps->param))->to_tag; @@ -953,9 +953,15 @@ void rls_notify_callback( struct cell *t, int type, struct tmcb_params *ps) if (dbmode != RLS_DB_ONLY) { - /* delete from database table */ - + /* delete from cache table */ + hash_code= core_hash(&subs.callid, &subs.to_tag , hash_size); + if(pres_delete_shtable(rls_table,hash_code, subs.to_tag)< 0) + { + LM_ERR("record not found in hash table\n"); + } + + /* delete from database table */ if (rls_dbf.use_table(rls_db, &rlsubs_table) < 0) { LM_ERR("in use_table\n"); @@ -976,24 +982,13 @@ void rls_notify_callback( struct cell *t, int type, struct tmcb_params *ps) if (rls_dbf.delete(rls_db, db_keys, 0, db_vals, 2) < 0) LM_ERR("cleaning expired messages\n"); } - - /* delete from cache table */ - if (dbmode == RLS_DB_ONLY) + else { if (delete_rlsdb(&subs.callid, &subs.to_tag, NULL) < 0 ) { LM_ERR( "unable to delete record from DB\n" ); } } - else - { - hash_code= core_hash(&subs.callid, &subs.to_tag , hash_size); - - if(pres_delete_shtable(rls_table,hash_code, subs.to_tag)< 0) - { - LM_ERR("record not found in hash table\n"); - } - } } done: diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index b1da62a..bf9aa0d 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -898,7 +898,7 @@ static void timer_send_full_state_notifies(int round) goto done; } - if (rls_dbf.start_transaction) + if (dbmode == RLS_DB_ONLY && rls_dbf.start_transaction) { if (rls_dbf.start_transaction(rls_db) < 0) { @@ -926,7 +926,7 @@ static void timer_send_full_state_notifies(int round) goto done; } - if (rls_dbf.end_transaction) + if (dbmode == RLS_DB_ONLY && rls_dbf.end_transaction) { if (rls_dbf.end_transaction(rls_db) < 0) { @@ -1011,7 +1011,7 @@ done: rls_dbf.free_result(rls_db, result); if (doc != NULL) xmlFreeDoc(doc); - if (rls_dbf.abort_transaction) + if (dbmode == RLS_DB_ONLY && rls_dbf.abort_transaction) { if (rls_dbf.abort_transaction(rls_db) < 0) LM_ERR("in abort_transaction\n"); diff --git a/modules_k/rls/rls.c b/modules_k/rls/rls.c index 7e73a27..06de4cb 100644 --- a/modules_k/rls/rls.c +++ b/modules_k/rls/rls.c @@ -721,7 +721,11 @@ static int child_init(int rank) LM_CRIT("database not bound\n"); return -1; } - rls_db = rls_dbf.init(&db_url); + /* In DB only mode do not pool the connections where possible. */ + if (dbmode == RLS_DB_ONLY && rls_dbf.init2) + rls_db = rls_dbf.init2(&db_url, DB_POOLING_NONE); + else + rls_db = rls_dbf.init(&db_url); if (!rls_db) { LM_ERR("child %d: Error while connecting database\n", @@ -744,7 +748,11 @@ static int child_init(int rank) LM_CRIT("database not bound\n"); return -1; } - rlpres_db = rlpres_dbf.init(&rlpres_db_url); + /* In DB only mode do not pool the connections where possible. */ + if (dbmode == RLS_DB_ONLY && rlpres_dbf.init2) + rlpres_db = rlpres_dbf.init2(&db_url, DB_POOLING_NONE); + else + rlpres_db = rlpres_dbf.init(&db_url); if (!rlpres_db) { LM_ERR("child %d: Error while connecting database\n", @@ -794,7 +802,11 @@ static int mi_child_init(void) LM_CRIT("database not bound\n"); return -1; } - rls_db = rls_dbf.init(&db_url); + /* In DB only mode do not pool the connections where possible. */ + if (dbmode == RLS_DB_ONLY && rls_dbf.init2) + rls_db = rls_dbf.init2(&db_url, DB_POOLING_NONE); + else + rls_db = rls_dbf.init(&db_url); if (!rls_db) { LM_ERR("Error while connecting database\n"); @@ -816,7 +828,11 @@ static int mi_child_init(void) LM_CRIT("database not bound\n"); return -1; } - rlpres_db = rlpres_dbf.init(&rlpres_db_url); + /* In DB only mode do not pool the connections where possible. */ + if (dbmode == RLS_DB_ONLY && rlpres_dbf.init2) + rlpres_db = rlpres_dbf.init2(&db_url, DB_POOLING_NONE); + else + rlpres_db = rlpres_dbf.init(&db_url); if (!rlpres_db) { LM_ERR("Error while connecting database\n");

1 0

git:master: modules_k/pua: Use non-pooled connections in db only mode ( where supported)
by Peter Dunkley 13 May '12

13 May '12

Module: sip-router Branch: master Commit: 126131202c76337103d67402940d0a2d6438e3e8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1261312… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun May 13 01:17:56 2012 +0100 modules_k/pua: Use non-pooled connections in db only mode (where supported) - This helps with databases (such as PostgreSQL, which is the only one that currently supports specifying non-pooled connections) that create a server process per client connection. --- modules_k/pua/pua.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules_k/pua/pua.c b/modules_k/pua/pua.c index 5d11066..b72f9e1 100644 --- a/modules_k/pua/pua.c +++ b/modules_k/pua/pua.c @@ -296,7 +296,11 @@ static int child_init(int rank) LM_CRIT("database not bound\n"); return -1; } - pua_db = pua_dbf.init(&db_url); + /* In DB only mode do not pool the connections where possible. */ + if (dbmode == PUA_DB_ONLY && pua_dbf.init2) + pua_db = pua_dbf.init2(&db_url, DB_POOLING_NONE); + else + pua_db = pua_dbf.init(&db_url); if (!pua_db) { LM_ERR("Child %d: connecting to database failed\n", rank); @@ -321,7 +325,11 @@ static int mi_child_init(void) LM_CRIT("database not bound\n"); return -1; } - pua_db = pua_dbf.init(&db_url); + /* In DB only mode do not pool the connections where possible. */ + if (dbmode == PUA_DB_ONLY && pua_dbf.init2) + pua_db = pua_dbf.init2(&db_url, DB_POOLING_NONE); + else + pua_db = pua_dbf.init(&db_url); if (!pua_db) { LM_ERR("connecting to database failed\n");

1 0

[tracker] Task opened: domain_attrs_table parameter not defined
by sip-router 12 May '12

12 May '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Charles Chance (sipcentric) Attached to Project - sip-router Summary - domain_attrs_table parameter not defined Task Type - Bug Report Category - Modules kamailio Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - The parameter "domain_attrs_table" is not exported by domain_mod.c, therefore Kamailio fails to start if parameter is defined in config. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=232 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] User took ownership: ndb_redis redis_free function
by sip-router 11 May '12

11 May '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Vicente Hernando has taken ownership of the following task: FS#231 - ndb_redis redis_free function More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=231 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task opened: ndb_redis redis_free function (Attachment added)
by sip-router 11 May '12

11 May '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Vicente Hernando (vicente) Attached to Project - sip-router Summary - ndb_redis redis_free function Task Type - Improvement Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - redis_free function removes a redis reply from memory. Only needed if a user performs a lot of different redis_cmd requests with different replyid. The first patch frees memory cleanly when ndb_redis module is destroyed. Second patch creates redis_free function and adds documentation. One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=231 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task opened: $sndto(ip) gives ip:port instead of just IP
by sip-router 11 May '12

11 May '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Bayan Towfiq (btowfiq) Attached to Project - sip-router Summary - $sndto(ip) gives ip:port instead of just IP Task Type - Bug Report Category - Core Status - Unconfirmed Assigned To - Operating System - Linux Severity - Medium Priority - Normal Reported Version - 3.1 Due in Version - Undecided Due Date - Undecided Details - In onsend_route $sndto(ip) gives IP:port i.e. "10.1.1.10:5060" instead of just the IP address. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=230 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task opened: ACK not in transaction when t_relay or t_check_trans
by sip-router 10 May '12

10 May '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Pawel Sternal (Sternik) Attached to Project - sip-router Summary - ACK not in transaction when t_relay or t_check_trans Task Type - Bug Report Category - Core Status - Unconfirmed Assigned To - Operating System - Linux Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Hi. We have noticed in currently installed kamailio 3.2.2 have problem with ACK. In kamailio 1.5.2 there are no problem with it. When kamailio received and forward 200ok, ACK on that response is not in transaction. ACK after that is forwarding statelessly - header Record-Route is added to the package. I'm looking at the diff between src of t_lookup.c with this "problem", and only I'm found that in 3.2.2, this ACK is in "2 - full match to a proxied transaction" when function "ack_matching" is call. Below two output of this same connection, after trying t_relay(). Also when I'm trying to "t_check_trans". ACK is not matched to 200ok. This is kamailio 1.5.2 log output {code} May 10 13:35:54 kamailio /usr/sbin/kamailio[5715]: DBG:tm:t_newtran: transaction on entrance=0xffffffff May 10 13:35:54 kamailio /usr/sbin/kamailio[5715]: DBG:core:parse_headers: flags=ffffffffffffffff May 10 13:35:54 kamailio /usr/sbin/kamailio[5715]: DBG:core:parse_headers: flags=78 May 10 13:35:54 kamailio /usr/sbin/kamailio[5715]: DBG:tm:t_lookup_request: start searching: hash=63132, isACK=1 May 10 13:35:54 kamailio /usr/sbin/kamailio[5715]: DBG:core:parse_headers: flags=38 May 10 13:35:54 kamailio /usr/sbin/kamailio[5715]: DBG:tm:t_lookup_request: RFC3261 ACK matched May 10 13:35:54 kamailio /usr/sbin/kamailio[5715]: DBG:tm:t_lookup_request: REF_UNSAFE: after is 1 May 10 13:35:54 kamailio /usr/sbin/kamailio[5715]: DBG:tm:t_lookup_request: e2e proxy ACK found May 10 13:35:54 kamailio /usr/sbin/kamailio[5715]: DBG:tm:t_newtran: building branch for end2end ACK May 10 13:35:54 kamailio /usr/sbin/kamailio[5715]: DBG:tm:t_relay_to: forwarding ACK May 10 13:35:54 kamailio /usr/sbin/kamailio[5715]: DBG:core:mk_proxy: doing DNS lookup... May 10 13:35:54 kamailio /usr/sbin/kamailio[5715]: DBG:core:forward_request: sending: ACK sip:NUM@IP_ADDR:5060;transport=udp SIP/2.0 Via: SIP/2.0/UDP IP_ADDR;branch=z9hG4bKc96f.0501e9d4.2 Via: SIP/2.0/UDP IP_ADDR:5061;received=127.0.0.1;branch=z9hG4bK363e1c74;rport=5061 From: "NUM" <sip:NUM@IP>;tag=as3f095bcb To: <sip:NUM@IP_ADDR>;tag=chfs37pbjs4ecadm.i Contact: <sip:NUM@IP:5061> Call-ID: 0d39b2602a306e84290f641218ae01f7@IP CSeq: 102 ACK User-Agent: Server Max-Forwards: 70 Remote-Party-ID: "NUM" <sip:NUM@IP>;privacy=off;screen=no Content-Length: 0 . May 10 13:35:54 kamailio /usr/sbin/kamailio[5715]: DBG:core:forward_request: orig. len=597, new_len=631, proto=1 May 10 13:35:54 kamailio /usr/sbin/kamailio[5715]: DBG:tm:t_unref_cell: UNREF_UNSAFE: after is 0 May 10 13:35:54 kamailio /usr/sbin/kamailio[5715]: DBG:core:destroy_avp_list: destroying list 0xb3381970 May 10 13:35:54 kamailio /usr/sbin/kamailio[5715]: DBG:core:receive_msg: cleaning up {code} This is kamailio 3.2.2 log output {code} May 10 12:23:43 kamailio /usr/sbin/kamailio[23198]: DEBUG: tm [t_lookup.c:1379]: DEBUG: t_newtran: msg id=35377 , global msg id=35376 , T on entrance=0xffffffff May 10 12:23:43 kamailio /usr/sbin/kamailio[23198]: DEBUG: tm [t_lookup.c:527]: t_lookup_request: start searching: hash=4487, isACK=1 May 10 12:23:43 kamailio /usr/sbin/kamailio[23198]: DEBUG: tm [t_lookup.c:485]: DEBUG: RFC3261 transaction matching failed May 10 12:23:43 kamailio /usr/sbin/kamailio[23198]: DEBUG: tm [t_lookup.c:709]: DEBUG: t_lookup_request: no transaction found May 10 12:23:43 kamailio /usr/sbin/kamailio[23198]: DEBUG: tm [t_funcs.c:315]: SER: forwarding ACK statelessly May 10 12:23:43 kamailio /usr/sbin/kamailio[23198]: DEBUG: <core> [msg_translator.c:204]: check_via_address(127.0.0.1, IP, 0) May 10 12:23:43 kamailio /usr/sbin/kamailio[23198]: DEBUG: <core> [forward.c:601]: Sending: ACK sip:NUM@IP:5060;transport=udp SIP/2.0 Record-Route: <sip:IP:5060;ftag=as50b3af68;lr> Via: SIP/2.0/UDP IP;branch=z9hG4bKcydzigwkX Via: SIP/2.0/UDP IP:5061;received=127.0.0.1;branch=z9hG4bK587eb61e;rport=5061 From: "NUM" <sip:NUM@IP>;tag=as50b3af68 To: <sip:NUM@IP>;tag=ovqdnmak77x4xa54.i Contact: <sip:NUM@IP:5061> Call-ID: 356753f079bf1d780728315859ffb2ac@IP CSeq: 102 ACK User-Agent: Server Max-Forwards: 70 Remote-Party-ID: "NUM" <sip:NUM@IP>;privacy=off;screen=no Content-Length: 0 . May 10 12:23:43 kamailio /usr/sbin/kamailio[23198]: DEBUG: <core> [forward.c:603]: orig. len=597, new_len=685, proto=1 May 10 12:23:43 kamailio /usr/sbin/kamailio[23198]: DEBUG: <core> [usr_avp.c:644]: DEBUG:destroy_avp_list: destroying list 0xb2f15ca8 May 10 12:23:43 kamailio /usr/sbin/kamailio[23198]: DEBUG: <core> [usr_avp.c:644]: DEBUG:destroy_avp_list: destroying list (nil) May 10 12:23:43 kamailio /usr/sbin/kamailio[23198]: DEBUG: <core> [usr_avp.c:644]: DEBUG:destroy_avp_list: destroying list (nil) May 10 12:23:43 kamailio /usr/sbin/kamailio[23198]: DEBUG: <core> [usr_avp.c:644]: DEBUG:destroy_avp_list: destroying list (nil) May 10 12:23:43 kamailio /usr/sbin/kamailio[23198]: DEBUG: <core> [usr_avp.c:644]: DEBUG:destroy_avp_list: destroying list (nil) May 10 12:23:43 kamailio /usr/sbin/kamailio[23198]: DEBUG: <core> [usr_avp.c:644]: DEBUG:destroy_avp_list: destroying list (nil) May 10 12:23:43 kamailio /usr/sbin/kamailio[23198]: DEBUG: <core> [xavp.c:365]: destroying xavp list (nil) May 10 12:23:43 kamailio /usr/sbin/kamailio[23198]: DEBUG: <core> [receive.c:291]: receive_msg: cleaning up {code} Maybe this not a bug, but why in kamailio 1.5.2 it work? :-) More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=229 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: kamailio.cfg: simplified route[AUTH]
by Daniel-Constantin Mierla 10 May '12

10 May '12

Module: sip-router Branch: master Commit: 661795403a2a72cae30765e9f8cefa99c5228434 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6617954… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 10 13:05:29 2012 +0200 kamailio.cfg: simplified route[AUTH] - use auth_check(...) function which is combining www/proxy_auth() internally based on typical scenario provided by default cfg --- etc/kamailio.cfg | 82 ++++++++++++++--------------------------------------- 1 files changed, 22 insertions(+), 60 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 6d60ee3..158b525 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -698,72 +698,34 @@ route[PRESENCE] { # Authentication route route[AUTH] { #!ifdef WITH_AUTH - if (is_method("REGISTER")) - { - # authenticate the REGISTER requests (uncomment to enable auth) - if (!www_authorize("$td", "subscriber")) - { - www_challenge("$td", "0"); - exit; - } - - if ($au!=$tU) - { - sl_send_reply("403","Forbidden auth ID"); - exit; - } - } else { #!ifdef WITH_IPAUTH - if(allow_source_address()) - { - # source IP allowed - return; - } -#!endif - - # authenticate if from local subscriber - if (from_uri==myself) - { - if (!proxy_authorize("$fd", "subscriber")) { - proxy_challenge("$fd", "0"); - exit; - } - if (is_method("PUBLISH")) - { - if ($au!=$fU || $au!=$tU) { - sl_send_reply("403","Forbidden auth ID"); - exit; - } - if ($au!=$rU) { - sl_send_reply("403","Forbidden R-URI"); - exit; - } -#!ifdef WITH_MULTIDOMAIN - if ($fd!=$rd) { - sl_send_reply("403","Forbidden R-URI domain"); - exit; - } + if((!is_method("REGISTER")) && allow_source_address()) + { + # source IP allowed + return; + } #!endif - } else { - if ($au!=$fU) { - sl_send_reply("403","Forbidden auth ID"); - exit; - } - } - consume_credentials(); - # caller authenticated - } else { - # caller is not local subscriber, then check if it calls - # a local destination, otherwise deny, not an open relay here - if (!uri==myself) - { - sl_send_reply("403","Not relaying"); - exit; - } + if (is_method("REGISTER") || from_uri==myself) + { + # authenticate requests + if (!auth_check("$fd", "subscriber", "1")) { + auth_challenge("$fd", "0"); + exit; } + # user authenticated - remove auth header + if(!is_method("REGISTER|PUBLISH")) + consume_credentials(); } + # if caller is not local subscriber, then check if it calls + # a local destination, otherwise deny, not an open relay here + if (from_uri!=myself && uri!=myself) + { + sl_send_reply("403","Not relaying"); + exit; + } + #!endif return; }

1 0

git:master: auth_db(k): multi-domain fixes for auth_check(...)
by Daniel-Constantin Mierla 10 May '12

10 May '12

Module: sip-router Branch: master Commit: 2d35cca6583a9ac556fe2dbeb9740d9fcf8e33e6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2d35cca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 10 13:04:09 2012 +0200 auth_db(k): multi-domain fixes for auth_check(...) - check domain parts in from/to based on use_domain parameter --- modules_k/auth_db/authorize.c | 47 +++++++++++++++++++++++++++++++++------- 1 files changed, 38 insertions(+), 9 deletions(-) diff --git a/modules_k/auth_db/authorize.c b/modules_k/auth_db/authorize.c index 877f506..909365c 100644 --- a/modules_k/auth_db/authorize.c +++ b/modules_k/auth_db/authorize.c @@ -44,6 +44,7 @@ #include "../../parser/parser_f.h" #include "../../parser/parse_from.h" #include "../../parser/parse_to.h" +#include "../../parser/parse_uri.h" #include "../../usr_avp.h" #include "../../mod_fix.h" #include "../../mem/mem.h" @@ -319,7 +320,9 @@ int auth_check(struct sip_msg* _m, char* _realm, char* _table, char *_flags) int iflags; int ret; hdr_field_t *hdr; - sip_uri_t *uri; + sip_uri_t *uri = NULL; + sip_uri_t *turi = NULL; + sip_uri_t *furi = NULL; if ((_m->REQ_METHOD == METHOD_ACK) || (_m->REQ_METHOD == METHOD_CANCEL)) { return AUTH_OK; @@ -367,17 +370,43 @@ int auth_check(struct sip_msg* _m, char* _realm, char* _table, char *_flags) if(ret==AUTH_OK && (iflags&AUTH_CHECK_ID_F)) { hdr = (_m->proxy_auth==0)?_m->authorization:_m->proxy_auth; srealm = ((auth_body_t*)(hdr->parsed))->digest.username.user; - if(_m->REQ_METHOD==METHOD_REGISTER) { - if((uri=parse_to_uri(_m))==NULL) + + if((furi=parse_from_uri(_m))==NULL) + return AUTH_ERROR; + + if(_m->REQ_METHOD==METHOD_REGISTER || _m->REQ_METHOD==METHOD_PUBLISH) { + if((turi=parse_to_uri(_m))==NULL) return AUTH_ERROR; + uri = turi; } else { - if((uri=parse_from_uri(_m))==NULL) - return AUTH_ERROR; + uri = furi; + } + if(srealm.len!=uri->user.len + || strncmp(srealm.s, uri->user.s, srealm.len)!=0) + return AUTH_USER_MISMATCH; + + if(_m->REQ_METHOD==METHOD_REGISTER || _m->REQ_METHOD==METHOD_PUBLISH) { + /* check from==to */ + if(furi->user.len!=turi->user.len + || strncmp(furi->user.s, turi->user.s, furi->user.len)!=0) + return AUTH_USER_MISMATCH; + if(use_domain!=0 && (furi->host.len!=turi->host.len + || strncmp(furi->host.s, turi->host.s, furi->host.len)!=0)) + return AUTH_USER_MISMATCH; + /* check r-uri==from for publish */ + if(_m->REQ_METHOD==METHOD_PUBLISH) { + if(parse_sip_msg_uri(_m)<0) + return AUTH_ERROR; + uri = &_m->parsed_uri; + if(furi->user.len!=uri->user.len + || strncmp(furi->user.s, uri->user.s, furi->user.len)!=0) + return AUTH_USER_MISMATCH; + if(use_domain!=0 && (furi->host.len!=uri->host.len + || strncmp(furi->host.s, uri->host.s, furi->host.len)!=0)) + return AUTH_USER_MISMATCH; + } } - if(srealm.len==uri->user.len - && strncmp(srealm.s, uri->user.s, srealm.len)==0) - return ret; - return AUTH_USER_MISMATCH; + return AUTH_OK; } return ret;

1 0

module development
by Vineet Menon 10 May '12

10 May '12

Hi, I am new to kamailio module devel... I want to test a new scheduling for SIP messages... Can i do that with kamailio modules? or I should go for something else? probably kamailio core?? Regards, Vineet Menon

3 10

← Newer
1
...
9
10
11
12
13
14
15
...
18
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2012