sr-dev October 2011

sr-dev@lists.kamailio.org

37 participants
284 discussions

3.2 regression in db_postgres
by Alex Balashov 20 Oct '11

20 Oct '11

Hi, I cloned branch 3.2, and I get a crash when using db_postgres with PostgreSQL >= 9.1.1 on an RHEL 6 build target. This is the only combination I have tried; I have not tried any other version of Postgres libs. However, when I revert to the 3.1 branch, the problem goes away. Here is the back trace: (gdb) where #0 0x0000003bb266ea2b in vsnprintf () from /lib64/libc.so.6 #1 0x0000003bb264ea53 in snprintf () from /lib64/libc.so.6 #2 0x00007f27d20ff319 in db_do_query (_h=… [View More]0x7f27d3829020, _k=0x7fffbfb8a610, _op=0x0, _v=0x7fffbfb8a5a0, _c=0x7fffbfb8a600, _n=1, _nc=1, _o=0x0, _r=0x7fffbfb8a5f8, val2str=0x7f27d063da00 <db_postgres_val2str>, submit_query=0x7f27d0639460 <db_postgres_submit_query>, store_result=0x7f27d0639de0 <db_postgres_store_result>) at db_query.c:63 #3 0x00007f27d0638918 in db_postgres_query (_h=<value optimized out>, _k=<value optimized out>, _op=<value optimized out>, _v=<value optimized out>, _c=<value optimized out>, _n=<value optimized out>, _nc=1, _o=0x0, _r=0x7fffbfb8a5f8) at km_dbase.c:370 #4 0x00007f27d20fa1e9 in db_table_version (dbf=0x7f27d0c946a0, connection=0x7f27d3829020, table=0x7f27d0c94010) at db.c:378 #5 0x00007f27d20fa80d in db_check_table_version (dbf=<value optimized out>, dbh=<value optimized out>, table=0x7f27d0c94010, version=4) at db.c:416 #6 0x00007f27d0a7fac6 in init_addresses () at address.c:208 #7 0x00007f27d0a8b5ed in mod_init () at permissions.c:630 #8 0x00000000004db7e0 in init_mod (m=0x7f27d36c1c78) at sr_module.c:922 #9 0x00000000004db764 in init_mod (m=0x7f27d36c2180) at sr_module.c:919 #10 0x00000000004db764 in init_mod (m=0x7f27d36c26c0) at sr_module.c:919 #11 0x00000000004db764 in init_mod (m=0x7f27d36c2dd0) at sr_module.c:919 #12 0x00000000004db764 in init_mod (m=0x7f27d36c3168) at sr_module.c:919 #13 0x00000000004db764 in init_mod (m=0x7f27d36c37b8) at sr_module.c:919 #14 0x00000000004db764 in init_mod (m=0x7f27d36c3af8) at sr_module.c:919 #15 0x00000000004db764 in init_mod (m=0x7f27d36c4010) at sr_module.c:919 #16 0x00000000004db764 in init_mod (m=0x7f27d36c4560) at sr_module.c:919 #17 0x00000000004db764 in init_mod (m=0x7f27d36c48e0) at sr_module.c:919 #18 0x00000000004dc6c2 in init_modules () at sr_module.c:949 #19 0x0000000000461d89 in main (argc=<value optimized out>, argv=0x7fffbfb8ab78) at main.c:2416 I have the core dump and could compile with debug info and get more information, but I thought it'd be a good start, since there haven't been many changes to db_postgres or srdb1, but there have been some. -- Alex Balashov - Principal Evariste Systems LLC 260 Peachtree Street NW Suite 2200 Atlanta, GA 30303 Tel: +1-678-954-0670 Fax: +1-404-961-1892 Web: http://www.evaristesys.com/ [View Less]

1 1

git:jason.penton/kamailio_ims_extensions: TM: moved fake reply wrapper to t_reply as opposed to t_cancel
by Jason Penton 20 Oct '11

20 Oct '11

Module: sip-router Branch: jason.penton/kamailio_ims_extensions Commit: 831ab80feec836dbfc7f4e497b590f7e76252b35 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=831ab80… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Thu Oct 20 14:58:05 2011 +0200 TM: moved fake reply wrapper to t_reply as opposed to t_cancel - a little cleanup --- modules/tm/t_cancel.c | 8 -------- modules/tm/t_cancel.… [View More]h | 3 --- modules/tm/t_reply.c | 6 ++++++ modules/tm/t_reply.h | 2 ++ 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/modules/tm/t_cancel.c b/modules/tm/t_cancel.c index ac1bf4f..5b7d666 100644 --- a/modules/tm/t_cancel.c +++ b/modules/tm/t_cancel.c @@ -65,8 +65,6 @@ #include "t_msgbuilder.h" #include "t_lookup.h" /* for t_lookup_callid in fifo_uac_cancel */ #include "t_hooks.h" -#include "timer.h" - /** Prepare to cancel a transaction. * Determine which branches should be canceled and prepare them (internally @@ -543,9 +541,3 @@ error3: return ret; } - -void w_fake_reply(struct cell *t, int branch, int code ) -{ - LOCK_REPLIES(t); - fake_reply(t, branch, code); -} diff --git a/modules/tm/t_cancel.h b/modules/tm/t_cancel.h index 8b44cc9..7e446f1 100644 --- a/modules/tm/t_cancel.h +++ b/modules/tm/t_cancel.h @@ -96,9 +96,6 @@ typedef int (*cancel_all_uacs_f)(struct cell *trans, int how); typedef void (*prepare_to_cancel_f)(struct cell *t, branch_bm_t *cancel_bm, branch_bm_t skip_branches); -void w_fake_reply(struct cell *t, int branch, int code ); - - /** Check if one branch needs CANCEL-ing and prepare it if it does. * Can be called w/o REPLY_LOCK held * between this call and the call to cancel_uacs()/cancel_branch() diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index b7c3a84..121e597 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -2629,3 +2629,9 @@ void rpc_reply(rpc_t* rpc, void* c) return; } } + +void w_fake_reply(struct cell *t, int branch, int code ) +{ + LOCK_REPLIES(t); + fake_reply(t, branch, code); +} diff --git a/modules/tm/t_reply.h b/modules/tm/t_reply.h index 1fe81ad..fd189b2 100644 --- a/modules/tm/t_reply.h +++ b/modules/tm/t_reply.h @@ -237,4 +237,6 @@ void free_faked_req(struct sip_msg *faked_req, struct cell *t); typedef int (*tget_picked_f)(void); int t_get_picked_branch(void); +void w_fake_reply(struct cell *t, int branch, int code ); + #endif [View Less]

1 0

git:jason.penton/kamailio_ims_extensions: TM: Expose fake reply via api
by Jason Penton 20 Oct '11

20 Oct '11

Module: sip-router Branch: jason.penton/kamailio_ims_extensions Commit: a8695bee7d918986fa32b05ae238cf1dcfa11aed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a8695be… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Thu Oct 20 14:09:50 2011 +0200 TM: Expose fake reply via api - Allows to be able to send fake replies through TM api. Useful for terminating early dialogs --- modules/tm/… [View More]t_cancel.c | 6 ++++++ modules/tm/t_cancel.h | 2 ++ modules/tm/timer.c | 2 +- modules/tm/timer.h | 2 +- modules/tm/tm_load.c | 1 + modules/tm/tm_load.h | 1 + modules/tm/uac.h | 2 ++ 7 files changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/tm/t_cancel.c b/modules/tm/t_cancel.c index c1b52be..ac1bf4f 100644 --- a/modules/tm/t_cancel.c +++ b/modules/tm/t_cancel.c @@ -65,6 +65,7 @@ #include "t_msgbuilder.h" #include "t_lookup.h" /* for t_lookup_callid in fifo_uac_cancel */ #include "t_hooks.h" +#include "timer.h" /** Prepare to cancel a transaction. @@ -543,3 +544,8 @@ error3: } +void w_fake_reply(struct cell *t, int branch, int code ) +{ + LOCK_REPLIES(t); + fake_reply(t, branch, code); +} diff --git a/modules/tm/t_cancel.h b/modules/tm/t_cancel.h index 874483c..8b44cc9 100644 --- a/modules/tm/t_cancel.h +++ b/modules/tm/t_cancel.h @@ -96,6 +96,8 @@ typedef int (*cancel_all_uacs_f)(struct cell *trans, int how); typedef void (*prepare_to_cancel_f)(struct cell *t, branch_bm_t *cancel_bm, branch_bm_t skip_branches); +void w_fake_reply(struct cell *t, int branch, int code ); + /** Check if one branch needs CANCEL-ing and prepare it if it does. * Can be called w/o REPLY_LOCK held diff --git a/modules/tm/timer.c b/modules/tm/timer.c index b834f11..768aa78 100644 --- a/modules/tm/timer.c +++ b/modules/tm/timer.c @@ -335,7 +335,7 @@ inline static ticks_t delete_cell( struct cell *p_cell, int unlock ) /* generate a fake reply * it assumes the REPLY_LOCK is already held and returns unlocked */ -static void fake_reply(struct cell *t, int branch, int code ) +void fake_reply(struct cell *t, int branch, int code ) { struct cancel_info cancel_data; short do_cancel_branch; diff --git a/modules/tm/timer.h b/modules/tm/timer.h index d506adb..9acddc1 100644 --- a/modules/tm/timer.h +++ b/modules/tm/timer.h @@ -148,7 +148,7 @@ extern struct msgid_var user_rt_t2_timeout_ms; extern struct msgid_var user_inv_max_lifetime; extern struct msgid_var user_noninv_max_lifetime; - +void fake_reply(struct cell *t, int branch, int code ); /** * \brief fix timer values to ticks */ diff --git a/modules/tm/tm_load.c b/modules/tm/tm_load.c index d57fd45..cda04f0 100644 --- a/modules/tm/tm_load.c +++ b/modules/tm/tm_load.c @@ -115,6 +115,7 @@ int load_tm( struct tm_binds *tmb) tmb->send_prepared_request = send_prepared_request; tmb->dlg_add_extra = dlg_add_extra; tmb->t_cancel_uac = t_uac_cancel; + tmb->fake_reply = w_fake_reply; #ifdef DIALOG_CALLBACKS tmb->register_new_dlg_cb=register_new_dlg_cb; diff --git a/modules/tm/tm_load.h b/modules/tm/tm_load.h index 370c2ef..58f0b70 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -91,6 +91,7 @@ struct tm_binds { cancel_all_uacs_f cancel_all_uacs; prepare_request_within_f prepare_request_within; send_prepared_request_f send_prepared_request; + fake_reply_f fake_reply; enum route_mode* route_mode; #ifdef DIALOG_CALLBACKS register_new_dlg_cb_f register_new_dlg_cb; diff --git a/modules/tm/uac.h b/modules/tm/uac.h index 619d43e..f10f0ab 100644 --- a/modules/tm/uac.h +++ b/modules/tm/uac.h @@ -96,6 +96,8 @@ typedef int (*prepare_request_within_f)(uac_req_t *uac_r, typedef void (*send_prepared_request_f)(struct retr_buf *request_dst); typedef void (*generate_fromtag_f)(str*, str*); +typedef void (*fake_reply_f)(struct cell *cell, int branch, int code); + /* * Generate a fromtag based on given Call-ID */ [View Less]

2 1

[tracker] Comment added: Changing R-URI in dialog-info PUBLISH in event_route[tm:local-request]
by sip-router 20 Oct '11

20 Oct '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#158 - Changing R-URI in dialog-info PUBLISH in event_route[tm:local-request] User who did this - Sebastian Zaprzalski (-sz-) ---------- PUBLISHES are generated by pua_dialoginfo. Changing R-URI was possible in Kamailio v. 3.1.4. We have used this in our config, but now we can't. We have prepared some workaroud, and our service works proprely. I would like to take this opportunity to describe the cause … [View More]

1 0

[tracker] Comment added: Changing R-URI in dialog-info PUBLISH in event_route[tm:local-request]
by sip-router 20 Oct '11

20 Oct '11

1 0

git:jason.penton/kamailio_ims_extensions: rr: added possibility to add custom user to record route header
by Jason Penton 20 Oct '11

20 Oct '11

Module: sip-router Branch: jason.penton/kamailio_ims_extensions Commit: a7c15341c5e0b4303842b3e3dc457dddbb541e4a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a7c1534… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Thu Oct 20 09:21:40 2011 +0200 rr: added possibility to add custom user to record route header - Added AVP to be set before calling record route to allow for custom user in … [View More]record route headers. This is required in IMS instances, for example mo@... for mobile originating route --- modules_k/rr/doc/rr_admin.xml | 18 ++++++++++++++++++ modules_k/rr/record.c | 36 +++++++++++++++++++++++++++++++++++- modules_k/rr/record.h | 4 +++- modules_k/rr/rr_mod.c | 17 ++++++++++++++++- 4 files changed, 72 insertions(+), 3 deletions(-) diff --git a/modules_k/rr/doc/rr_admin.xml b/modules_k/rr/doc/rr_admin.xml index 8eb248e..d4906bf 100644 --- a/modules_k/rr/doc/rr_admin.xml +++ b/modules_k/rr/doc/rr_admin.xml @@ -212,6 +212,24 @@ modparam("rr", "add_username", 1) </programlisting> </example> </section> + + <section> + <title><varname>custom_user_avp</varname> (string)</title> + <para> + AVP to populate for custom user of record_route. If not set, + default URI user is used + </para> + <example> + <title>Set <varname>add_username</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("rr", "custom_user_avp", "$avp(i:20") +$avp(i:20)="my_custom_user"; +record_route(); +... +</programlisting> + </example> + </section> <section> <title><varname>enable_socket_mismatch_warning</varname> (integer)</title> diff --git a/modules_k/rr/record.c b/modules_k/rr/record.c index 629c38a..525a7e7 100644 --- a/modules_k/rr/record.c +++ b/modules_k/rr/record.c @@ -74,6 +74,37 @@ static char rr_param_buf_ptr[RR_PARAM_BUF_SIZE]; static str rr_param_buf = {rr_param_buf_ptr,0}; static unsigned int rr_param_msg; +static pv_spec_t *custom_user_avp; /*!< AVP for custom_user setting */ + + +void init_custom_user(pv_spec_t *custom_user_avp_p) +{ + custom_user_avp = custom_user_avp_p; +} + +/*! + * \brief Return the custom_user for a record route + * \param req SIP message + * \param custom_user to be returned + * \return <0 for failure + */ +inline static int get_custom_user(struct sip_msg *req, str *custom_user) +{ + pv_value_t pv_val; + + if( custom_user_avp ) { + if ( pv_get_spec_value( req, custom_user_avp, &pv_val)==0 && + pv_val.flags&PV_VAL_STR && pv_val.rs.len>0 ) { + custom_user->s = pv_val.rs.s; + custom_user->len = pv_val.rs.len; + return 0; + } + LM_DBG("invalid AVP value, using default user from RURI\n"); + } + + return -1; + +} /*! @@ -281,14 +312,17 @@ int record_route(struct sip_msg* _m, str *params) str user; struct to_body* from = NULL; str* tag; - + user.len = 0; if (add_username) { + /* check if there is a custom user set */ + if (get_custom_user(_m, &user) < 0) { if (get_username(_m, &user) < 0) { LM_ERR("failed to extract username\n"); return -1; } + } } if (append_fromtag) { diff --git a/modules_k/rr/record.h b/modules_k/rr/record.h index f1ec944..0a96d24 100644 --- a/modules_k/rr/record.h +++ b/modules_k/rr/record.h @@ -31,7 +31,7 @@ #include "../../parser/msg_parser.h" #include "../../str.h" - +#include "../../pvar.h" /*! * \brief Insert a new Record-Route header field with lr parameter @@ -66,5 +66,7 @@ int record_route_preset(struct sip_msg* _m, str* _data); */ int add_rr_param(struct sip_msg* msg, str* rr_param); +void init_custom_user(pv_spec_t *custom_user_avp); + #endif /* RECORD_H */ diff --git a/modules_k/rr/rr_mod.c b/modules_k/rr/rr_mod.c index 3e23eab..e2cc3f6 100644 --- a/modules_k/rr/rr_mod.c +++ b/modules_k/rr/rr_mod.c @@ -56,7 +56,9 @@ int append_fromtag = 1; /*!< append from tag by default */ int enable_double_rr = 1; /*!< enable using of 2 RR by default */ int enable_full_lr = 0; /*!< compatibilty mode disabled by default */ int add_username = 0; /*!< do not add username by default */ - int enable_socket_mismatch_warning = 1; /*!< enable socket mismatch warning */ +int enable_socket_mismatch_warning = 1; /*!< enable socket mismatch warning */ +static str custom_user_spec = {NULL, 0}; +pv_spec_t custom_user_avp; static unsigned int last_rr_msg; @@ -112,6 +114,7 @@ static param_export_t params[] ={ #endif {"add_username", INT_PARAM, &add_username}, {"enable_socket_mismatch_warning",INT_PARAM,&enable_socket_mismatch_warning}, + { "custom_user_avp", STR_PARAM, &custom_user_spec.s}, {0, 0, 0 } }; @@ -156,6 +159,18 @@ static int mod_init(void) i_user.len = 0; } #endif + + if (custom_user_spec.s) { + custom_user_spec.len = strlen(custom_user_spec.s); + if ( pv_parse_spec(&custom_user_spec, &custom_user_avp)==0 + && (custom_user_avp.type!=PVT_AVP)){ + LM_ERR("malformed or non AVP custom_user " + "AVP definition in '%.*s'\n", custom_user_spec.len,custom_user_spec.s); + return -1; + } + } + + init_custom_user(custom_user_spec.s?&custom_user_avp:0); return 0; } [View Less]

1 0

can't push to master
by Jon Bonilla 19 Oct '11

19 Oct '11

Hi all When trying to push a commit to master I get the following error manwe@ks26913:~/kamailio-repo-stuff/nightly-builds/sip-router/pkg/kamailio/deb$ git commit -a Created commit 4f43ac0: pkg: Set version to 3.3-dev 5 files changed, 30 insertions(+), 0 deletions(-) manwe@ks26913:~/kamailio-repo-stuff/nightly-builds/sip-router/pkg/kamailio/deb$ git push fatal: The remote end hung up unexpectedly Any ideas? Is it a server problem or something else?

3 3

very basic handling for ua-profile event
by MÉSZÁROS Mihály 19 Oct '11

19 Oct '11

Hi, Please find attached a new _very_ basic presence modul to make available user profile provisioning as it stated in RFC6080. Best Regards, Misi

2 3

git:master: modules_k/rls: removed some debug that was left-over from the development
by Peter Dunkley 19 Oct '11

19 Oct '11

Module: sip-router Branch: master Commit: 3ac41f0ceb165de3050b69e33ed6ac9689d0977a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3ac41f0… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Oct 19 13:34:49 2011 +0100 modules_k/rls: removed some debug that was left-over from the development --- modules_k/rls/subscribe.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/… [View More]

1 0

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router
by Henning Westerholt 19 Oct '11

19 Oct '11

Module: sip-router Branch: master Commit: cd2b03bb1192bc0bc3ca43603cf65e2eb2bc0317 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd2b03b… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Wed Oct 19 14:05:38 2011 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router * 'master' of ssh://git.sip-router.org/sip-router: modules/app_lua: added lots of new modules and functions ---

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2011