sr-dev

sr-dev@lists.kamailio.org

15 participants
44232 discussions

git:master: pike_top: moved from tools/ to utils/

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 21e69f544001fac0363d6a12ace881870127de4e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=21e69f5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 9 14:09:17 2009 +0200 pike_top: moved from tools/ to utils/ --- {tools => utils}/pike_top/INSTALL | 0 {tools => utils}/pike_top/Makefile | 0 {tools => utils}/pike_top/pike_top.c | 0 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tools/pike_top/INSTALL b/utils/pike_top/INSTALL similarity index 100% rename from tools/pike_top/INSTALL rename to utils/pike_top/INSTALL diff --git a/tools/pike_top/Makefile b/utils/pike_top/Makefile similarity index 100% rename from tools/pike_top/Makefile rename to utils/pike_top/Makefile diff --git a/tools/pike_top/pike_top.c b/utils/pike_top/pike_top.c similarity index 100% rename from tools/pike_top/pike_top.c rename to utils/pike_top/pike_top.c

15 years, 3 months

git:master: Merge remote branch 'origin/tmp/core_events'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: e57768f78261efa068b4de2b4fc8b01811765d48 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e57768f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 9 14:16:41 2009 +0200 Merge remote branch 'origin/tmp/core_events' * origin/tmp/core_events: core ev: minor cleanups topoh: new module for hiding topology details core: new sr events system core: execute callbacks for NET_DATA_IN and NET_DATA_OUT ---

15 years, 3 months

git:master: kamctl: moved from tools/ to utils/

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 9df9c6e10ffe0851b7f4f2f00697c5644aaf9faa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9df9c6e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Oct 9 14:05:15 2009 +0200 kamctl: moved from tools/ to utils/ - mv tools/kamctl utils/kamctl - updated srdb1 Makefile and test/unit/include/common with the new kamctl path --- lib/srdb1/schema/Makefile | 2 +- test/unit/include/common | 4 ++-- {tools => utils}/kamctl/Makefile | 0 {tools => utils}/kamctl/db_berkeley/kamailio/acc | 0 .../kamctl/db_berkeley/kamailio/active_watchers | 0 .../kamctl/db_berkeley/kamailio/address | 0 .../kamctl/db_berkeley/kamailio/aliases | 0 .../kamctl/db_berkeley/kamailio/carrier_name | 0 .../db_berkeley/kamailio/carrierfailureroute | 0 .../kamctl/db_berkeley/kamailio/carrierroute | 0 {tools => utils}/kamctl/db_berkeley/kamailio/cpl | 0 .../kamctl/db_berkeley/kamailio/dbaliases | 0 .../kamctl/db_berkeley/kamailio/dialog | 0 .../kamctl/db_berkeley/kamailio/dialplan | 0 .../kamctl/db_berkeley/kamailio/dispatcher | 0 .../kamctl/db_berkeley/kamailio/domain | 0 .../kamctl/db_berkeley/kamailio/domain_name | 0 .../kamctl/db_berkeley/kamailio/domainpolicy | 0 .../kamctl/db_berkeley/kamailio/globalblacklist | 0 {tools => utils}/kamctl/db_berkeley/kamailio/grp | 0 {tools => utils}/kamctl/db_berkeley/kamailio/gw | 0 .../kamctl/db_berkeley/kamailio/htable | 0 .../kamctl/db_berkeley/kamailio/imc_members | 0 .../kamctl/db_berkeley/kamailio/imc_rooms | 0 {tools => utils}/kamctl/db_berkeley/kamailio/lcr | 0 .../kamctl/db_berkeley/kamailio/location | 0 .../kamctl/db_berkeley/kamailio/missed_calls | 0 {tools => utils}/kamctl/db_berkeley/kamailio/pdt | 0 .../kamctl/db_berkeley/kamailio/presentity | 0 {tools => utils}/kamctl/db_berkeley/kamailio/pua | 0 .../kamctl/db_berkeley/kamailio/purplemap | 0 .../kamctl/db_berkeley/kamailio/re_grp | 0 .../kamctl/db_berkeley/kamailio/rls_presentity | 0 .../kamctl/db_berkeley/kamailio/rls_watchers | 0 {tools => utils}/kamctl/db_berkeley/kamailio/silo | 0 .../kamctl/db_berkeley/kamailio/sip_trace | 0 .../kamctl/db_berkeley/kamailio/speed_dial | 0 .../kamctl/db_berkeley/kamailio/subscriber | 0 .../kamctl/db_berkeley/kamailio/trusted | 0 {tools => utils}/kamctl/db_berkeley/kamailio/uri | 0 .../kamctl/db_berkeley/kamailio/userblacklist | 0 .../kamctl/db_berkeley/kamailio/usr_preferences | 0 .../kamctl/db_berkeley/kamailio/version | 0 .../kamctl/db_berkeley/kamailio/watchers | 0 {tools => utils}/kamctl/db_berkeley/kamailio/xcap | 0 {tools => utils}/kamctl/dbtext/kamailio/acc | 0 .../kamctl/dbtext/kamailio/active_watchers | 0 {tools => utils}/kamctl/dbtext/kamailio/address | 0 {tools => utils}/kamctl/dbtext/kamailio/aliases | 0 .../kamctl/dbtext/kamailio/carrier_name | 0 .../kamctl/dbtext/kamailio/carrierfailureroute | 0 .../kamctl/dbtext/kamailio/carrierroute | 0 {tools => utils}/kamctl/dbtext/kamailio/cpl | 0 {tools => utils}/kamctl/dbtext/kamailio/dbaliases | 0 {tools => utils}/kamctl/dbtext/kamailio/dialog | 0 {tools => utils}/kamctl/dbtext/kamailio/dialplan | 0 {tools => utils}/kamctl/dbtext/kamailio/dispatcher | 0 {tools => utils}/kamctl/dbtext/kamailio/domain | 0 .../kamctl/dbtext/kamailio/domain_name | 0 .../kamctl/dbtext/kamailio/domainpolicy | 0 .../kamctl/dbtext/kamailio/globalblacklist | 0 {tools => utils}/kamctl/dbtext/kamailio/grp | 0 {tools => utils}/kamctl/dbtext/kamailio/gw | 0 {tools => utils}/kamctl/dbtext/kamailio/htable | 0 .../kamctl/dbtext/kamailio/imc_members | 0 {tools => utils}/kamctl/dbtext/kamailio/imc_rooms | 0 {tools => utils}/kamctl/dbtext/kamailio/lcr | 0 {tools => utils}/kamctl/dbtext/kamailio/location | 0 .../kamctl/dbtext/kamailio/missed_calls | 0 {tools => utils}/kamctl/dbtext/kamailio/pdt | 0 {tools => utils}/kamctl/dbtext/kamailio/presentity | 0 {tools => utils}/kamctl/dbtext/kamailio/pua | 0 {tools => utils}/kamctl/dbtext/kamailio/purplemap | 0 {tools => utils}/kamctl/dbtext/kamailio/re_grp | 0 .../kamctl/dbtext/kamailio/rls_presentity | 0 .../kamctl/dbtext/kamailio/rls_watchers | 0 {tools => utils}/kamctl/dbtext/kamailio/silo | 0 {tools => utils}/kamctl/dbtext/kamailio/sip_trace | 0 {tools => utils}/kamctl/dbtext/kamailio/speed_dial | 0 {tools => utils}/kamctl/dbtext/kamailio/subscriber | 0 {tools => utils}/kamctl/dbtext/kamailio/trusted | 0 {tools => utils}/kamctl/dbtext/kamailio/uri | 0 .../kamctl/dbtext/kamailio/userblacklist | 0 .../kamctl/dbtext/kamailio/usr_preferences | 0 {tools => utils}/kamctl/dbtext/kamailio/version | 0 {tools => utils}/kamctl/dbtext/kamailio/watchers | 0 {tools => utils}/kamctl/dbtext/kamailio/xcap | 0 {tools => utils}/kamctl/dbtextdb/__init__.py | 0 {tools => utils}/kamctl/dbtextdb/dbtextdb.py | 0 {tools => utils}/kamctl/dbtextdb/dbtextdb_test.py | 0 .../kamctl/dbtextdb/tests/bad_table_auto_dupe | 0 .../kamctl/dbtextdb/tests/bad_table_int | 0 .../kamctl/dbtextdb/tests/bad_table_long_row | 0 .../kamctl/dbtextdb/tests/bad_table_null | 0 .../kamctl/dbtextdb/tests/bad_table_short_row | 0 .../kamctl/dbtextdb/tests/bad_table_wrong_type | 0 {tools => utils}/kamctl/dbtextdb/tests/subscriber | 0 {tools => utils}/kamctl/dbtextdb/tests/test | 0 .../kamctl/dbtextdb/tests/unsorted_table | 0 .../kamctl/dbtextdb/tests/unsorted_table2 | 0 {tools => utils}/kamctl/kamctl | 0 {tools => utils}/kamctl/kamctl.8 | 0 {tools => utils}/kamctl/kamctl.base | 0 {tools => utils}/kamctl/kamctl.ctlbase | 0 {tools => utils}/kamctl/kamctl.db_berkeley | 0 {tools => utils}/kamctl/kamctl.dbtext | 0 {tools => utils}/kamctl/kamctl.fifo | 0 {tools => utils}/kamctl/kamctl.mysql | 0 {tools => utils}/kamctl/kamctl.oracle | 0 {tools => utils}/kamctl/kamctl.pgsql | 0 {tools => utils}/kamctl/kamctl.sqlbase | 0 {tools => utils}/kamctl/kamctl.unixsock | 0 {tools => utils}/kamctl/kamctlrc | 0 {tools => utils}/kamctl/kamdbctl | 0 {tools => utils}/kamctl/kamdbctl.8 | 0 {tools => utils}/kamctl/kamdbctl.base | 0 {tools => utils}/kamctl/kamdbctl.db_berkeley | 0 {tools => utils}/kamctl/kamdbctl.dbtext | 0 {tools => utils}/kamctl/kamdbctl.mysql | 0 {tools => utils}/kamctl/kamdbctl.oracle | 0 {tools => utils}/kamctl/kamdbctl.pgsql | 0 {tools => utils}/kamctl/kamdbfunc.oracle | 0 {tools => utils}/kamctl/mysql/acc-create.sql | 0 {tools => utils}/kamctl/mysql/alias_db-create.sql | 0 {tools => utils}/kamctl/mysql/auth_db-create.sql | 0 {tools => utils}/kamctl/mysql/avpops-create.sql | 0 .../kamctl/mysql/carrierroute-create.sql | 0 {tools => utils}/kamctl/mysql/cpl-create.sql | 0 {tools => utils}/kamctl/mysql/dialog-create.sql | 0 {tools => utils}/kamctl/mysql/dialplan-create.sql | 0 .../kamctl/mysql/dispatcher-create.sql | 0 {tools => utils}/kamctl/mysql/domain-create.sql | 0 .../kamctl/mysql/domainpolicy-create.sql | 0 {tools => utils}/kamctl/mysql/group-create.sql | 0 {tools => utils}/kamctl/mysql/htable-create.sql | 0 {tools => utils}/kamctl/mysql/imc-create.sql | 0 {tools => utils}/kamctl/mysql/lcr-create.sql | 0 {tools => utils}/kamctl/mysql/msilo-create.sql | 0 {tools => utils}/kamctl/mysql/pdt-create.sql | 0 .../kamctl/mysql/permissions-create.sql | 0 {tools => utils}/kamctl/mysql/presence-create.sql | 0 {tools => utils}/kamctl/mysql/purple-create.sql | 0 {tools => utils}/kamctl/mysql/registrar-create.sql | 0 {tools => utils}/kamctl/mysql/rls-create.sql | 0 {tools => utils}/kamctl/mysql/siptrace-create.sql | 0 {tools => utils}/kamctl/mysql/speeddial-create.sql | 0 {tools => utils}/kamctl/mysql/standard-create.sql | 0 {tools => utils}/kamctl/mysql/uri_db-create.sql | 0 .../kamctl/mysql/userblacklist-create.sql | 0 {tools => utils}/kamctl/mysql/usrloc-create.sql | 0 {tools => utils}/kamctl/oracle/README.TYPES | 0 {tools => utils}/kamctl/oracle/acc-create.sql | 0 {tools => utils}/kamctl/oracle/admin/README | 0 .../kamctl/oracle/admin/_create_as_sys.tmpl | 0 .../kamctl/oracle/admin/_drop_as_sys.tmpl | 0 {tools => utils}/kamctl/oracle/alias_db-create.sql | 0 {tools => utils}/kamctl/oracle/auth_db-create.sql | 0 {tools => utils}/kamctl/oracle/avpops-create.sql | 0 .../kamctl/oracle/carrierroute-create.sql | 0 {tools => utils}/kamctl/oracle/cpl-create.sql | 0 {tools => utils}/kamctl/oracle/dialog-create.sql | 0 {tools => utils}/kamctl/oracle/dialplan-create.sql | 0 .../kamctl/oracle/dispatcher-create.sql | 0 {tools => utils}/kamctl/oracle/domain-create.sql | 0 .../kamctl/oracle/domainpolicy-create.sql | 0 {tools => utils}/kamctl/oracle/group-create.sql | 0 {tools => utils}/kamctl/oracle/htable-create.sql | 0 {tools => utils}/kamctl/oracle/imc-create.sql | 0 .../kamctl/oracle/inc/_create_compat.sql | 0 {tools => utils}/kamctl/oracle/inc/_createsch.tmpl | 0 {tools => utils}/kamctl/oracle/inc/_dropsch.tmpl | 0 {tools => utils}/kamctl/oracle/inc/_grantfunc.tmpl | 0 {tools => utils}/kamctl/oracle/inc/_grantroot.tmpl | 0 {tools => utils}/kamctl/oracle/lcr-create.sql | 0 {tools => utils}/kamctl/oracle/msilo-create.sql | 0 {tools => utils}/kamctl/oracle/pdt-create.sql | 0 .../kamctl/oracle/permissions-create.sql | 0 {tools => utils}/kamctl/oracle/presence-create.sql | 0 {tools => utils}/kamctl/oracle/purple-create.sql | 0 .../kamctl/oracle/registrar-create.sql | 0 {tools => utils}/kamctl/oracle/rls-create.sql | 0 {tools => utils}/kamctl/oracle/siptrace-create.sql | 0 .../kamctl/oracle/speeddial-create.sql | 0 {tools => utils}/kamctl/oracle/standard-create.sql | 0 {tools => utils}/kamctl/oracle/uri_db-create.sql | 0 .../kamctl/oracle/userblacklist-create.sql | 0 {tools => utils}/kamctl/oracle/usrloc-create.sql | 0 {tools => utils}/kamctl/postgres/acc-create.sql | 0 .../kamctl/postgres/alias_db-create.sql | 0 .../kamctl/postgres/auth_db-create.sql | 0 {tools => utils}/kamctl/postgres/avpops-create.sql | 0 .../kamctl/postgres/carrierroute-create.sql | 0 {tools => utils}/kamctl/postgres/cpl-create.sql | 0 {tools => utils}/kamctl/postgres/dialog-create.sql | 0 .../kamctl/postgres/dialplan-create.sql | 0 .../kamctl/postgres/dispatcher-create.sql | 0 {tools => utils}/kamctl/postgres/domain-create.sql | 0 .../kamctl/postgres/domainpolicy-create.sql | 0 {tools => utils}/kamctl/postgres/group-create.sql | 0 {tools => utils}/kamctl/postgres/htable-create.sql | 0 {tools => utils}/kamctl/postgres/imc-create.sql | 0 {tools => utils}/kamctl/postgres/lcr-create.sql | 0 {tools => utils}/kamctl/postgres/msilo-create.sql | 0 {tools => utils}/kamctl/postgres/pdt-create.sql | 0 .../kamctl/postgres/permissions-create.sql | 0 .../kamctl/postgres/presence-create.sql | 0 {tools => utils}/kamctl/postgres/purple-create.sql | 0 .../kamctl/postgres/registrar-create.sql | 0 {tools => utils}/kamctl/postgres/rls-create.sql | 0 .../kamctl/postgres/siptrace-create.sql | 0 .../kamctl/postgres/speeddial-create.sql | 0 .../kamctl/postgres/standard-create.sql | 0 {tools => utils}/kamctl/postgres/uri_db-create.sql | 0 .../kamctl/postgres/userblacklist-create.sql | 0 {tools => utils}/kamctl/postgres/usrloc-create.sql | 0 215 files changed, 3 insertions(+), 3 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=9df…

15 years, 3 months

Database docs - INSTALL

by Olle E. Johansson

As a separate issue for a morning discussion, we need to discuss the varius "*ctl" apps. The INSTALL document fails to mention that we have kamdbctl that will populate the databases with the proper tables and indexes automagically for you. Now, this is on the kamailio side of our schizophrenic product, so it's propably not very generic - or have we reached a stage where the database tables are the same for both variants of sip-router? If so, we should propably move kamdbctl out of the kamailio corner, move it up front and rename it srdbctl or something more generic. When we package Kamailio for release 3, we can modify the INSTALL for that distro, but if we can avoid having to mantain duplicates or different versions of documentation, life will be much easier for everyone involved. Your thoughts or feedback on this, please! /O

15 years, 3 months

git:master: Updating INSTALL - mostly formatting

by Olle E. Johansson

Module: sip-router Branch: master Commit: df0c82a0c0a18eb195c03b1b0e55c0624da8a7e6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=df0c82a… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Fri Oct 9 11:23:20 2009 +0200 Updating INSTALL - mostly formatting --- INSTALL | 664 ++++++++++++++++++++++++++++++--------------------------------- 1 files changed, 319 insertions(+), 345 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=df0…

15 years, 3 months

INSTALL file

by Olle E. Johansson

Good morning, team! I took a look at the INSTALL file yesterday, and it's getting very old and not very up2date. I added a small part in the beginning to explain the new product: + Welcome to the SIP router! This is an amazingly flexible, robust + and secure SIP server built on years of experience in several Open + Source projects. It's a merge of the SIP Express Router and the + OpenSER/Kamailio products produced by a joint development team. + This memo gives you hints how to set up SIP Router quickly. To understand how SIP Router works and how to configure it properly, - read admin's guide available from SIP Router website. We also - urge you to read latest ISSUES (available from SIP Router website + please read the admin's guide available from the SIP Router website. + + We also urge you to read latest ISSUES (available from SIP Router website too) and check for potential problems in this release. - Users of previous releases are encouraged to read NEWS to - learn how to move to this new SIP Router version. + Users of previous releases are encouraged to read NEWS to learn how to move to + this new SIP Router version. OK? I also changed the layout to make it more readable. Seemed like many people have added to the file during the years and had different ideas on formatting. The documented only mentioned Mysql as a module and made it sound like installing Mysql was a requirement unless you wanted to run without any security at all. I rephrased that and changes to "a database module, like MySQL" and mentioned Berkeley DB and PostgreSQL somewhere to make it a bit more generic and also show that we have support of multiple databases. There are also parts that refer to commercial support by iptelorg and iptelorg bulletin boards that I think we either should remove or make more neutral by referring to a "group of commercial companies providing support" and a sr-biz mailing list. One thing I did not attempt was to sort out the modules part. Now, I know that we will have a few different distributions that emphasize the kamailio side or the ser side, but I also do believe that a lot of people will simply download sip-router. Should I make an attempt to explain this for the coming release in the INSTALL file? It feels important. Feedback, please before I commit :-) /O

15 years, 3 months

kamctl dir and git

by Andrei Pelinescu-Onciul

There is a known bug in git when dealing with merges involving a file that was transformed in a directory (e.g. foo => moved to foo/foo). Merges with branches made prior to such a move will fail. (http://permalink.gmane.org/gmane.comp.version-control.git/53402 https://kerneltrap.org/mailarchive/git/2007/9/18/270272/thread ) This affects us too: tools/kamctl was moved in tools/kamctl/kamctl. This means that any merge with a branch made prior to 22 Sep will fail, requiring non-trivial manual intervention. We have the following possibilities: 1. ignore and wait for a fixed git version 2. rename tools/kamctl to something else, e.g.: tools/kam_ctl, tools/kamilioctl (only the directory name has to be changed) 3. move tools/kamctl to utils/kamctl I would go for 3 and I would move also pike_top in the process and drop tools/. So is anybody against it? Any reason to keep separate tools/ and utils/ directories? Andrei

15 years, 3 months

sercmd segfaults

by jh＠tutpro.com

today i noticed that sercmd is crashing right at start. gdb does not tell much: Program terminated with signal 11, Segmentation fault. [New process 15687] #0 0x00000001 in __do_global_dtors_aux () (gdb) where #0 0x00000001 in __do_global_dtors_aux () it had worked fine before. -- juha

15 years, 3 months

git:master: makefile: use separate CFLAGS & LDFLAGS for utils

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 89d400689357f919ed0cd200e3b0576ffa79d1c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=89d4006… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 8 17:45:44 2009 +0200 makefile: use separate CFLAGS & LDFLAGS for utils - added UTILS_CFLAGS and UTILS_LDFLAGS (Makefile.defs and saved in the config) - use UTILS_CFLAGS and UTILS_LDFLAGS when compiling the utils (fixes a bug when an util compiled by a module will be compiled with the module flags) --- Makefile.defs | 9 ++++++--- Makefile.utils | 6 +++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 88abb70..f883a0b 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1528,7 +1528,7 @@ endif # CC_NAME=suncc endif # CC_NAME=icc endif # CC_NAME=gcc -#*FLAGS used for compiling the modules +#CFLAGS used for compiling the modules, libraries and utils ifeq ($(CC_NAME), gcc) MOD_CFLAGS=-fPIC -DPIC $(CFLAGS) LIB_CFLAGS=-fPIC -DPIC $(CFLAGS) @@ -1542,6 +1542,9 @@ ifeq ($(CC_NAME), suncc) MOD_CFLAGS=-xcode=pic32 $(CFLAGS) LIB_CFLAGS=-xcode=pic32 $(CFLAGS) endif +UTILS_CFLAGS=$(CFLAGS) +# LDFLAGS uses for compiling the utils +UTILS_LDFLAGS=$(LDFLAGS) ifeq ($(LEX),) LEX=flex @@ -1891,7 +1894,7 @@ export exported_vars saved_fixed_vars:= MAIN_NAME CFG_NAME SCR_NAME \ RELEASE OS ARCH \ C_DEFS DEFS_RM PROFILE CC LD MKDEP MKTAGS LDFLAGS C_INCLUDES \ - MOD_LDFLAGS LIB_LDFLAGS LIB_SONAME LD_RPATH \ + MOD_LDFLAGS LIB_LDFLAGS UTILS_LDFLAGS LIB_SONAME LD_RPATH \ LIB_SUFFIX LIB_PREFIX \ LIBS \ LEX YACC YACC_FLAGS \ @@ -1903,7 +1906,7 @@ saved_fixed_vars:= MAIN_NAME CFG_NAME SCR_NAME \ # variable changeable at compile time # extra: prefix DESTDIR BASEDIR basedirt saved_chg_vars:=\ - CC_EXTRA_OPTS CPU CFLAGS_RM CFLAGS MOD_CFLAGS LIB_CFLAGS \ + CC_EXTRA_OPTS CPU CFLAGS_RM CFLAGS MOD_CFLAGS LIB_CFLAGS UTILS_CFLAGS \ BASEDIR basedir DESTDIR \ PREFIX prefix\ cfg_prefix cfg_dir bin_prefix bin_dir modules_prefix modules_dir \ diff --git a/Makefile.utils b/Makefile.utils index 3f48660..570a9ef 100644 --- a/Makefile.utils +++ b/Makefile.utils @@ -40,7 +40,7 @@ override static_modules= override static_modules_path= # temporary def (visible only in the util makefile, not exported) -DEFS += +DEFS += -DMOD_NAME="utils/$(UTIL_NAME)" ifneq ($(makefile_defs_included),1) $(error "the local makefile does not include Makefile.defs!") @@ -63,6 +63,10 @@ include $(COREPATH)/Makefile.sources # the rest of makefile and try only to remake the config ifeq ($(makefile_defs),1) +# set CFLAGS & LDFLAGS +CFLAGS:=$(UTILS_CFLAGS) +LDFLAGS:=$(UTILS_LDFLAGS) + err_fail?=1 include $(COREPATH)/Makefile.dirs

15 years, 3 months

git:master: memcached(sr): fix docs for value deletion

by Henning Westerholt

Module: sip-router Branch: master Commit: 56e0b7d4127525250a885815e26f8d05f8281d30 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=56e0b7d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 8 16:12:52 2009 +0200 memcached(sr): fix docs for value deletion --- modules_k/memcached/README | 4 ++-- modules_k/memcached/doc/memcached_admin.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules_k/memcached/README b/modules_k/memcached/README index 0e432c0..46b4d16 100644 --- a/modules_k/memcached/README +++ b/modules_k/memcached/README @@ -85,8 +85,8 @@ Chapter 1. Admin Guide ... $mct(test) = 1; xlog("stored value is $mct(test)"); -$mct(test) = null; # delete it -xlog("stored value is $mct(test)"); # will return <null> +$mct(test) = $null; # delete it +xlog("stored value is $mct(test)"); # will return <null> or empty string ... Example 1.2. Using atomic operations diff --git a/modules_k/memcached/doc/memcached_admin.xml b/modules_k/memcached/doc/memcached_admin.xml index 17e9aac..dd77070 100644 --- a/modules_k/memcached/doc/memcached_admin.xml +++ b/modules_k/memcached/doc/memcached_admin.xml @@ -30,8 +30,8 @@ ... $mct(test) = 1; xlog("stored value is $mct(test)"); -$mct(test) = null; # delete it -xlog("stored value is $mct(test)"); # will return <null> +$mct(test) = $null; # delete it +xlog("stored value is $mct(test)"); # will return <null> or empty string ... </programlisting> </example>

15 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev