sr-dev

sr-dev@lists.kamailio.org

15 participants
44248 discussions

git:sr_3.0: core: fix cfg_update() on config error 2nd try

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: 9d8e1c67c2c22d4e4d00480e3799c72e0f2ade41 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d8e1c6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Oct 12 21:20:02 2009 +0200 core: fix cfg_update() on config error 2nd try The cfg framework is considered initialized only after the cfg_child_cb_no_init() call. Fixes 29e63735632a379df5d6b49130d05d47e2829a60. --- main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/main.c b/main.c index e5e0833..fc25588 100644 --- a/main.c +++ b/main.c @@ -1548,6 +1548,7 @@ int main_loop() #endif /* init cfg, but without per child callbacks support */ cfg_child_no_cb_init(); + cfg_ok=1; #ifdef EXTRA_DEBUG for (r=0; r<*process_count; r++){ @@ -2088,7 +2089,6 @@ try_again: LOG(L_CRIT, "could not declare the core configuration\n"); goto error; } - cfg_ok=1; #ifdef USE_TCP if (tcp_register_cfg()){ LOG(L_CRIT, "could not register the tcp configuration\n");

15 years, 3 months

git:master: mi_rpc: Revert Changing mi_rpc licence

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: b90ac7da0de80d2ce997fc9586976b80e9aee788 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b90ac7d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 15 20:06:29 2009 +0200 mi_rpc: Revert Changing mi_rpc licence Revert commit cbfe9a14fdb05e8212ba4a0b24472f5239850a77 (changing mi_rpc_mod.c licence), at Daniel's request. --- modules/mi_rpc/mi_rpc_mod.c | 36 ++++++++++-------------------------- 1 files changed, 10 insertions(+), 26 deletions(-) diff --git a/modules/mi_rpc/mi_rpc_mod.c b/modules/mi_rpc/mi_rpc_mod.c index de9db37..b678f25 100644 --- a/modules/mi_rpc/mi_rpc_mod.c +++ b/modules/mi_rpc/mi_rpc_mod.c @@ -5,35 +5,19 @@ * * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com). * - * This file is part of SIP-router, a free SIP server. + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * SIP-router is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * SIP-router is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - */ - -/*! - * \file - * \brief Management interface :: RPC support - * \ingroup mi_rpc - */ - -/*! - * \defgroup mi_rpc Management interface :: RPC support + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - #include <stdlib.h> #include <string.h> #include <unistd.h>

15 years, 3 months

git:master: Merge remote branch 'origin/sr_3.0'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: a45f5ddbf321cc7421783a9d8fe700d4607306a0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a45f5dd… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 15 20:01:11 2009 +0200 Merge remote branch 'origin/sr_3.0' Weekly update with the latest sr_3.0 fixes. * origin/sr_3.0: core: fix fixup_spve_* reuse after free Remove obsolete gen_ha1. modules_k/permissions: Increased version number of 'trusted' table lib/srdb1/schema/trusted.xml: forgot to increase version number lib/srdb1/schema/trusted.xml: increased tag length from 32 to 64 chars makefile: support self-installing utils, extra cfgs a.s.o. core: fix memleak in fixup_free* core: fix cfg_update() on config error 2nd try userblacklist(k): gcc 2.95 compile fixes statistics(k): minor warning in printf fmt siputils(k): gcc 2.95 compile fixes registrar(k): gcc 2.95 compile fixes pua_mi: gcc 2.95 compile fixes cfgutils(k): gcc 2.95 compile fixes lcr: compile & warning fixes for gcc 2.95 db_postgres: compile fixes for gcc 2.95 db_mysql: compile fix for gcc 2.95 compile: don't warn on old gcc versions utils/sercmd: Fixed include paths also in sr_3.0 branch. Conflicts: Makefile ---

15 years, 3 months

Bug in exported function by ser modules(segmentation fault)

by marius zbihlei

Hello, Bear with me for a second long e-mail First the Core dump: Program terminated with signal 11, Segmentation fault. #0 0x00000020 in ?? () (gdb) bt #0 0x00000020 in ?? () #1 0x080bab93 in pv_printf (msg=0xbfdda43c, list=0xbfdda434, buf=0x820c220 "", len=0xbfdd9f08) at pvapi.c:975 #2 0x080baea7 in pv_printf_s (msg=0x82ac978, list=0xbfdda434, s=0xbfdd9f04) at pvapi.c:1126 #3 0xb7d27baf in check_user_list (msg=0x82ac978, str1=<value optimized out>, str2=0x82a977c "\344K*\b", str3=0x0, str4=0xbfdda434 "\200y&\b", listtype=0) at userblacklist.c:247 #4 0x0805a424 in do_action (h=0xbfdda698, a=0x82a4a90, msg=0x82ac978) at action.c:866 #5 0x0805ce28 in run_actions (h=0xbfdda698, a=0x82a4a90, msg=0x82ac978) at action.c:1301 #6 0x080dd405 in rval_get_int (h=0xbfdda698, msg=0x82ac978, i=0xbfdda388, rv=0xbfdd9e3c, cache=0x0) at rvalue.c:866 #7 0x080e08ad in rval_expr_eval_int (h=0xbfdda698, msg=0x82ac978, res=0xbfdda388, rve=0x82a4c94) at rvalue.c:1752 #8 0x080e08d5 in rval_expr_eval_int (h=0xbfdda698, msg=0x82ac978, res=0xbfdda634, rve=0x82a5048) at rvalue.c:1757 #9 0x08059819 in do_action (h=0xbfdda698, a=0x82a5958, msg=0x82ac978) at action.c:840 #10 0x0805ce28 in run_actions (h=0xbfdda698, a=0x82a1cd8, msg=0x82ac978) at action.c:1301 #11 0x0805d184 in run_top_route (a=0x82a1cd8, msg=0x82ac978, c=0x0) at action.c:1349 #12 0x080c3f1e in receive_msg ( buf=0x8254560 "INVITE sip:49721123456789@127.0.0.1:5059 SIP/2.0\r\nVia: SIP/2.0/UDP 127.0.0.1:5061;branch=z9hG4bK-21468-1-0\r\nFrom: sipp <sip:sipp@127.0.0.1:5061>;tag=21468SIPpTag001\r\nTo: sut <sip:49721123456789@127.0."..., len=519, rcv_info=0xbfdda818) at receive.c:195 #13 0x0814416b in udp_rcv_loop () at udp_server.c:527 #14 0x08098d49 in main_loop () at main.c:1454 #15 0x0809ba98 in main (argc=5, argv=0xbfddaaa4) at main.c:2251 (Check that str4 is not null even if the usage is as below) How to replicate: Load userblacklist module (or other kamailio module) and call check_user_blacklist with 2 parameters(check_user_blacklist("$avp(i:80)", "$avp(i:81)")) (doesn't work every time, depends on compilation and what pointer lies there) Problem The userblacklist module has the exports for the check_user_blacklist : { "check_user_blacklist", (cmd_function)check_user_blacklist, 2, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, { "check_user_blacklist", (cmd_function)check_user_blacklist, 3, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"check_user_blacklist", (cmd_function)check_user_blacklist, 4, check_user_blacklist_fixup, 0, REQUEST_ROUTE | FAILURE_ROUTE }, The function check_user_blacklist in userblacklist.c has the signature : int check_user_blacklist(struct sip_msg *msg, char* str1, char* str2, char* str3, char* str4) This is cast to a cmd_function (struct sip_msg* msg, char* str1, char* str2) witch is called with 2 parameters(or casted to cmd_function3 and called with 3 parameters depending of the case) in the action.c do_action method. This actually leaves the rest of the pointers having some random not NULL values, causing the application to crash. I've seen that sr doesn't use the same function for various number of parameters. I've made a patch that registered for each number of parameters an internal function matching the configured number ( int check_user_blacklist2(struct sip_msg *msg, char* str1, char* str2) { return check_user_list(msg, str1, str2, 0, 0, 0); } ) . With this everything is ok. Another solution is to define cmd_function like in kamailio (haveing 6 (max) numbers of char*) Any suggestions from devs is most welcome. (The problem plagues also cr_route call with 5 parameters) P.S. #0 0xb7d746b2 in actually_rewrite (_msg=0x82b34f4, _carrier=0x82b02f4, _domain=0x82b03a4, _prefix_matching=0x82b034c, _rewrite_user=0x82b03fc, _hsrc=shs_call_id, _halg=alg_crc32, _dstavp=0x868f2ea) at cr_func.c:345 345 if (add_avp(AVP_VAL_STR | descavp->v.pve->spec.pvp.pvn.u.isname.type, (gdb) bt #0 0xb7d746b2 in actually_rewrite (_msg=0x82b34f4, _carrier=0x82b02f4, _domain=0x82b03a4, _prefix_matching=0x82b034c, _rewrite_user=0x82b03fc, _hsrc=shs_call_id, _halg=alg_crc32, _dstavp=0x868f2ea) at cr_func.c:345 #1 rewrite_on_rule (_msg=0x82b34f4, _carrier=0x82b02f4, _domain=0x82b03a4, _prefix_matching=0x82b034c, _rewrite_user=0x82b03fc, _hsrc=shs_call_id, _halg=alg_crc32, _dstavp=0x868f2ea) at cr_func.c:460 #2 rewrite_uri_recursor (_msg=0x82b34f4, _carrier=0x82b02f4, _domain=0x82b03a4, _prefix_matching=0x82b034c, _rewrite_user=0x82b03fc, _hsrc=shs_call_id, _halg=alg_crc32, _dstavp=0x868f2ea) at cr_func.c:499 #3 cr_do_route (_msg=0x82b34f4, _carrier=0x82b02f4, _domain=0x82b03a4, _prefix_matching=0x82b034c, _rewrite_user=0x82b03fc, _hsrc=shs_call_id, _halg=alg_crc32, _dstavp=0x868f2ea) at cr_func.c:591 #4 0xb7d761bf in cr_route (_msg=0x82b34f4, _carrier=0x82b02f4, _domain=0x82b03a4, _prefix_matching=0x82b034c, _rewrite_user=0x82b03fc, _hsrc=shs_call_id, _descavp=0x868f2ea) at cr_func.c:676 #5 0x0805a0aa in do_action (h=0xbf80a0c8, a=0x82a4124, msg=0x82b34f4) at action.c:917 #6 0x0805ce28 in run_actions (h=0xbf80a0c8, a=0x82a4124, msg=0x82b34f4) at action.c:1301 #7 0x080dd405 in rval_get_int (h=0xbf80a0c8, msg=0x82b34f4, i=0xbf809ad8, rv=0x2e2e2030, cache=0x0) at rvalue.c:866 #8 0x080e08ad in rval_expr_eval_int (h=0xbf80a0c8, msg=0x82b34f4, res=0xbf809ad8, rve=0x82a4538) at rvalue.c:1752 #9 0x080e08d5 in rval_expr_eval_int (h=0xbf80a0c8, msg=0x82b34f4, res=0xbf809d84, rve=0x82a48ec) at rvalue.c:1757 #10 0x08059819 in do_action (h=0xbf80a0c8, a=0x82a50a8, msg=0x82b34f4) at action.c:840 #11 0x0805ce28 in run_actions (h=0xbf80a0c8, a=0x82a3fd0, msg=0x82b34f4) at action.c:1301 #12 0x08059872 in do_action (h=0xbf80a0c8, a=0x82a7968, msg=0x82b34f4) at action.c:855 #13 0x0805ce28 in run_actions (h=0xbf80a0c8, a=0x82a24ac, msg=0x82b34f4) at action.c:1301 #14 0x0805d184 in run_top_route (a=0x82a24ac, msg=0x82b34f4, c=0x0) at action.c:1349 #15 0x080c3f1e in receive_msg ( buf=0x8254560 "INVITE sip:49721123456785@127.0.0.1:5060 SIP/2.0\r\nVia: SIP/2.0/UDP 127.0.0.1:5061;branch=z9hG4bK-28495-1-0\r\nFrom: sipp <sip:sipp@127.0.0.1:5061>;tag=28495SIPpTag001\r\nTo: sut <sip:49721123456785@127.0."..., len=519, rcv_info=0xbf80a248) at receive.c:195 #16 0x0814416b in udp_rcv_loop () at udp_server.c:527 #17 0x08098d49 in main_loop () at main.c:1454 #18 0x0809ba98 in main (argc=5, argv=0xbf80a4d4) at main.c:2251 Another core dump by using cr_route without the last avp

15 years, 3 months

garbage in outgoing sip request

by Juha Heinanen

i build new sip-router and then tried to make a call, but the request that sr send out contained binary garbage in the header section after append_hf call. i have two append_hf calls and garbage is after the header added by the first call. the second header is not there at all, but just garbage. has something changed during the previous couple of days that could explain this? -- juha

15 years, 3 months

git:sr_3.0: core: fix fixup_spve_* reuse after free

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: c6e33a080b218ec87184b216144e527cb41754da URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c6e33a0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 15 17:58:05 2009 +0200 core: fix fixup_spve_* reuse after free - fixup_spve_* functions have an optimization that checks if a a parsed format is a simple string and if this happens it frees the fixed param an re-does the fixup with type==string. However when freeing the result of the first fixup the original string was freed too and the next string fixup would be called with freed memory instead of a valid string. (this bug was hidden before the memleak fix in af8f3e1536d) --- mod_fix.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/mod_fix.c b/mod_fix.c index 90a4a4d..53b12ea 100644 --- a/mod_fix.c +++ b/mod_fix.c @@ -197,7 +197,6 @@ FIXUP_F2FP_T(igp_pvar_pvar, 1, 3, 1, FPARAM_INT|FPARAM_PVS, FPARAM_PVS) int ret; \ char * bkp; \ fparam_t* fp; \ - bkp=*param; \ if (param_no<=(no1)){ \ if ((ret=fix_param_types(FPARAM_PVE, param))<0){ \ ERR("Cannot convert function parameter %d to" #type2 "\n", \ @@ -206,6 +205,8 @@ FIXUP_F2FP_T(igp_pvar_pvar, 1, 3, 1, FPARAM_INT|FPARAM_PVS, FPARAM_PVS) } else{ \ fp=(fparam_t*)*param; \ if ((ret==0) && (fp->v.pve->spec.getf==0)){ \ + bkp=fp->orig; \ + fp->orig=0; /* make sure orig string is not freed */ \ fparam_free_contents(fp); \ pkg_free(fp); \ *param=bkp; \

15 years, 3 months

Compilation defaults for git code

by Jan Janak

Hello, I am wondering whether we are using the right defaults for code downloaded and compiled from the master branch in the git repository. I mean the code in that branch is almost always considered unstable and when people try to compile and use it they mostly do this for debugging purposes (well, at least developers, ordinary users should not be using the code). If you compile the code from the git repository, using compilation defaults and a very simple configuration file, it is likely that you end up having lots of memory related messages in syslog and and binary optimized for speed which can be difficult to debug with gdb. We have DBG_QM_MALLOC enabled by default in the git repository which I think is good, however, the value of memdbg is set to L_DBG and the value of debug is set to L_WARN by default. This means that unless you explicitly configure memdbg in your configuration file, you'll see all the memory debugging messages and it is a *a lot* of text. You can disable memory debugging messages by setting the value of memdbg higher than debug, but I pretty much always forget to do it. Also the default configuration files are not consistent in this regard. The simple one disables it by setting debug to 2 (L_DBG is 3 so memory debugging is disabled), but if you want to investigate a problem and set debug to 3 to do that then you end up having lots of traffic in syslog again and you have to use memdbg explicitly in the configuration file. The complex one, sip-router-oob.cfg, uses the defaults so you get all the messages. How about changing the default for memdbg to a value that is higher than 3 (the debugging value)? Then we would always have memory debugging messages disabled and people (both users and developers) can easily turn them on by configuring a lower value in the configuration file. The second default which I believe is not entirely correct for the code stored in the master branch in the git repository is the compilation mode. The makefile system generates code that is optimized for speed by default. We use -O9 which turns on pretty much all performance optimizations in gcc. That includes variables stored in CPU registers, however, code that uses such optimizations is difficult to debug because gdb cannot display values of variables stored in registers properly. Here again, I pretty much always forget to add mode=debug when configuring the build and often have to recompile the code after trying to use gdb to debug something. Shouldn't we use mode=debug by default for the code in git master branch? Or perhaps it is just me having these issues? Maybe others have secret techniques to share how to avoid such dumb problems? -- Jan

15 years, 3 months

New entities for docbook

by Olle E. Johansson

In a coming commit, I'll introduce two new entities: +<!ENTITY sercmd "sercmd"> +<!ENTITY ctlsocket "ser_ctl"> These are mentioned in several doc files and will be easier to handle if we use entities. /O

15 years, 3 months

git:master: Remove reference to the tool gen_ha1 from packaging file.

by Jan Janak

Module: sip-router Branch: master Commit: 41ed9305428503c5442575c69750a87225d7ecdd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=41ed930… Author: Jan Janak <jan(a)ryngle.com> Committer: Jan Janak <jan(a)ryngle.com> Date: Thu Oct 15 12:46:17 2009 +0200 Remove reference to the tool gen_ha1 from packaging file. The gen_ha1 tool does not exist anymore. --- pkg/freebsd/pkg-plist | 1 - pkg/gentoo/ser-0.8.10.ebuild | 2 -- pkg/gentoo/ser-0.8.9.ebuild | 3 --- pkg/netbsd/PLIST | 1 - pkg/openbsd/pkg/PLIST | 1 - pkg/opensuse/ser.spec | 1 - pkg/rpm/ser.spec-4.1 | 2 -- pkg/solaris/prototype | 1 - pkg/suse/ser.spec | 1 - 9 files changed, 0 insertions(+), 13 deletions(-) diff --git a/pkg/freebsd/pkg-plist b/pkg/freebsd/pkg-plist index 7680605..c6825ed 100644 --- a/pkg/freebsd/pkg-plist +++ b/pkg/freebsd/pkg-plist @@ -47,7 +47,6 @@ lib/ser/modules/uri_db.so lib/ser/modules/usrloc.so lib/ser/modules/xlog.so lib/ser/modules/xmlrpc.so -sbin/gen_ha1 sbin/ser sbin/ser_mysql.sh sbin/serunix diff --git a/pkg/gentoo/ser-0.8.10.ebuild b/pkg/gentoo/ser-0.8.10.ebuild index 5939b04..dc497cd 100644 --- a/pkg/gentoo/ser-0.8.10.ebuild +++ b/pkg/gentoo/ser-0.8.10.ebuild @@ -56,10 +56,8 @@ src_install () { # fix what the Makefile don't do exeinto /usr/sbin newexe scripts/harv_ser.sh harv_ser.sh - rm ${D}/usr/sbin/gen_ha1 if [ "`use mysql`" ]; then exeinto /usr/bin - newexe utils/gen_ha1/gen_ha1 gen_ha1 else rm ${D}/usr/sbin/ser_mysql.sh fi diff --git a/pkg/gentoo/ser-0.8.9.ebuild b/pkg/gentoo/ser-0.8.9.ebuild index c6b3a1a..cd133bb 100644 --- a/pkg/gentoo/ser-0.8.9.ebuild +++ b/pkg/gentoo/ser-0.8.9.ebuild @@ -32,8 +32,6 @@ src_compile() { prefix=${D}/ \ cfg-prefix=/ \ cfg-target=/etc/ser/ || die - cd utils/gen_ha1 - make all || die } src_install () { @@ -54,7 +52,6 @@ src_install () { exeinto /etc/init.d newexe gentoo/ser.init ser exeinto /usr/bin - newexe utils/gen_ha1/gen_ha1 gen_ha1 exeinto /usr/sbin newexe scripts/harv_ser.sh harv_ser.sh newexe scripts/sc serctl diff --git a/pkg/netbsd/PLIST b/pkg/netbsd/PLIST index 1ea1bc4..4231118 100644 --- a/pkg/netbsd/PLIST +++ b/pkg/netbsd/PLIST @@ -45,7 +45,6 @@ lib/ser/modules/uri_db.so lib/ser/modules/usrloc.so lib/ser/modules/xlog.so lib/ser/modules/xmlrpc.so -sbin/gen_ha1 sbin/ser sbin/ser_mysql.sh sbin/serunix diff --git a/pkg/openbsd/pkg/PLIST b/pkg/openbsd/pkg/PLIST index 9c3911e..2c560cc 100644 --- a/pkg/openbsd/pkg/PLIST +++ b/pkg/openbsd/pkg/PLIST @@ -47,7 +47,6 @@ lib/ser/modules/uri_db.so lib/ser/modules/usrloc.so lib/ser/modules/xlog.so lib/ser/modules/xmlrpc.so -sbin/gen_ha1 sbin/ser sbin/ser_mysql.sh sbin/serunix diff --git a/pkg/opensuse/ser.spec b/pkg/opensuse/ser.spec index fa78175..2164049 100644 --- a/pkg/opensuse/ser.spec +++ b/pkg/opensuse/ser.spec @@ -220,7 +220,6 @@ sbin/insserv etc/init.d/ %{_sbindir}/ser %{_sbindir}/serctl %{_sbindir}/serunix -%{_sbindir}/gen_ha1 /usr/sbin/rcser %{_mandir}/man5/* diff --git a/pkg/rpm/ser.spec-4.1 b/pkg/rpm/ser.spec-4.1 index 9f2682d..0e44c19 100644 --- a/pkg/rpm/ser.spec-4.1 +++ b/pkg/rpm/ser.spec-4.1 @@ -239,8 +239,6 @@ fi %{_sbindir}/ser %{_sbindir}/sercmd -%{_sbindir}/gen_ha1 - %{_mandir}/man5/* %{_mandir}/man8/* diff --git a/pkg/solaris/prototype b/pkg/solaris/prototype index 7bb1b6b..48879fb 100644 --- a/pkg/solaris/prototype +++ b/pkg/solaris/prototype @@ -5,7 +5,6 @@ d none etc/ser 0755 bin bin e none etc/ser/dictionary.ser 0644 bin bin e none etc/ser/ser.cfg 0644 bin bin d none sbin 0755 bin bin -f none sbin/gen_ha1 0755 bin bin f none sbin/ser 0755 bin bin f none sbin/ser_mysql.sh 0755 bin bin f none sbin/serctl 0755 bin bin diff --git a/pkg/suse/ser.spec b/pkg/suse/ser.spec index 42dd333..1dfd7ab 100644 --- a/pkg/suse/ser.spec +++ b/pkg/suse/ser.spec @@ -230,7 +230,6 @@ sbin/insserv etc/init.d/ %{_sbindir}/ser %{_sbindir}/serctl %{_sbindir}/serunix -%{_sbindir}/gen_ha1 /usr/sbin/rcser %{_mandir}/man5/*

15 years, 3 months

git:sr_3.0: Remove obsolete gen_ha1.

by Jan Janak

Module: sip-router Branch: sr_3.0 Commit: e79a572382aa269b25db21990faa232d07a1343c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e79a572… Author: Jan Janak <jan(a)ryngle.com> Committer: Jan Janak <jan(a)ryngle.com> Date: Thu Oct 15 12:19:29 2009 +0200 Remove obsolete gen_ha1. The tool gen_ha1 is not needed anymore. It was used by an old version of the script serctl. The same functionality can be achieved by other means either on the command line or in MySQL with server-side commands. --- Makefile | 4 +- utils/gen_ha1/.cvsignore | 2 - utils/gen_ha1/Makefile | 13 ---- utils/gen_ha1/calc.c | 139 ---------------------------------------------- utils/gen_ha1/calc.h | 62 -------------------- utils/gen_ha1/gen_ha1.c | 51 ----------------- 6 files changed, 2 insertions(+), 269 deletions(-) diff --git a/Makefile b/Makefile index 80fcf22..258ac0e 100644 --- a/Makefile +++ b/Makefile @@ -341,10 +341,10 @@ cmodules=$(foreach mods,$(modules_dirs), $($(mods))) # list of utils directories that should be compiled by make utils -C_COMPILE_UTILS= utils/gen_ha1 utils/sercmd +C_COMPILE_UTILS= utils/sercmd # list of binaries that should be installed alongside # (they should be created after make utils, see C_COMPILE_UTILS) -C_INSTALL_BIN= utils/gen_ha1/gen_ha1 # sercmd is now installed by ctl +C_INSTALL_BIN= # sercmd is now installed by ctl # which utils know to install themselves and should be installed # along the core (list of utils directories) diff --git a/utils/gen_ha1/.cvsignore b/utils/gen_ha1/.cvsignore deleted file mode 100644 index 77502d1..0000000 --- a/utils/gen_ha1/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -gen_ha1 - diff --git a/utils/gen_ha1/Makefile b/utils/gen_ha1/Makefile deleted file mode 100644 index 79e4d58..0000000 --- a/utils/gen_ha1/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# $Id$ -# -# gen_ha1 Makefile -# - -include ../../Makefile.defs - -auto_gen= -NAME=gen_ha1 -LIBS=../../md5.o - - -include ../../Makefile.utils diff --git a/utils/gen_ha1/calc.c b/utils/gen_ha1/calc.c deleted file mode 100644 index 326860a..0000000 --- a/utils/gen_ha1/calc.c +++ /dev/null @@ -1,139 +0,0 @@ -/* - * $Id$ - * - * Copyright (C) 2001-2003 FhG Fokus - * - * This file is part of ser, a free SIP server. - * - * ser is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * For a license to use the ser software under conditions - * other than those described here, or to purchase support for this - * software, please contact iptel.org by e-mail at the following addresses: - * info(a)iptel.org - * - * ser is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#include <sys/types.h> -#include <stdlib.h> -#include <string.h> - -#include "calc.h" -#include "../../md5global.h" -#include "../../md5.h" - - -void CvtHex(HASH Bin, HASHHEX Hex) -{ - unsigned short i; - unsigned char j; - - for (i = 0; i < HASHLEN; i++) { - j = (Bin[i] >> 4) & 0xf; - if (j <= 9) - Hex[i*2] = (j + '0'); - else - Hex[i*2] = (j + 'a' - 10); - j = Bin[i] & 0xf; - if (j <= 9) - Hex[i*2+1] = (j + '0'); - else - Hex[i*2+1] = (j + 'a' - 10); - }; - Hex[HASHHEXLEN] = '\0'; -} - - -/* - * calculate H(A1) as per spec - */ -void DigestCalcHA1(const char * pszAlg, const char * pszUserName, - const char * pszRealm, const char * pszPassword, - const char * pszNonce, const char * pszCNonce, - HASHHEX SessionKey) -{ - MD5_CTX Md5Ctx; - HASH HA1; - - MD5Init(&Md5Ctx); - MD5Update(&Md5Ctx, pszUserName, strlen(pszUserName)); - MD5Update(&Md5Ctx, ":", 1); - MD5Update(&Md5Ctx, pszRealm, strlen(pszRealm)); - MD5Update(&Md5Ctx, ":", 1); - MD5Update(&Md5Ctx, pszPassword, strlen(pszPassword)); - MD5Final(HA1, &Md5Ctx); - if (strcmp(pszAlg, "md5-sess") == 0) { - MD5Init(&Md5Ctx); - MD5Update(&Md5Ctx, HA1, HASHLEN); - MD5Update(&Md5Ctx, ":", 1); - MD5Update(&Md5Ctx, pszNonce, strlen(pszNonce)); - MD5Update(&Md5Ctx, ":", 1); - MD5Update(&Md5Ctx, pszCNonce, strlen(pszCNonce)); - MD5Final(HA1, &Md5Ctx); - }; - CvtHex(HA1, SessionKey); -} - - -/* - * calculate request-digest/response-digest as per HTTP Digest spec - */ -void DigestCalcResponse( - HASHHEX HA1, /* H(A1) */ - const char * pszNonce, /* nonce from server */ - const char * pszNonceCount, /* 8 hex digits */ - const char * pszCNonce, /* client nonce */ - const char * pszQop, /* qop-value: "", "auth", "auth-int" */ - const char * pszMethod, /* method from the request */ - const char * pszDigestUri, /* requested URL */ - HASHHEX HEntity, /* H(entity body) if qop="auth-int" */ - HASHHEX Response /* request-digest or response-digest */) -{ - MD5_CTX Md5Ctx; - HASH HA2; - HASH RespHash; - HASHHEX HA2Hex; - - /* calculate H(A2) */ - MD5Init(&Md5Ctx); - MD5Update(&Md5Ctx, pszMethod, strlen(pszMethod)); - MD5Update(&Md5Ctx, ":", 1); - MD5Update(&Md5Ctx, pszDigestUri, strlen(pszDigestUri)); - if (strcmp(pszQop, "auth-int") == 0) { - MD5Update(&Md5Ctx, ":", 1); - MD5Update(&Md5Ctx, HEntity, HASHHEXLEN); - }; - MD5Final(HA2, &Md5Ctx); - CvtHex(HA2, HA2Hex); - - /* calculate response */ - MD5Init(&Md5Ctx); - MD5Update(&Md5Ctx, HA1, HASHHEXLEN); - MD5Update(&Md5Ctx, ":", 1); - MD5Update(&Md5Ctx, pszNonce, strlen(pszNonce)); - MD5Update(&Md5Ctx, ":", 1); - if (*pszQop) { - MD5Update(&Md5Ctx, pszNonceCount, strlen(pszNonceCount)); - MD5Update(&Md5Ctx, ":", 1); - MD5Update(&Md5Ctx, pszCNonce, strlen(pszCNonce)); - MD5Update(&Md5Ctx, ":", 1); - MD5Update(&Md5Ctx, pszQop, strlen(pszQop)); - MD5Update(&Md5Ctx, ":", 1); - }; - MD5Update(&Md5Ctx, HA2Hex, HASHHEXLEN); - MD5Final(RespHash, &Md5Ctx); - CvtHex(RespHash, Response); -} - diff --git a/utils/gen_ha1/calc.h b/utils/gen_ha1/calc.h deleted file mode 100644 index bc9044e..0000000 --- a/utils/gen_ha1/calc.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * $Id$ - * - * Copyright (C) 2001-2003 FhG Fokus - * - * This file is part of ser, a free SIP server. - * - * ser is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * For a license to use the ser software under conditions - * other than those described here, or to purchase support for this - * software, please contact iptel.org by e-mail at the following addresses: - * info(a)iptel.org - * - * ser is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#ifndef CALC_H -#define CALC_H - - -#define HASHLEN 16 -typedef char HASH[HASHLEN]; - - -#define HASHHEXLEN 32 -typedef char HASHHEX[HASHHEXLEN+1]; - - -void CvtHex(HASH Bin, HASHHEX Hex); - -/* - * calculate H(A1) as per HTTP Digest spec - */ -void DigestCalcHA1(const char * pszAlg, const char * pszUserName, const char * pszRealm, - const char * pszPassword, const char * pszNonce, const char * pszCNonce, - HASHHEX SessionKey); - -/* calculate request-digest/response-digest as per HTTP Digest spec */ -void DigestCalcResponse(HASHHEX HA1, /* H(A1) */ - const char * pszNonce, /* nonce from server */ - const char * pszNonceCount, /* 8 hex digits */ - const char * pszCNonce, /* client nonce */ - const char * pszQop, /* qop-value: "", "auth", "auth-int" */ - const char * pszMethod, /* method from the request */ - const char * pszDigestUri, /* requested URL */ - HASHHEX HEntity, /* H(entity body) if qop="auth-int" */ - HASHHEX Response /* request-digest or response-digest */); - - -#endif diff --git a/utils/gen_ha1/gen_ha1.c b/utils/gen_ha1/gen_ha1.c deleted file mode 100644 index 799da62..0000000 --- a/utils/gen_ha1/gen_ha1.c +++ /dev/null @@ -1,51 +0,0 @@ -/* - * $Id$ - * - * Copyright (C) 2001-2003 FhG Fokus - * - * This file is part of ser, a free SIP server. - * - * ser is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version - * - * For a license to use the ser software under conditions - * other than those described here, or to purchase support for this - * software, please contact iptel.org by e-mail at the following addresses: - * info(a)iptel.org - * - * ser is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#include <stdio.h> -#include <stdlib.h> -#include "../../md5global.h" -#include "../../md5.h" -#include "calc.h" - - - -int main(int argc, char** argv) -{ - HASHHEX ha1; - - if (argc != 4) { - printf("Usage: gen_ha1 <username> <realm> <password> \n"); - /* return EXIT_SUCCESS; -jku */ - return 1; - } - - DigestCalcHA1("md5", argv[1], argv[2], argv[3], "", "", ha1); - printf("%s\n", ha1); - - return 0; /* jku */ -}

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