sr-dev October 2014

sr-dev@lists.kamailio.org

34 participants
381 discussions

git:master: core: default pkg memory size set to 8MB

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2376ef7c6f3317054c844ae9b99366d084065121 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2376ef7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 2 09:48:36 2014 +0200 core: default pkg memory size set to 8MB - as per discussion on mailing lists --- config.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/config.h b/config.h index 45609e0..687e6a6 100644 --- a/config.h +++ b/config.h @@ -144,7 +144,7 @@ #define SRV_MAX_PREFIX_LEN SRV_TLS_PREFIX_LEN #ifndef PKG_MEM_SIZE -#define PKG_MEM_SIZE 4 +#define PKG_MEM_SIZE 8 #endif #define PKG_MEM_POOL_SIZE PKG_MEM_SIZE*1024*1024 /*!< used only if PKG_MALLOC is defined*/

9 years, 6 months

[tracker] Task opened: kamailio fails to start when -u -g flags used by non privileged user

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Ovidiu Sas (osas) Attached to Project - sip-router Summary - kamailio fails to start when -u -g flags used by non privileged user Task Type - Bug Report Category - Core Status - New Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Starting kamailio by user root with STARTOPTIONS="-u kamailio -g kamailio" works ok. Starting kamailio by user kamailio with STARTOPTIONS="-u kamailio -g kamailio" doesn't work. CRITICAL: <core> [daemonize.c:468]: do_suid(): cannot set supplementary groups: Operation not permitted If the user/group that is starting kamailio is the same as the imposed user/group via -u/-g flags, then there's no need for suid. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=473 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

9 years, 6 months

[tracker] Task closed: pid file generated with wrong attributes when starting with -u -g switches

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#472 - pid file generated with wrong attributes when starting with -u -g switches User who did this - Ovidiu Sas (osas) Reason for closing: Fixed More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=472 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

9 years, 6 months

git:master: core: daemonize.c: convert logs to new format

by Ovidiu Sas

Module: sip-router Branch: master Commit: ccdf1c61834ac2f4cfe139ac83e83dfd72d90139 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ccdf1c6… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Oct 1 12:54:31 2014 -0400 core: daemonize.c: convert logs to new format --- daemonize.c | 74 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 37 insertions(+), 37 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ccd…

9 years, 6 months

git:master: core: change the uid and gid for pid and pgid files

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c873758624da24359117b3fa158cc56ccd0a5d73 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c873758… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 1 17:27:49 2014 +0200 core: change the uid and gid for pid and pgid files - use the user and group given to daemon to update ownership of pid and pgid files - reported by Ovidiu Sas, FS#472 --- daemonize.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/daemonize.c b/daemonize.c index 93d2d14..862e109 100644 --- a/daemonize.c +++ b/daemonize.c @@ -272,6 +272,14 @@ int daemonize(char* name, int status_wait) pid_t pid; int r, p; char pipe_status; + uid_t pid_uid; + gid_t pid_gid; + + if(uid) pid_uid = uid; + else pid_uid = -1; + + if(gid) pid_gid = gid; + else pid_gid = -1; p=-1; /* flush std file descriptors to avoid flushes after fork @@ -360,6 +368,10 @@ int daemonize(char* name, int status_wait) }else{ fprintf(pid_stream, "%i\n", (int)pid); fclose(pid_stream); + if(chown(pid_file, pid_uid, pid_gid)<0) { + LM_ERR("failed to chwon PID file: %s\n", strerror(errno)); + goto error; + } } } @@ -384,6 +396,10 @@ int daemonize(char* name, int status_wait) }else{ fprintf(pid_stream, "%i\n", (int)pid); fclose(pid_stream); + if(chown(pid_file, pid_uid, pid_gid)<0) { + LM_ERR("failed to chwon PGID file: %s\n", strerror(errno)); + goto error; + } } }else{ LOG(L_WARN, "we don't have our own process so we won't save"

9 years, 6 months

git:master: test/unit: use SRC_DIR to point to kamailio source and updated tests 4, 5, 6

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 4bfc11009df67de7584cd1634997a86ad023322c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4bfc110… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 1 16:52:41 2014 +0200 test/unit: use SRC_DIR to point to kamailio source and updated tests 4, 5, 6 --- test/unit/2.sh | 4 ++-- test/unit/22.sh | 2 +- test/unit/31.sh | 2 +- test/unit/39.sh | 2 +- test/unit/4.sh | 8 ++++---- test/unit/44.sh | 2 +- test/unit/5.sh | 6 +++--- test/unit/6.sh | 11 +++-------- test/unit/include/common | 14 +++++++------- test/unit/include/require | 4 ++-- test/unit/route-empty.cfg | 3 +++ 11 files changed, 28 insertions(+), 30 deletions(-) diff --git a/test/unit/2.sh b/test/unit/2.sh index 4301aa2..71ba85d 100755 --- a/test/unit/2.sh +++ b/test/unit/2.sh @@ -35,8 +35,8 @@ cp $CFG $CFG.bak touch dispatcher.list -echo "loadmodule \"$SR_DIR/modules/db_mysql/db_mysql.so\"" >> $CFG -echo "modparam(\"dispatcher\", \"list_file\", \"$SR_DIR/$TEST_DIR/dispatcher.list\")" >> $CFG +echo "loadmodule \"$SRC_DIR/modules/db_mysql/db_mysql.so\"" >> $CFG +echo "modparam(\"dispatcher\", \"list_file\", \"$SRC_DIR/$TEST_DIR/dispatcher.list\")" >> $CFG echo -e "\nrequest_route {\n ;\n}" >> $CFG # start diff --git a/test/unit/22.sh b/test/unit/22.sh index 8775e48..3945feb 100755 --- a/test/unit/22.sh +++ b/test/unit/22.sh @@ -30,7 +30,7 @@ fi ; CFG=11.cfg cp $CFG $CFG.tmp -echo "loadmodule \"$SR_DIR/modules/db_postgres/db_postgres.so\"" >> $CFG +echo "loadmodule \"$SRC_DIR/modules/db_postgres/db_postgres.so\"" >> $CFG echo "modparam(\"usrloc\", \"db_url\", \"postgres://kamailio:kamailiorw@localhost/kamailio\")" >> $CFG $BIN -w . -f $CFG > /dev/null diff --git a/test/unit/31.sh b/test/unit/31.sh index 5673d14..7b6d9f1 100755 --- a/test/unit/31.sh +++ b/test/unit/31.sh @@ -35,7 +35,7 @@ NR=50 cp $CFG $CFG.bak -echo "loadmodule \"$SR_DIR/modules/db_mysql/db_mysql.so\"" >> $CFG +echo "loadmodule \"$SRC_DIR/modules/db_mysql/db_mysql.so\"" >> $CFG echo "modparam(\"usrloc\", \"fetch_rows\", 13)" >> $CFG COUNTER=0 diff --git a/test/unit/39.sh b/test/unit/39.sh index 5b4d906..9a3757a 100755 --- a/test/unit/39.sh +++ b/test/unit/39.sh @@ -36,7 +36,7 @@ NR=25 cp $CFG $CFG.bak -echo "loadmodule \"$SR_DIR/modules/db_unixodbc/db_unixodbc.so\"" >> $CFG +echo "loadmodule \"$SRC_DIR/modules/db_unixodbc/db_unixodbc.so\"" >> $CFG echo "modparam(\"usrloc\", \"db_url\", \"unixodbc://kamailio:kamailiorw@localhost/kamailio\")" >> $CFG echo "modparam(\"usrloc\", \"fetch_rows\", 13)" >> $CFG diff --git a/test/unit/4.sh b/test/unit/4.sh index 4901115..452249e 100755 --- a/test/unit/4.sh +++ b/test/unit/4.sh @@ -29,10 +29,10 @@ if ! (check_kamailio); then fi ; # setup config -echo -e "loadmodule \"$SR_DIR/modules/mi_fifo/mi_fifo.so\"" > $CFG -echo -e "loadmodule \"$SR_DIR/modules/kex/kex.so\"" >> $CFG +echo -e "loadmodule \"$SRC_DIR/modules/mi_fifo/mi_fifo.so\"" > $CFG +echo -e "loadmodule \"$SRC_DIR/modules/kex/kex.so\"" >> $CFG echo -e "modparam(\"mi_fifo\", \"fifo_name\", \"/tmp/kamailio_fifo\")" >> $CFG - +echo -e "\nrequest_route {\n ;\n}" >> $CFG $BIN -w . -f $CFG > /dev/null @@ -48,4 +48,4 @@ $KILL rm -f $CFG -exit $ret \ No newline at end of file +exit $ret diff --git a/test/unit/44.sh b/test/unit/44.sh index c8f0215..0bb4083 100755 --- a/test/unit/44.sh +++ b/test/unit/44.sh @@ -30,7 +30,7 @@ fi ; CFG=11.cfg cp $CFG $CFG.tmp -echo "loadmodule \"$SR_DIR/modules/db_unixodbc/db_unixodbc.so\"" >> $CFG +echo "loadmodule \"$SRC_DIR/modules/db_unixodbc/db_unixodbc.so\"" >> $CFG echo "modparam(\"usrloc\", \"db_url\", \"unixodbc://kamailio:kamailiorw@localhost/kamailio\")" >> $CFG $BIN -w . -f $CFG > /dev/null diff --git a/test/unit/5.sh b/test/unit/5.sh index 47412c1..0554ae2 100755 --- a/test/unit/5.sh +++ b/test/unit/5.sh @@ -24,7 +24,7 @@ source include/common source include/require -CFG=5.cfg +CFG=$SRC_DIR/etc/kamailio.cfg if ! (check_kamailio); then exit 0 @@ -32,10 +32,10 @@ fi ; # start -$BIN -w . -f $CFG &> /dev/null +$BIN -w . -L $SRC_DIR/modules/ -f $CFG -A WITH_SRCPATH -a no > /dev/null 2>&1 ret=$? sleep 1 $KILL -exit $ret \ No newline at end of file +exit $ret diff --git a/test/unit/6.sh b/test/unit/6.sh index 68afccf..a89284d 100755 --- a/test/unit/6.sh +++ b/test/unit/6.sh @@ -1,5 +1,5 @@ #!/bin/bash -# checks a configuration with 'kamailio -c' and 'kamailio -C' +# checks a specific configuration with 'kamailio -c' # Copyright (C) 2007 1&1 Internet AG # @@ -29,12 +29,7 @@ if ! (check_kamailio); then fi ; # start -../$BIN -w . -c -f $CFG > /dev/null 2>&1 +cat $CFG | cat - route-empty.cfg | $BIN -w . -a no -c -f - > /dev/null 2>&1 ret=$? -if [ "$ret" -eq 0 ] ; then - ../$BIN -C -f $CFG > /dev/null 2>&1 - ret=$? -fi ; - -exit $ret \ No newline at end of file +exit $ret diff --git a/test/unit/include/common b/test/unit/include/common index cab5637..2459843 100644 --- a/test/unit/include/common +++ b/test/unit/include/common @@ -1,18 +1,18 @@ # 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" # root directory relative to tests -SR_DIR="../.." -CTL_DIR="$SR_DIR/utils/kamctl" +SRC_DIR="../.." +CTL_DIR="$SRC_DIR/utils/kamctl" CTLRC="$CTL_DIR/kamctlrc" CTL="$CTL_DIR/kamctl" DBCTL="$CTL_DIR/kamdbctl" -BIN="$SR_DIR/ser" -if [ -f $SR_DIR/kamailio ] ; then - BIN="$SR_DIR/kamailio" +BIN="$SRC_DIR/kamailio" +if [ -f $SRC_DIR/kamailio ] ; then + BIN="$SRC_DIR/kamailio" BNAME="kamailio" else - if [ -f $SR_DIR/ser ] ; then - BIN="$SR_DIR/ser" + if [ -f $SRC_DIR/ser ] ; then + BIN="$SRC_DIR/ser" BNAME="ser" else echo "WARNING Binary not found!" diff --git a/test/unit/include/require b/test/unit/include/require index b6163b9..825dfd7 100644 --- a/test/unit/include/require +++ b/test/unit/include/require @@ -32,8 +32,8 @@ function check_module() { return 1 fi - if ! (test -e $SR_DIR/modules/$1/$1.so) ; then - echo "$SR_DIR/modules/$1/$1.so not found, not run" + if ! (test -e $SRC_DIR/modules/$1/$1.so) ; then + echo "$SRC_DIR/modules/$1/$1.so not found, not run" return 1 fi; return 0 diff --git a/test/unit/route-empty.cfg b/test/unit/route-empty.cfg new file mode 100644 index 0000000..2ac3275 --- /dev/null +++ b/test/unit/route-empty.cfg @@ -0,0 +1,3 @@ +request_route { + ; +}

9 years, 6 months

git:master: core: fixed overwriting mpath value given in command line via config

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e1e40d3a58bf3ed6c4f2df830e29d5468d7bee82 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e1e40d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 1 16:53:44 2014 +0200 core: fixed overwriting mpath value given in command line via config - -L is in the group of options evaluated before config --- cfg.y | 22 ++++++++++++++++------ globals.h | 1 + main.c | 2 ++ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/cfg.y b/cfg.y index 1e52289..2e7a6b4 100644 --- a/cfg.y +++ b/cfg.y @@ -1651,15 +1651,25 @@ module_stm: } | LOADMODULE error { yyerror("string expected"); } | LOADPATH STRING { - DBG("loading modules under %s\n", $2); - printf("loading modules under %s\n", $2); - mods_dir = $2; + if(mods_dir_cmd==0) { + DBG("loading modules under %s\n", $2); + printf("loading modules under config path: %s\n", $2); + mods_dir = $2; + } else { + DBG("ignoring mod path given in config: %s\n", $2); + printf("loading modules under command line path: %s\n", mods_dir); + } } | LOADPATH error { yyerror("string expected"); } | LOADPATH EQUAL STRING { - DBG("loading modules under %s\n", $3); - printf("loading modules under %s\n", $3); - mods_dir = $3; + if(mods_dir_cmd==0) { + DBG("loading modules under %s\n", $3); + printf("loading modules under config path: %s\n", $3); + mods_dir = $3; + } else { + DBG("ignoring mod path given in config: %s\n", $3); + printf("loading modules under command line path: %s\n", mods_dir); + } } | LOADPATH EQUAL error { yyerror("string expected"); } | MODPARAM LPAREN STRING COMMA STRING COMMA STRING RPAREN { diff --git a/globals.h b/globals.h index 0e02c7c..76e7f35 100644 --- a/globals.h +++ b/globals.h @@ -44,6 +44,7 @@ extern char* mods_dir; /* directory with dyn. loadable modules */ +extern int mods_dir_cmd; /* marker if mods dir was set in command line */ extern char* cfg_file; extern int config_check; extern char* stat_file; diff --git a/main.c b/main.c index be75335..8a566b0 100644 --- a/main.c +++ b/main.c @@ -337,6 +337,7 @@ int own_pgid = 0; /* whether or not we have our own pgid (and it's ok to use kill(0, sig) */ char* mods_dir = MODS_DIR; /* search path for dyn. loadable modules */ +int mods_dir_cmd = 0; /* mods dir path set in command lin e*/ char* cfg_file = 0; unsigned int maxbuffer = MAX_RECV_BUFFER_SIZE; /* maximum buffer size we do @@ -1939,6 +1940,7 @@ int main(int argc, char** argv) break; case 'L': mods_dir = optarg; + mods_dir_cmd = 1; break; case 'm': shm_mem_size=strtol(optarg, &tmp, 10) * 1024 * 1024;

9 years, 6 months

git:master: kamctl: note in kamctlrc how to enable automatic creation of dbuid tables

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 0247bd79f6753c6153a4b17f82803e4349e7745e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0247bd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 1 14:45:28 2014 +0200 kamctl: note in kamctlrc how to enable automatic creation of dbuid tables --- utils/kamctl/kamctlrc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index c3e0103..b8b241b 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -98,6 +98,9 @@ # If to install presence related tables. # INSTALL_PRESENCE_TABLES=ask +# If to install uid modules related tables. +# INSTALL_DBUID_TABLES=ask + # Define what module tables should be installed. # If you use the postgres database and want to change the installed tables, then you # must also adjust the STANDARD_TABLES or EXTRA_TABLES variable accordingly in the

9 years, 6 months

git:master: test/unit: 3.sh is back in working stage

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2b21542f93740508e334605551fe4332eec7db11 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b21542… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 1 14:51:07 2014 +0200 test/unit: 3.sh is back in working stage - used for testing creating database structure with latin1 charset --- test/unit/3.sh | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/test/unit/3.sh b/test/unit/3.sh index e0bcb7f..9578c01 100755 --- a/test/unit/3.sh +++ b/test/unit/3.sh @@ -22,6 +22,8 @@ # Needs a mysql database, the root user password must be assigned to # the 'PW' variable in the file 'dbrootpw' in the test directory, e.g.: # PW=sql_root_passwd +# If MySQL root password is empty, add in the file the line: +# PWSKIP=yes source include/common @@ -38,22 +40,23 @@ cd $CTL_DIR # setup config file cp $CTLRC $CTLRC.bak -sed -i "s/# DBENGINE=MYSQL/DBENGINE=MYSQL/g" $CTLRC -sed -i "s/# INSTALL_EXTRA_TABLES=ask/INSTALL_EXTRA_TABLES=yes/g" $CTLRC -sed -i "s/# INSTALL_PRESENCE_TABLES=ask/INSTALL_PRESENCE_TABLES=yes/g" $CTLRC +sed -i '' -e "s/# DBENGINE=MYSQL/DBENGINE=MYSQL/g" $CTLRC +sed -i '' -e "s/# INSTALL_EXTRA_TABLES=ask/INSTALL_EXTRA_TABLES=yes/g" $CTLRC +sed -i '' -e "s/# INSTALL_PRESENCE_TABLES=ask/INSTALL_PRESENCE_TABLES=yes/g" $CTLRC +sed -i '' -e "s/# INSTALL_DBUID_TABLES=ask/INSTALL_DBUID_TABLES=yes/g" $CTLRC cp $DBCTL $DBCTL.bak -sed -i "s/TEST=\"false\"/TEST=\"true\"/g" $DBCTL +sed -i '' -e "s/TEST=\"false\"/TEST=\"true\"/g" $DBCTL # set the mysql root password cp $DBCTL.mysql $DBCTL.mysql.bak -sed -i "s/#PW=\"\"/PW=\"$PW\"/g" $DBCTL.mysql +sed -i '' -e "s/#PW=\"\"/PW=\"$PW\"/g" $DBCTL.mysql -./$DBCTL create $tmp_name > /dev/null +PWSKIP="$PWSKIP" CHARSET="latin1" ./$DBCTL create $tmp_name > /dev/null ret=$? if [ "$ret" -eq 0 ] ; then - ./$DBCTL drop $tmp_name > /dev/null + PWSKIP="$PWSKIP" ./$DBCTL drop $tmp_name > /dev/null ret=$? fi ;

9 years, 6 months

git:master: kamdbctl: option to run without asking mysql root password if empty

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 765532005914b9f457596aaac715cf2a0b863078 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7655320… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Oct 1 14:44:40 2014 +0200 kamdbctl: option to run without asking mysql root password if empty - provide PWSKIP=yes - good for automate testing --- utils/kamctl/kamdbctl.mysql | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/utils/kamctl/kamdbctl.mysql b/utils/kamctl/kamdbctl.mysql index 0c6d5d3..dea0d95 100644 --- a/utils/kamctl/kamdbctl.mysql +++ b/utils/kamctl/kamdbctl.mysql @@ -130,9 +130,10 @@ kamailio_db_create () # pars: <database name> exit 1 fi - minfo "test server charset" - - db_charset_test + if [ "$CHARSET" = "" ]; then + minfo "test server charset" + db_charset_test + fi minfo "creating database $1 ..." @@ -536,5 +537,7 @@ fi export PW if [ "$#" -ne 0 ] && [ "$PW" = "" ]; then - prompt_pw + if [ "$PWSKIP" = "" ]; then + prompt_pw + fi fi

9 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2014