sr-dev

sr-dev@lists.kamailio.org

15 participants
44248 discussions

by Jan Janak

Module: sip-router Branch: master Commit: fade70e2412b7c75ae571c48aa006c08148d4e53 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fade70e… 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 768c080..ca0eba5 100644 --- a/Makefile +++ b/Makefile @@ -341,8 +341,8 @@ cmodules=$(foreach mods,$(modules_dirs), $($(mods))) # which utils need compilation (directory path) and which to install # (full path including file name) -utils_compile= utils/gen_ha1 utils/sercmd -utils_bin_install= utils/gen_ha1/gen_ha1 # sercmd is now installed by ctl +utils_compile= utils/sercmd +utils_bin_install= # sercmd is now installed by ctl utils_script_install= # This is the list of files to be installed into the arch-independent 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

git:sr_3.0: modules_k/permissions: Increased version number of 'trusted' table

by Juha Heinanen

Module: sip-router Branch: sr_3.0 Commit: 9af70ff505e6ea45110b7a7d5c63eafd3f5b58f8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9af70ff… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Oct 15 12:47:01 2009 +0300 modules_k/permissions: Increased version number of 'trusted' table - Increased version number of 'trusted' table also in code so that it matches the one in db. --- modules_k/permissions/trusted.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/permissions/trusted.c b/modules_k/permissions/trusted.c index d7a2a71..d3c4860 100644 --- a/modules_k/permissions/trusted.c +++ b/modules_k/permissions/trusted.c @@ -40,7 +40,7 @@ #include "../../parser/parse_from.h" #include "../../usr_avp.h" -#define TABLE_VERSION 4 +#define TABLE_VERSION 5 struct trusted_list ***hash_table; /* Pointer to current hash table pointer */ struct trusted_list **hash_table_1; /* Pointer to hash table 1 */

15 years, 3 months

git:master: Fix test 21.sh

by Marius Zbihlei

Module: sip-router Branch: master Commit: 41273f90b8d979c3a601961b44121270b27de5ef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=41273f9… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Oct 15 12:05:49 2009 +0300 Fix test 21.sh Module path problems --- test/unit/21.cfg | 4 ++-- test/unit/21.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/unit/21.cfg b/test/unit/21.cfg index dae5a7c..9eba1d9 100644 --- a/test/unit/21.cfg +++ b/test/unit/21.cfg @@ -22,10 +22,10 @@ rev_dns=no # ------------------ module loading ---------------------------------- #set module path -mpath="../modules/" +mpath="../../modules_k/" # Uncomment this if you want to use SQL database -loadmodule "db_mysql/db_mysql.so" +loadmodule "../../modules/db_mysql/db_mysql.so" loadmodule "sl/sl.so" loadmodule "rr/rr.so" diff --git a/test/unit/21.sh b/test/unit/21.sh index 7c2d74c..4ee2fc5 100755 --- a/test/unit/21.sh +++ b/test/unit/21.sh @@ -33,7 +33,7 @@ CFG=21.cfg # add an registrar entry to the db; $MYSQL "INSERT INTO subscriber (username, domain, password, email_address) VALUES (\"alice\",\"localhost\",\"alice\",\"alice@localhost\");" -../$BIN -w . -f $CFG &> /dev/null; +$BIN -w . -f $CFG &> /dev/null; ret=$? sleep 1

15 years, 3 months

mi_rpc and xmlrpc modules - explanation?

by Olle E. Johansson

Hi folks! Klaus and I are trying to organize some documentation efforts here at Astricon, but we have been sidetracked by all the fun people around... :-) Anyway, I was spending a few minutes looking at mi_rpc and xmlrpc and don't really get what's up with these modules. We must lack some serious documentation here, on why we have two modules. mi_rpc is poorly documented, too. Anyone that can explain if these are just the same modules or if the case is that they are totally different and tell me that I'm stupid and totally forgot to read documentation? /O

15 years, 3 months

INV_FR_TIME_OUT_FIRST

by Jan Janak

I am testing serial forking timers with the merged tm module and noticed that we have INV_FR_TIME_OUT_FIRST defined, in addition to IN_FR_TIME_OUT_NEXT. INV_FR_TIME_OUT_FIRST does not seem to be used anywhere neither in sip-router nor in kamailio. Is this a relict and we can potentionally remove it and keep INV_FR_TIME_OUT_NEXT only, or do I miss something? -- Jan

15 years, 3 months

Default database connection string

by Olle E. Johansson

<quote>mysql://openser:openserrw@localhost/openser</quote>. Is it time to change this? /O

15 years, 3 months

TLS docs

by Olle E. Johansson

<title><varname>config</varname> (string)</title> <para> Sets the name of the TLS specific config file. </para> <para> If set the TLS module will load a special config file, in which different TLS parameters can be specified on a per role (server or client) and domain basis (for now only IPs). The corresponding module parameters will be ignored. </para> Is this still valid - that we only configure tls on IP? /O

15 years, 3 months

git:master: Typos, small updates

by Olle E. Johansson

Module: sip-router Branch: master Commit: 2b9b87abe5e1c266905057c0213523a3494c2750 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b9b87a… Author: oej <oej(a)edvina.net> Committer: oej <oej(a)edvina.net> Date: Wed Oct 14 19:10:50 2009 +0200 Typos, small updates --- modules/dialplan/README | 370 ------------------------------- modules/dialplan/doc/dialplan_admin.xml | 44 ++-- modules/tm/doc/api.xml | 17 +- 3 files changed, 29 insertions(+), 402 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=2b9…

15 years, 3 months

git:master: tls(sr): fix define error introduced in 9accd256fdc80e6a6207cb7

by Henning Westerholt

Module: sip-router Branch: master Commit: 22595b7d37980bd16aff22c5bc24314563933e93 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=22595b7… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Oct 14 18:59:06 2009 +0200 tls(sr): fix define error introduced in 9accd256fdc80e6a6207cb7 --- modules/tls/tls_mod.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tls/tls_mod.h b/modules/tls/tls_mod.h index ff4b35d..0ea4ada 100644 --- a/modules/tls/tls_mod.h +++ b/modules/tls/tls_mod.h @@ -38,7 +38,7 @@ #ifndef _TLS_MOD_H -#iefine _TLS_MOD_H +#define _TLS_MOD_H #include "../../str.h" #include "../../locking.h"

15 years, 3 months

[tracker] Task opened: Include ruri info in dialog data for use in pua_dialog_info (Attachment added)

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 - Fran (flv) Attached to Project - sip-router Summary - Include ruri info in dialog data for use in pua_dialog_info Task Type - Improvement Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - According to problem explained in thread: [[http://lists.kamailio.org/pipermail/users/2009-September/024635.html|Presen… issue - pua dialoginfo]] It has been added 'include_req_uri' parameter to pua_dialog_info module in order to have request uri information in dialog data. The value chosen to be stored is the original request uri of the dialog. Affected modules: dialog, pua_dialog_info. One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=18 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.

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