sr-dev January 2013

sr-dev@lists.kamailio.org

46 participants
325 discussions

git:master: ims_registrar_pcscf: fic cross-compilation

by Ovidiu Sas

Module: sip-router Branch: master Commit: 2c70b76e122d061b62058623e85e42872cd003ac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2c70b76… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Jan 10 16:43:29 2013 -0500 ims_registrar_pcscf: fic cross-compilation --- modules/ims_registrar_pcscf/Makefile | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/modules/ims_registrar_pcscf/Makefile b/modules/ims_registrar_pcscf/Makefile index 6e7c0cc..cae4581 100644 --- a/modules/ims_registrar_pcscf/Makefile +++ b/modules/ims_registrar_pcscf/Makefile @@ -8,16 +8,22 @@ include ../../Makefile.defs auto_gen= NAME=ims_registrar_pcscf.so -LIBS= -DEFS+=-DOPENSER_MOD_INTERFACE -I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 - -LIBS += -L$(LOCALBASE)/lib +ifeq ($(CROSS_COMPILE),) +XML2CFG=$(shell which xml2-config) +endif -ifneq ($(OS),darwin) - LIBS += -lrt +ifneq ($(XML2CFG),) + DEFS += $(shell $(XML2CFG) --cflags ) + LIBS += $(shell $(XML2CFG) --libs) +else + DEFS+=-I$(LOCALBASE)/include/libxml2 \ + -I$(LOCALBASE)/include + LIBS+=-L$(LOCALBASE)/lib -lxml2 endif +DEFS+=-DOPENSER_MOD_INTERFACE + SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/kcore/kcore SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims

11 years, 11 months

git:master: ims_icscf: fic cross-compilation

by Ovidiu Sas

Module: sip-router Branch: master Commit: f1e6a00c93f18871c5c069a08aac77fe783fd6cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f1e6a00… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Jan 10 16:42:34 2013 -0500 ims_icscf: fic cross-compilation --- modules/ims_icscf/Makefile | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/modules/ims_icscf/Makefile b/modules/ims_icscf/Makefile index 4b30a30..9e74f28 100644 --- a/modules/ims_icscf/Makefile +++ b/modules/ims_icscf/Makefile @@ -4,28 +4,26 @@ # # - include ../../Makefile.defs auto_gen= NAME=ims_icscf.so -LIBS= - -DEFS += -DOPENSER_MOD_INTERFACE -DEFS += -I/usr/include/libxml2 -LIBS += -L$(LOCALBASE)/lib -lxml2 +ifeq ($(CROSS_COMPILE),) +XML2CFG=$(shell which xml2-config) +endif -ifneq ($(OS),darwin) - LIBS += -lrt +ifneq ($(XML2CFG),) + DEFS += $(shell $(XML2CFG) --cflags ) + LIBS += $(shell $(XML2CFG) --libs) +else + DEFS+=-I$(LOCALBASE)/include/libxml2 \ + -I$(LOCALBASE)/include + LIBS+=-L$(LOCALBASE)/lib -lxml2 endif +DEFS += -DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 $(SERLIBPATH)/kcore/kcore SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims - - - - - include ../../Makefile.modules

11 years, 11 months

git:master: ims_auth: fix cross-compilation

by Ovidiu Sas

Module: sip-router Branch: master Commit: 5799a797c7e4d0e84aca20618ef61dbf1a33692c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5799a79… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Jan 10 16:42:08 2013 -0500 ims_auth: fix cross-compilation --- modules/ims_auth/Makefile | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/modules/ims_auth/Makefile b/modules/ims_auth/Makefile index 5b168b2..a891adf 100644 --- a/modules/ims_auth/Makefile +++ b/modules/ims_auth/Makefile @@ -8,17 +8,22 @@ include ../../Makefile.defs auto_gen= NAME=ims_auth.so -LIBS= -DEFS+=-DOPENSER_MOD_INTERFACE - -DEFS += -I/usr/include/libxml2 -LIBS += -L$(LOCALBASE)/lib -lxml2 +ifeq ($(CROSS_COMPILE),) +XML2CFG=$(shell which xml2-config) +endif -ifneq ($(OS),darwin) - LIBS += -lrt +ifneq ($(XML2CFG),) + DEFS += $(shell $(XML2CFG) --cflags ) + LIBS += $(shell $(XML2CFG) --libs) +else + DEFS+=-I$(LOCALBASE)/include/libxml2 \ + -I$(LOCALBASE)/include + LIBS+=-L$(LOCALBASE)/lib -lxml2 endif +DEFS+=-DOPENSER_MOD_INTERFACE + SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/kcore/kcore SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims

11 years, 11 months

git:master: kamailio.cfg: describe log levels

by Klaus Darilion

Module: sip-router Branch: master Commit: 52a773fb8bcd9a07f12dcb0de9bff8744ab386d3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=52a773f… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Thu Jan 10 22:45:09 2013 +0100 kamailio.cfg: describe log levels --- etc/kamailio.cfg | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 4f3d20c..a7ed0e3 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -132,6 +132,7 @@ import_file "kamailio-local.cfg" ####### Global Parameters ######### +### LOG Levels: 3=DBG, 2=INFO, 1=NOTICE, 0=WARN, -1=ERR #!ifdef WITH_DEBUG debug=4 log_stderror=yes

11 years, 11 months

git:master: mtree Add RPC command mtree.summary

by Olle E. Johansson

Module: sip-router Branch: master Commit: 6d34982c99060436bc9a3a07058eb805488fc34d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d34982… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Thu Jan 10 21:45:09 2013 +0100 mtree Add RPC command mtree.summary --- modules/mtree/README | 28 +++++++++++-- modules/mtree/doc/mtree_admin.xml | 14 ++++++- modules/mtree/mtree_mod.c | 78 +++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 6 deletions(-) diff --git a/modules/mtree/README b/modules/mtree/README index 3be2e53..05f3422 100644 --- a/modules/mtree/README +++ b/modules/mtree/README @@ -61,6 +61,10 @@ Juha Heinanen 5.2. mt_reload 5.3. mt_summary + 6. RPC Commands + + 6.1. mtree.summary + List of Examples 1.1. Set db_url parameter @@ -114,6 +118,10 @@ Chapter 1. Admin Guide 5.2. mt_reload 5.3. mt_summary + 6. RPC Commands + + 6.1. mtree.summary + 1. Overview This module loads data indexed by prefixes from database and returns @@ -155,7 +163,7 @@ Chapter 1. Admin Guide URL of the database server to be used. - Default value is "mysql://openser:openserrw@localhost/openser". + Default value is "mysql://kamailio:kamailiorw@localhost/kamailio". Example 1.1. Set db_url parameter ... @@ -302,7 +310,7 @@ modparam("mtree", "mt_allow_duplicates", 1) 4.1. mt_match(mtree, pv, mode) -4.1. mt_match(mtree, pv, mode) +4.1. mt_match(mtree, pv, mode) Match 'pv' value against 'mtree'. If 'mtree' type is 0 or 2 and value of 'mode' is NOT 2, sets a value of the longest matching prefix to @@ -323,7 +331,7 @@ mt_match("mytree", "$rU", "0"); 5.2. mt_reload 5.3. mt_summary -5.1. mt_list +5.1. mt_list List content of a tree. @@ -337,7 +345,7 @@ mt_match("mytree", "$rU", "0"); _mtname_ _empty_line_ -5.2. mt_reload +5.2. mt_reload Reload mtree from database. @@ -352,7 +360,7 @@ mt_match("mytree", "$rU", "0"); _mtname_ _empty_line_ -5.3. mt_summary +5.3. mt_summary List usage summary for all trees. @@ -363,3 +371,13 @@ mt_match("mytree", "$rU", "0"); MI FIFO Command Format: :mt_summary:_reply_fifo_file_ _empty_line_ + +6. RPC Commands + + 6.1. mtree.summary + +6.1. mtree.summary + + List usage summary for all trees. + + Parameters: none. diff --git a/modules/mtree/doc/mtree_admin.xml b/modules/mtree/doc/mtree_admin.xml index 8558ccd..62154f0 100644 --- a/modules/mtree/doc/mtree_admin.xml +++ b/modules/mtree/doc/mtree_admin.xml @@ -416,7 +416,19 @@ mt_match("mytree", "$rU", "0"); _empty_line_ </programlisting> </section> - </section> + </section> + <section> + <title>RPC Commands</title> + <section> + <title> + <function moreinfo="none">mtree.summary</function> + </title> + <para> + List usage summary for all trees. + </para> + <para>Parameters: none.</para> + </section> + </section> </chapter> diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index 389fa3d..ac22d48 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -39,6 +39,8 @@ #include "../../action.h" #include "../../mod_fix.h" #include "../../parser/parse_from.h" +#include "../../rpc.h" +#include "../../rpc_lookup.h" #include "mtree.h" @@ -109,6 +111,7 @@ static int mod_init(void); static void mod_destroy(void); static int child_init(int rank); static int mi_child_init(void); +static int mtree_init_rpc(void); static int mt_match(struct sip_msg *msg, gparam_t *dm, gparam_t *var, gparam_t *mode); @@ -183,6 +186,11 @@ static int mod_init(void) LM_ERR("failed to register MI commands\n"); return -1; } + if(mtree_init_rpc()!=0) + { + LM_ERR("failed to register RPC commands\n"); + return -1; + } db_url.len = strlen(db_url.s); db_table.len = strlen(db_table.s); @@ -980,3 +988,73 @@ error: free_mi_tree(rpl_tree); return 0; } + +void rpc_mtree_summary(rpc_t* rpc, void* c) +{ + m_tree_t *pt; + void* th; + void* ih; + + if(!mt_defined_trees()) + { + rpc->fault(c, 500, "Empty tree list."); + return; + } + + if (rpc->add(c, "{", &th) < 0) + { + rpc->fault(c, 500, "Internal error creating rpc"); + return; + } + pt = mt_get_first_tree(); + + while(pt!=NULL) + { + if(rpc->struct_add(th, "s{", + "table", pt->tname.s, + "item", &ih) < 0) + { + rpc->fault(c, 500, "Internal error creating rpc ih"); + return; + } + + if(rpc->struct_add(ih, "d", "ttype", pt->type) < 0 ) { + rpc->fault(c, 500, "Internal error adding type"); + return; + } + if(rpc->struct_add(ih, "d", "memsize", pt->memsize) < 0 ) { + rpc->fault(c, 500, "Internal error adding memsize"); + return; + } + if(rpc->struct_add(ih, "d", "nrnodes", pt->nrnodes) < 0 ) { + rpc->fault(c, 500, "Internal error adding nodes"); + return; + } + if(rpc->struct_add(ih, "d", "nritems", pt->nritems) < 0 ) { + rpc->fault(c, 500, "Internal error adding items"); + return; + } + pt = pt->next; + } + return; +} + +static const char* rpc_mtree_summary_doc[2] = { + "Print summary of loaded mtree tables", + 0 +}; + +rpc_export_t mtree_rpc[] = { + {"mtree.summary", rpc_mtree_summary, rpc_mtree_summary_doc, 0}, + {0, 0, 0, 0} +}; + +static int mtree_init_rpc(void) +{ + if (rpc_register_array(mtree_rpc) != 0) + { + LM_ERR("failed to register RPC commands\n"); + return -1; + } + return 0; +}

11 years, 11 months

git:master: mtree Bug fix - save number of nodes in mtree data structure at load

by Olle E. Johansson

Module: sip-router Branch: master Commit: 52331c6ba80f2eb862405e7987ab21d6f55549e0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=52331c6… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Thu Jan 10 20:10:49 2013 +0100 mtree Bug fix - save number of nodes in mtree data structure at load Otherwise MI function doesn't report anything but zero nodes and memory --- modules/mtree/mtree_mod.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index 7a2d666..389fa3d 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -593,6 +593,9 @@ static int mt_load_db(str *tname) bk_head = old_tree->head; old_tree->head = new_tree.head; + old_tree->nrnodes = new_tree.nrnodes; + old_tree->nritems = new_tree.nritems; + old_tree->memsize = new_tree.memsize; mt_reload_flag = 0;

11 years, 11 months

git:master: modules/rtpproxy: allowing rtpproxy_manage to take the flags parameter as a pseudo-variable

by Peter Dunkley

Module: sip-router Branch: master Commit: 222166ef3a20c0c4a98a3c810112901c71ef275d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=222166e… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jan 10 19:01:47 2013 +0000 modules/rtpproxy: allowing rtpproxy_manage to take the flags parameter as a pseudo-variable - Feature added by Hugh Waite @ Crocodile RCS --- modules/rtpproxy/README | 105 ++++++++++++++++--------------- modules/rtpproxy/doc/rtpproxy_admin.xml | 4 +- modules/rtpproxy/rtpproxy.c | 14 +++- 3 files changed, 67 insertions(+), 56 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=222…

11 years, 11 months

git:master: kamdbctl: new command - kamdbctl pframework create

by Ovidiu Sas

Module: sip-router Branch: master Commit: ef2b3a6ee84f75bd49a06635a486807eeaebc08a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ef2b3a6… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Jan 10 12:50:06 2013 -0500 kamdbctl: new command - kamdbctl pframework create - creates a provisioning framework for the installed db tables --- utils/kamctl/Makefile | 1 + utils/kamctl/kamdbctl | 75 ++++++++++++++++++++++++++++++++++++++++++++ utils/kamctl/kamdbctl.base | 25 +++++++++----- 3 files changed, 92 insertions(+), 9 deletions(-) diff --git a/utils/kamctl/Makefile b/utils/kamctl/Makefile index ba3d67a..3056ae0 100644 --- a/utils/kamctl/Makefile +++ b/utils/kamctl/Makefile @@ -70,6 +70,7 @@ install-bin: $(bin_prefix)/$(bin_dir) # install db setup base script sed -e "s#/usr/local/sbin#$(bin_target)#g" \ -e "s#/usr/local/etc/kamailio#$(cfg_target)#g" \ + -e "s#/usr/local/share/kamailio#$(data_target)#g" \ < kamdbctl.base > /tmp/kamdbctl.base $(INSTALL_CFG) /tmp/kamdbctl.base \ $(modules_prefix)/$(lib_dir)/kamctl/kamdbctl.base diff --git a/utils/kamctl/kamdbctl b/utils/kamctl/kamdbctl index 681818e..4784729 100755 --- a/utils/kamctl/kamdbctl +++ b/utils/kamctl/kamdbctl @@ -168,6 +168,76 @@ kamailio_restore() #pars: <database name> <filename> } +kamailio_pframework_create() #pars: none +{ + touch $DEFAULT_CFG_DIR/pi_framework_sample + if [ $? -ne 0 ] ; then + merr "Unable to create $DEFAULT_CFG_DIR/pi_framework_sample" + exit 1 + fi + + if [ -d "$DATA_DIR/xhttp_pi" ] ; then + PI_MODULES="$STANDARD_MODULES" + else + merr "Please install first the xhttp_pi module" + exit 1 + fi + + + get_answer $INSTALL_EXTRA_TABLES "Add provisionning framework for extra tables? (y/n): " + if [ "$ANSWER" = "y" ]; then + PI_MODULES="$PI_MODULES $EXTRA_MODULES" + fi + + get_answer $INSTALL_PRESENCE_TABLES "Add provisionning framework for presence tables? (y/n): " + if [ "$ANSWER" = "y" ]; then + PI_MODULES="$PI_MODULES $PRESENCE_TABLES" + fi + + cat $DATA_DIR/xhttp_pi/pi_framework-00 > $DEFAULT_CFG_DIR/pi_framework_sample + for TABLE in $PI_MODULES; do + if [ -e $DATA_DIR/xhttp_pi/$TABLE-table ]; then + cat $DATA_DIR/xhttp_pi/$TABLE-table >> $DEFAULT_CFG_DIR/pi_framework_sample + else + merr "Unable to configure: $TABLE - missing table descriptor" + fi + done + cat $DATA_DIR/xhttp_pi/pi_framework-01 >> $DEFAULT_CFG_DIR/pi_framework_sample + for TABLE in $PI_MODULES; do + if [ -e $DATA_DIR/xhttp_pi/$TABLE-mod ]; then + cat $DATA_DIR/xhttp_pi/$TABLE-mod >> $DEFAULT_CFG_DIR/pi_framework_sample + else + merr "Unable to configure: $TABLE - missing mod descriptor" + fi + done + cat $DATA_DIR/xhttp_pi/pi_framework-02 >> $DEFAULT_CFG_DIR/pi_framework_sample + + minfo "Sample provisionning framework saved as: $DEFAULT_CFG_DIR/pi_framework_sample" +} + +kamailio_pframework() #pars: <action> +{ + if [ $# -ne 1 ] ; then + merr "kamailio_pframework function takes one parameter" + exit 1 + fi + + case $1 in + create) + shift + kamailio_pframework_create "$@" + exit $? + ;; + *) + merr "Unexpected pframework action: $1" + usage + exit 1 + ;; + esac +} + + + case $1 in migrate) if [ "$USED_DBENGINE" != "mysql" ] ; then @@ -303,6 +373,11 @@ case $1 in kamailio_berkeley "$@" exit $? ;; + pframework) + shift + kamailio_pframework "$@" + exit $? + ;; version) echo "$0 $VERSION" ;; diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base index 8e367be..f387aa2 100644 --- a/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base @@ -56,6 +56,12 @@ DEFAULT_CSEQ=${DEFAULT_CSEQ:-13} DEFAULT_LOCATION_EXPIRES=${DEFAULT_LOCATION_EXPIRES:-${FOREVER}} +# default location for config files +DEFAULT_CFG_DIR=/usr/local/etc/kamailio + +# default location for data files +DEFAULT_DATA_DIR=/usr/local/share/kamailio + # Needed programs MD5=${MD5:-md5sum} AWK=${AWK:-awk} @@ -79,21 +85,22 @@ COMMAND=`basename $0` cat <<EOF $0 $VERSION -usage: $COMMAND create <db name or db_path, optional> .....(creates a new database) - $COMMAND drop <db name or db_path, optional> .......(!entirely deletes tables!) - $COMMAND reinit <db name or db_path, optional> .....(!entirely deletes and than re-creates tables!) - $COMMAND backup <file> .................................(dumps current database to file) - $COMMAND restore <file> ................................(restores tables from a file) - $COMMAND copy <new_db> .................................(creates a new db from an existing one) - $COMMAND migrate <old_db> <new_db> .....................(migrates DB from 1.2 to 1.3, not implemented yet!) - $COMMAND presence ......................................(adds the presence related tables) - $COMMAND extra .........................................(adds the extra tables) +usage: $COMMAND create <db name or db_path, optional> ...(creates a new database) + $COMMAND drop <db name or db_path, optional> .....(!entirely deletes tables!) + $COMMAND reinit <db name or db_path, optional> ...(!entirely deletes and than re-creates tables!) + $COMMAND backup <file> ...........................(dumps current database to file) + $COMMAND restore <file> ..........................(restores tables from a file) + $COMMAND copy <new_db> ...........................(creates a new db from an existing one) + $COMMAND migrate <old_db> <new_db> ...............(migrates DB from 1.2 to 1.3, not implemented yet!) + $COMMAND presence ................................(adds the presence related tables) + $COMMAND extra ...................................(adds the extra tables) if you want to manipulate database as other database user than root, want to change database name from default value "$DBNAME", or want to use other values for users and password, edit the "config vars" section of the command $COMMAND. + $COMMAND pframework create .......................(creates a sample provisioning framework file) EOF } #usage

11 years, 11 months

git:master: modules_k/cfgutils: add locking around gflags

by Alex Hermann

Module: sip-router Branch: master Commit: 2793567c9f4f31e2d58e23faa092750f0d71a0c1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2793567… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Sep 29 18:47:46 2011 +0200 modules_k/cfgutils: add locking around gflags gflags are stored in shared memory and must thus be protected against concurrent access. Reads from an int are atomic on most (all?) real world hardware, so only modification of the flags is placed under the protection of the lock, not reads. --- modules_k/cfgutils/cfgutils.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/modules_k/cfgutils/cfgutils.c b/modules_k/cfgutils/cfgutils.c index 36932ca..37c106a 100644 --- a/modules_k/cfgutils/cfgutils.c +++ b/modules_k/cfgutils/cfgutils.c @@ -134,6 +134,7 @@ static char* hash_file = NULL; static int initial_gflags=0; static unsigned int *gflags=0; +static gen_lock_t *gflags_lock = NULL; static gen_lock_set_t *_cfg_lock_set = NULL; static unsigned int _cfg_lock_size = 0; @@ -291,14 +292,18 @@ static int fixup_gflags( void** param, int param_no) static int set_gflag(struct sip_msg *bar, char *flag, char *foo) { + lock_get(gflags_lock); (*gflags) |= (unsigned int)(long)flag; + lock_release(gflags_lock); return 1; } static int reset_gflag(struct sip_msg *bar, char *flag, char *foo) { + lock_get(gflags_lock); (*gflags) &= ~ ((unsigned int)(long)flag); + lock_release(gflags_lock); return 1; } @@ -326,7 +331,9 @@ static struct mi_root* mi_set_gflag(struct mi_root* cmd_tree, void* param ) goto error; } + lock_get(gflags_lock); (*gflags) |= flag; + lock_release(gflags_lock); return init_mi_tree( 200, MI_OK_S, MI_OK_LEN); error: @@ -351,7 +358,9 @@ static struct mi_root* mi_reset_gflag(struct mi_root* cmd_tree, void* param ) goto error; } + lock_get(gflags_lock); (*gflags) &= ~ flag; + lock_release(gflags_lock); return init_mi_tree( 200, MI_OK_S, MI_OK_LEN); error: @@ -403,16 +412,19 @@ static struct mi_root* mi_get_gflags(struct mi_root* cmd_tree, void* param ) { struct mi_root* rpl_tree= NULL; struct mi_node* node= NULL; + static unsigned int flags; rpl_tree = init_mi_tree( 200, MI_OK_S, MI_OK_LEN ); if(rpl_tree == NULL) return 0; - node = addf_mi_node_child( &rpl_tree->node, 0, 0, 0, "0x%X",(*gflags)); + flags = *gflags; + + node = addf_mi_node_child( &rpl_tree->node, 0, 0, 0, "0x%X",(flags)); if(node == NULL) goto error; - node = addf_mi_node_child( &rpl_tree->node, 0, 0, 0, "%u",(*gflags)); + node = addf_mi_node_child( &rpl_tree->node, 0, 0, 0, "%u",(flags)); if(node == NULL) goto error; @@ -764,6 +776,16 @@ static int mod_init(void) return -1; } *gflags=initial_gflags; + gflags_lock = lock_alloc(); + if (gflags_lock==0) { + LM_ERR("cannot allocate gflgas lock\n"); + return -1; + } + if (lock_init(gflags_lock)==NULL) { + LM_ERR("cannot initiate gflags lock\n"); + lock_dealloc(gflags_lock); + return -1; + } if(_cfg_lock_size>0 && _cfg_lock_size<=10) { _cfg_lock_size = 1<<_cfg_lock_size; @@ -784,6 +806,10 @@ static void mod_destroy(void) shm_free(probability); if (gflags) shm_free(gflags); + if (gflags_lock) { + lock_destroy(gflags_lock); + lock_dealloc(gflags_lock); + } if(_cfg_lock_set!=NULL) { lock_set_destroy(_cfg_lock_set);

11 years, 11 months

git:master: pkg/kamailio/(centos|fedora): updated .spec

by Peter Dunkley

Module: sip-router Branch: master Commit: 6f0f560ec9bf67d93e18f932f572aa8b526ac955 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6f0f560… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jan 10 16:00:46 2013 +0000 pkg/kamailio/(centos|fedora): updated .spec --- pkg/kamailio/fedora/16/kamailio.spec | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/pkg/kamailio/fedora/16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec index 85de2aa..0f5d337 100644 --- a/pkg/kamailio/fedora/16/kamailio.spec +++ b/pkg/kamailio/fedora/16/kamailio.spec @@ -26,7 +26,7 @@ Conflicts: kamailio-python < %ver, kamailio-regex < %ver Conflicts: kamailio-dialplan < %ver, kamailio-lcr < %ver Conflicts: kamailio-xmlops < %ver, kamailio-cdp < %ver Conflicts: kamailio-websocket < %ver, kamailio-xhttp-pi < %ver -Conflicts: kamailio-outbound < %ver +Conflicts: kamailio-outbound < %ver, kamailio-ims < %ver %if 0%{?fedora} Conflicts: kamailio-radius < %ver, kamailio-carrierroute < %ver Conflicts: kamailio-redis < %ver, kamailio-json < %ver @@ -388,7 +388,7 @@ make every-module skip_modules="auth_identity db_cassandra iptrtpproxy \ group_include="kstandard kmysql kpostgres kcpl kradius kunixodbc \ kxml kperl ksnmpstats kxmpp kcarrierroute kberkeley kldap kutils \ kpurple ktls kwebsocket kpresence klua kpython kgeoip ksqlite kjson \ - kredis kmono koutbound" \ + kredis kmono koutbound kims" \ include_modules="cdp mangler print_lib xhttp_pi" %else make every-module skip_modules="auth_identity db_cassandra iptrtpproxy\ @@ -396,7 +396,7 @@ make every-module skip_modules="auth_identity db_cassandra iptrtpproxy\ group_include="kstandard kmysql kpostgres kcpl kunixodbc \ kxml kperl ksnmpstats kxmpp kberkeley kldap kutils \ kpurple ktls kwebsocket kpresence klua kpython ksqlite \ - koutbound" \ + koutbound kims" \ include_modules="cdp mangler print_lib xhttp_pi" %endif make utils @@ -413,7 +413,7 @@ make install-modules-all skip_modules="auth_identity db_cassandra iptrtpproxy\ group_include="kstandard kmysql kpostgres kcpl kradius kunixodbc\ kxml kperl ksnmpstats kxmpp kcarrierroute kberkeley kldap kutils\ kpurple ktls kwebsocket kpresence klua kpython kgeoip ksqlite kjson\ - kredis kmono koutbound" \ + kredis kmono koutbound kims" \ include_modules="cdp mangler print_lib xhttp_pi" mkdir -p $RPM_BUILD_ROOT/%{_unitdir} @@ -429,7 +429,7 @@ make install-modules-all skip_modules="auth_identity db_cassandra iptrtpproxy\ group_include="kstandard kmysql kpostgres kcpl kunixodbc \ kxml kperl ksnmpstats kxmpp kberkeley kldap kutils \ kpurple ktls kwebsocket kpresence klua kpython ksqlite \ - koutbound" \ + koutbound kims" \ include_modules="cdp mangler print_lib xhttp_pi" mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d @@ -507,7 +507,6 @@ fi %doc %{_docdir}/kamailio/modules/README.db_flatstore %doc %{_docdir}/kamailio/modules/README.db2_ops %doc %{_docdir}/kamailio/modules/README.debugger -%doc %{_docdir}/kamailio/modules/README.dialog_ng %doc %{_docdir}/kamailio/modules/README.enum %doc %{_docdir}/kamailio/modules/README.ipops %doc %{_docdir}/kamailio/modules/README.malloc_test @@ -649,7 +648,6 @@ fi %{_libdir}/kamailio/modules/db_flatstore.so %{_libdir}/kamailio/modules/db2_ops.so %{_libdir}/kamailio/modules/debugger.so -%{_libdir}/kamailio/modules/dialog_ng.so %{_libdir}/kamailio/modules/enum.so %{_libdir}/kamailio/modules/ipops.so %{_libdir}/kamailio/modules/malloc_test.so @@ -990,17 +988,21 @@ fi %{_libdir}/kamailio/libkamailio_ims.so %{_libdir}/kamailio/libkamailio_ims.so.0 %{_libdir}/kamailio/libkamailio_ims.so.0.1 -#%doc %{_docdir}/kamailio/modules/README.ims_auth +%doc %{_docdir}/kamailio/modules/README.dialog_ng +%{_libdir}/kamailio/modules/dialog_ng.so +%doc %{_docdir}/kamailio/modules/README.ims_auth %{_libdir}/kamailio/modules/ims_auth.so -#%doc %{_docdir}/kamailio/modules/README.ims_icscf +%doc %{_docdir}/kamailio/modules/README.ims_icscf %{_libdir}/kamailio/modules/ims_icscf.so -#%doc %{_docdir}/kamailio/modules/README.ims_isc +%doc %{_docdir}/kamailio/modules/README.ims_isc %{_libdir}/kamailio/modules/ims_isc.so +%doc %{_docdir}/kamailio/modules/README.ims_qos +%{_libdir}/kamailio/modules/ims_qos.so #%doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %{_libdir}/kamailio/modules/ims_registrar_pcscf.so #%doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf %{_libdir}/kamailio/modules/ims_registrar_scscf.so -#%doc %{_docdir}/kamailio/modules/README.ims_usrloc_pcscf +%doc %{_docdir}/kamailio/modules/README.ims_usrloc_pcscf %{_libdir}/kamailio/modules/ims_usrloc_pcscf.so #%doc %{_docdir}/kamailio/modules/README.ims_usrloc_scscf %{_libdir}/kamailio/modules/ims_usrloc_scscf.so @@ -1074,6 +1076,8 @@ fi %changelog +* Thu Jan 10 2013 Peter Dunkley <peter(a)dunkley.me.uk> + - More IMS updates * Tue Jan 8 2013 Peter Dunkley <peter(a)dunkley.me.uk> - Changed dialog2 to dialog_ng - Renamed all IMS modules (prepended ims_)

11 years, 11 months

← Newer
1
...
15
16
17
18
19
20
21
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2013