sr-dev January 2011

sr-dev@lists.kamailio.org

14 participants
226 discussions

[tracker] Task changed: alias_db: support user to alias conversion

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been changed. The changes are listed below. For full information about what has changed, visit the URL and click the History tab. FS#110 - alias_db: support user to alias conversion User who did this: Tristan Mahé (gled) Task details edited: ------- alias_db already does alias to user conversion and ruri rewrite. we should have the opposite ( user to alias conversion and from rewrite ). Patch on its way, still need to find the correct way to replace from and will add patch once it's ok :) ------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=110 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.

14 years, 1 month

[tracker] User took ownership: alias_db: support user to alias conversion

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Tristan Mahé has taken ownership of the following task: FS#110 - alias_db: support user to alias conversion More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=110 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.

14 years, 1 month

[tracker] Task opened: alias_db: support user to alias conversion

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Tristan Mahé (gled) Attached to Project - sip-router Summary - alias_db: support user to alias conversion Task Type - Feature Request Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - alias_db already does alias to user conversion and ruri rewrite. we should have the opposite ( user to alias conversion and from rewrite ). Patch on its way, but can't assign this task to myself. Will add patch once it's ok :) More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=110 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.

14 years, 1 month

git:carstenbock/ims: - Cleanup: memlog is not defined within Kamailio/ sip-router.org

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: 099c1575d65681890893c72aba7d06bc14738176 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=099c157… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Fri Jan 7 14:16:37 2011 +0100 - Cleanup: memlog is not defined within Kamailio/sip-router.org - several code parts removed due to lack of use (ifedefs) --- modules/cdp/acceptor.c | 13 ------------- modules/cdp/diameter_peer.c | 26 -------------------------- modules/cdp/globals.c | 30 ++++-------------------------- modules/cdp/globals.h | 7 ------- modules/cdp/receiver.c | 15 --------------- modules/cdp/timer.c | 14 -------------- modules/cdp/worker.c | 11 ----------- 7 files changed, 4 insertions(+), 112 deletions(-) diff --git a/modules/cdp/acceptor.c b/modules/cdp/acceptor.c index 75dd693..7321121 100644 --- a/modules/cdp/acceptor.c +++ b/modules/cdp/acceptor.c @@ -109,19 +109,6 @@ void acceptor_process(dp_config *cfg) close(listening_socks[i]); if (listening_socks) pkg_free(listening_socks); -#ifdef CDP_FOR_SER -#else -#ifdef PKG_MALLOC - #ifdef PKG_MALLOC - LOG(memlog, "Acceptor Memory status (pkg):\n"); - //pkg_status(); - #ifdef pkg_sums - pkg_sums(); - #endif - #endif -#endif - dp_del_pid(getpid()); -#endif done: LOG(L_INFO,"INFO:... Acceptor process finished\n"); exit(0); diff --git a/modules/cdp/diameter_peer.c b/modules/cdp/diameter_peer.c index 9147eb1..3fa8c85 100644 --- a/modules/cdp/diameter_peer.c +++ b/modules/cdp/diameter_peer.c @@ -477,8 +477,6 @@ int diameter_peer_start(int blocking) return 1; } -extern int memlog; - /** * Shutdown the CDiameterPeer nicely. * It stops the workers, disconnects peers, drops timers and wait for all processes to exit. @@ -565,30 +563,6 @@ void diameter_peer_destroy() free_dp_config(config); LOG(L_CRIT,"INFO:destroy_diameter_peer(): Bye Bye from C Diameter Peer test\n"); - -#ifndef CDP_FOR_SER - -#ifdef WHARF - -#else - #ifdef PKG_MALLOC - LOG(memlog, "Memory status (pkg):\n"); - //pkg_status(); - #ifdef pkg_sums - pkg_sums(); - #endif - #endif - #ifdef SHM_MEM - LOG(memlog, "Memory status (shm):\n"); - //shm_status(); - #ifdef shm_sums - shm_sums(); - #endif - /* zero all shmem alloc vars that we still use */ - shm_mem_destroy(); - #endif -#endif -#endif } diff --git a/modules/cdp/globals.c b/modules/cdp/globals.c index fc2ef9e..691da48 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_INFO; - int debug = L_INFO; - 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_INFO, "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_INFO, "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 b33f91f..aa3c31d 100644 --- a/modules/cdp/globals.h +++ b/modules/cdp/globals.h @@ -62,13 +62,6 @@ #define DPNAME "CDiameterPeer" #define DPVERSION "0.0.2" - -#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/receiver.c b/modules/cdp/receiver.c index c7b6261..a2b5d88 100644 --- a/modules/cdp/receiver.c +++ b/modules/cdp/receiver.c @@ -487,21 +487,6 @@ done: } /* remove pid from list of running processes */ dp_del_pid(getpid()); - -#ifdef CDP_FOR_SER - -#else -#ifdef PKG_MALLOC - #ifdef PKG_MALLOC - LOG(memlog, "Receiver[%.*s] Memory status (pkg):\n", - p?p->fqdn.len:0,p?p->fqdn.s:0); - //pkg_status(); - #ifdef pkg_sums - pkg_sums(); - #endif - #endif -#endif -#endif LOG(L_INFO,"INFO:receiver_process(): [%.*s]... Receiver process finished.\n", p?p->fqdn.len:0,p?p->fqdn.s:0); diff --git a/modules/cdp/timer.c b/modules/cdp/timer.c index 9e75f9d..b4324e8 100644 --- a/modules/cdp/timer.c +++ b/modules/cdp/timer.c @@ -215,20 +215,6 @@ void timer_process(int returns) LOG(L_INFO,"INFO:... Timer process finished\n"); if (!returns) { -#ifdef CDP_FOR_SER -#else -#ifdef PKG_MALLOC - #ifdef PKG_MALLOC - LOG(memlog, "Timer Memory status (pkg):\n"); - //pkg_status(); - #ifdef pkg_sums - pkg_sums(); - #endif - #endif -#endif - dp_del_pid(getpid()); -#endif - exit(0); } } diff --git a/modules/cdp/worker.c b/modules/cdp/worker.c index 026d279..9ae872b 100644 --- a/modules/cdp/worker.c +++ b/modules/cdp/worker.c @@ -406,17 +406,6 @@ void worker_process(int id) } worker_poison_queue(); LOG(L_INFO,"INFO:[%d]... Worker process finished\n",id); -#ifdef CDP_FOR_SER -#else - #ifdef PKG_MALLOC - LOG(memlog, "Worker[%d] Memory status (pkg):\n",id); - //pkg_status(); - #ifdef pkg_sums - pkg_sums(); - #endif - #endif - dp_del_pid(getpid()); -#endif exit(0); }

14 years, 1 month

git:carstenbock/ims: - added some files to be added to the configuration upon installation

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: fddd99dfe5667daebb65c51672b53a7e945fbafc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fddd99d… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Jan 6 23:28:46 2011 +0100 - added some files to be added to the configuration upon installation --- modules/pcscf/Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/pcscf/Makefile b/modules/pcscf/Makefile index 32fedcb..642c24a 100644 --- a/modules/pcscf/Makefile +++ b/modules/pcscf/Makefile @@ -19,6 +19,8 @@ DEFS += -DCDP_FOR_SER DEFS += -I/usr/include/libxml2 LIBS += -L$(LOCALBASE)/lib -lxml2 +MOD_INSTALL_CFGS=emerg_info.xml reginfo.dtd + #DEFS += -DWITH_IMS_PM include ../../Makefile.modules

14 years, 1 month

git:carstenbock/ims: - Cleanup of Makefile for SCSCF

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: 789a227b8029e6443700466ebacc11edf878ea89 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=789a227… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Jan 6 22:52:53 2011 +0100 - Cleanup of Makefile for SCSCF --- modules/scscf/Makefile | 23 +++++++---------------- 1 files changed, 7 insertions(+), 16 deletions(-) diff --git a/modules/scscf/Makefile b/modules/scscf/Makefile index 569b398..d3b37ec 100644 --- a/modules/scscf/Makefile +++ b/modules/scscf/Makefile @@ -11,24 +11,15 @@ include ../../Makefile.defs auto_gen= NAME=scscf.so -ifeq ($(CFG_NAME),kamailio) - DEFS+=-DSER_MOD_INTERFACE - SERLIBPATH=../../lib - SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 - #LIBS+=-L../../lib/cds -lser_cds -else -ifeq ($(CFG_NAME),sip-router) - DEFS+=-DSER_MOD_INTERFACE - SERLIBPATH=../../lib - SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 - LIBS+=-L../../lib/cds -lser_cds -else - LIBS+=-L../../lib/cds -l_ser_cds -endif -endif +DEFS+=-DSER +INCLUDES = -I../../lib -I../.. +DEFS+=-DSER_MOD_INTERFACE + +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 $(SERLIBPATH)/cds/ser_cds DEFS += -DCDP_FOR_SER -DEFS += -I/usr/include/libxml2 -I../../lib -DSER -I../.. +DEFS += -I/usr/include/libxml2 LIBS += -L$(LOCALBASE)/lib -lxml2 #DEFS += -DWITH_IMS_PM

14 years, 1 month

git:carstenbock/ims: - extended the kims group: More modules compilable within Kamailio

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: 92a6d72d1401fe8dedd83c162360a8070288221e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=92a6d72… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Jan 6 22:56:59 2011 +0100 - extended the kims group: More modules compilable within Kamailio --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 771c701..7ac0d6c 100644 --- a/Makefile +++ b/Makefile @@ -272,7 +272,7 @@ module_group_kpython=app_python module_group_kgeoip=geoip # K IMS modules -module_group_kims=pcscf cdp +module_group_kims=pcscf icscf scscf isc cdp cdp_avp # if not set on the cmd. line, env or in the modules.lst (cfg_group_include) # exclude the below modules.

14 years, 1 month

git:carstenbock/ims: - made the MGCF Module compilable using Kamailio

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: 8deb67d3029dcf714efe772a5d11d17de1aa8dfb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8deb67d… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Jan 6 22:47:58 2011 +0100 - made the MGCF Module compilable using Kamailio --- modules/mgcf/Makefile | 11 ++++++++--- modules/mgcf/dlg_state.c | 2 +- modules/mgcf/mod.c | 2 +- modules/mgcf/release_call.c | 6 +++++- modules/mgcf/release_call.h | 2 +- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/modules/mgcf/Makefile b/modules/mgcf/Makefile index 553389f..b34ecbe 100644 --- a/modules/mgcf/Makefile +++ b/modules/mgcf/Makefile @@ -6,12 +6,17 @@ # WARNING: do not run this directly, it should be run by the master Makefile include ../../Makefile.defs + auto_gen= NAME=mgcf.so -include ../../Makefile.modules +DEFS+=-DSER_MOD_INTERFACE +DEFS+=-DSER -#DEFS += -I../../lib -DSER -I../.. -#LIBS += -L../../lib/cds -l_ser_cds +SERLIBPATH=../../lib +INCLUDES = -I../../lib -I../.. +SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 $(SERLIBPATH)/cds/ser_cds + +include ../../Makefile.modules #DEFS += -DWITH_IMS_PM diff --git a/modules/mgcf/dlg_state.c b/modules/mgcf/dlg_state.c index 02a58a9..05b26fa 100644 --- a/modules/mgcf/dlg_state.c +++ b/modules/mgcf/dlg_state.c @@ -532,7 +532,7 @@ void print_m_dialogs(int log_level) { m_dialog *d; int i,j; - if (debug<log_level) return; /* to avoid useless calls when nothing will be printed */ + if (L_DBG<log_level) return; /* to avoid useless calls when nothing will be printed */ d_act_time(); LOG(log_level,"INF:"M_NAME":---------- MGCF Dialog List begin --------------\n"); for(i=0;i<m_dialogs_hash_size;i++){ diff --git a/modules/mgcf/mod.c b/modules/mgcf/mod.c index e9fb9cf..b7c78b9 100644 --- a/modules/mgcf/mod.c +++ b/modules/mgcf/mod.c @@ -63,7 +63,7 @@ #include "../../timer.h" #include "../../locking.h" #include "../tm/tm_load.h" -#include "../dialog/dlg_mod.h" +#include "../../modules_s/dialog/dlg_mod.h" #include "../../pt.h" diff --git a/modules/mgcf/release_call.c b/modules/mgcf/release_call.c index 5461f0b..7717772 100644 --- a/modules/mgcf/release_call.c +++ b/modules/mgcf/release_call.c @@ -312,7 +312,11 @@ int release_call_previous(m_dialog *d,enum release_call_situation situation,int if (t && t!=(void*) -1 && t->uas.request) { /*first trick: i really want to get this reply sent even though we are onreply*/ +#ifdef SER_MOD_INTERFACE + route_type = FAILURE_ROUTE; +#else *tmb.route_mode=MODE_ONFAILURE; +#endif /*second trick .. i haven't recieve any response from the uac * if i don't do this i get a cancel sent to the S-CSCF .. its not a big deal*/ @@ -324,7 +328,7 @@ int release_call_previous(m_dialog *d,enum release_call_situation situation,int /*now its safe to do this*/ tmb.t_reply(t->uas.request,reason_code,reason_text.s); - *tmb.route_mode=MODE_ONREPLY; + // *tmb.route_mode=MODE_ONREPLY; tmb.t_release(t->uas.request); /*needed because if not i get last message retransmited... diff --git a/modules/mgcf/release_call.h b/modules/mgcf/release_call.h index a914b5d..137a315 100644 --- a/modules/mgcf/release_call.h +++ b/modules/mgcf/release_call.h @@ -58,7 +58,7 @@ #define RELEASE_CALL_H_ #include "../tm/tm_load.h" #include "dlg_state.h" -#include "../dialog/dlg_mod.h" +#include "../../modules_s/dialog/dlg_mod.h" #include "sip.h"

14 years, 1 month

git:carstenbock/ims: - Cleanup of Makefiles for CDP and CDP_AVP

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: 60798118dce7988175e7dbc1f1187690af202a9b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6079811… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Jan 6 22:04:39 2011 +0100 - Cleanup of Makefiles for CDP and CDP_AVP - Adaptions to make icscf compile under sip-router.org --- modules/cdp/Makefile | 15 ++------------- modules/cdp_avp/Makefile | 19 +++---------------- modules/icscf/Makefile | 8 +++----- 3 files changed, 8 insertions(+), 34 deletions(-) diff --git a/modules/cdp/Makefile b/modules/cdp/Makefile index 23fc4ba..e8ac8d1 100644 --- a/modules/cdp/Makefile +++ b/modules/cdp/Makefile @@ -9,19 +9,8 @@ include ../../Makefile.defs auto_gen= NAME=cdp.so -ifeq ($(CFG_NAME),sip-router) - DEFS+=-DSER_MOD_INTERFACE -endif - -ifeq ($(CFG_NAME),kamailio) - DEFS+=-DSER_MOD_INTERFACE -endif - -ifeq ($(CFG_NAME),Wharf) - DEFS += -DWHARF -else - DEFS += -DCDP_FOR_SER -endif +DEFS+=-DSER_MOD_INTERFACE +DEFS += -DCDP_FOR_SER DEFS += -I/usr/include/libxml2 LIBS += -L$(LOCALBASE)/lib -lxml2 -lrt diff --git a/modules/cdp_avp/Makefile b/modules/cdp_avp/Makefile index 97653e0..126ef02 100644 --- a/modules/cdp_avp/Makefile +++ b/modules/cdp_avp/Makefile @@ -10,22 +10,9 @@ include ../../Makefile.defs NAME=cdp_avp.so - -ifeq ($(CFG_NAME),sip-router) - DEFS+=-DSER_MOD_INTERFACE -endif - -ifeq ($(CFG_NAME),kamailio) - DEFS+=-DSER_MOD_INTERFACE -endif - - -ifeq ($(CFG_NAME),Wharf) - DEFS += -DWHARF -else - DEFS += -DCDP_FOR_SER - DEFS += -I/usr/include/libxml2 -endif +DEFS+=-DSER_MOD_INTERFACE +DEFS += -DCDP_FOR_SER +DEFS += -I/usr/include/libxml2 #libs+= #includes+= diff --git a/modules/icscf/Makefile b/modules/icscf/Makefile index 97af4df..ced956e 100644 --- a/modules/icscf/Makefile +++ b/modules/icscf/Makefile @@ -11,11 +11,9 @@ include ../../Makefile.defs auto_gen= NAME=icscf.so -ifeq ($(CFG_NAME),sip-router) - DEFS+=-DSER_MOD_INTERFACE - SERLIBPATH=../../lib - SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 -endif +DEFS+=-DSER_MOD_INTERFACE +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 DEFS += -DCDP_FOR_SER DEFS += -I/usr/include/libxml2

14 years, 1 month

git:carstenbock/ims: - Fixed Makefile for PCSCF

by Carsten Bock

Module: sip-router Branch: carstenbock/ims Commit: a54eb8a8ef324d3f68793603499c215a259b7425 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a54eb8a… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Jan 6 18:56:55 2011 +0100 - Fixed Makefile for PCSCF --- modules/pcscf/Makefile | 24 +++++------------------- 1 files changed, 5 insertions(+), 19 deletions(-) diff --git a/modules/pcscf/Makefile b/modules/pcscf/Makefile index 3c9a7e7..32fedcb 100644 --- a/modules/pcscf/Makefile +++ b/modules/pcscf/Makefile @@ -9,25 +9,11 @@ include ../../Makefile.defs auto_gen= NAME=pcscf.so - -ifeq ($(CFG_NAME),kamailio) - DEFS+=-DSER_MOD_INTERFACE - SERLIBPATH=../../lib - SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 - #LIBS+=-L../../lib/cds -lser_cds -else -ifeq ($(CFG_NAME),sip-router) - DEFS+=-DSER_MOD_INTERFACE - SERLIBPATH=../../lib - SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 - LIBS+=-L../../lib/cds -lser_cds -else - LIBS+=-L../../lib/cds -l_ser_cds -endif -endif - -DEFS += -I/usr/include/libxml2 -I../../lib -DSER -I../.. -LIBS += -lxml2 +DEFS+=-DSER +INCLUDES = -I../../lib -I../.. +DEFS+=-DSER_MOD_INTERFACE +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 $(SERLIBPATH)/cds/ser_cds DEFS += -DCDP_FOR_SER DEFS += -I/usr/include/libxml2

14 years, 1 month

← Newer
1
...
14
15
16
17
18
19
20
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2011