sr-dev June 2018

sr-dev@lists.kamailio.org

26 participants
320 discussions

git:master:422e7dbd: dispatcher: docs updated removing avp params and adding xavp params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 422e7dbd0bebc14d6a4cc43e7f59326de00f24b0 URL: https://github.com/kamailio/kamailio/commit/422e7dbd0bebc14d6a4cc43e7f59326… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-12T09:01:50+02:00 dispatcher: docs updated removing avp params and adding xavp params --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/422e7dbd0bebc14d6a4cc43e7f59326… Patch: https://github.com/kamailio/kamailio/commit/422e7dbd0bebc14d6a4cc43e7f59326…

6 years, 6 months

git:master:11ff4226: dispatcher: use xavps instead of avps

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 11ff4226dea81582fd97661701142abbf5348911 URL: https://github.com/kamailio/kamailio/commit/11ff4226dea81582fd97661701142ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-12T09:01:50+02:00 dispatcher: use xavps instead of avps - removed avp names parameters - new parameters: - xavp_dst - name of the xavp to store destination records - xavp_dst_mode - control the fields added to xavp_dst - xavp_ctx - name of the xavp to store context attributes - xavp_ctx_mode - control the fields added to xavp_ctx --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/11ff4226dea81582fd97661701142ab… Patch: https://github.com/kamailio/kamailio/commit/11ff4226dea81582fd97661701142ab…

6 years, 6 months

[kamailio/kamailio] src/Makefile: fix source code revision output (#1560)

by Mikko Lehto

I noticed that ```kamailio -I``` and ```kamailio -V``` do not give git version hash anymore. This commit fixes at least kamailio -I and -V output, I think. I don't know / remember if further adjustment is needed for other REPO_ constants. # Before ``` #define REPO_VER "" #define REPO_HASH "unknown" #define REPO_STATE "" ``` ``` $ src/kamailio -I|grep Source Source code revision ID: unknown ``` # After ``` #define REPO_VER "5c48b2" #define REPO_HASH "5c48b2" #define REPO_STATE "" ``` ``` $ src/kamailio -I|grep Source Source code revision ID: 5c48b2 ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1560 -- Commit Summary -- * src/Makefile: adjust Makefile to populate REPO_ variables in autover.h again -- File Changes -- M src/Makefile (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1560.patch https://github.com/kamailio/kamailio/pull/1560.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/1560

6 years, 6 months

git:master:7585a570: src/Makefile: adjust Makefile to populate REPO_ variables in autover.h again

by Henning Westerholt

Module: kamailio Branch: master Commit: 7585a57037f6ef21cda376b16b0077fa981eceac URL: https://github.com/kamailio/kamailio/commit/7585a57037f6ef21cda376b16b0077f… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2018-06-12T08:19:23+02:00 src/Makefile: adjust Makefile to populate REPO_ variables in autover.h again --- Modified: src/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/7585a57037f6ef21cda376b16b0077f… Patch: https://github.com/kamailio/kamailio/commit/7585a57037f6ef21cda376b16b0077f… --- diff --git a/src/Makefile b/src/Makefile index d0faa5d473..5b67d7ad67 100644 --- a/src/Makefile +++ b/src/Makefile @@ -348,7 +348,7 @@ modules-cfg modules-list modules-lst: rm -f modules.lst $(MAKE) modules.lst -ifneq ($(wildcard .git),) +ifneq ($(wildcard ../.git),) # if .git/ exists repo_ver=$(shell RV=`git rev-parse --verify --short=6 HEAD 2>/dev/null`;\ [ -n "$$RV" ] && \ @@ -358,7 +358,7 @@ repo_ver=$(shell RV=`git rev-parse --verify --short=6 HEAD 2>/dev/null`;\ RV="$$RV"-dirty; echo "$$RV") repo_hash=$(subst -dirty,,$(repo_ver)) repo_state=$(subst %-dirty,dirty,$(findstring -dirty,$(repo_ver))) -autover_h_dep=.git $(filter-out $(auto_gen), $(sources)) core/cfg.y core/cfg.lex Makefile +autover_h_dep=../.git $(filter-out $(auto_gen), $(sources)) core/cfg.y core/cfg.lex Makefile else # else if .git/ does not exist repo_ver=

6 years, 6 months

git:master:ebd207ad: modules: readme files regenerated - mqueue ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: ebd207ade41ccdfec687d85e210c32ffe9a7e6b0 URL: https://github.com/kamailio/kamailio/commit/ebd207ade41ccdfec687d85e210c32f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-11T18:16:43+02:00 modules: readme files regenerated - mqueue ... [skip ci] --- Modified: src/modules/mqueue/README Modified: src/modules/rtpproxy/README Modified: src/modules/sdpops/README Modified: src/modules/tmx/README --- Diff: https://github.com/kamailio/kamailio/commit/ebd207ade41ccdfec687d85e210c32f… Patch: https://github.com/kamailio/kamailio/commit/ebd207ade41ccdfec687d85e210c32f… --- diff --git a/src/modules/mqueue/README b/src/modules/mqueue/README index 118cc534c8..860887af56 100644 --- a/src/modules/mqueue/README +++ b/src/modules/mqueue/README @@ -200,7 +200,7 @@ xlog("L_INFO", "Size of queue is: $var(q_size)\n"); 5. Exported Variables - * $mqv(mqueue) - the most recent item key fetched from the specified + * $mqk(mqueue) - the most recent item key fetched from the specified mqueue * $mqv(mqueue) - the most recent item value fetched from the specified mqueue diff --git a/src/modules/rtpproxy/README b/src/modules/rtpproxy/README index 556e93d66b..9b7aa5a818 100644 --- a/src/modules/rtpproxy/README +++ b/src/modules/rtpproxy/README @@ -230,7 +230,7 @@ Chapter 1. Admin Guide 4.1. rtpproxy_sock (string) - Used to define the list of RTPPRoxy instances to connect to. These can + Used to define the list of RTPProxy instances to connect to. These can be UNIX sockets or IPv4/IPv6 UDP sockets. Each modparam entry will insert sockets into a single set. If no set ID is given, the default set ID '0' will be used. To define multiple sets add the set number at diff --git a/src/modules/sdpops/README b/src/modules/sdpops/README index 7e029018f9..ce0e06ec2c 100644 --- a/src/modules/sdpops/README +++ b/src/modules/sdpops/README @@ -482,7 +482,7 @@ if(sdp_with_ice()) { Store the search part of SDP body message with line beginning with 'string' in an AVP. Return 1 if 'string' is found in SDP, -1 on error and -2 if there is no SDP part in the message body. The second - parameter can contain psudeo-variables. + parameter can contain pseudo-variables. This function can be used from ANY_ROUTE. diff --git a/src/modules/tmx/README b/src/modules/tmx/README index 81568f329d..58237382cd 100644 --- a/src/modules/tmx/README +++ b/src/modules/tmx/README @@ -264,7 +264,7 @@ if (t_reply_callid("123qaz", "5", "458", "Replied remotely")) { created via t_newtran() and the flags have been altered since. It is not needed to execute this function when using t_relay() (or - similar tm relay functions, flags are synchornized automatically in + similar tm relay functions, flags are synchronized automatically in that case). This function can be used from ANY_ROUTE . @@ -282,7 +282,7 @@ t_flush_flags(); been altered since. It is not needed to execute this function when using t_relay() (or - similar tm relay functions, xflags are synchornized automatically in + similar tm relay functions, xflags are synchronized automatically in that case). This function can be used from ANY_ROUTE .

6 years, 6 months

git:master:f46fc58f: sdpops: fix documentation typo

by Mikko Lehto

Module: kamailio Branch: master Commit: f46fc58f88b41563ada32b2abb13cf47161eeb5a URL: https://github.com/kamailio/kamailio/commit/f46fc58f88b41563ada32b2abb13cf4… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-06-11T18:55:53+03:00 sdpops: fix documentation typo --- Modified: src/modules/sdpops/doc/sdpops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f46fc58f88b41563ada32b2abb13cf4… Patch: https://github.com/kamailio/kamailio/commit/f46fc58f88b41563ada32b2abb13cf4… --- diff --git a/src/modules/sdpops/doc/sdpops_admin.xml b/src/modules/sdpops/doc/sdpops_admin.xml index 37f7f2d5a7..f51dfe0a3c 100644 --- a/src/modules/sdpops/doc/sdpops_admin.xml +++ b/src/modules/sdpops/doc/sdpops_admin.xml @@ -557,7 +557,7 @@ if(sdp_with_ice()) { <para> Store the search part of SDP body message with line beginning with 'string' in an AVP. Return 1 if 'string' is found in SDP, -1 on error and -2 if there is no SDP part in the message body. - The second parameter can contain psudeo-variables. + The second parameter can contain pseudo-variables. </para> <para> This function can be used from ANY_ROUTE.

6 years, 6 months

git:master:9ba37fd6: mqueue: fix typo in variable name documentation

by Mikko Lehto

Module: kamailio Branch: master Commit: 9ba37fd602a67066bd49f6959350ea1fd72d5e47 URL: https://github.com/kamailio/kamailio/commit/9ba37fd602a67066bd49f6959350ea1… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-06-11T18:55:38+03:00 mqueue: fix typo in variable name documentation --- Modified: src/modules/mqueue/doc/mqueue_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9ba37fd602a67066bd49f6959350ea1… Patch: https://github.com/kamailio/kamailio/commit/9ba37fd602a67066bd49f6959350ea1… --- diff --git a/src/modules/mqueue/doc/mqueue_admin.xml b/src/modules/mqueue/doc/mqueue_admin.xml index f9c3493aaf..0ab18f0be0 100644 --- a/src/modules/mqueue/doc/mqueue_admin.xml +++ b/src/modules/mqueue/doc/mqueue_admin.xml @@ -207,7 +207,7 @@ xlog("L_INFO", "Size of queue is: $var(q_size)\n"); <title>Exported Variables</title> <itemizedlist> <listitem> - <emphasis>$mqv(mqueue)</emphasis> - the most recent item key fetched from the specified mqueue + <emphasis>$mqk(mqueue)</emphasis> - the most recent item key fetched from the specified mqueue </listitem> <listitem> <emphasis>$mqv(mqueue)</emphasis> - the most recent item value fetched from the specified mqueue

6 years, 6 months

git:master:21c219bc: rtpproxy: mark RPC call with proper tag and small typo fix

by Mikko Lehto

Module: kamailio Branch: master Commit: 21c219bcdd3f74a029582cd353c5f91d91a46f3d URL: https://github.com/kamailio/kamailio/commit/21c219bcdd3f74a029582cd353c5f91… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-06-11T18:55:38+03:00 rtpproxy: mark RPC call with proper tag and small typo fix --- Modified: src/modules/rtpproxy/doc/rtpproxy_admin.xml Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/21c219bcdd3f74a029582cd353c5f91… Patch: https://github.com/kamailio/kamailio/commit/21c219bcdd3f74a029582cd353c5f91… --- diff --git a/src/modules/rtpproxy/doc/rtpproxy_admin.xml b/src/modules/rtpproxy/doc/rtpproxy_admin.xml index 618f7938ef..d7f9b6de15 100644 --- a/src/modules/rtpproxy/doc/rtpproxy_admin.xml +++ b/src/modules/rtpproxy/doc/rtpproxy_admin.xml @@ -98,7 +98,7 @@ <section id="rtpproxy.p.rtpproxy_sock"> <title><varname>rtpproxy_sock</varname> (string)</title> <para> - Used to define the list of RTPPRoxy instances to connect to. + Used to define the list of RTPProxy instances to connect to. These can be UNIX sockets or IPv4/IPv6 UDP sockets. Each modparam entry will insert sockets into a single set. If no set ID is given, the default set ID '0' will be used. To define multiple sets add the set number at the beginning of each parameter followed by '=='. @@ -873,7 +873,7 @@ start_recording(); <section> <title>RPC Commands</title> <section id="rtpproxy.r.enable"> - <title>rtpproxy.enable</title> + <title><function>rtpproxy.enable</function></title> <para> Enables a rtp proxy if parameter value is greater than 0. Disables it if a zero value is given. diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 4251a9ac82..b0b7a67fcf 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -169,7 +169,7 @@ static int_str ice_candidate_priority_avp; static str rtp_inst_pv_param = {NULL, 0}; static pv_spec_t *rtp_inst_pvar = NULL; -/* array with the sockets used by rtpporxy (per process)*/ +/* array with the sockets used by rtpproxy (per process)*/ static unsigned int rtpp_no = 0; static int *rtpp_socks = 0;

6 years, 6 months

git:master:c1d10616: tmx: fix documentation typo

by Mikko Lehto

Module: kamailio Branch: master Commit: c1d106161819b86427a9ea7a6e6502c1922d4b6f URL: https://github.com/kamailio/kamailio/commit/c1d106161819b86427a9ea7a6e6502c… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-06-11T18:55:38+03:00 tmx: fix documentation typo --- Modified: src/modules/tmx/doc/tmx_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c1d106161819b86427a9ea7a6e6502c… Patch: https://github.com/kamailio/kamailio/commit/c1d106161819b86427a9ea7a6e6502c… --- diff --git a/src/modules/tmx/doc/tmx_admin.xml b/src/modules/tmx/doc/tmx_admin.xml index fe630d2f76..19c808c931 100644 --- a/src/modules/tmx/doc/tmx_admin.xml +++ b/src/modules/tmx/doc/tmx_admin.xml @@ -216,7 +216,7 @@ if (t_reply_callid("123qaz", "5", "458", "Replied remotely")) { </para> <para> It is not needed to execute this function when using t_relay() (or - similar tm relay functions, flags are synchornized automatically in + similar tm relay functions, flags are synchronized automatically in that case). </para> <para> @@ -242,7 +242,7 @@ t_flush_flags(); </para> <para> It is not needed to execute this function when using t_relay() (or - similar tm relay functions, xflags are synchornized automatically in + similar tm relay functions, xflags are synchronized automatically in that case). </para> <para>

6 years, 6 months

git:master:72f5eaee: tm: force free cell in UNREF_FREE() if transaction is unlinkled from timers

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 72f5eaeeef0239ebd16a2d645b83e83eb1a2b506 URL: https://github.com/kamailio/kamailio/commit/72f5eaeeef0239ebd16a2d645b83e83… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-11T12:39:54+02:00 tm: force free cell in UNREF_FREE() if transaction is unlinkled from timers --- Modified: src/modules/tm/t_funcs.h Modified: src/modules/tm/timer.c Modified: src/modules/tm/timer.h Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/72f5eaeeef0239ebd16a2d645b83e83… Patch: https://github.com/kamailio/kamailio/commit/72f5eaeeef0239ebd16a2d645b83e83… --- diff --git a/src/modules/tm/t_funcs.h b/src/modules/tm/t_funcs.h index bbab42482f..5c219ca02f 100644 --- a/src/modules/tm/t_funcs.h +++ b/src/modules/tm/t_funcs.h @@ -96,13 +96,18 @@ int send_pr_buffer( struct retr_buf *rb, void *buf, int len); #ifdef TM_DEL_UNREF -#define UNREF_FREE(_T_cell) \ +#define UNREF_FREE(_T_cell, _T_unlinked) \ do{\ if (atomic_dec_and_test(&(_T_cell)->ref_count)){ \ unlink_timers((_T_cell)); \ free_cell((_T_cell)); \ - }else \ - t_stats_delayed_free(); \ + }else{ \ + if(_T_unlinked){ \ + free_cell((_T_cell)); \ + }else{ \ + t_stats_delayed_free(); \ + } \ + } \ }while(0) #define UNREF_NOSTATS(_T_cell) \ diff --git a/src/modules/tm/timer.c b/src/modules/tm/timer.c index 996efbc21c..b5e4325929 100644 --- a/src/modules/tm/timer.c +++ b/src/modules/tm/timer.c @@ -648,7 +648,11 @@ ticks_t wait_handler(ticks_t ti, struct timer_ln *wait_tl, void *data) remove_from_hash_table_unsafe(p_cell); UNLOCK_HASH(p_cell->hash_index); p_cell->flags |= T_IN_AGONY; - UNREF_FREE(p_cell); + if(t_linked_timers(p_cell)) { + UNREF_FREE(p_cell, 0); + } else { + UNREF_FREE(p_cell, 1); + } ret = 0; #else /* TM_DEL_UNREF */ if(p_cell->flags & T_IN_AGONY) { diff --git a/src/modules/tm/timer.h b/src/modules/tm/timer.h index 3bdb16a65a..5cb6c736a6 100644 --- a/src/modules/tm/timer.h +++ b/src/modules/tm/timer.h @@ -375,5 +375,24 @@ inline static void unlink_timers(struct cell *t) cleanup_localcancel_timers(t); } +inline static int t_linked_timers(tm_cell_t *t) +{ + int i; + + if(t->uas.response.timer.next!=NULL || t->uas.response.timer.prev!=NULL) { + return 1; + } + for(i = 0; i < t->nr_of_outgoings; i++) { + if(t->uac[i].request.timer.next!=NULL + || t->uac[i].request.timer.prev!=NULL) { + return 1; + } + if(t->uac[i].local_cancel.timer.next!=NULL + || t->uac[i].local_cancel.timer.prev!=NULL) { + return 1; + } + } + return 0; +} #endif diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 9b2f51b5f6..42e25762d2 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -589,7 +589,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, if(atomic_get_int(&new_cell->ref_count)==0) { free_cell(new_cell); } else { - UNREF_FREE(new_cell); + UNREF_FREE(new_cell, 0); } } #else

6 years, 6 months

← Newer
1
...
18
19
20
21
22
23
24
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2018