sr-dev

sr-dev@lists.kamailio.org

12 participants
44188 discussions

git:master: test: adaption of kamailio specific scripts to sr, more generalization

by Henning Westerholt

Module: sip-router Branch: master Commit: 21ac862fd73687d469f3e0ef9e535c521cfc3e75 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=21ac862… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 6 17:12:17 2009 +0200 test: adaption of kamailio specific scripts to sr, more generalization --- test/unit/include/common | 15 ++++++++++----- test/unit/include/require | 11 ++++++++--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/test/unit/include/common b/test/unit/include/common index 48f48b2..feda07e 100644 --- a/test/unit/include/common +++ b/test/unit/include/common @@ -1,6 +1,11 @@ +# all database modules DB_ALL_MOD="acc|alias_db|auth_db|avpops|dialog|dialplan|dispatcher|domain|domainpolicy|group|imc|lcr|msilo|siptrace|speeddial|uri_db|usrloc|permissions|pdt|userblacklist" -CTLRC="kamctlrc" -CTL="kamctl" -DBCTL="kamdbctl" -BIN="kamailio" -KILL="killall -15 kamailio" \ No newline at end of file +# root directory relative to tests +SR_DIR="../.." +CTLRC="$SR_DIR/scripts/kamctlrc" +CTL="$SR_DIR/scripts/kamctl" +DBCTL="$SR_DIR/scripts/kamdbctl" +BIN="$SR_DIR/ser" +KILL="killall -15 $BIN" +# test directory relative to root +TEST_DIR="test/unit" \ No newline at end of file diff --git a/test/unit/include/require b/test/unit/include/require index fef0bcb..80a1058 100644 --- a/test/unit/include/require +++ b/test/unit/include/require @@ -16,8 +16,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +source include/common + function check_kamailio() { - if ! (test -e ../kamailio) ; then + if ! (test -e $BIN) ; then echo "kamailio not found, not run" return -1 fi; @@ -30,8 +32,11 @@ function check_module() { return -1 fi - if ! (test -e ../modules/$1/$1.so) ; then - echo "modules/$1/$1.so not found, not run" + if ! (test -e $SR_DIR/modules_k/$1/$1.so) ; then + echo "$SR_DIR/modules_k/$1/$1.so not found, try $SR_DIR/modules" + fi; + if ! (test -e $SR_DIR/modules/$1/$1.so) ; then + echo "$SR_DIR/modules/$1/$1.so not found, not run" return -1 fi; return 0

15 years, 8 months

git:master: port from k r5751, fscanf can fail, fix warning related to recent glibc versions

by Henning Westerholt

Module: sip-router Branch: master Commit: 5dbe4f22ddc81c67cebe89c072cbffc0daf3aecd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5dbe4f2… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 6 15:04:34 2009 +0200 port from k r5751, fscanf can fail, fix warning related to recent glibc versions --- daemonize.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/daemonize.c b/daemonize.c index 03552be..e87bec2 100644 --- a/daemonize.c +++ b/daemonize.c @@ -133,7 +133,9 @@ int daemonize(char* name) if (pid_file!=0){ if ((pid_stream=fopen(pid_file, "r"))!=NULL){ - fscanf(pid_stream, "%d", &p); + if (fscanf(pid_stream, "%d", &p) < 0) { + LM_WARN("could not parse pid file %s\n", pid_file); + } fclose(pid_stream); if (p==-1){ LOG(L_CRIT, "pid file %s exists, but doesn't contain a valid" @@ -161,7 +163,9 @@ int daemonize(char* name) if (pgid_file!=0){ if ((pid_stream=fopen(pgid_file, "r"))!=NULL){ - fscanf(pid_stream, "%d", &p); + if (fscanf(pid_stream, "%d", &p) < 0) { + LM_WARN("could not parse pgid file %s\n", pgid_file); + } fclose(pid_stream); if (p==-1){ LOG(L_CRIT, "pgid file %s exists, but doesn't contain a valid"

15 years, 8 months

git:master: refine 15e2e89e5d1e7f9dc6265c270153088596159ee5, remove instead comment out

by Henning Westerholt

Module: sip-router Branch: master Commit: 778362943cce3c1d27c8e1afac25bfceeb4aa0fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7783629… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 6 14:31:33 2009 +0200 refine 15e2e89e5d1e7f9dc6265c270153088596159ee5, remove instead comment out --- modules_s/uri/Makefile | 1 - modules_s/uri/checks.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules_s/uri/Makefile b/modules_s/uri/Makefile index d7d185f..a755e14 100644 --- a/modules_s/uri/Makefile +++ b/modules_s/uri/Makefile @@ -13,6 +13,5 @@ LIBS= DEFS+=-DSER_MOD_INTERFACE SERLIBPATH=../../lib -#SER_LIBS+=$(SERLIBPATH)/srdb2/srdb2 include ../../Makefile.modules diff --git a/modules_s/uri/checks.c b/modules_s/uri/checks.c index 9d5a1c6..a703d92 100644 --- a/modules_s/uri/checks.c +++ b/modules_s/uri/checks.c @@ -43,7 +43,6 @@ #include "../../parser/parse_uri.h" #include "../../parser/parse_param.h" #include "../../ut.h" /* Handy utilities */ -//#include "../../lib/srdb2/db.h" /* Database API */ #include "../../dset.h" #include "uri_mod.h" #include "checks.h"

15 years, 8 months

git:master: core: Consolidate append_str macro usage

by Jan Janak

Module: sip-router Branch: master Commit: 47945782e1459935b1f327abb92fbc1a3ffcd86f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4794578… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed May 6 14:47:14 2009 +0200 core: Consolidate append_str macro usage The definition of append_str macro was scattered across the source tree, there were multiple definition of the macro, some of them with different parameters. This patch brings the definition of append_str macro into ut.h header file and removes all other definitions from core and modules. We chose the version with three parameters where the pointer and the length of the source string are passed separately to the macro. This is more flexible than passing both of them within one parameter as str structure. All references to append_mem_block have been removed because the same operation can now be achieved with append_str. In addition to that we updated parameters passed to append_str where needed, converting one str parameter to <pointer,len> pair of parameters. Some modules had yet another version of append_str defined, there we renamed the macro to some other name to make sure that the local definition does not conflict with the definition on ut.h --- lib/kcore/km_ut.h | 11 ---- modules/tm/t_fifo.c | 8 ++-- modules/tm/t_funcs.h | 16 ------ modules/tm/t_msgbuilder.c | 96 ++++++++++++++++++------------------ modules/tm/t_serial.c | 8 ++-- modules_s/acc_syslog/acc_syslog.c | 8 ++-- modules_s/sms/sms_funcs.c | 4 -- msg_translator.c | 6 -- ut.h | 12 +++++ 9 files changed, 72 insertions(+), 97 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=479…

15 years, 8 months

git:master: presence_xml: disable bla support

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: dd78db27471fb2cdd266ffd5e70c6d71b321467b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd78db2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed May 6 14:09:47 2009 +0200 presence_xml: disable bla support - needs review with latest spec updates - potential issues with merging need to be reviewed as well --- modules_k/presence_xml/README | 239 +++++++++++--------- modules_k/presence_xml/doc/presence_xml_admin.xml | 2 +- modules_k/presence_xml/presence_xml.c | 2 +- 3 files changed, 133 insertions(+), 110 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=dd7…

15 years, 8 months

git:master: Serial forking functions.

by Jan Janak

Module: sip-router Branch: master Commit: 00f54c06f2f6d4e4c8a5a004eb07367c93b82329 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=00f54c0… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed May 6 11:17:17 2009 +0200 Serial forking functions. This patch adds two new functions to tm module, t_load_contacts and t_next_contacts which can be used to implement serial forking. There are also two new parameters, fr_inv_timer_next and contacts_avp. Parameter fr_inv_timer_next is similar to fr_inv_timer, the value of this parameter is used for subsequent branches during serial forking. The value of contacts_avp is the identifier of the AVP which contains the list of contacts to be used for serial forking. The serial forking functions originate from Kamailio where they were implemented by Juha Heinanen. --- modules/tm/README | 636 +++++++++++++++++++++-------------------- modules/tm/config.c | 3 + modules/tm/config.h | 5 + modules/tm/doc/functions.xml | 79 ++++++ modules/tm/doc/params.xml | 51 ++++ modules/tm/doc/tm.xml | 9 + modules/tm/t_fifo.c | 22 +-- modules/tm/t_funcs.c | 25 ++- modules/tm/t_funcs.h | 24 ++- modules/tm/t_msgbuilder.c | 14 +- modules/tm/t_serial.c | 519 ++++++++++++++++++++++++++++++++++ modules/tm/t_serial.h | 35 +++ modules/tm/tm.c | 15 +- 13 files changed, 1090 insertions(+), 347 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=00f…

15 years, 8 months

New commits on branch master

by Jan Janak

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aa639c4… Merge: 00f54c06f2f6d4e4c8a5a004eb07367c93b82329 64d5ac2e01f80b9f54db286294d01664d4bc87fa Author: Jan Janak <jan(a)iptel.org> Date: Wed May 6 12:08:08 2009 +0200 Merge unit tests from kamailio trunk. * trunk: (126 commits) - extend test with one non-digit URI (bug #2694633) - fix isql function, remove column delimiter - add missing check for kamailio binary on start - fix NULL behaviour for db_unixodbc in module - add functionality for runtime message forwarding, this is useful - remove a few modules that need (now) external libraries - change functionality in cr_route, cr_prime_route to not store information - improve tests a bit for flags and mask matching - fix test description - move encode_contact, decode_contact and decode_contact_header function - add a new test for carrierroute, non-numerical matching mode - fix tests after removal of the uri module and the moving of the $shv vars - fix tests, add pv loadmodule.. - remove options module from test after removal in the tree - add missing module and compile checks on start - add new utils module to test - finish renaming, fix module name in test - add new module 'utils', to hold various SIP message related functionality - extend registrar test for db_mysql and db_postgres: test also for contact - finish refactoring of carrierroute module ... URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=64d5ac2… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Mar 19 16:49:51 2009 +0000 - extend test with one non-digit URI (bug #2694633) git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5729 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=00981ef… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Mar 2 12:37:09 2009 +0000 - fix isql function, remove column delimiter git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5653 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6f4d830… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 25 11:23:04 2009 +0000 - add missing check for kamailio binary on start git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5629 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=baa1063… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jan 26 18:08:46 2009 +0000 - fix NULL behaviour for db_unixodbc in module - add test for NULL behaviour on db_unixodbc git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5519 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8b500b2… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jan 26 09:06:35 2009 +0000 - add functionality for runtime message forwarding, this is useful for example to transfer SIP traffic from your balancers to testing machines - forwarding can be modified with some FIFO commands, only certain message types can be matched - message are forwarded before the config script is executed, with some callbacks - derived of a stand-alone module, written from Hardy Kahl, hardy dot kahl at 1und1 dot de, some functions were removed - not activated per default, thus no run-time overhead when not used - TODO: FIFO commands documentation missing - add a test for the functionality git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5510 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=12f1f51… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jan 26 08:53:13 2009 +0000 - remove a few modules that need (now) external libraries git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5509 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c0f1917… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Jan 22 13:43:17 2009 +0000 - change functionality in cr_route, cr_prime_route to not store information about the destination host in the given AVP, instead the content of the routing description is stored - no existing functionality is lost, $rt, or $rd + $rp can be used instead - fix tests to work after modification git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5497 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d8cfe5b… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Jan 8 15:28:19 2009 +0000 - improve tests a bit for flags and mask matching git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5436 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=83f8d8d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Dec 15 16:22:15 2008 +0000 - fix test description git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5361 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0cacfdd… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Dec 8 16:38:47 2008 +0000 - move encode_contact, decode_contact and decode_contact_header function from mangler to siputils, delete remaining mangler module - credits belongs to Frederick Bullik, frederick dot bullik at 1und1 dot de - remove almost empty common.h file, remove module from test 2 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5318 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=680efdf… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Dec 5 16:57:31 2008 +0000 - add a new test for carrierroute, non-numerical matching mode git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5305 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a6fe2e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Dec 3 18:02:13 2008 +0000 - fix tests after removal of the uri module and the moving of the $shv vars git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5294 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6a20c89… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Nov 27 15:31:59 2008 +0000 - fix tests, add pv loadmodule.. git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5277 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6a03be3… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Nov 26 15:24:03 2008 +0000 - remove options module from test after removal in the tree git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5269 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7f62201… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Nov 24 17:42:12 2008 +0000 - add missing module and compile checks on start - remove obselete comment git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5251 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cda0b04… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Nov 24 12:21:25 2008 +0000 - add new utils module to test git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5247 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=55f0153… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Nov 18 11:38:25 2008 +0000 - finish renaming, fix module name in test - instead of (ab)using the fixup function to delay the initialization, just check for a positive timeout value git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5215 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f8c0181… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Nov 14 14:25:52 2008 +0000 - add new module 'utils', to hold various SIP message related functionality - add a function to convert 183 messages (for example in parallel call) to 180 (derived from some internal module that we implemented long ago) - Credits for the original code belongs to Hardy Kahl, hardy dot kahl at 1und1 dot de - write some doxygen comments, write user documentation, add timeout value as parameter, add new module to test 2 - in the near term some other functions of small modules will be moved to this place, e.g. maxfwd, some new contributions are also planned to be placed here git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5202 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e37837a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Nov 13 16:17:34 2008 +0000 - extend registrar test for db_mysql and db_postgres: test also for contact persistence accross server restarts (the NULL value behaviour differ between the two database types) git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5198 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd003a0… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Nov 12 15:53:01 2008 +0000 - finish refactoring of carrierroute module - replace O(n) matching logic for carrier and domain names with a efficient binary search implementation - use qsort and bsearch of glibc in most of the cases, where its possible (basically all carrier/domain searches are O(log n) now, only when dynamic strings for are used in the cfg, it needs to search the whole list) - change carrier and domain names from string to integer, to allow the lookup - instead of storing the carrier/domain name string in the memory structure, a pointer to the name is used to save space - get rid of this internal ID vs. external ID stuff, we use now only one - rename the route_tree table to carrier_name - add a new table domain_name, to hold the domain names (like route_tree tbl) - adapt tests for the new or changed functionality - extend documentation with a paragraph about the used matching logic - Credits for this work belongs to Hardy Kahl, hardy dot kahl at 1und1 dot de - fix a few errors in the postgres cr test, fix a few doxygen statements - move some parts of log messages to DBG log level - update documentation and database schemes git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5189 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7bd6577… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Nov 12 11:31:44 2008 +0000 - add a test that checks for a certain out of memory condition in avpops in PKG_MEM, related to bug #2229966 (test fails, as this is not fixed yet) git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5186 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=591c3b5… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Nov 11 14:48:42 2008 +0000 - make test a little bit more strict git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5182 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f84d91f… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Nov 11 14:42:10 2008 +0000 - add a test for the pike module git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5181 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=03f6a3d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Oct 27 13:20:38 2008 +0000 - fix 2.cfg, 7.cfg - contact_avp is not available anymore in lcr - add small function to test for sipsak availability - extend mysql registrar test (11.sh), use sipsak to test for more cases (cleanup timer in usrloc, unregistration of specific contacts, unregistration of all contacts, contact binding update..) - extend postgres registrar test (22.sh), use sipsak here too git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5137 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a4d739a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 9 09:17:09 2008 +0000 - add a test for fetch_result with usrloc on unixodbc - change name for SQL command git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5052 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d29191a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Sep 24 12:00:46 2008 +0000 - speed up tests by grouping database insertion together git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4987 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e85ed32… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Sep 24 10:23:35 2008 +0000 - add htable module to load test git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4984 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea31860… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Sep 23 14:26:23 2008 +0000 - generalize test/ improve structure a bit, use cleanup function git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4979 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f274888… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Sep 18 15:47:59 2008 +0000 - add common method to kill the server, use signal 15 instead of signal 9 to get a proper shutdown git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4959 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4b1ab80… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Sep 18 09:20:41 2008 +0000 - add presence_dialoginfo and pua_dialoginfo to load test git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4944 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=721715e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Sep 17 11:36:34 2008 +0000 - add 'pv' module to tests, spelling fix git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4935 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=91d939f… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Sep 12 16:24:48 2008 +0000 - integrate definitions from md5global.h into md5.h/ md5.c after cleanups - remove inclusion of this file from uac and auth module - extend test 12 with variable assignment and md5/ string transformations - small formatting fix for the copyright headers - todo: remove this PROTO_LIST stuff, this mask some warnings, remove this custom mem routines that are not used because of USE_MEM define in md5.c git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4897 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=39dbabd… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Sep 11 12:05:38 2008 +0000 - add functions to check for accessible postgres and unixodbc database to prevent errors if some DB is not installed, change test to use this - move postgres query command to variable, cleanup 22, 23 and 32 - small comment fix in 37 - add new test for server module loading on unixodbc git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4884 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4842df3… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Sep 10 16:53:55 2008 +0000 - increase number of routing rules in test, after fetch_result support introduction git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4877 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=747f65b… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Sep 8 12:47:51 2008 +0000 - add test for carrierroute with larger number of routings rules - as this needs a bigger PKG_MEM pool, the default number of rules is small git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4867 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eb23cf3… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Sep 4 15:02:09 2008 +0000 - integrate gflags functionality into cfgutils module - the 'initial' parameter was renamed to 'initial_gflags' - adapt test and doxygen git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4843 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=73af9d8… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Sep 3 14:18:13 2008 +0000 - make test a little bit more relaxed git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4810 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5917d1f… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Sep 2 14:50:38 2008 +0000 - add correct listen statement to test 12 - fix database checks in include, don't output data git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4806 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d262e6… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Sep 1 16:20:01 2008 +0000 - add missing file for registrar test (11) git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4800 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9667e87… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Aug 29 16:15:50 2008 +0000 - extend test a little bit after reg_callid_avp addition in registrar git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4777 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=131f4c1… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Aug 29 13:59:47 2008 +0000 - add test for private memory effiency and eventual fragmentation with ul_dump with and without PKG_MALLOC - especially with regards to the fragmentation this needs some extensions git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4775 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cb2a1ef… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Aug 28 09:46:59 2008 +0000 - cleanup in carrierroute test - test also avpops startup with db table git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4761 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=33fa7e4… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Aug 25 10:47:19 2008 +0000 - small change, uri_db module checks uri table instead of subscriber, this is already done in several other tests git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4732 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a1f9967… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Sat Aug 23 10:43:00 2008 +0000 - check for available mysql database in some more tests git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4719 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cdb0cc2… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Aug 8 14:35:50 2008 +0000 - some generalisations in test suite git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4649 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fc42fdd… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Aug 7 12:30:02 2008 +0000 - fix tests after renaming (mostly database related) - introduce parameter for rc file and control tools git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4633 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6ed7e3f… Author: Klaus Darilion <klaus.darilion(a)pernau.at> Date: Tue Aug 5 14:52:49 2008 +0000 - renaming: openser -> kamailio git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4562 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f6b26b… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jul 28 15:39:28 2008 +0000 - change name in copyright headers git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4518 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8028d6c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Jul 11 16:28:05 2008 +0000 - various cleanups and checks added - move mysql command definition to own include file - cleanups some configurations - add command to check for a mysql DB access with the default auth data - fix some carrierroute related mysql warnings git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4482 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=464deb0… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Jul 11 09:17:26 2008 +0000 - extend permissions test, check also allow_trusted (related to #1925738), some small cleanups git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4479 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6135eab… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Jul 4 11:23:40 2008 +0000 - small fix in test 2 - add new test for presence related modules startup on mysql git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4451 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78b223d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jun 30 10:44:43 2008 +0000 - Fix problem in the allow_address() and allow_source_address() functions, they worked properly only with /0, /8, /16, /24, /32 netmasks so far. Related to bug #1888101, reported from Giovanni Coriasco - add a small testcase for the permission module git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4432 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b2730e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Jun 27 15:54:16 2008 +0000 - add some variables to test 19 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4429 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a999de7… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Jun 27 15:52:50 2008 +0000 - small spelling fix in test purpose git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4428 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0ed71b0… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jun 9 14:52:34 2008 +0000 - add some small functions to check for an compiled openser, modules and some helper programs - add also a variable for a "all module" statement for inclusion in the cfg - convert existing tests to use the functions git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4349 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2f23b08… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jun 9 13:27:01 2008 +0000 - add dialplan module also to non SQL tests git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4348 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7b9a034… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jun 9 11:24:34 2008 +0000 - add dialplan to test 2 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4347 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2ae2fd9… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jun 2 10:22:02 2008 +0000 - remove some mediaproxy parameter, there are not available anymore - fix userblacklist test after recent schema changes git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4288 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9945286… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon May 26 16:03:04 2008 +0000 - silence killall statement, as this should fail - add new nat_traversal module to 'load all' test git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4254 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=947cd9e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 21 09:13:44 2008 +0000 - fix test 33, add a small sleep as the core dumping is sometimes slow - add a TEST check for the dbtext DB to the openserctl.dbtext, fix test 10 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4233 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9730327… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon May 19 14:17:19 2008 +0000 - add test for cfgutils (check config file hashing, some parameter definitions, memory dumps and core dump functionality) git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4227 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d6f596… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 14 08:58:06 2008 +0000 - small bugfix git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4177 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a00583b… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue May 13 15:28:43 2008 +0000 - make carrierroute tests a little more robust, allow for a certain imbalance in routing, as the CRC32 hash is not perfect - make userblacklist test make robust, sipp > 1.X is a little bit more sensitive during startup/ or needs a little bit more time to stop.. git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4165 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=95e0ec8… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue May 13 14:12:30 2008 +0000 - add directory prefix to openserctl calls, allow them to run without an installed openser - add missing 'TEST' mode sed hack to some tests - remove double 'sipp' test in test 20 - fix postgres ID comparision for 8.3 version git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4164 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ad1f591… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri May 9 11:57:32 2008 +0000 - remove now unneeded 32.cfg git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4145 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=47097ff… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu May 8 15:47:43 2008 +0000 - postgres fetch_result test should also use a small fetch_rows parameter git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4136 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bc45c8a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed May 7 16:02:41 2008 +0000 - add tests for fetch_result functionality used from usrloc for mysql and postgres database - modify existing test 11 to make configuration usable for the new ones git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4123 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7927ec3… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Apr 28 13:32:26 2008 +0000 - add an AVP for the domain in userblacklist test - silence debug logging for other tests git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4096 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a42f984… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Apr 17 12:02:41 2008 +0000 - fix postgres cpl test name - add routing test for carrierroute from config file git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4028 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=67e373c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Apr 14 13:32:53 2008 +0000 - extend test with flag support git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4012 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4e15894… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Apr 11 10:22:40 2008 +0000 - cpl test also for postgres git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4010 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=07080c8… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Apr 11 09:47:17 2008 +0000 - rename presence test - add test with some simple cpl operations for mysql git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4008 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=05ea178… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Apr 4 14:09:05 2008 +0000 - fix reported test purpose git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3991 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8ce6328… Author: Anca Vamanu <anca(a)voice-system.ro> Date: Fri Apr 4 13:36:22 2008 +0000 - added tests for presence git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3989 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7cba478… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Apr 4 11:28:21 2008 +0000 - fix userblacklist test after column renaming git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3985 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=98f3082… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Mar 13 15:36:20 2008 +0000 - fix tests after noisy_ctimer removal git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3935 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7611536… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Mar 7 18:11:15 2008 +0000 - extend test 21 to INVITEs, add more tests for uri_db - fix test 7.cfg after uri_db changes - several cleanups git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3885 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7437fe9… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Mar 7 14:34:39 2008 +0000 - make src for str_dup const - remove obselete change information - update test 5, (default cfg) git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3882 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9e77c56… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Mar 6 12:09:50 2008 +0000 - small indention fix - update test descriptions git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3866 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fabdb7a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Mar 5 17:20:12 2008 +0000 - silence successful tests git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3856 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=de8ca61… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Mar 3 15:43:16 2008 +0000 - extend cr test with actual failure routes - small cleanups, add ratelimit to test 2 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3832 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c7e02d5… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Feb 29 17:02:46 2008 +0000 - update test 13 with some carrierfailureroute data - add a new test that exercise some simple routing git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3812 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b1bdf4a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Feb 29 13:03:50 2008 +0000 - fix and extend carrierroute loading tests git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3807 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=509721e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Feb 28 17:25:32 2008 +0000 - add carrierfailureroute to table list - fix cfg for carrierroute test git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3795 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d7c3065… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 27 15:43:38 2008 +0000 - fix test 15, 16 and 17 after addition of the userblacklist module to 2.cfg git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3774 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=57d5e6c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 27 15:38:22 2008 +0000 - add userblacklist module to test 2 - add a new test, checking openserdbctl for postgres git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3773 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f1329b6… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 27 14:28:06 2008 +0000 - improve test for userblacklist, now with empty prefix - spelling fix in 19.cfg git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3770 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d5d49a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Feb 26 13:51:26 2008 +0000 - add a new module, called 'userblacklist' for handling user and global blacklists - credits for this module goes to Hardy Kahl, hardy dot kahl at 1und1 dot de - add documentation, database scheme and test for this module git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3760 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ede0929… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 13 17:14:16 2008 +0000 - modify openserdbctl tests to set the 'TEST' variable - fix some minor errors - remove SERWEB specific stuff git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3706 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=39ff769… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Feb 7 16:40:21 2008 +0000 - improve test for carrierroute route loading git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3664 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5c201be… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 6 15:46:09 2008 +0000 further changes after the db name change - update INSTALL file - fix Makefile skip modules variable - fix module Makefile, lib name - change db_bind_mod to add the db prefix in the function - change db url defines in db_berkeley and db_text - change database modules names in module struct - fix debian packaging - fix tests git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3642 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f8c6933… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 6 14:57:16 2008 +0000 - new tests, postgres and carrierroute git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3640 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d2cb6da… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jan 30 13:19:37 2008 +0000 - add some parameter for acc testing git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3598 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5a2c818… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jan 22 12:07:53 2008 +0000 - add new test, authentification with postgres - enable logging to syslog for some tests, better info messages git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3562 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e33090d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Dec 21 15:30:35 2007 +0000 - fix error in test 6 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3480 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f817205… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Dec 21 14:52:59 2007 +0000 - fix accidental commit git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3478 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8510baa… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Dec 21 14:19:00 2007 +0000 - add working dir to tests, to get core dumps git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3477 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7fe3958… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Dec 20 17:29:29 2007 +0000 - don't disable retransmits for tests, better fail after some time git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3470 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=637275e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Dec 18 12:12:38 2007 +0000 - fix test after lcr change git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3423 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=413350a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Dec 18 12:10:26 2007 +0000 - fix test after lcr change git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3422 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f527d1f… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Dec 14 10:25:41 2007 +0000 - fix error in default config that prevents the server start - test 5 uses now the new config.. git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3375 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5e6aef5… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Dec 12 13:41:03 2007 +0000 - add a warning that the tests in the current state should only run from devs git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3324 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2f2b2d1… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Dec 11 15:38:46 2007 +0000 - adds proper copyright notice git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3309 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a5b447… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Dec 11 15:21:34 2007 +0000 - more tests - user lookup for proxy functionality - authentification with auth and auth_db - basic accounting functionality - openser command line arguments - Credits go to Frederick Bullik, Frederick dot Bullik at 1und1 dot de git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3308 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cbc392b… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Dec 10 12:23:28 2007 +0000 - output also the number of the actual test - test 6 checks uses now also '-C' git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3295 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e8f7d68… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Dec 3 17:39:54 2007 +0000 - silence test 6 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3249 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a9cab1… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Nov 29 17:26:43 2007 +0000 - remove unneeded mysql stuff from test 8 - test 17 creates now a fresh db git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3234 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=80300a5… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Nov 27 17:39:50 2007 +0000 - don't echo return status, be more tolerant git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3218 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1f4cf1b… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Nov 27 17:30:09 2007 +0000 - add some linefeeds to test 12 - improve test to check the output git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3217 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1a572c0… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Nov 26 18:57:25 2007 +0000 - fix for database tests, dialog module should use database git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3211 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0994a3c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Nov 26 13:18:37 2007 +0000 - dbtext and db_berkeley must be loaded before modules that want to use them git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3206 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c3e5860… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Nov 22 18:20:33 2007 +0000 - add a test for db_berkeley module git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3201 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=55abae6… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Nov 22 17:39:43 2007 +0000 - add a check for mysql driver to test 2 - add a test for postgres db git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3198 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=97fdb67… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Nov 22 12:35:59 2007 +0000 - don't load dbtext mod in test 2, change cfg to not include mysql, do this in test - add a new test that checks openser db related module startup with dbtext git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3190 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6764257… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Nov 16 14:57:04 2007 +0000 - some cleanup in existing tests - add more tests: 12 - script with PVs, transformations and xlog 13 - carrierroute with db 14 - carrierroute with config file git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3158 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b8abae5… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Nov 12 14:40:50 2007 +0000 - add test for bug 1829002, config check - fix test 2, extend comment in 3 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3103 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=29f416a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Nov 9 18:09:32 2007 +0000 - commit missing SIP test messages git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3093 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3b396f6… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Nov 9 18:05:57 2007 +0000 - fix output for test 8 - add a test for persistent registrar for mysql git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3092 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=08c5fc9… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Nov 9 17:08:25 2007 +0000 - openserctl test for dbtext git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3091 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b442520… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Nov 9 17:04:18 2007 +0000 - openserdbctl test for dbtext - openserctl test for mysql git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3090 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cfdcccd… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Nov 9 16:27:57 2007 +0000 - add a test for the openser default config - add a test for a bigger config, generated from sipwise wizard git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3086 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a6d243… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Nov 9 16:27:10 2007 +0000 - use the dispatcher file from etch dir git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3085 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a4cb39a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Nov 9 13:34:55 2007 +0000 - don' run test that depends on the db root password if this is not available git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3078 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9136edb… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Nov 8 17:23:17 2007 +0000 fix config for test 2 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3068 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c54d84d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Nov 8 17:16:55 2007 +0000 - fix output of script git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3067 689a6050-402a-0410-94f2-e92a70836424 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=abe2ee2… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Nov 8 16:58:20 2007 +0000 - really small framework for 'smoke tests' for openser, to test basic functionality of server and some tools after a build - add a 'make test' case to the main Makefile git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3066 689a6050-402a-0410-94f2-e92a70836424

15 years, 8 months

git:master: Splitting fix_sock_str into socket2str and fix_sock_str

by Jan Janak

Module: sip-router Branch: master Commit: 14839e8ff8da792974058779dc0cf4daf4181ac5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=14839e8… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed May 6 11:10:48 2009 +0200 Splitting fix_sock_str into socket2str and fix_sock_str This patch splits fix_sock_str into two function, socket2str and fix_sock_str. The function socket2str is exported and can be used to print the socket into a pre-allocated memory buffer. Function fix_sock_str allocates the memory buffer and calls socket2str internally. The primary consumer of this change is the serial forking code in tm module. This patch also defines a new macro called MAX_SOCKET_STR which evaluates to the maximum size of textual representation of any socket. --- socket_info.c | 73 ++++++++++++++++++++++++++++++++++++++++---------------- socket_info.h | 7 +++++ 2 files changed, 59 insertions(+), 21 deletions(-) diff --git a/socket_info.c b/socket_info.c index ac2c82f..93c453a 100644 --- a/socket_info.c +++ b/socket_info.c @@ -298,6 +298,50 @@ static char* get_proto_name(unsigned short proto) } } +/** Convert socket to its textual representation. + * + * This function converts the transport protocol, the IP address and the port + * number in a comma delimited string of form proto:ip:port. The resulting + * string is NOT zero terminated + * + * @param s is a pointer to the destination memory buffer + * @param len is a pointer to an integer variable. Initially the variable + * should contain the size of the buffer in s. The value of the variable + * will be changed to the length of the resulting string on success and + * to the desired size of the destination buffer if it is too small + * @param si is a pointer to the socket_info structure to be printed + * @return -1 on error and 0 on success + */ +int socket2str(char* s, int* len, struct socket_info* si) +{ + str proto; + int l; + + proto.s = get_proto_name(si->proto); + proto.len = strlen(proto.s); + + l = proto.len + si->address_str.len + si->port_no_str.len + 2; + + if (*len < l) { + ERR("socket2str: Destionation buffer too short\n"); + *len = l; + return -1; + } + + memcpy(s, proto.s, proto.len); + s += proto.len; + *s = ':'; s++; + memcpy(s, si->address_str.s, si->address_str.len); + s += si->address_str.len; + *s = ':'; s++; + memcpy(s, si->port_no_str.s, si->port_no_str.len); + s += si->port_no_str.len; + + *len = l; + return 0; +} + + /* Fill si->sock_str with string representing the socket_info structure, * format of the string is 'proto:address:port'. Returns 0 on success and @@ -305,33 +349,20 @@ static char* get_proto_name(unsigned short proto) */ static int fix_sock_str(struct socket_info* si) { - char* p; - str proto; + int len = MAX_SOCKET_STR; if (si->sock_str.s) pkg_free(si->sock_str.s); - proto.s = get_proto_name(si->proto); - proto.len = strlen(proto.s); - - si->sock_str.len = proto.len + si->address_str.len + - si->port_no_str.len + 2; - - si->sock_str.s = pkg_malloc(si->sock_str.len + 1); + si->sock_str.s = pkg_malloc(len + 1); if (si->sock_str.s == NULL) { - LOG(L_ERR, "fix_sock_str: No pkg memory left\n"); + ERR("fix_sock_str: No memory left\n"); return -1; } - p = si->sock_str.s; - memcpy(p, proto.s, proto.len); - p += proto.len; - *p = ':'; p++; - memcpy(p, si->address_str.s, si->address_str.len); - p += si->address_str.len; - *p = ':'; p++; - memcpy(p, si->port_no_str.s, si->port_no_str.len); - p += si->port_no_str.len; - *p = '\0'; - + if (socket2str(si->sock_str.s, &len, si) < 0) { + BUG("fix_sock_str: Error in socket2str\n"); + return -1; + } + si->sock_str.s[len] = '\0'; return 0; } diff --git a/socket_info.h b/socket_info.h index ebe051a..4179869 100644 --- a/socket_info.h +++ b/socket_info.h @@ -43,6 +43,13 @@ #include "dprint.h" #include "globals.h" +/* This macro evaluates to the maximum length of string buffer needed to print + * the text description of any socket, not counting the terminating zero added + * by socket2str */ +#define MAX_SOCKET_STR (sizeof("unknown") - 1 + IP_ADDR_MAX_STR_SIZE + \ + INT2STR_MAX_LEN + 2) + +int socket2str(char* s, int* len, struct socket_info* si); /* struct socket_info is defined in ip_addr.h */

15 years, 8 months

git:master: core: type casts support in the script

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: e41bc0575e8a4c22dfd7fbd2b6ae923f3c634a85 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e41bc05… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue May 5 19:43:18 2009 +0200 core: type casts support in the script Support for casts added: (int) and (str). E.g.: (int)$v ; (str)$v+"test". --- NEWS | 5 +++-- cfg.lex | 4 ++++ cfg.y | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index ed1ab96..460d70c 100644 --- a/NEWS +++ b/NEWS @@ -6,13 +6,14 @@ $Id$ sip-router changes core: + - type casts operators: (int), (str). - new operators eq, ne for string compares and ieq, ine for interger compares. The names are not yet final (use them at your own risk). Future version might use ==/!= only for ints (ieq/ine) and eq/ne for strings (under debate). They are almost equivalent to == or !=, but they force the conversion - of their operands (eq to string and ieq to int), allowing among other - things better type checking on startup and more optimizations. + of their operands (eq to string and ieq to int), allowing among other + things better type checking on startup and more optimizations. Non equiv. examples: 0 == "" (true) is not equivalent to 0 eq "" (false: it evaluates to "0" eq ""). "a" ieq "b" (true: (int)"a" is 0 and (int)"b" is 0) is not equivalent to "a" == "b" (false). diff --git a/cfg.lex b/cfg.lex index b599d13..167fc95 100644 --- a/cfg.lex +++ b/cfg.lex @@ -252,6 +252,8 @@ STREQ eq INTEQ ieq STRDIFF ne INTDIFF ine +INTCAST $int$ +STRCAST $str$ /* Attribute specification */ ATTR_MARK "%" @@ -783,6 +785,8 @@ EAT_ABLE [\ \t\b\r] <INITIAL>{INTEQ} { count(); return INTEQ; } <INITIAL>{STRDIFF} { count(); return STRDIFF; } <INITIAL>{INTDIFF} { count(); return INTDIFF; } +<INITIAL>{INTCAST} { count(); return INTCAST; } +<INITIAL>{STRCAST} { count(); return STRCAST; } <INITIAL>{SELECT_MARK} { count(); state = SELECT_S; BEGIN(SELECT); return SELECT_MARK; } <SELECT>{ID} { count(); addstr(&s_buf, yytext, yyleng); diff --git a/cfg.y b/cfg.y index 5897914..8480434 100644 --- a/cfg.y +++ b/cfg.y @@ -494,6 +494,7 @@ static int case_check_default(struct case_stms* stms); %left STAR SLASH %right NOT %right DEFINED +%right INTCAST STRCAST %left DOT /* no precedence, they use () */ @@ -2269,6 +2270,8 @@ rval_expr: rval { $$=$1; */ } | rve_un_op %prec NOT rval_expr {$$=mk_rve1($1, $2); } + | INTCAST rval_expr {$$=mk_rve1(RVE_INT_OP, $2); } + | STRCAST rval_expr {$$=mk_rve1(RVE_STR_OP, $2); } | rval_expr PLUS rval_expr {$$=mk_rve2(RVE_PLUS_OP, $1, $3); } | rval_expr MINUS rval_expr {$$=mk_rve2(RVE_MINUS_OP, $1, $3); } | rval_expr STAR rval_expr {$$=mk_rve2(RVE_MUL_OP, $1, $3); } @@ -2285,6 +2288,8 @@ rval_expr: rval { $$=$1; | STREMPTY LPAREN rval_expr RPAREN {$$=mk_rve1(RVE_STREMPTY_OP, $3);} | DEFINED rval_expr { $$=mk_rve1(RVE_DEFINED_OP, $2);} | rve_un_op %prec NOT error { $$=0; yyerror("bad expression"); } + | INTCAST error { $$=0; yyerror("bad expression"); } + | STRCAST error { $$=0; yyerror("bad expression"); } | rval_expr PLUS error { yyerror("bad expression"); } | rval_expr MINUS error { yyerror("bad expression"); } | rval_expr STAR error { yyerror("bad expression"); }

15 years, 8 months

git:master: core expr: optimizations fixes for $v op 0|1 -> $v

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 9c3327d5742b1f8280b159c7ea228b95bb2e8f35 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9c3327d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue May 5 16:15:01 2009 +0200 core expr: optimizations fixes for $v op 0|1 -> $v - fix missing cast for the $v <op> c -> $v optimizations (e.g. $v - 0 -> $v, 1 * $v -> $v): instead of replacing $v <op> c with $v use (type_of(<op>)) $v. $v without the cast to the type produced by the operator is used now only when type_of($v)==type_of(<op>). E.g.: 1 * $v -> (int)$v 1 * ($v/$w) -> $v/$w ($v/$w produces always an int, so no need for the cast) Bug example: 1*"2"+3 was optimized to "2"+3 == "23" instead of (int)"2"+3 == 5. - better debugging messages --- rvalue.c | 370 +++++++++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 257 insertions(+), 113 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=9c3…

15 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev