sr-dev October 2011

sr-dev@lists.kamailio.org

37 participants
283 discussions

git:master: core/sdp: restore setting of IP address type
by Daniel-Constantin Mierla 25 Oct '11

25 Oct '11

Module: sip-router Branch: master Commit: 6e1af068c99e84d0bfd5f713ced1e5f484ff9c5c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6e1af06… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 25 17:35:25 2011 +0200 core/sdp: restore setting of IP address type - refactoring of extract_mediaip() skipped setting IPv4/IPv6 type in sdp structure - reported by Jason Penton --- parser/sdp/sdp_helpr_funcs.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/parser/sdp/sdp_helpr_funcs.c b/parser/sdp/sdp_helpr_funcs.c index 09a9287..13d1ca9 100644 --- a/parser/sdp/sdp_helpr_funcs.c +++ b/parser/sdp/sdp_helpr_funcs.c @@ -451,9 +451,16 @@ int extract_mediaip(str *body, str *mediaip, int *pf, char *line) LM_ERR("invalid content for `%s' line\n",line); return -1; } - if(cp[3]!='4' && cp[3]!='6') { - LM_ERR("invalid addrtype IPx for `%s' line\n",line); - return -1; + switch(cp[3]) { + case '4': + *pf = AF_INET; + break; + case '6': + *pf = AF_INET6; + break; + default: + LM_ERR("invalid addrtype IPx for `%s' line\n",line); + return -1; } cp += 5;

1 0

KamailioJingle
by Rubén Mazariegos del Rey 25 Oct '11

25 Oct '11

Hi! I am Rubén Mazariegos, a developing engineer at Telefónica R&D. I have read about your initiative to develop a Kamailio module to act as a SIP to Jingle gateway (http://jitsi.org/index.php/GSOC2011/KamailioJingle) last summer during the 2011 edition of Google Summer of Code. I was wondering if you already have some results from the initiative. Do you have a web site with further information about this subject? Thanks and congratulations for your initiative! Rubén Este mensaje se dirige exclusivamente a su destinatario. Puede consultar nuestra política de envío y recepción de correo electrónico en el enlace situado más abajo. This message is intended exclusively for its addressee. We only send and receive email on the basis of the terms set out at. http://www.tid.es/ES/PAGINAS/disclaimer.aspx

1 0

git:jason.penton/kamailio_ims_extensions: CDP: add api load function
by Jason Penton 25 Oct '11

25 Oct '11

Module: sip-router Branch: jason.penton/kamailio_ims_extensions Commit: 60b8c36c98ff2d0ee28087d3fee523283cb496cc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=60b8c36… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Tue Oct 25 12:59:05 2011 +0200 CDP: add api load function --- modules/cdp/cdp_load.h | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/modules/cdp/cdp_load.h b/modules/cdp/cdp_load.h index 7444f01..241d4c3 100644 --- a/modules/cdp/cdp_load.h +++ b/modules/cdp/cdp_load.h @@ -54,7 +54,7 @@ #ifndef _CDP_BIND_H #define _CDP_BIND_H - +#include "../../sr_module.h" #include "utils.h" #include "diameter.h" #include "diameter_api.h" @@ -116,6 +116,25 @@ struct cdp_binds { typedef int(*load_cdp_f)( struct cdp_binds *cdpb ); int load_cdp( struct cdp_binds *cdpb); +static inline int load_cdp_api(struct cdp_binds* cdpb) +{ + load_cdp_f load_cdp; + + /* import the TM auto-loading function */ + load_cdp = (load_cdp_f)find_export("load_cdp", NO_SCRIPT, 0); + + if (load_cdp == NULL) { + LOG(L_WARN, "Cannot import load_cdp function from CDP module\n"); + return -1; + } + + /* let the auto-loading function load all TM stuff */ + if (load_cdp(cdpb) == -1) { + return -1; + } + return 0; +} + #endif

1 0

git:jason.penton/kamailio_ims_extensions: CDP: fixed logging inconsistencies
by Jason Penton 25 Oct '11

25 Oct '11

Module: sip-router Branch: jason.penton/kamailio_ims_extensions Commit: e1274a386f3761af07a34ec5884b5e4dcd0e1209 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e1274a3… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Tue Oct 25 11:03:36 2011 +0200 CDP: fixed logging inconsistencies --- modules/cdp/acceptor.c | 2 +- modules/cdp/globals.c | 30 ++++-------------------------- modules/cdp/globals.h | 10 ---------- modules/cdp/peermanager.c | 2 +- modules/cdp/receiver.c | 4 ++-- modules/cdp/tcp_accept.c | 2 +- modules/cdp/timer.c | 2 +- modules/cdp/transaction.c | 2 +- modules/cdp/worker.c | 2 +- 9 files changed, 12 insertions(+), 44 deletions(-) diff --git a/modules/cdp/acceptor.c b/modules/cdp/acceptor.c index 75dd693..1ff581c 100644 --- a/modules/cdp/acceptor.c +++ b/modules/cdp/acceptor.c @@ -113,7 +113,7 @@ void acceptor_process(dp_config *cfg) #else #ifdef PKG_MALLOC #ifdef PKG_MALLOC - LOG(memlog, "Acceptor Memory status (pkg):\n"); + LOG(L_DBG, "Acceptor Memory status (pkg):\n"); //pkg_status(); #ifdef pkg_sums pkg_sums(); diff --git a/modules/cdp/globals.c b/modules/cdp/globals.c index 0e9aa6a..32eea31 100644 --- a/modules/cdp/globals.c +++ b/modules/cdp/globals.c @@ -57,28 +57,6 @@ #include "globals.h" #include "utils.h" -#ifdef CDP_FOR_SER - -#else - -#ifdef WHARF - -#else - - unsigned long shm_mem_size = SHM_MEM_SIZE; - int memlog = L_ERR; - int memdbg = L_DBG; - int debug = L_DBG; - int log_facility = 1; - int log_stderr = 1; - int process_no=0; - -#endif - -#endif - - - //str aaa_fqdn={"unset_fqdn",10}; //str aaa_realm={"unset_realm",11}; //str aaa_identity={"unset_identity",14}; @@ -90,7 +68,7 @@ int init_memory(int show_status) if (init_pkg_mallocs()==-1) goto error; if (show_status){ - LOG(memlog, "Memory status (pkg):\n"); + LOG(L_DBG, "Memory status (pkg):\n"); pkg_status(); } #endif @@ -104,7 +82,7 @@ int init_memory(int show_status) )==-1) goto error; if (show_status){ - LOG(memlog, "Memory status (shm):\n"); + LOG(L_DBG, "Memory status (shm):\n"); shm_status(); } #endif @@ -123,7 +101,7 @@ void destroy_memory(int show_status) allow an almost gracious shutdown */ #ifdef SHM_MEM if (show_status){ - LOG(memlog, "Memory status (shm):\n"); + LOG(L_DBG, "Memory status (shm):\n"); //shm_status(); #ifndef SER_MOD_INTERFACE shm_sums(); @@ -138,7 +116,7 @@ void destroy_memory(int show_status) #endif #ifdef PKG_MALLOC if (show_status){ - LOG(memlog, "Memory status (pkg):\n"); + LOG(L_DBG, "Memory status (pkg):\n"); //pkg_status(); #ifndef SER_MOD_INTERFACE pkg_sums(); diff --git a/modules/cdp/globals.h b/modules/cdp/globals.h index 4749c5e..aa3c31d 100644 --- a/modules/cdp/globals.h +++ b/modules/cdp/globals.h @@ -62,16 +62,6 @@ #define DPNAME "CDiameterPeer" #define DPVERSION "0.0.2" - -#define L_MEM L_DBG - - -#ifdef CDP_FOR_SER -#else -extern unsigned long shm_mem_size; -extern int memlog; -#endif - extern int process_no; int init_memory(int show_status); diff --git a/modules/cdp/peermanager.c b/modules/cdp/peermanager.c index 09f6edc..8d2f43e 100644 --- a/modules/cdp/peermanager.c +++ b/modules/cdp/peermanager.c @@ -272,7 +272,7 @@ int peer_timer(time_t now,void *ptr) { peer *p,*n; int i; - LOG(L_MEM,"DBG:peer_timer(): taking care of peers...\n"); + LOG(L_DBG,"DBG:peer_timer(): taking care of peers...\n"); lock_get(peer_list_lock); p = peer_list->head; while(p){ diff --git a/modules/cdp/receiver.c b/modules/cdp/receiver.c index b45f3d7..585b80a 100644 --- a/modules/cdp/receiver.c +++ b/modules/cdp/receiver.c @@ -495,7 +495,7 @@ done: #else #ifdef PKG_MALLOC #ifdef PKG_MALLOC - LOG(memlog, "Receiver[%.*s] Memory status (pkg):\n", + LOG(L_DBG, "Receiver[%.*s] Memory status (pkg):\n", p?p->fqdn.len:0,p?p->fqdn.s:0); //pkg_status(); #ifdef pkg_sums @@ -663,7 +663,7 @@ int receive_loop(peer *original_peer) while(!n){ if (shutdownx&&*shutdownx) break; - log_serviced_peers(L_MEM); + log_serviced_peers(L_DBG); max =-1; diff --git a/modules/cdp/tcp_accept.c b/modules/cdp/tcp_accept.c index 9a7e964..84e8798 100644 --- a/modules/cdp/tcp_accept.c +++ b/modules/cdp/tcp_accept.c @@ -225,7 +225,7 @@ void accept_loop() nready = select( max_sock+1, &listen_set, 0, 0, &timeout); if (nready == 0){ - LOG(L_MEM,"DBG:accept_loop(): No connection attempts\n"); + LOG(L_DBG,"DBG:accept_loop(): No connection attempts\n"); continue; } if (nready == -1) { diff --git a/modules/cdp/timer.c b/modules/cdp/timer.c index 9e75f9d..75b43ee 100644 --- a/modules/cdp/timer.c +++ b/modules/cdp/timer.c @@ -219,7 +219,7 @@ void timer_process(int returns) #else #ifdef PKG_MALLOC #ifdef PKG_MALLOC - LOG(memlog, "Timer Memory status (pkg):\n"); + LOG(L_DBG, "Timer Memory status (pkg):\n"); //pkg_status(); #ifdef pkg_sums pkg_sums(); diff --git a/modules/cdp/transaction.c b/modules/cdp/transaction.c index 27f9803..3b39496 100644 --- a/modules/cdp/transaction.c +++ b/modules/cdp/transaction.c @@ -199,7 +199,7 @@ inline void cdp_free_trans(cdp_trans_t *x) int cdp_trans_timer(time_t now, void* ptr) { cdp_trans_t *x,*n; - LOG(L_MEM,"DBG:trans_timer(): taking care of diameter transactions...\n"); + LOG(L_DBG,"DBG:trans_timer(): taking care of diameter transactions...\n"); lock_get(trans_list->lock); x = trans_list->head; while(x) diff --git a/modules/cdp/worker.c b/modules/cdp/worker.c index 026d279..fbb55ec 100644 --- a/modules/cdp/worker.c +++ b/modules/cdp/worker.c @@ -409,7 +409,7 @@ void worker_process(int id) #ifdef CDP_FOR_SER #else #ifdef PKG_MALLOC - LOG(memlog, "Worker[%d] Memory status (pkg):\n",id); + LOG(L_DBG, "Worker[%d] Memory status (pkg):\n",id); //pkg_status(); #ifdef pkg_sums pkg_sums();

1 0

git:jason.penton/kamailio_ims_extensions: OpenIMS: cdp, cdp_avp - added latest modules
by Jason Penton 25 Oct '11

25 Oct '11

Module: sip-router Branch: jason.penton/kamailio_ims_extensions Commit: a4f5e4a819889714d1137dbd5a0352d123cc0e00 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a4f5e4a… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Tue Oct 25 07:51:02 2011 +0200 OpenIMS: cdp, cdp_avp - added latest modules - Latest CDP and CDP_AVP modules from openims --- modules/cdp/Makefile | 19 + modules/cdp/RFC3588.vsd | Bin 0 -> 300032 bytes modules/cdp/RFC3588_acct_state_machine_client.png | Bin 0 -> 440240 bytes modules/cdp/RFC3588_acct_state_machine_server.png | Bin 0 -> 272720 bytes modules/cdp/RFC3588_auth_state_machine_client.png | Bin 0 -> 418965 bytes modules/cdp/RFC3588_auth_state_machine_server.png | Bin 0 -> 230635 bytes modules/cdp/RFC3588_peer_state_machine_1.png | Bin 0 -> 305180 bytes modules/cdp/RFC3588_peer_state_machine_2.png | Bin 0 -> 369572 bytes modules/cdp/acceptor.c | 128 +++ modules/cdp/acceptor.h | 65 ++ modules/cdp/api_process.c | 122 ++ modules/cdp/api_process.h | 90 ++ modules/cdp/authstatemachine.c | 887 +++++++++++++++ modules/cdp/authstatemachine.h | 81 ++ modules/cdp/cdp_load.c | 123 ++ modules/cdp/cdp_load.h | 121 ++ modules/cdp/config.c | 241 ++++ modules/cdp/config.h | 157 +++ modules/cdp/configdtd.h | 114 ++ modules/cdp/configexample/ConfigExample.xml | 113 ++ modules/cdp/configparser.c | 491 ++++++++ modules/cdp/diameter.h | 303 +++++ modules/cdp/diameter_api.h | 228 ++++ modules/cdp/diameter_avp.c | 769 +++++++++++++ modules/cdp/diameter_code_avp.h | 579 ++++++++++ modules/cdp/diameter_code_result.h | 150 +++ modules/cdp/diameter_comm.c | 357 ++++++ modules/cdp/diameter_epc.h | 76 ++ modules/cdp/diameter_epc_code_app.h | 79 ++ modules/cdp/diameter_epc_code_avp.h | 941 ++++++++++++++++ modules/cdp/diameter_epc_code_cmd.h | 134 +++ modules/cdp/diameter_epc_code_result.h | 88 ++ modules/cdp/diameter_ims.h | 127 +++ modules/cdp/diameter_ims_code_app.h | 69 ++ modules/cdp/diameter_ims_code_avp.h | 506 +++++++++ modules/cdp/diameter_ims_code_cmd.h | 109 ++ modules/cdp/diameter_ims_code_result.h | 116 ++ modules/cdp/diameter_msg.c | 631 +++++++++++ modules/cdp/diameter_peer.c | 594 ++++++++++ modules/cdp/diameter_peer.h | 87 ++ modules/cdp/globals.c | 150 +++ modules/cdp/globals.h | 103 ++ modules/cdp/mod.c | 234 ++++ modules/cdp/mod.h | 213 ++++ modules/cdp/mod_wharf.c | 170 +++ modules/cdp/mod_wharf.h | 37 + modules/cdp/peer.c | 123 ++ modules/cdp/peer.h | 144 +++ modules/cdp/peermanager.c | 359 ++++++ modules/cdp/peermanager.h | 92 ++ modules/cdp/peerstatemachine.c | 1253 +++++++++++++++++++++ modules/cdp/peerstatemachine.h | 89 ++ modules/cdp/receiver.c | 1170 +++++++++++++++++++ modules/cdp/receiver.h | 107 ++ modules/cdp/routing.c | 195 ++++ modules/cdp/routing.h | 66 ++ modules/cdp/sem.h | 103 ++ modules/cdp/session.c | 685 +++++++++++ modules/cdp/session.h | 278 +++++ modules/cdp/tcp_accept.c | 251 ++++ modules/cdp/tcp_accept.h | 65 ++ modules/cdp/timer.c | 236 ++++ modules/cdp/timer.h | 93 ++ modules/cdp/transaction.c | 260 +++++ modules/cdp/transaction.h | 104 ++ modules/cdp/utils.h | 101 ++ modules/cdp/worker.c | 422 +++++++ modules/cdp/worker.h | 117 ++ modules/cdp_avp/Makefile | 22 + modules/cdp_avp/avp_add.c | 160 +++ modules/cdp_avp/avp_add.h | 99 ++ modules/cdp_avp/avp_get.c | 140 +++ modules/cdp_avp/avp_get.h | 100 ++ modules/cdp_avp/avp_get_base | 268 +++++ modules/cdp_avp/avp_get_base_data_format.c | 270 +++++ modules/cdp_avp/avp_get_base_data_format.h | 149 +++ modules/cdp_avp/avp_new.c | 86 ++ modules/cdp_avp/avp_new.h | 84 ++ modules/cdp_avp/avp_new_base_data_format.c | 243 ++++ modules/cdp_avp/avp_new_base_data_format.h | 200 ++++ modules/cdp_avp/base.c | 89 ++ modules/cdp_avp/base.h | 455 ++++++++ modules/cdp_avp/ccapp.c | 89 ++ modules/cdp_avp/ccapp.h | 489 ++++++++ modules/cdp_avp/epcapp.c | 126 ++ modules/cdp_avp/epcapp.h | 957 ++++++++++++++++ modules/cdp_avp/get_reference.h | 85 ++ modules/cdp_avp/get_reference.sh | 7 + modules/cdp_avp/imsapp.c | 90 ++ modules/cdp_avp/imsapp.h | 512 +++++++++ modules/cdp_avp/macros.h | 467 ++++++++ modules/cdp_avp/mod.c | 359 ++++++ modules/cdp_avp/mod_export.h | 228 ++++ modules/cdp_avp/nasapp.c | 89 ++ modules/cdp_avp/nasapp.h | 404 +++++++ 95 files changed, 22182 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a4f…

1 0

Best way to URL encode in Kamailio?
by Bruce Stephenson 25 Oct '11

25 Oct '11

Hi other SR-Devs- I am making xmlrpc calls from with Kamailio via http_query(url, response). This is working nicely. Question 1: Please, what is the best way to URL encode from within the Kamailio config file? Got a simple code sample? Question 2: I am considering writing an extension to http_query that allows HTTP POST. This will allow us to send more data than is allowed in a HTTP GET URL. I'd like this to be my first contribution to the Kamailio source code. Comments? Thanks for your time and attention, all! Regards, Bruce Stephenson energyscholar(a)gmail.com CTO of Starnumber SA

2 1

Only Carsten Bock work on IMS Module ?
by alexis.marcou＠orange.com 21 Oct '11

21 Oct '11

Hi all, I just want to know, if only Carsten Bock work, on IMS Module ? I only see contribution from him, on his branch : carstenbock/ims Thanks Alexis ******************************************************************************** IMPORTANT.Les informations contenues dans ce message electronique y compris les fichiers attaches sont strictement confidentielles et peuvent etre protegees par la loi. Ce message electronique est destine exclusivement au(x) destinataire(s) mentionne(s) ci-dessus. Si vous avez recu ce message par erreur ou s il ne vous est pas destine, veuillez immediatement le signaler a l expediteur et effacer ce message et tous les fichiers eventuellement attaches. Toute lecture, exploitation ou transmission des informations contenues dans ce message est interdite. Tout message electronique est susceptible d alteration. A ce titre, le Groupe France Telecom decline toute responsabilite notamment s il a ete altere, deforme ou falsifie. De meme, il appartient au destinataire de s assurer de l absence de tout virus. IMPORTANT.This e-mail message and any attachments are strictly confidential and may be protected by law. This message is intended only for the named recipient(s) above. If you have received this message in error, or are not the named recipient(s), please immediately notify the sender and delete this e-mail message. Any unauthorized view, usage or disclosure ofthis message is prohibited. Since e-mail messages may not be reliable, France Telecom Group shall not be liable for any message if modified, changed or falsified. Additionally the recipient should ensure they are actually virus free. ********************************************************************************

2 1

git:master: modules_k/msilo: adding storage of MESSAGE headers to msilo broke some of the existing extra_headers stuff in the module
by Peter Dunkley 21 Oct '11

21 Oct '11

Module: sip-router Branch: master Commit: f08415ed7be6593921ce779a6d90c5a62b531196 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f08415e… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Fri Oct 21 15:58:09 2011 +0100 modules_k/msilo: adding storage of MESSAGE headers to msilo broke some of the existing extra_headers stuff in the module - Now fixed. Fix by Hugh Waite at Crocodile RCS --- modules_k/msilo/msilo.c | 47 +++++++++++++++++++++++++++++++---------------- 1 files changed, 31 insertions(+), 16 deletions(-) diff --git a/modules_k/msilo/msilo.c b/modules_k/msilo/msilo.c index 172b879..5be2f70 100644 --- a/modules_k/msilo/msilo.c +++ b/modules_k/msilo/msilo.c @@ -38,6 +38,7 @@ * 2004-06-07 updated to the new DB api (andrei) * 2006-09-10 m_dump now checks if registering UA supports MESSAGE method (jh) * 2006-10-05 added max_messages module variable (jh) + * 2011-10-19 added storage of extra SIP headers (hpw) */ #include <stdio.h> @@ -73,17 +74,17 @@ #define MAX_DEL_KEYS 1 #define NR_KEYS 11 -static str sc_mid = str_init("id"); /* 0 */ -static str sc_from = str_init("src_addr"); /* 1 */ -static str sc_to = str_init("dst_addr"); /* 2 */ -static str sc_uri_user = str_init("username"); /* 3 */ -static str sc_uri_host = str_init("domain"); /* 4 */ -static str sc_body = str_init("body"); /* 5 */ -static str sc_ctype = str_init("ctype"); /* 6 */ -static str sc_exp_time = str_init("exp_time"); /* 7 */ -static str sc_inc_time = str_init("inc_time"); /* 8 */ -static str sc_snd_time = str_init("snd_time"); /* 9 */ -static str sc_extra_hdrs = str_init("extra_hdrs"); /* 10 */ +static str sc_mid = str_init("id"); /* 0 */ +static str sc_from = str_init("src_addr"); /* 1 */ +static str sc_to = str_init("dst_addr"); /* 2 */ +static str sc_uri_user = str_init("username"); /* 3 */ +static str sc_uri_host = str_init("domain"); /* 4 */ +static str sc_body = str_init("body"); /* 5 */ +static str sc_ctype = str_init("ctype"); /* 6 */ +static str sc_exp_time = str_init("exp_time"); /* 7 */ +static str sc_inc_time = str_init("inc_time"); /* 8 */ +static str sc_snd_time = str_init("snd_time"); /* 9 */ +static str sc_stored_hdrs = str_init("extra_hdrs"); /* 10 */ #define SET_STR_VAL(_str, _res, _r, _c) \ if (RES_ROWS(_res)[_r].values[_c].nul == 0) \ @@ -217,7 +218,7 @@ static param_export_t params[]={ { "sc_exp_time", STR_PARAM, &sc_exp_time.s }, { "sc_inc_time", STR_PARAM, &sc_inc_time.s }, { "sc_snd_time", STR_PARAM, &sc_snd_time.s }, - { "sc_extra_hdrs", STR_PARAM, &sc_extra_hdrs.s }, + { "sc_stored_hdrs", STR_PARAM, &sc_stored_hdrs.s }, { "snd_time_avp", STR_PARAM, &ms_snd_time_avp_param.s }, { "add_date", INT_PARAM, &ms_add_date }, { "max_messages", INT_PARAM, &ms_max_messages }, @@ -790,7 +791,7 @@ static int m_store(struct sip_msg* msg, str *owner_s) goto error; } - db_keys[nr_keys] = &sc_extra_hdrs; + db_keys[nr_keys] = &sc_stored_hdrs; db_vals[nr_keys].type = DB1_BLOB; db_vals[nr_keys].nul = 0; @@ -928,7 +929,7 @@ static int m_dump(struct sip_msg* msg, str* owner_s) static char body_buf[1024]; struct sip_uri puri; uac_req_t uac_r; - str str_vals[5], hdr_str, body_str, extra_hdrs_str; + str str_vals[5], hdr_str, body_str, extra_hdrs_str, tmp_extra_hdrs; time_t rtime; /* init */ @@ -947,7 +948,7 @@ static int m_dump(struct sip_msg* msg, str* owner_s) db_cols[3]=&sc_body; db_cols[4]=&sc_ctype; db_cols[5]=&sc_inc_time; - db_cols[6]=&sc_extra_hdrs; + db_cols[6]=&sc_stored_hdrs; LM_DBG("------------ start ------------\n"); @@ -1063,18 +1064,32 @@ static int m_dump(struct sip_msg* msg, str* owner_s) } else { extra_hdrs_str.len = 0; } + + tmp_extra_hdrs.len = extra_hdrs_str.len+str_vals[4].len; + if ((tmp_extra_hdrs.s = pkg_malloc(tmp_extra_hdrs.len+1)) == NULL) + { + LM_ERR("Out of pkg memory"); + if (msilo_dbf.free_result(db_con, db_res) < 0) + LM_ERR("failed to free the query result\n"); + msg_list_set_flag(ml, mid, MS_MSG_ERRO); + goto error; + } + snprintf(tmp_extra_hdrs.s, tmp_extra_hdrs.len, "%.*s%.*s", extra_hdrs_str.len, extra_hdrs_str.s, + str_vals[4].len, str_vals[4].s); hdr_str.len = 1024; if(m_build_headers(&hdr_str, str_vals[3] /*ctype*/, str_vals[0]/*from*/, rtime /*Date*/, - str_vals[4] /*stored_hdrs*/) < 0) + tmp_extra_hdrs /*extra_hdrs*/) < 0) { LM_ERR("headers building failed [%d]\n", mid); + pkg_free(tmp_extra_hdrs.s); if (msilo_dbf.free_result(db_con, db_res) < 0) LM_ERR("failed to free the query result\n"); msg_list_set_flag(ml, mid, MS_MSG_ERRO); goto error; } + pkg_free(tmp_extra_hdrs.s); LM_DBG("msg [%d-%d] for: %.*s\n", i+1, mid, pto->uri.len, pto->uri.s);

1 0

git:master: modules_k/rls: the checks on the number of records returned from the DB when updating RLS subscriptions from the configuration file while in db only mode were too strict
by Peter Dunkley 21 Oct '11

21 Oct '11

Module: sip-router Branch: master Commit: b48bc0977c98e3ee71f4bc44b3f7ed2e1eafce26 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b48bc09… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Fri Oct 21 15:53:33 2011 +0100 modules_k/rls: the checks on the number of records returned from the DB when updating RLS subscriptions from the configuration file while in db only mode were too strict --- modules_k/rls/rls_db.c | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/modules_k/rls/rls_db.c b/modules_k/rls/rls_db.c index 9c35a28..8adca7b 100644 --- a/modules_k/rls/rls_db.c +++ b/modules_k/rls/rls_db.c @@ -488,21 +488,6 @@ int update_all_subs_rlsdb( str *from_user, str *from_domain, str *evt ) nr_rows = RES_ROW_N(result); - if (nr_rows == 0) - { - /* no match */ - LM_ERR( "update_all_subs_rlsdb: NO MATCH\n" ); - rls2_dbf.free_result(rls2_db, result); - return(-1); - } - - if (nr_rows != 1) - { - LM_ERR( "update_all_subs_rlsdb: TOO MANY MATCHES=%d\n", nr_rows); - rls2_dbf.free_result(rls2_db, result); - return(-1); - } - /* get the results and fill in return data structure */ for (loop=0; loop <nr_rows; loop++) {

1 0

git:master: modules_k/presence, modules_k/pua, modules_k/rls: Fixed issues discovered while testing with PostgreSQL 9.0
by Peter Dunkley 21 Oct '11

21 Oct '11

Module: sip-router Branch: master Commit: d2ca9a17add030a16645ddf17488555d044214bb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d2ca9a1… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Fri Oct 21 15:51:32 2011 +0100 modules_k/presence, modules_k/pua, modules_k/rls: Fixed issues discovered while testing with PostgreSQL 9.0 - Some of the fields in the DB have not null constraints that result in errors when using PostgreSQL but not MySQL. --- modules_k/presence/subscribe.c | 17 ++++++++++------- modules_k/pua/pua.c | 17 +++++++---------- modules_k/pua/pua_db.c | 9 +++++++++ modules_k/rls/resource_notify.c | 14 +++++++++----- 4 files changed, 35 insertions(+), 22 deletions(-) diff --git a/modules_k/presence/subscribe.c b/modules_k/presence/subscribe.c index 9db947e..3227cc7 100644 --- a/modules_k/presence/subscribe.c +++ b/modules_k/presence/subscribe.c @@ -2211,15 +2211,18 @@ int insert_db_subs_auth(subs_t* subs) db_vals[n_query_cols].nul = 0; db_vals[n_query_cols].val.int_val= (int)time(NULL); n_query_cols++; - + + db_keys[n_query_cols] =&str_reason_col; + db_vals[n_query_cols].type = DB1_STR; + db_vals[n_query_cols].nul = 0; if(subs->reason.s && subs->reason.len) - { - db_keys[n_query_cols] =&str_reason_col; - db_vals[n_query_cols].type = DB1_STR; - db_vals[n_query_cols].nul = 0; db_vals[n_query_cols].val.str_val = subs->reason; - n_query_cols++; - } + else + { + db_vals[n_query_cols].val.str_val.s = ""; + db_vals[n_query_cols].val.str_val.len = 0; + } + n_query_cols++; if (pa_dbf.use_table(pa_db, &watchers_table) < 0) { diff --git a/modules_k/pua/pua.c b/modules_k/pua/pua.c index e8ce882..eea341a 100644 --- a/modules_k/pua/pua.c +++ b/modules_k/pua/pua.c @@ -171,9 +171,6 @@ static int mod_init(void) LM_DBG("db_url=%s/%d/%p\n", ZSW(db_url.s), db_url.len, db_url.s); db_table.len = db_table.s ? strlen(db_table.s) : 0; - if (dbmode==PUA_DB_ONLY) - LM_ERR( "DB ONLY MODE ACTIVE\n" ); - /* binding to database module */ if (db_bind_mod(&db_url, &pua_dbf)) { @@ -780,7 +777,7 @@ static void db_update(unsigned int ticks,void *param) db_key_t db_cols[5]; db_val_t q_vals[20], db_vals[5]; db_op_t db_ops[1] ; - int n_query_cols= 0, n_query_update= 0, n_actual_query_cols= 0; + int n_query_cols= 0, n_query_update= 0; int n_update_cols= 0; int i; int puri_col,pid_col,expires_col,flag_col,etag_col,tuple_col,event_col; @@ -1101,14 +1098,14 @@ static void db_update(unsigned int ticks,void *param) } if(p->extra_headers) - { - n_actual_query_cols = n_query_cols; q_vals[extra_headers_col].val.str_val = *(p->extra_headers); - } else - n_actual_query_cols = n_query_cols - 1; - - if(pua_dbf.insert(pua_db, q_cols, q_vals,n_actual_query_cols )<0) + { + q_vals[extra_headers_col].val.str_val.s = ""; + q_vals[extra_headers_col].val.str_val.len = 0; + } + + if(pua_dbf.insert(pua_db, q_cols, q_vals,n_query_cols )<0) { LM_ERR("while inserting in db table pua\n"); if(!no_lock) diff --git a/modules_k/pua/pua_db.c b/modules_k/pua/pua_db.c index cd7ec4c..407eca7 100644 --- a/modules_k/pua/pua_db.c +++ b/modules_k/pua/pua_db.c @@ -1634,6 +1634,15 @@ void insert_puadb(ua_pres_t* pres) db_vals[n_cols].val.str_val.len = pres->extra_headers->len; n_cols++; } + else + { + db_cols[n_cols] = &str_extra_headers_col; + db_vals[n_cols].type = DB1_STR; + db_vals[n_cols].nul = 0; + db_vals[n_cols].val.str_val.s = ""; + db_vals[n_cols].val.str_val.len = 0; + n_cols++; + } if(pua_db == NULL) diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c index 8fd49f2..af64522 100644 --- a/modules_k/rls/resource_notify.c +++ b/modules_k/rls/resource_notify.c @@ -730,14 +730,18 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2) query_vals[n_query_cols].val.int_val= auth_flag; n_query_cols++; + query_cols[n_query_cols]= &str_reason_col; + query_vals[n_query_cols].type = DB1_STR; + query_vals[n_query_cols].nul = 0; if(reason) - { - query_cols[n_query_cols]= &str_reason_col; - query_vals[n_query_cols].type = DB1_STR; - query_vals[n_query_cols].nul = 0; query_vals[n_query_cols].val.str_val= *reason; - n_query_cols++; + else + { + query_vals[n_query_cols].val.str_val.s = ""; + query_vals[n_query_cols].val.str_val.len = 0; } + n_query_cols++; + query_cols[n_query_cols]= &str_content_type_col; query_vals[n_query_cols].type = DB1_STR; query_vals[n_query_cols].nul = 0;

1 0

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