sr-dev April 2017

sr-dev@lists.kamailio.org

31 participants
426 discussions

git:master:0df66ff9: core: remove dead code

by Mikko Lehto

Module: kamailio Branch: master Commit: 0df66ff94a9ccef4fe072f8704dc47f4f790cda4 URL: https://github.com/kamailio/kamailio/commit/0df66ff94a9ccef4fe072f8704dc47f… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-04-18T20:36:54+03:00 core: remove dead code --- Modified: src/core/config.h Modified: src/core/globals.h Modified: src/main.c Modified: src/modules/tm/h_table.h Removed: src/core/types.h --- Diff: https://github.com/kamailio/kamailio/commit/0df66ff94a9ccef4fe072f8704dc47f… Patch: https://github.com/kamailio/kamailio/commit/0df66ff94a9ccef4fe072f8704dc47f… --- diff --git a/src/core/config.h b/src/core/config.h index 66ba0df..91d15fa 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -35,8 +35,6 @@ #ifndef config_h #define config_h -#include "types.h" - #define SIP_PORT 5060 /*!< default SIP port if none specified */ #define SIPS_PORT 5061 /*!< default SIP port for TLS if none specified */ diff --git a/src/core/globals.h b/src/core/globals.h index 1fb93f1..fc5f2c9 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -32,7 +32,6 @@ #ifndef globals_h #define globals_h -#include "types.h" #include "ip_addr.h" #include "str.h" #include "poll_types.h" @@ -113,7 +112,6 @@ extern int dont_daemonize; extern int check_via; extern int phone2tel; extern int received_dns; -/* extern int process_no; */ extern int child_rank; extern int sip_warning; extern int server_signature; @@ -144,12 +142,6 @@ extern int auto_bind_ipv6; extern int tos; extern int pmtu_discovery; -/* - * debug & log_stderr moved to dprint.h*/ - -/* extern process_bm_t process_bit; */ -/* extern int *pids; -moved to pt.h */ - extern int cfg_errors; extern int cfg_warnings; extern unsigned int msg_no; @@ -160,11 +152,6 @@ extern unsigned long pkg_mem_size; /* AVP configuration */ extern char *avp_db_url; /* db url used by user preferences (AVPs) */ -/* moved to pt.h -extern int *pids; -extern int process_no; -*/ - extern int reply_to_via; extern int is_main; diff --git a/src/core/types.h b/src/core/types.h deleted file mode 100644 index eba0e92..0000000 --- a/src/core/types.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2001-2003 FhG Fokus - * - * This file is part of Kamailio, a free SIP server. - * - * 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 Kamailio 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 - * - * 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. - * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - -#ifndef _TYPES_H_ -#define _TYPES_H_ - -typedef unsigned int process_bm_t; - -#endif diff --git a/src/main.c b/src/main.c index 99feebb..7781901 100644 --- a/src/main.c +++ b/src/main.c @@ -471,10 +471,6 @@ int child_rank = 0; /* how much to wait for children to terminate, before taking extreme measures*/ int ser_kill_timeout=DEFAULT_SER_KILL_TIMEOUT; -/* process_bm_t process_bit = 0; */ -#ifdef ROUTE_SRV -#endif - /* cfg parsing */ int cfg_errors=0; int cfg_warnings=0; @@ -1364,7 +1360,6 @@ int main_loop(void) if (pid==0){ /* child */ /* timer!*/ - /* process_bit = 0; */ if (real_time&2) set_rt_prio(rt_timer2_prio, rt_timer2_policy); @@ -1383,7 +1378,6 @@ int main_loop(void) if (pid==0){ /* child */ /* timer!*/ - /* process_bit = 0; */ if (real_time&1) set_rt_prio(rt_timer1_prio, rt_timer1_policy); if (arm_timer()<0) goto error; diff --git a/src/modules/tm/h_table.h b/src/modules/tm/h_table.h index 7783446..9047095 100644 --- a/src/modules/tm/h_table.h +++ b/src/modules/tm/h_table.h @@ -46,7 +46,6 @@ #include "../../core/clist.h" #include "../../core/parser/msg_parser.h" -#include "../../core/types.h" #include "../../core/md5utils.h" #include "../../core/usr_avp.h" #ifdef WITH_XAVP

7 years, 7 months

git:master:102ef546: core: substitute ser string with NAME macro

by Mikko Lehto

Module: kamailio Branch: master Commit: 102ef546ee418fcc92eaa8fe16c3a4fd453036c0 URL: https://github.com/kamailio/kamailio/commit/102ef546ee418fcc92eaa8fe16c3a4f… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-04-18T19:27:56+03:00 core: substitute ser string with NAME macro --- Modified: src/core/route.c --- Diff: https://github.com/kamailio/kamailio/commit/102ef546ee418fcc92eaa8fe16c3a4f… Patch: https://github.com/kamailio/kamailio/commit/102ef546ee418fcc92eaa8fe16c3a4f… --- diff --git a/src/core/route.c b/src/core/route.c index 97df31e..63e4f83 100644 --- a/src/core/route.c +++ b/src/core/route.c @@ -993,7 +993,7 @@ int fix_actions(struct action* a) si=find_si(&ip, ((struct socket_id*)t->val[0].u.data)->port, ((struct socket_id*)t->val[0].u.data)->proto); if (si==0){ - LM_ERR("bad force_send_socket argument: %s:%d (ser doesn't listen on it)\n", + LM_ERR("bad force_send_socket argument: %s:%d (" NAME " doesn't listen on it)\n", ((struct socket_id*)t->val[0].u.data)->addr_lst->name, ((struct socket_id*)t->val[0].u.data)->port); ret = E_BAD_ADDRESS;

7 years, 7 months

[kamailio/kamailio] core: dead code and ser string removal (#1076)

by Mikko Lehto

While tracking 'ser' string (after incorrect use of force_send_socket script function), also found some disabled code and file nearby. types.h introduced in 4bd1673d3decc16db0081efafaf6a4b97c58d737, process_bm_t usage removed in a76545c8aec9e9dc88facf2691e3841b4c89051d both during year 2002. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1076 -- Commit Summary -- * core: substitute ser string with NAME macro * core: remove dead code -- File Changes -- M src/core/config.h (2) M src/core/globals.h (13) M src/core/route.c (2) D src/core/types.h (32) M src/main.c (6) M src/modules/tm/h_table.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1076.patch https://github.com/kamailio/kamailio/pull/1076.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1076

7 years, 7 months

git:master:bfe2cec3: rtpproxy: fix docs for rtpproxy_stop_stream2uas()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bfe2cec3951874da8dccba69493922006129da5c URL: https://github.com/kamailio/kamailio/commit/bfe2cec3951874da8dccba694939220… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-19T08:05:13+02:00 rtpproxy: fix docs for rtpproxy_stop_stream2uas() - it has no parameters --- Modified: src/modules/rtpproxy/doc/rtpproxy_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bfe2cec3951874da8dccba694939220… Patch: https://github.com/kamailio/kamailio/commit/bfe2cec3951874da8dccba694939220… --- diff --git a/src/modules/rtpproxy/doc/rtpproxy_admin.xml b/src/modules/rtpproxy/doc/rtpproxy_admin.xml index 15f950c..e06ae8d 100644 --- a/src/modules/rtpproxy/doc/rtpproxy_admin.xml +++ b/src/modules/rtpproxy/doc/rtpproxy_admin.xml @@ -801,6 +801,29 @@ rtpproxy_manage(); These functions can be used from REQUEST_ROUTE, ONREPLY_ROUTE. </para> </section> + <section id="rtpproxy.f.rtpproxy_stop_stream2uas"> + <title> + <function>rtpproxy_stop_stream2uas()</function> + </title> + <para> + See function <function>rtpproxy_stop_stream2uac()</function>. + </para> + <example> + <title><function>rtpproxy_stop_stream2uas</function> usage</title> + <programlisting> +... + if (is_method("INVITE")) { + rtpproxy_offer(); + if (is_audio_on_hold()) { + rtpproxy_stream2uas("/var/rtpproxy/prompts/music_on_hold", "-1"); + } else { + rtpproxy_stop_stream2uas(); + }; + }; +... + </programlisting> + </example> + </section> <section id="rtpproxy.f.start_recording"> <title> <function moreinfo="none">start_recording()</function> @@ -822,15 +845,6 @@ start_recording(); </programlisting> </example> </section> - <section id="rtpproxy.f.rtpproxy_stop_stream2uas"> - <title> - <function>rtpproxy_stop_stream2uas(prompt_name, count)</function> - </title> - <para> - See function <function>rtpproxy_stop_stream2uac(prompt_name, count)</function>. - </para> - </section> - </section>

7 years, 7 months

[kamailio/kamailio] modules/{acc, cdp}: allows big endian build (#1068)

by tmh1999

In modules/cdp/diameter.h and modules/acc/diam_message.h, this directive still exists : ```#error BIG endian detected!!``` Meanwhile in modules/auth_diameter/diameter_msg.h, for example, this directive was removed in 5.0 release. Is there any reason to leave this directive present in these 2 headers? The build system is Alpine Linux s390x which is big endian. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1068 -- Commit Summary -- * modules/{acc,cdp}: allows big endian build -- File Changes -- M src/modules/acc/diam_message.h (1) M src/modules/cdp/diameter.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1068.patch https://github.com/kamailio/kamailio/pull/1068.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1068

7 years, 7 months

git:4.4:3d166a44: tm: don't reset uac reply if in a continue route

by Federico Cabiddu

Module: kamailio Branch: 4.4 Commit: 3d166a443c2de24a6b742a1bb5f5dd7f2dfac98b URL: https://github.com/kamailio/kamailio/commit/3d166a443c2de24a6b742a1bb5f5dd7… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-04-18T23:00:03+02:00 tm: don't reset uac reply if in a continue route (cherry picked from commit 152504f108d39ae33c845f7e74a889411868033d) --- Modified: modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/3d166a443c2de24a6b742a1bb5f5dd7… Patch: https://github.com/kamailio/kamailio/commit/3d166a443c2de24a6b742a1bb5f5dd7… --- diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index cf56de7..aa37f2a 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -1293,7 +1293,10 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, picked_branch = branch; run_branch_failure_handlers( Trans, Trans->uac[branch].reply, new_code, extra_flags); - Trans->uac[branch].reply = 0; + /* Don't do reset the reply if we are in a resume route, + * we need to free it at the end of the continue processing */ + if (!(Trans->flags&T_ASYNC_CONTINUE)) + Trans->uac[branch].reply = 0; } @@ -1375,8 +1378,11 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, /* now reset it; after the failure logic, the reply may * not be stored any more and we don't want to keep into - * transaction some broken reference */ - Trans->uac[branch].reply = 0; + * transaction some broken reference. Don't do it if we + * are in a resume route, we need to free it at the end + * of the continue processing */ + if (!(Trans->flags&T_ASYNC_CONTINUE)) + Trans->uac[branch].reply = 0; /* look if the callback perhaps replied transaction; it also covers the case in which a transaction is replied localy

7 years, 7 months

git:master:b9a37f59: modules: readme files regenerated - acc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: b9a37f59cedc81ce2b63dd53f87bd87738969964 URL: https://github.com/kamailio/kamailio/commit/b9a37f59cedc81ce2b63dd53f87bd87… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-04-18T22:01:19+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/b9a37f59cedc81ce2b63dd53f87bd87… Patch: https://github.com/kamailio/kamailio/commit/b9a37f59cedc81ce2b63dd53f87bd87… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index 3d1dd7f..35c12fc 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -856,11 +856,11 @@ modparam("acc", "log_missed_flag", 3) Log level at which accounting messages are issued to syslog. - Default value is L_NOTICE. + Default value is 1 (L_NOTICE). Example 1.12. log_level example ... -modparam("acc", "log_level", 2) # Set log_level to 2 +modparam("acc", "log_level", 2) # Set log_level to 2 (L_INFO) ... 6.13. log_facility (string) @@ -1243,7 +1243,7 @@ modparam("acc", "cdrs_table", "acc_cdrs") * 0 - (default), save only unix timestamp for syslog and datetime for database. * 1 - save seconds in time_attr and microseconds in time_exten. - * 2 - save seconds.miliseconds in time_attr. + * 2 - save seconds.milliseconds in time_attr. * 3 - save formatted time according to time_format parameter, using the output of localtime(). * 4 - save formatted time according to time_format parameter, using @@ -1284,7 +1284,7 @@ modparam("acc", "time_attr", "seconds") Example 1.46. time_exten example ... -modparam("acc", "time_exten", "micorsecs") +modparam("acc", "time_exten", "microsecs") ... 6.47. time_format (str)

7 years, 7 months

git:master:4a19f63f: modules/acc: add log_level names to examples

by Mikko Lehto

Module: kamailio Branch: master Commit: 4a19f63fdee945fbcbc46ab6ebabbf4af67eba7b URL: https://github.com/kamailio/kamailio/commit/4a19f63fdee945fbcbc46ab6ebabbf4… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-04-18T22:58:59+03:00 modules/acc: add log_level names to examples --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4a19f63fdee945fbcbc46ab6ebabbf4… Patch: https://github.com/kamailio/kamailio/commit/4a19f63fdee945fbcbc46ab6ebabbf4… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 591d9e0..258d3a2 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -707,13 +707,13 @@ modparam("acc", "log_missed_flag", 3) Log level at which accounting messages are issued to syslog. </para> <para> - Default value is L_NOTICE. + Default value is 1 (L_NOTICE). </para> <example> <title>log_level example</title> <programlisting format="linespecific"> ... -modparam("acc", "log_level", 2) # Set log_level to 2 +modparam("acc", "log_level", 2) # Set log_level to 2 (L_INFO) ... </programlisting> </example>

7 years, 7 months

git:master:2842990a: modules/acc: fix documentation typos

by Mikko Lehto

Module: kamailio Branch: master Commit: 2842990aef959c1c6208ccf786e8edbc20372c13 URL: https://github.com/kamailio/kamailio/commit/2842990aef959c1c6208ccf786e8edb… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-04-18T22:57:55+03:00 modules/acc: fix documentation typos --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2842990aef959c1c6208ccf786e8edb… Patch: https://github.com/kamailio/kamailio/commit/2842990aef959c1c6208ccf786e8edb… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 832b78f..591d9e0 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -1300,7 +1300,7 @@ modparam("acc", "cdrs_table", "acc_cdrs") microseconds in time_exten.</para> </listitem> <listitem> - <para><emphasis>2</emphasis> - save seconds.miliseconds + <para><emphasis>2</emphasis> - save seconds.milliseconds in time_attr.</para> </listitem> <listitem> @@ -1375,7 +1375,7 @@ modparam("acc", "time_attr", "seconds") <title>time_exten example</title> <programlisting format="linespecific"> ... -modparam("acc", "time_exten", "micorsecs") +modparam("acc", "time_exten", "microsecs") ... </programlisting> </example>

7 years, 7 months

git:5.0:c9ccc96d: tm: don't reset uac reply if in a continue route

by Federico Cabiddu

Module: kamailio Branch: 5.0 Commit: c9ccc96d97258a26248abea4c034bb458b71c61d URL: https://github.com/kamailio/kamailio/commit/c9ccc96d97258a26248abea4c034bb4… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-04-18T21:07:54+02:00 tm: don't reset uac reply if in a continue route (cherry picked from commit 152504f108d39ae33c845f7e74a889411868033d) --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/c9ccc96d97258a26248abea4c034bb4… Patch: https://github.com/kamailio/kamailio/commit/c9ccc96d97258a26248abea4c034bb4… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 6163240..38f5d03 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1279,7 +1279,10 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, picked_branch = branch; run_branch_failure_handlers( Trans, Trans->uac[branch].reply, new_code, extra_flags); - Trans->uac[branch].reply = 0; + /* Don't do reset the reply if we are in a resume route, + * we need to free it at the end of the continue processing */ + if (!(Trans->flags&T_ASYNC_CONTINUE)) + Trans->uac[branch].reply = 0; } @@ -1362,8 +1365,11 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, /* now reset it; after the failure logic, the reply may * not be stored any more and we don't want to keep into - * transaction some broken reference */ - Trans->uac[branch].reply = 0; + * transaction some broken reference. Don't do it if we + * are in a resume route, we need to free it at the end + * of the continue processing */ + if (!(Trans->flags&T_ASYNC_CONTINUE)) + Trans->uac[branch].reply = 0; /* look if the callback perhaps replied transaction; it also * covers the case in which a transaction is replied localy

7 years, 7 months

← Newer
1
...
20
21
22
23
24
25
26
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2017