sr-dev August 2012

sr-dev@lists.kamailio.org

30 participants
170 discussions

git:pd/outbound: modules_k/rls: Added DB transaction code around rls_presentity insert/replace
by Peter Dunkley 13 Aug '12

13 Aug '12

Module: sip-router Branch: pd/outbound Commit: 65dcb2d0e72757d51b0ee51c457c5440278444bc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=65dcb2d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Aug 13 15:50:05 2012 +0100 modules_k/rls: Added DB transaction code around rls_presentity insert/replace --- modules_k/rls/resource_notify.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index bf9aa0d..8937131 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -767,6 +767,15 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) goto error; } + if (dbmode == RLS_DB_ONLY && rlpres_dbf.start_transaction) + { + if (rlpres_dbf.start_transaction(rlpres_db) < 0) + { + LM_ERR("in start_transaction\n"); + goto error; + } + } + if (rlpres_dbf.replace != NULL) { if(rlpres_dbf.replace(rlpres_db, query_cols, query_vals, n_query_cols, @@ -796,7 +805,16 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) LM_DBG("Inserted in database table new record\n"); } } - + + if (dbmode == RLS_DB_ONLY && rlpres_dbf.end_transaction) + { + if (rlpres_dbf.end_transaction(rlpres_db) < 0) + { + LM_ERR("in end_transaction\n"); + goto error; + } + } + LM_DBG("Updated rlpres_table\n"); /* reply 200OK */ done: @@ -831,6 +849,13 @@ error: if (reason.s) pkg_free(reason.s); free_to_params(&TO); + + if (dbmode == RLS_DB_ONLY && rlpres_dbf.abort_transaction) + { + if (rlpres_dbf.abort_transaction(rlpres_db) < 0) + LM_ERR("in abort_transaction\n"); + } + return -1; }

1 0

git:3.3: modules_k/pua: Fixed double-free in pua
by Peter Dunkley 13 Aug '12

13 Aug '12

Module: sip-router Branch: 3.3 Commit: dd26ed0cc3233fcf64635a8d2ee27361352b711a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd26ed0… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Aug 13 15:48:18 2012 +0100 modules_k/pua: Fixed double-free in pua (cherry picked from commit 5387288eac896a0710fb1c55cc4837e973e04946) --- modules_k/pua/send_subscribe.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/pua/send_subscribe.c b/modules_k/pua/send_subscribe.c index cd089e6..89a8141 100644 --- a/modules_k/pua/send_subscribe.c +++ b/modules_k/pua/send_subscribe.c @@ -623,6 +623,7 @@ faked_error: presentity->record_route.len= record_route.len; size+= record_route.len; pkg_free(record_route.s); + record_route.s = NULL; } presentity->contact.s= (char*)presentity + size;

1 0

git:3.3: modules_k/rls: Added DB transaction code around rls_presentity insert/replace
by Peter Dunkley 13 Aug '12

13 Aug '12

Module: sip-router Branch: 3.3 Commit: 03f8f4d9c4304ac0a8f629e1c94230ab70b58917 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=03f8f4d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Aug 13 15:50:05 2012 +0100 modules_k/rls: Added DB transaction code around rls_presentity insert/replace (cherry picked from commit 65dcb2d0e72757d51b0ee51c457c5440278444bc) --- modules_k/rls/resource_notify.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index bf9aa0d..8937131 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -767,6 +767,15 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) goto error; } + if (dbmode == RLS_DB_ONLY && rlpres_dbf.start_transaction) + { + if (rlpres_dbf.start_transaction(rlpres_db) < 0) + { + LM_ERR("in start_transaction\n"); + goto error; + } + } + if (rlpres_dbf.replace != NULL) { if(rlpres_dbf.replace(rlpres_db, query_cols, query_vals, n_query_cols, @@ -796,7 +805,16 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) LM_DBG("Inserted in database table new record\n"); } } - + + if (dbmode == RLS_DB_ONLY && rlpres_dbf.end_transaction) + { + if (rlpres_dbf.end_transaction(rlpres_db) < 0) + { + LM_ERR("in end_transaction\n"); + goto error; + } + } + LM_DBG("Updated rlpres_table\n"); /* reply 200OK */ done: @@ -831,6 +849,13 @@ error: if (reason.s) pkg_free(reason.s); free_to_params(&TO); + + if (dbmode == RLS_DB_ONLY && rlpres_dbf.abort_transaction) + { + if (rlpres_dbf.abort_transaction(rlpres_db) < 0) + LM_ERR("in abort_transaction\n"); + } + return -1; }

1 0

git:3.3: modules_k/rls: Fixed memory leak in rls
by Peter Dunkley 13 Aug '12

13 Aug '12

Module: sip-router Branch: 3.3 Commit: 52f1ea5eb0067e94207dcfaa461260d96b2635bc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=52f1ea5… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Aug 13 15:49:09 2012 +0100 modules_k/rls: Fixed memory leak in rls - Issue fixed by Paul Pankhurst and Peter Dunkley @ Crocodile RCS (cherry picked from commit c9628aa038ad7099a72af67f9284e5d0a9b78173) --- modules_k/rls/subscribe.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c index 7df5d40..66c295a 100644 --- a/modules_k/rls/subscribe.c +++ b/modules_k/rls/subscribe.c @@ -463,6 +463,7 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma subs_t subs; pres_ev_t* event = NULL; int err_ret = -1; + int ret = to_presence_code; str* contact = NULL; xmlDocPtr doc = NULL; xmlNodePtr service_node = NULL; @@ -743,6 +744,8 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma remove_expired_rlsubs(&subs, hash_code); done: + ret = 1; +forpresence: if(contact!=NULL) { if(contact->s!=NULL) @@ -758,14 +761,7 @@ done: xmlFreeDoc(doc); if (rlsubs_did.s != NULL) pkg_free(rlsubs_did.s); - return 1; - -forpresence: - if(subs.pres_uri.s!=NULL) - pkg_free(subs.pres_uri.s); - if (rlsubs_did.s != NULL) - pkg_free(rlsubs_did.s); - return to_presence_code; + return ret; bad_event: err_ret = 0;

1 0

git:master: modules_k/pua: Fixed double-free in pua
by Peter Dunkley 13 Aug '12

13 Aug '12

Module: sip-router Branch: master Commit: 5387288eac896a0710fb1c55cc4837e973e04946 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5387288… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Aug 13 15:48:18 2012 +0100 modules_k/pua: Fixed double-free in pua --- modules_k/pua/send_subscribe.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/pua/send_subscribe.c b/modules_k/pua/send_subscribe.c index cd089e6..89a8141 100644 --- a/modules_k/pua/send_subscribe.c +++ b/modules_k/pua/send_subscribe.c @@ -623,6 +623,7 @@ faked_error: presentity->record_route.len= record_route.len; size+= record_route.len; pkg_free(record_route.s); + record_route.s = NULL; } presentity->contact.s= (char*)presentity + size;

1 0

git:master: modules_k/rls: Added DB transaction code around rls_presentity insert/replace
by Peter Dunkley 13 Aug '12

13 Aug '12

Module: sip-router Branch: master Commit: 65dcb2d0e72757d51b0ee51c457c5440278444bc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=65dcb2d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Aug 13 15:50:05 2012 +0100 modules_k/rls: Added DB transaction code around rls_presentity insert/replace --- modules_k/rls/resource_notify.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index bf9aa0d..8937131 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -767,6 +767,15 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) goto error; } + if (dbmode == RLS_DB_ONLY && rlpres_dbf.start_transaction) + { + if (rlpres_dbf.start_transaction(rlpres_db) < 0) + { + LM_ERR("in start_transaction\n"); + goto error; + } + } + if (rlpres_dbf.replace != NULL) { if(rlpres_dbf.replace(rlpres_db, query_cols, query_vals, n_query_cols, @@ -796,7 +805,16 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) LM_DBG("Inserted in database table new record\n"); } } - + + if (dbmode == RLS_DB_ONLY && rlpres_dbf.end_transaction) + { + if (rlpres_dbf.end_transaction(rlpres_db) < 0) + { + LM_ERR("in end_transaction\n"); + goto error; + } + } + LM_DBG("Updated rlpres_table\n"); /* reply 200OK */ done: @@ -831,6 +849,13 @@ error: if (reason.s) pkg_free(reason.s); free_to_params(&TO); + + if (dbmode == RLS_DB_ONLY && rlpres_dbf.abort_transaction) + { + if (rlpres_dbf.abort_transaction(rlpres_db) < 0) + LM_ERR("in abort_transaction\n"); + } + return -1; }

1 0

git:master: modules_k/rls: Fixed memory leak in rls
by Peter Dunkley 13 Aug '12

13 Aug '12

Module: sip-router Branch: master Commit: c9628aa038ad7099a72af67f9284e5d0a9b78173 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c9628aa… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Aug 13 15:49:09 2012 +0100 modules_k/rls: Fixed memory leak in rls - Issue fixed by Paul Pankhurst and Peter Dunkley @ Crocodile RCS --- modules_k/rls/subscribe.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c index 7df5d40..66c295a 100644 --- a/modules_k/rls/subscribe.c +++ b/modules_k/rls/subscribe.c @@ -463,6 +463,7 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma subs_t subs; pres_ev_t* event = NULL; int err_ret = -1; + int ret = to_presence_code; str* contact = NULL; xmlDocPtr doc = NULL; xmlNodePtr service_node = NULL; @@ -743,6 +744,8 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma remove_expired_rlsubs(&subs, hash_code); done: + ret = 1; +forpresence: if(contact!=NULL) { if(contact->s!=NULL) @@ -758,14 +761,7 @@ done: xmlFreeDoc(doc); if (rlsubs_did.s != NULL) pkg_free(rlsubs_did.s); - return 1; - -forpresence: - if(subs.pres_uri.s!=NULL) - pkg_free(subs.pres_uri.s); - if (rlsubs_did.s != NULL) - pkg_free(rlsubs_did.s); - return to_presence_code; + return ret; bad_event: err_ret = 0;

1 0

git:master: modules_k/usrloc: Downgraded a WARN to INFO
by Peter Dunkley 13 Aug '12

13 Aug '12

Module: sip-router Branch: master Commit: b5132f217f521872fb0a6a4ab215443a700bab6f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b5132f2… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Aug 13 15:45:20 2012 +0100 modules_k/usrloc: Downgraded a WARN to INFO - When Kamailio loads a contact binding whose socket is not local a warning is printed. Unfortunately, this happens a lot on multi-server systems and it is not something to worry about. - The end result is a huge number of warnings that swamps log messages relating to real problems. - So downgrading to INFO. --- modules_k/usrloc/udomain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/usrloc/udomain.c b/modules_k/usrloc/udomain.c index cf7807e..c676111 100644 --- a/modules_k/usrloc/udomain.c +++ b/modules_k/usrloc/udomain.c @@ -318,7 +318,7 @@ static inline ucontact_info_t* dbrow2info( db_val_t *vals, str *contact) } ci.sock = grep_sock_info( &host, (unsigned short)port, proto); if (ci.sock==0) { - LM_WARN("non-local socket <%s>...ignoring\n", p); + LM_INFO("non-local socket <%s>...ignoring\n", p); } }

1 0

Re: [sr-dev] reSIProcate/repro proxy and Kamailio
by Alex Balashov 13 Aug '12

13 Aug '12

Personally, I would say that it is not in the interest of the project to scatter focus away from itself, while further confusing newbies and in general making the "marketing message" less coherent. That effort would be better spent on making Kamailio more user-friendly and/or easily deployable for trivial scenarios and small-scale, narrow purposes--if that's a priority for the project. Whether it even should be a priority deserves some rational discussion, since that may not be where Kamailio is strongest, just by design. The goal of a project should be to try to succeed in the game most appropriate for its character, and one which best aligns with the vision behind it. -- Alex -- Sent from my Samsung mobile, and thus lacking in the refinement one might expect from a proper keyboard. Alex Balashov - Principal Evariste Systems LLC 235 E Ponce de Leon Ave Suite 106 Decatur, GA 30030 Tel: +1-678-954-0670 Web: http://www.evaristesys.com/Daniel-Constantin Mierla <miconda(a)gmail.com> wrote:Personally I haven't used repro, so I cannot give relevant comments on it. Cheers, Daniel On 8/5/12 11:25 PM, Daniel Pocock wrote: > > > I've recently been doing some improvements to reSIProcate and it's SIP > proxy, `repro' > > http://www.resiprocate.org/About_Repro > > It may appear to be a competitor for Kamailio - but a closer look at it > reveals some interesting possibilities: > > a) the config file is less flexible than Kamailio - but this makes it > extremely easy to set up. This makes it an ideal stepping stone for > people who are not ready for Kamailio > > b) for Kamailio to really become widespread depends on a wide community > of sites running SIP proxies - repro appears to be a solution that can > be used to activate many public SIP servers very quickly, creating a > world where everyone speaks Kamailio's language > > I'm curious to get some feedback about > > - have other people involved with Kamailio (and related proxies) had any > exposure to reSIProcate already? > > - making repro and Kamailio work well together (ideally using DNS SRV > and TLS with domain certificates/federated VoIP) - test cases? public > test servers? > > - promoting the two proxies together, repro as the beginner solution, > Kamailio as a strategic option for people who need more flexibility - > does anyone feel comfortable with this concept? > > > _______________________________________________ > sr-dev mailing list > sr-dev(a)lists.sip-router.org > http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, Seattle, USA, Sep 23-26, 2012 - http://asipto.com/u/katu Kamailio Practical Workshop, Netherlands, Sep 10-12, 2012 - http://asipto.com/u/kpw _______________________________________________ sr-dev mailing list sr-dev(a)lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev

4 3

$timef PV / DB ACC
by Brandon Armstead 12 Aug '12

12 Aug '12

Hello, I am looking to export $timef PV to the db_use_table acc / module parameter. I've been looking through source and it seems Line 390 under modules_k/acc/acc.c is where this "fixup" is happening at a higher level. It looks like fixup_var_pve_str_12 should be called for the 2nd parameter? I'm having a difficult time tracking the flow between acc -> srdb1 and PV for what I would imagine would be a rather simple modification. Is there any online documentation for such cases to more familiarize myself with the inner workings. Thank you for all help / insight in advance! Sincerely, Brandon Armstead

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2012