sr-dev January 2015

sr-dev@lists.kamailio.org

38 participants
530 discussions

by Andrey Rybkin

You can merge this Pull Request by running: git pull https://github.com/AndreyRybkin/kamailio patch-1 Or you can view, comment on it, or merge it online at: https://github.com/kamailio/kamailio/pull/25 -- Commit Summary -- * Add GPLv2 license -- File Changes -- M modules/usrloc_dmq/usrloc_dmq.c (26) -- Patch Links -- https://github.com/kamailio/kamailio/pull/25.patch https://github.com/kamailio/kamailio/pull/25.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/25

9 years, 10 months

git:master:49cbae4a: tls change "ser.cfg" to "kamailio.cfg" in error message

by Olle E. Johansson

Module: kamailio Branch: master Commit: 49cbae4aab6c45a90080a40a7d4311e63d1311da URL: https://github.com/kamailio/kamailio/commit/49cbae4aab6c45a90080a40a7d4311e… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-01-11T22:21:57+01:00 tls change "ser.cfg" to "kamailio.cfg" in error message --- Modified: modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/49cbae4aab6c45a90080a40a7d4311e… Patch: https://github.com/kamailio/kamailio/commit/49cbae4aab6c45a90080a40a7d4311e… --- diff --git a/modules/tls/tls_init.c b/modules/tls/tls_init.c index a53b91b..6812f42 100644 --- a/modules/tls/tls_init.c +++ b/modules/tls/tls_init.c @@ -519,11 +519,11 @@ int init_tls_h(void) * (e.g. 0.9.8a & 0.9.8c are ok, but 0.9.8 and 0.9.9x are not) */ if ((ssl_version>>8)!=(OPENSSL_VERSION_NUMBER>>8)){ LOG(L_CRIT, "ERROR: tls: init_tls_h: installed openssl library " - "version is too different from the library the ser tls module " + "version is too different from the library the Kamailio tls module " "was compiled with: installed \"%s\" (0x%08lx), compiled " "\"%s\" (0x%08lx).\n" " Please make sure a compatible version is used" - " (tls_force_run in ser.cfg will override this check)\n", + " (tls_force_run in kamailio.cfg will override this check)\n", SSLeay_version(SSLEAY_VERSION), ssl_version, OPENSSL_VERSION_TEXT, (long)OPENSSL_VERSION_NUMBER); if (cfg_get(tls, tls_cfg, force_run)) @@ -572,8 +572,8 @@ int init_tls_h(void) if (lib_kerberos!=-1){ LOG(L_CRIT, "ERROR: tls: init_tls_h: openssl compile options" " mismatch: library has kerberos support" - " %s and ser tls %s (unstable configuration)\n" - " (tls_force_run in ser.cfg will override this" + " %s and Kamailio tls %s (unstable configuration)\n" + " (tls_force_run in kamailio.cfg will override this" " check)\n", lib_kerberos?"enabled":"disabled", kerberos_support?"enabled":"disabled" @@ -624,7 +624,7 @@ int init_tls_h(void) low_mem_threshold1, low_mem_threshold2); if (shm_available()==(unsigned long)(-1)){ - LOG(L_WARN, "tls: ser compiled without MALLOC_STATS support:" + LOG(L_WARN, "tls: Kamailio is compiled without MALLOC_STATS support:" " the workaround for low mem. openssl bugs will _not_ " "work\n"); low_mem_threshold1=0;

9 years, 10 months

git:master:c8eeed25: core: removed unused code

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c8eeed253763d4407268494f89050b7681518091 URL: https://github.com/kamailio/kamailio/commit/c8eeed253763d4407268494f89050b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-11T16:51:36+01:00 core: removed unused code - removes also some clang compile warnings --- Modified: cfg.y Modified: route_struct.c --- Diff: https://github.com/kamailio/kamailio/commit/c8eeed253763d4407268494f89050b7… Patch: https://github.com/kamailio/kamailio/commit/c8eeed253763d4407268494f89050b7… --- diff --git a/cfg.y b/cfg.y index 7184191..cd3d317 100644 --- a/cfg.y +++ b/cfg.y @@ -2153,19 +2153,6 @@ exp_elem: { $$=0; yyerror(" URI, SRCIP or DSTIP expected"); } | MYSELF error { $$=0; yyerror ("invalid operator, == or != expected"); } ; -/* -exp_elem2: - rval_expr cmpop rval_expr %prec GT - { $$=mk_elem( $2, RVE_ST, $1, RVE_ST, $3);} - | - rval_expr equalop rval_expr %prec EQUAL_T - { $$=mk_elem( $2, RVE_ST, $1, RVE_ST, $3);} - | rval_expr LOG_AND rval_expr - { $$=mk_exp_rve(LOGAND_OP, $1, $3);} - | rval_expr LOG_OR rval_expr - { $$=mk_exp_rve(LOGOR_OP, $1, $3);} -; -*/ ipnet: ip SLASH ip { $$=mk_new_net($1, $3); } diff --git a/route_struct.c b/route_struct.c index f14ed2a..d57a736 100644 --- a/route_struct.c +++ b/route_struct.c @@ -83,27 +83,6 @@ struct expr* mk_exp(int op, struct expr* left, struct expr* right) } -struct expr* mk_exp_rve(int op, void* left, void* right) -{ - struct expr * e; - e=(struct expr*)pkg_malloc(sizeof (struct expr)); - if (e==0) goto error; - e->type=EXP_T; - e->op=op; - e->l.param=mk_elem(RVEXP_O, RVE_ST, left, 0, 0); - e->r.param=mk_elem(RVEXP_O, RVE_ST, right, 0, 0); - if (e->l.param==0 || e->r.param==0){ - if (e->l.param) pkg_free(e->l.param); - if (e->r.param) pkg_free(e->r.param); - pkg_free(e); - goto error; - } - return e; -error: - LM_CRIT("memory allocation failure\n"); - return 0; -} - struct expr* mk_elem(int op, expr_l_type ltype, void* lparam, expr_r_type rtype, void* rparam) {

9 years, 10 months

git:master:bc2b423d: timer Update header in source code

by Olle E. Johansson

Module: kamailio Branch: master Commit: bc2b423dc6d2ee59dfa511ae442c30f73f499750 URL: https://github.com/kamailio/kamailio/commit/bc2b423dc6d2ee59dfa511ae442c30f… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-01-11T15:02:57+01:00 timer Update header in source code --- Modified: modules/timer/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/bc2b423dc6d2ee59dfa511ae442c30f… Patch: https://github.com/kamailio/kamailio/commit/bc2b423dc6d2ee59dfa511ae442c30f… --- diff --git a/modules/timer/timer.c b/modules/timer/timer.c index 1986f26..abfbb70 100644 --- a/modules/timer/timer.c +++ b/modules/timer/timer.c @@ -1,21 +1,14 @@ /* - * $Id$ - * * Copyright (C) 2006 iptelorg GmbH * - * This file is part of ser, a free SIP server. + * This file is part of Kamailio, a free SIP server. * - * ser is free software; you can redistribute it and/or modify + * Kamailio 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, + * Kamailio 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.

9 years, 10 months

git:master:910ab2f1: timer Update documentation ("ser" => "Kamailio")

by Olle E. Johansson

Module: kamailio Branch: master Commit: 910ab2f17ed4a1af3c358d4e2a7ef1d626992447 URL: https://github.com/kamailio/kamailio/commit/910ab2f17ed4a1af3c358d4e2a7ef1d… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-01-11T15:01:59+01:00 timer Update documentation ("ser" => "Kamailio") --- Modified: modules/timer/README Modified: modules/timer/doc/timer.xml --- Diff: https://github.com/kamailio/kamailio/commit/910ab2f17ed4a1af3c358d4e2a7ef1d… Patch: https://github.com/kamailio/kamailio/commit/910ab2f17ed4a1af3c358d4e2a7ef1d…

9 years, 10 months

git:master:256d0776: tmx Remove svn ID, fix doxygen

by Olle E. Johansson

Module: kamailio Branch: master Commit: 256d0776f0215af8dc56f717c6aab1375f0038a0 URL: https://github.com/kamailio/kamailio/commit/256d0776f0215af8dc56f717c6aab13… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-01-11T14:58:04+01:00 tmx Remove svn ID, fix doxygen --- Modified: modules/tmx/t_mi.c Modified: modules/tmx/t_mi.h Modified: modules/tmx/t_var.c Modified: modules/tmx/t_var.h Modified: modules/tmx/tmx_mod.c Modified: modules/tmx/tmx_mod.h Modified: modules/tmx/tmx_pretran.c Modified: modules/tmx/tmx_pretran.h --- Diff: https://github.com/kamailio/kamailio/commit/256d0776f0215af8dc56f717c6aab13… Patch: https://github.com/kamailio/kamailio/commit/256d0776f0215af8dc56f717c6aab13…

9 years, 10 months

git:master:5ddb3d46: pipelimit fix typo

by Olle E. Johansson

Module: kamailio Branch: master Commit: 5ddb3d46e381d6a60146ef1e04010d56d4d9e4a5 URL: https://github.com/kamailio/kamailio/commit/5ddb3d46e381d6a60146ef1e04010d5… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-01-11T14:54:15+01:00 pipelimit fix typo --- Modified: modules/pipelimit/pl_db.h Modified: modules/pipelimit/pl_ht.h --- Diff: https://github.com/kamailio/kamailio/commit/5ddb3d46e381d6a60146ef1e04010d5… Patch: https://github.com/kamailio/kamailio/commit/5ddb3d46e381d6a60146ef1e04010d5… --- diff --git a/modules/pipelimit/pl_db.h b/modules/pipelimit/pl_db.h index 54b996f..8b6fe12 100644 --- a/modules/pipelimit/pl_db.h +++ b/modules/pipelimit/pl_db.h @@ -23,7 +23,7 @@ /*! \file * \ingroup pipelimit * \brief pipelimit :: pl_db - * + */ #ifndef _RL_DB_H_ #define _RL_DB_H_ diff --git a/modules/pipelimit/pl_ht.h b/modules/pipelimit/pl_ht.h index 9960b64..ecdefaf 100644 --- a/modules/pipelimit/pl_ht.h +++ b/modules/pipelimit/pl_ht.h @@ -25,7 +25,7 @@ /*! \file * \ingroup pipelimit * \brief pipelimit :: pl_ht - * + */ #ifndef _RL_HT_H_ #define _RL_HT_H_

9 years, 10 months

git:master:cd6f4f47: pipelimit Remove SVN ID and fix doxygen

by Olle E. Johansson

Module: kamailio Branch: master Commit: cd6f4f476936c033e7a63ccdc792b42682ed9f84 URL: https://github.com/kamailio/kamailio/commit/cd6f4f476936c033e7a63ccdc792b42… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-01-11T14:53:12+01:00 pipelimit Remove SVN ID and fix doxygen --- Modified: modules/pipelimit/pipelimit.c Modified: modules/pipelimit/pl_db.c Modified: modules/pipelimit/pl_db.h Modified: modules/pipelimit/pl_ht.c Modified: modules/pipelimit/pl_ht.h --- Diff: https://github.com/kamailio/kamailio/commit/cd6f4f476936c033e7a63ccdc792b42… Patch: https://github.com/kamailio/kamailio/commit/cd6f4f476936c033e7a63ccdc792b42… --- diff --git a/modules/pipelimit/pipelimit.c b/modules/pipelimit/pipelimit.c index b966fc5..50d35f8 100644 --- a/modules/pipelimit/pipelimit.c +++ b/modules/pipelimit/pipelimit.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * pipelimit module * * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com) @@ -23,11 +21,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * History: - * --------- + */ + +/*! \file + * \ingroup pipelimit + * \brief pipelimit :: pl_db * - * 2008-01-10 ported from SER project (osas) - * 2008-01-16 ported enhancements from openims project (osas) + */ +/*! \defgroup pipelimit Pipelimit - rate limiting using BSD pipe model */ #include <stdio.h> diff --git a/modules/pipelimit/pl_db.c b/modules/pipelimit/pl_db.c index 7292450..08dd2e0 100644 --- a/modules/pipelimit/pl_db.c +++ b/modules/pipelimit/pl_db.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * pipelimit module * * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com) diff --git a/modules/pipelimit/pl_db.h b/modules/pipelimit/pl_db.h index 823f3be..54b996f 100644 --- a/modules/pipelimit/pl_db.h +++ b/modules/pipelimit/pl_db.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * pipelimit module * * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com) @@ -21,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +/*! \file + * \ingroup pipelimit + * \brief pipelimit :: pl_db + * #ifndef _RL_DB_H_ #define _RL_DB_H_ diff --git a/modules/pipelimit/pl_ht.c b/modules/pipelimit/pl_ht.c index 6e48bb4..a79ccce 100644 --- a/modules/pipelimit/pl_ht.c +++ b/modules/pipelimit/pl_ht.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * pipelimit module * * Copyright (C) 2006 Hendrik Scholz <hscholz(a)raisdorf.net> diff --git a/modules/pipelimit/pl_ht.h b/modules/pipelimit/pl_ht.h index 38c7a43..9960b64 100644 --- a/modules/pipelimit/pl_ht.h +++ b/modules/pipelimit/pl_ht.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * pipelimit module * * Copyright (C) 2006 Hendrik Scholz <hscholz(a)raisdorf.net> @@ -23,6 +21,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +/*! \file + * \ingroup pipelimit + * \brief pipelimit :: pl_ht + * #ifndef _RL_HT_H_ #define _RL_HT_H_

9 years, 10 months

git:master:354ab05c: ratelimit remove svn ID and history

by Olle E. Johansson

Module: kamailio Branch: master Commit: 354ab05cd84033702c7a85236b4df9ee058012ea URL: https://github.com/kamailio/kamailio/commit/354ab05cd84033702c7a85236b4df9e… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-01-11T14:48:41+01:00 ratelimit remove svn ID and history --- Modified: modules/ratelimit/ratelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/354ab05cd84033702c7a85236b4df9e… Patch: https://github.com/kamailio/kamailio/commit/354ab05cd84033702c7a85236b4df9e… --- diff --git a/modules/ratelimit/ratelimit.c b/modules/ratelimit/ratelimit.c index 561185f..6bbe558 100644 --- a/modules/ratelimit/ratelimit.c +++ b/modules/ratelimit/ratelimit.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * ratelimit module * * Copyright (C) 2006 Hendrik Scholz <hscholz(a)raisdorf.net> @@ -22,12 +20,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * History: - * --------- - * - * 2008-01-10 ported from SER project (osas) - * 2008-01-16 ported enhancements from openims project (osas) - * 2020-04-28 add sip-router rpc interface (osas) */ #include <stdio.h>

9 years, 10 months

git:master:d9763926: pkg/kamailio/deb: add new jansson module to kamailio-extra-modules

by Victor Seva

Module: kamailio Branch: master Commit: d97639266ff28184ea888656698fee4848e4c9f3 URL: https://github.com/kamailio/kamailio/commit/d97639266ff28184ea888656698fee4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-01-11T11:59:30+01:00 pkg/kamailio/deb: add new jansson module to kamailio-extra-modules --- Modified: pkg/kamailio/deb/debian/backports/squeeze Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/squeeze/rules Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/wheezy/rules --- Diff: https://github.com/kamailio/kamailio/commit/d97639266ff28184ea888656698fee4… Patch: https://github.com/kamailio/kamailio/commit/d97639266ff28184ea888656698fee4…

9 years, 10 months

← Newer
1
...
27
28
29
30
31
32
33
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2015