sr-dev October 2011

sr-dev@lists.kamailio.org

37 participants
283 discussions

git:master: lib/srdb1: Fixed problem with the new bitwise and DB operation
by Peter Dunkley 21 Oct '11

21 Oct '11

Module: sip-router Branch: master Commit: da4e2976f0fc9f2217758c886a518e3406efafc3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=da4e297… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Fri Oct 21 15:45:56 2011 +0100 lib/srdb1: Fixed problem with the new bitwise and DB operation - In MySQL you can do "select * from table where value&mask;" but that is not actually correct SQL and fails on … [View More]

1 0

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

21 Oct '11

Module: sip-router Branch: jason.penton/kamailio_ims_extensions Commit: 8844e39741271794fdafe351d7b34a3ef7c9ec05 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8844e39… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Oct 21 16:49:51 2011 +0200 Revert "TM: Expose fake reply via api" - This is no longer required This reverts commit a8695bee7d918986fa32b05ae238cf1dcfa11aed. --- modules/… [View More]tm/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, 2 insertions(+), 14 deletions(-) diff --git a/modules/tm/t_cancel.c b/modules/tm/t_cancel.c index ac1bf4f..c1b52be 100644 --- a/modules/tm/t_cancel.c +++ b/modules/tm/t_cancel.c @@ -65,7 +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. @@ -544,8 +543,3 @@ 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 8b44cc9..874483c 100644 --- a/modules/tm/t_cancel.h +++ b/modules/tm/t_cancel.h @@ -96,8 +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 diff --git a/modules/tm/timer.c b/modules/tm/timer.c index 768aa78..b834f11 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 */ -void fake_reply(struct cell *t, int branch, int code ) +static 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 9acddc1..d506adb 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 cda04f0..d57fd45 100644 --- a/modules/tm/tm_load.c +++ b/modules/tm/tm_load.c @@ -115,7 +115,6 @@ 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 58f0b70..370c2ef 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -91,7 +91,6 @@ 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 f10f0ab..619d43e 100644 --- a/modules/tm/uac.h +++ b/modules/tm/uac.h @@ -96,8 +96,6 @@ 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]

1 0

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

21 Oct '11

Module: sip-router Branch: jason.penton/kamailio_ims_extensions Commit: 39fb23f2e9bd6e7cc98d22a64d8495ee406cea9d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=39fb23f… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Oct 21 16:49:07 2011 +0200 Revert "TM: moved fake reply wrapper to t_reply as opposed to t_cancel" - This is not required anymore This reverts commit … [View More]831ab80feec836dbfc7f4e497b590f7e76252b35. --- modules/tm/t_cancel.c | 8 ++++++++ modules/tm/t_cancel.h | 3 +++ modules/tm/t_reply.c | 6 ------ modules/tm/t_reply.h | 2 -- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/modules/tm/t_cancel.c b/modules/tm/t_cancel.c index 5b7d666..ac1bf4f 100644 --- a/modules/tm/t_cancel.c +++ b/modules/tm/t_cancel.c @@ -65,6 +65,8 @@ #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 @@ -541,3 +543,9 @@ 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 7e446f1..8b44cc9 100644 --- a/modules/tm/t_cancel.h +++ b/modules/tm/t_cancel.h @@ -96,6 +96,9 @@ 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 121e597..b7c3a84 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -2629,9 +2629,3 @@ 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 fd189b2..1fe81ad 100644 --- a/modules/tm/t_reply.h +++ b/modules/tm/t_reply.h @@ -237,6 +237,4 @@ 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: Dialog2: The beginnings of a new dialog2 module
by Jason Penton 21 Oct '11

21 Oct '11

Module: sip-router Branch: jason.penton/kamailio_ims_extensions Commit: 4972908bc8dc79ecab88b426a2846cb7e25cf2e7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4972908… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Oct 21 16:32:59 2011 +0200 Dialog2: The beginnings of a new dialog2 module - An effort to implement dialog2 based on wiki discussion: http://www.kamailio.org/dokuwiki/… [View More]

1 0

[tracker] Comment added: dialplan replacement with AVPs doesn't work
by sip-router 21 Oct '11

21 Oct '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#153 - dialplan replacement with AVPs doesn't work User who did this - Andrew Pogrebennyk (marduk) ---------- Thank you Daniel, it works like a magic! Yes, the backport to 3.1 branch would be desired. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=153#comment311 You are receiving this message because you have requested it … [View More]

1 0

git:master: dispatcher(k): restore actve state via MI
by Daniel-Constantin Mierla 20 Oct '11

20 Oct '11

Module: sip-router Branch: master Commit: 25bedcd991bc0225c50467abf0b6e48618893cbf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=25bedcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 20 23:50:08 2011 +0200 dispatcher(k): restore actve state via MI - resetting the state flags were not in effect for active state, reported by Asgaroth - added define to check whether a … [View More]destionation addres should be skipped or not based on its state --- modules_k/dispatcher/dispatch.c | 32 ++++++++++++++++++-------------- modules_k/dispatcher/dispatch.h | 3 +++ 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index 9bb942a..3049adc 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -1221,8 +1221,7 @@ int ds_get_leastloaded(ds_set_t *dset) t = dset->dlist[k].dload; for(j=1; j<dset->nr; j++) { - if(!((dset->dlist[j].flags & DS_INACTIVE_DST) - || (dset->dlist[j].flags & DS_PROBING_DST))) + if(!ds_skip_dst(dset->dlist[j].flags & DS_PROBING_DST)) { if(dset->dlist[j].dload<t) { @@ -1692,8 +1691,7 @@ int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode) else hash = hash%idx->nr; i=hash; - while ((idx->dlist[i].flags & DS_INACTIVE_DST) - || (idx->dlist[i].flags & DS_PROBING_DST)) + while (ds_skip_dst(idx->dlist[i].flags)) { if(ds_use_default!=0 && idx->nr!=1) i = (i+1)%(idx->nr-1); @@ -1705,8 +1703,7 @@ int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode) if(ds_use_default!=0) { i = idx->nr-1; - if((idx->dlist[i].flags & DS_INACTIVE_DST) - || (idx->dlist[i].flags & DS_PROBING_DST)) + if(ds_skip_dst(idx->dlist[i].flags)) return -1; break; } else { @@ -1769,7 +1766,7 @@ int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode) for(i=hash-1; i>=0; i--) { - if((idx->dlist[i].flags & DS_INACTIVE_DST) + if(ds_skip_dst(idx->dlist[i].flags) || (ds_use_default!=0 && i==(idx->nr-1))) continue; LM_DBG("using entry [%d/%d]\n", set, i); @@ -1803,7 +1800,7 @@ int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode) for(i=idx->nr-1; i>hash; i--) { - if((idx->dlist[i].flags & DS_INACTIVE_DST) + if(ds_skip_dst(idx->dlist[i].flags) || (ds_use_default!=0 && i==(idx->nr-1))) continue; LM_DBG("using entry [%d/%d]\n", set, i); @@ -2026,9 +2023,9 @@ int ds_set_state(int group, str *address, int state, int type, struct sip_msg *m /* remove the Probing/Inactive-State? Set the fail-count to 0. */ if (state == DS_PROBING_DST) { if (type) { - if (idx->dlist[i].flags & DS_INACTIVE_DST) { + if (idx->dlist[i].flags & DS_DISABLED_DST) { LM_INFO("Ignoring the request to set this destination" - " to probing: It is already inactive!\n"); + " to probing: It is disabled by admin!\n"); return 0; } @@ -2050,7 +2047,7 @@ int ds_set_state(int group, str *address, int state, int type, struct sip_msg *m /* Type 2 means reply from OPTIONS-Ping */ if (type == 2) { - if (idx->dlist[i].flags & DS_INACTIVE_DST) { + if (idx->dlist[i].flags & DS_DISABLED_DST) { LM_INFO("Ignoring the request to set this destination" " to active: It is already administratively deactivated!\n"); return 0; @@ -2135,6 +2132,9 @@ int ds_reinit_state(int group, str *address, int state) && strncasecmp(idx->dlist[i].uri.s, address->s, address->len)==0) { + /* reset the bits used for states */ + idx->dlist[i].flags &= ~(DS_STATES_ALL); + /* set the new states */ idx->dlist[i].flags |= state; return 0; } @@ -2165,10 +2165,10 @@ int ds_print_list(FILE *fout) { fprintf(fout, "\n set #%d\n", list->id); - if (list->dlist[j].flags&DS_INACTIVE_DST) + if (list->dlist[j].flags&DS_DISABLED_DST) fprintf(fout, " Disabled "); - else if (list->dlist[j].flags&DS_PROBING_DST) - fprintf(fout, " Probing "); + else if (list->dlist[j].flags&DS_INACTIVE_DST) + fprintf(fout, " Inactive "); else { fprintf(fout, " Active"); /* Optional: Print the tries for this host. */ @@ -2180,6 +2180,10 @@ int ds_print_list(FILE *fout) fprintf(fout, " "); } } + if (list->dlist[j].flags&DS_PROBING_DST) + fprintf(fout, "(P)"); + else + fprintf(fout, "(*)"); fprintf(fout, " %.*s\n", list->dlist[j].uri.len, list->dlist[j].uri.s); diff --git a/modules_k/dispatcher/dispatch.h b/modules_k/dispatcher/dispatch.h index d468e01..6fcd4a5 100644 --- a/modules_k/dispatcher/dispatch.h +++ b/modules_k/dispatcher/dispatch.h @@ -52,8 +52,11 @@ #define DS_INACTIVE_DST 1 /*!< inactive destination */ #define DS_PROBING_DST 2 /*!< checking destination */ #define DS_DISABLED_DST 4 /*!< admin disabled destination */ +#define DS_STATES_ALL 7 /*!< all bits for the states of destination */ #define DS_RESET_FAIL_DST 8 /*!< Reset-Failure-Counter */ +#define ds_skip_dst(flags) ((flags) & (DS_INACTIVE_DST|DS_DISABLED_DST)) + extern str ds_db_url; extern str ds_table_name; extern str ds_set_id_col; [View Less]

1 0

New developer: Mészáros Mihály
by Daniel-Constantin Mierla 20 Oct '11

20 Oct '11

Hello, just to let everyone know that a new person got today write access to GIT repository: Mészáros Mihály (cc-ed), having the user id misi. Welcome to development team and looking forward to your contributions! Involved in the mailing lists in the past, he submitted the first new module to be part of next major release: presence_profile, implementation of an extension about sip user agent configuration framework, specified in RFC6080: * http://tools.ietf.org/html/rfc6080 The … [View More]

1 0

git:3.2: kamctl: version set to 3.2.0 to match kamailio stable branch
by Daniel-Constantin Mierla 20 Oct '11

20 Oct '11

Module: sip-router Branch: 3.2 Commit: e19bb840fdb581ca8dbed6410e167b67ee899c77 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e19bb84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 20 20:02:47 2011 +0200 kamctl: version set to 3.2.0 to match kamailio stable branch --- utils/kamctl/kamctl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/utils/… [View More]

1 0

git:master: kamctl: version set to 3.3.0 for development
by Daniel-Constantin Mierla 20 Oct '11

20 Oct '11

Module: sip-router Branch: master Commit: 808a7b553f11a19ddbab1079a2719d706994522c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=808a7b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 20 20:01:10 2011 +0200 kamctl: version set to 3.3.0 for development --- utils/kamctl/kamctl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/utils/kamctl/kamctl … [View More]

1 0

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

← Newer
1
...
5
6
7
8
9
10
11
...
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