June 2018 - sr-dev - kamailio.org

git:master:f6960f87: dispatcher: added defines for dst address update operations
by Daniel-Constantin Mierla 12 Jun '18

12 Jun '18

Module: kamailio Branch: master Commit: f6960f8771fc0689f6923c58a3e5d683434a6a11 URL: https://github.com/kamailio/kamailio/commit/f6960f8771fc0689f6923c58a3e5d68… 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: added defines for dst address update operations --- 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/f6960f8771fc0689f6923c58a3e5d68… Patch: https://github.com/kamailio/kamailio/commit/f6960f8771fc0689f6923c58a3e5d68…

1 0

git:master:422e7dbd: dispatcher: docs updated removing avp params and adding xavp params
by Daniel-Constantin Mierla 12 Jun '18

12 Jun '18

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…

1 0

git:master:11ff4226: dispatcher: use xavps instead of avps
by Daniel-Constantin Mierla 12 Jun '18

12 Jun '18

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…

1 0

[kamailio/kamailio] src/Makefile: fix source code revision output (#1560)
by Mikko Lehto 12 Jun '18

12 Jun '18

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

2 2

git:master:7585a570: src/Makefile: adjust Makefile to populate REPO_ variables in autover.h again
by Henning Westerholt 12 Jun '18

12 Jun '18

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=

1 0

git:master:ebd207ad: modules: readme files regenerated - mqueue ... [skip ci]
by Kamailio Dev 11 Jun '18

11 Jun '18

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 .

1 0

git:master:f46fc58f: sdpops: fix documentation typo
by Mikko Lehto 11 Jun '18

11 Jun '18

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.

1 0

git:master:9ba37fd6: mqueue: fix typo in variable name documentation
by Mikko Lehto 11 Jun '18

11 Jun '18

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

1 0

git:master:21c219bc: rtpproxy: mark RPC call with proper tag and small typo fix
by Mikko Lehto 11 Jun '18

11 Jun '18

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;

1 0

git:master:c1d10616: tmx: fix documentation typo
by Mikko Lehto 11 Jun '18

11 Jun '18

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>

1 0

git:master:72f5eaee: tm: force free cell in UNREF_FREE() if transaction is unlinkled from timers
by Daniel-Constantin Mierla 11 Jun '18

11 Jun '18

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

1 0

git:master:5fe2a1a1: tm: backup and restore T and T_branch in t_continue()
by Daniel-Constantin Mierla 11 Jun '18

11 Jun '18

Module: kamailio Branch: master Commit: 5fe2a1a1c67b550431dcae3c98701073f7edd953 URL: https://github.com/kamailio/kamailio/commit/5fe2a1a1c67b550431dcae3c9870107… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-11T12:39:53+02:00 tm: backup and restore T and T_branch in t_continue() - it may be required to cleanup old T states after t_continue() is finished --- Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/5fe2a1a1c67b550431dcae3c9870107… Patch: https://github.com/kamailio/kamailio/commit/5fe2a1a1c67b550431dcae3c9870107… --- diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index a150829699..205c945d4c 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -166,7 +166,9 @@ int t_suspend(struct sip_msg *msg, int t_continue_helper(unsigned int hash_index, unsigned int label, struct action *rtact, str *cbname, str *cbparam) { - struct cell *t; + tm_cell_t *t; + tm_cell_t *backup_T = T_UNDEFINED; + int backup_T_branch = T_BR_UNDEFINED; sip_msg_t *faked_req; sip_msg_t *brpl; void *erpl; @@ -187,13 +189,18 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, cfg_update(); + backup_T = get_t(); + backup_T_branch = get_t_branch(); + if (t_lookup_ident(&t, hash_index, label) < 0) { + set_t(backup_T, backup_T_branch); LM_ERR("transaction not found\n"); return -1; } if (!(t->flags & T_ASYNC_SUSPENDED)) { LM_WARN("transaction is not suspended [%u:%u]\n", hash_index, label); + set_t(backup_T, backup_T_branch); return -2; } @@ -203,7 +210,7 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, * needless to continue */ UNREF(t); /* t_unref would kill the transaction */ /* reset T as we have no working T anymore */ - set_t(T_UNDEFINED, T_BR_UNDEFINED); + set_t(backup_T, backup_T_branch); return 1; } @@ -248,6 +255,7 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, t->flags &= ~T_ASYNC_CONTINUE; UNLOCK_ASYNC_CONTINUE(t); UNREF(t); /* t_unref would kill the transaction */ + set_t(backup_T, backup_T_branch); return 1; } @@ -387,7 +395,6 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, if(keng->froute(t->uac[branch].reply, TM_ONREPLY_ROUTE, cbname, &evname)<0) { LM_ERR("error running event route kemi callback\n"); - return -1; } } else { LM_DBG("event callback (%.*s) set, but no cfg engine\n", @@ -539,7 +546,7 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, sip_msg_free(brpl); } - + set_t(backup_T, backup_T_branch); return 0; kill_trans: @@ -566,6 +573,7 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, /* response handling */ t_unref(t->uac[branch].reply); } + set_t(backup_T, backup_T_branch); return ret; }

1 0

git:5.1:e4ff0ab2: ims_registrar_pcscf: fix #1556
by Victor Seva 11 Jun '18

11 Jun '18

Module: kamailio Branch: 5.1 Commit: e4ff0ab2a86c64438251d8de969ac821f8b31309 URL: https://github.com/kamailio/kamailio/commit/e4ff0ab2a86c64438251d8de969ac82… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-11T09:14:05+02:00 ims_registrar_pcscf: fix #1556 (cherry picked from commit cddcdb3db2745ef43b5b892a20c3bd1aae439bae) --- Modified: src/modules/ims_registrar_pcscf/service_routes.c --- Diff: https://github.com/kamailio/kamailio/commit/e4ff0ab2a86c64438251d8de969ac82… Patch: https://github.com/kamailio/kamailio/commit/e4ff0ab2a86c64438251d8de969ac82… --- diff --git a/src/modules/ims_registrar_pcscf/service_routes.c b/src/modules/ims_registrar_pcscf/service_routes.c index 9c5eba8090..bc4a2a0bec 100644 --- a/src/modules/ims_registrar_pcscf/service_routes.c +++ b/src/modules/ims_registrar_pcscf/service_routes.c @@ -130,9 +130,9 @@ int checkcontact(struct sip_msg* _m, pcontact_t * c) { break; } } else if (c->security_temp) { - switch (c->security->type) { + switch (c->security_temp->type) { case SECURITY_IPSEC: - security_server_port = c->security->data.ipsec->port_uc; + security_server_port = c->security_temp->data.ipsec->port_uc; break; case SECURITY_TLS: case SECURITY_NONE:

1 0

[kamailio/kamailio] P-CSCF crash during login(Boghe IMS client) (#1556)
by uts09 11 Jun '18

11 Jun '18

### Description Kamailio P-CSCF process is crashing during login. This issue is observed only on v5.1.4  ### Troubleshooting #### Reproduction Login using Boghe IMS client. Kamailio P-CSCF crashes and core file is generated. However process is not existing and subsequent login fails.  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` [root@osboxes kamailio_pcscf]# kamailio -f /usr/local/etc/kamailio_pcscf/kamailio-pcscf.cfg loading modules under config path: /usr/local/lib64/kamailio/modules/ 0(16002) INFO: <core> [core/sctp_core.c:75]: sctp_core_check_support(): SCTP API not enabled - if you want to use it, load sctp module Listening on udp: 192.168.56.101 [192.168.56.101]:4060 Aliases: *: pcscf.ims.mnc001.mcc001.3gppnetwork.org:* WARNING: no fork mode 0(16002) INFO: rr [../outbound/api.h:52]: ob_load_api(): unable to import bind_ob - maybe module is not loaded 0(16002) INFO: rr [rr_mod.c:175]: mod_init(): outbound module not available 0(16002) INFO: ims_usrloc_pcscf [hslot.c:62]: ul_init_locks(): locks array size 1024 0(16002) INFO: <core> [core/udp_server.c:153]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 0(16002) INFO: <core> [core/udp_server.c:205]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 0(16002) INFO: <script>: [REGISTER] from [sip:alice@ims.mnc001.mcc001.3gppnetwork.org] to [sip:alice@ims.mnc001.mcc001.3gppnetwork.org] 0(16002) ERROR: <script>: REGISTER (sip:alice@ims.mnc001.mcc001.3gppnetwork.org (10.0.3.2:49178) to sip:alice@ims.mnc001.mcc001.3gppnetwork.org, d0cb661a-aefd-53b6-dc11-aee832fd7123) 0(16002) ERROR: ims_registrar_pcscf [save.c:342]: save_pending(): Error parsing sec-agree parameters: 4 0(16002) INFO: <script>: [REGISTER] from [sip:alice@ims.mnc001.mcc001.3gppnetwork.org] to [sip:alice@ims.mnc001.mcc001.3gppnetwork.org] 0(16002) ERROR: <script>: REGISTER (sip:alice@ims.mnc001.mcc001.3gppnetwork.org (10.0.3.2:49178) to sip:alice@ims.mnc001.mcc001.3gppnetwork.org, d0cb661a-aefd-53b6-dc11-aee832fd7123) 0(16002) ERROR: ims_registrar_pcscf [save.c:342]: save_pending(): Error parsing sec-agree parameters: 4 0(16002) INFO: <script>: [SUBSCRIBE] from [sip:alice@ims.mnc001.mcc001.3gppnetwork.org] to [sip:alice@ims.mnc001.mcc001.3gppnetwork.org] 0(16002) ERROR: <script>: SUBSCRIBE (sip:alice@ims.mnc001.mcc001.3gppnetwork.org (10.0.3.2:49178) to sip:alice@ims.mnc001.mcc001.3gppnetwork.org, 988b1427-88f8-406d-1454-aeff7304dddb) Segmentation fault (core dumped) ``` #### SIP Traffic  ``` [root@osboxes ~]# tcpdump -i any port 4060 -A -s 0 -nn tcpdump: verbose output suppressed, use -v or -vv for full protocol decode listening on any, link-type LINUX_SLL (Linux cooked), capture size 262144 bytes 06:34:21.504451 IP 10.0.3.2.49178 > 192.168.56.101.4060: UDP, length 868 E.......@... .....8e.....l .REGISTER sip:ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 Via: SIP/2.0/UDP 127.0.0.1:49178;branch=z9hG4bK22613780;rport From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Contact: <sip:alice@127.0.0.1:49178;transport=udp>;expires=600000;+g.oma.sip-im;language="en,fr";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10207 REGISTER Content-Length: 0 Max-Forwards: 70 Allow: INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER Privacy: none P-Access-Network-Info: ADSL;utran-cell-id-3gpp=00000000 User-Agent: IM-client/OMA1.0 Boghe-Win32/v2.0.153.836 P-Preferred-Identity: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Supported: path ................ 06:34:21.505544 IP 192.168.56.101.4060 > 10.0.3.2.49178: UDP, length 549 E..A....@.l...8e ........-.NSIP/2.0 100 Trying Via: SIP/2.0/UDP 127.0.0.1:49178;branch=z9hG4bK22613780;rport=49178;received=10.0.3.2 From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10207 REGISTER Server: Kamailio P-CSCF Content-Length: 0 Warning: 392 192.168.56.101:4060 "Noisy feedback tells: pid=16002 req_src_ip=10.0.3.2 req_src_port=49178 in_uri=sip:ims.mnc001.mcc001.3gppnetwork.org out_uri=sip:ims.mnc001.mcc001.3gppnetwork.org via_cnt==1" ................ 06:34:21.507267 IP 192.168.56.101.4060 > 192.168.56.101.5060: SIP: REGISTER sip:ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 E...7f..@.L...8e..8e.....{..REGISTER sip:ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 Via: SIP/2.0/UDP 192.168.56.101:4060;branch=z9hG4bK9a2b.e288671bc5d681b0a2965b18b9e50542.0 Via: SIP/2.0/UDP 127.0.0.1:49178;received=10.0.3.2;branch=z9hG4bK22613780;rport=49178 From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Contact: <sip:alice@127.0.0.1:49178;transport=udp>;expires=600000;+g.oma.sip-im;language="en,fr";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10207 REGISTER Content-Length: 0 Max-Forwards: 69 Allow: INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER Privacy: none P-Access-Network-Info: ADSL;utran-cell-id-3gpp=00000000 User-Agent: IM-client/OMA1.0 Boghe-Win32/v2.0.153.836 P-Preferred-Identity: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Supported: path Path: <sip:term@pcscf.ims.mnc001.mcc001.3gppnetwork.org:4060;lr> Supported: path Require: path P-Visited-Network-ID: ims.mnc001.mcc001.3gppnetwork.org ................ 06:34:21.507486 IP 192.168.56.101.5060 > 192.168.56.101.4060: SIP: SIP/2.0 100 Trying E...7g..@.N...8e..8e........SIP/2.0 100 Trying Via: SIP/2.0/UDP 192.168.56.101:4060;branch=z9hG4bK9a2b.e288671bc5d681b0a2965b18b9e50542.0 Via: SIP/2.0/UDP 127.0.0.1:49178;received=10.0.3.2;branch=z9hG4bK22613780;rport=49178 From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10207 REGISTER Server: Kamailio I-CSCF Content-Length: 0 Warning: 392 192.168.56.101:5060 "Noisy feedback tells: pid=15608 req_src_ip=192.168.56.101 req_src_port=4060 in_uri=sip:ims.mnc001.mcc001.3gppnetwork.org out_uri=sip:ims.mnc001.mcc001.3gppnetwork.org via_cnt==2" ................ 06:34:21.551488 IP 192.168.56.101.5060 > 192.168.56.101.4060: SIP: SIP/2.0 401 Unauthorized - Challenging the UE E...7n..@.Np..8e..8e........SIP/2.0 401 Unauthorized - Challenging the UE Via: SIP/2.0/UDP 192.168.56.101:4060;branch=z9hG4bK9a2b.e288671bc5d681b0a2965b18b9e50542.0 Via: SIP/2.0/UDP 127.0.0.1:49178;received=10.0.3.2;branch=z9hG4bK22613780;rport=49178 From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=4be9d07af59780377285d1aba6f964e3-8e87 Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10207 REGISTER WWW-Authenticate: Digest realm="ims.mnc001.mcc001.3gppnetwork.org", nonce="ddae560be0664e9b2cc83c74f84bdc15", algorithm=MD5, qop="auth,auth-int" Path: <sip:term@pcscf.ims.mnc001.mcc001.3gppnetwork.org:4060;lr> Server: Kamailio S-CSCF Content-Length: 0 ................ 06:34:21.552560 IP 192.168.56.101.4060 > 10.0.3.2.49178: UDP, length 620 E.......@.l...8e ........t..SIP/2.0 401 Unauthorized - Challenging the UE Via: SIP/2.0/UDP 127.0.0.1:49178;received=10.0.3.2;branch=z9hG4bK22613780;rport=49178 From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=4be9d07af59780377285d1aba6f964e3-8e87 Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10207 REGISTER WWW-Authenticate: Digest realm="ims.mnc001.mcc001.3gppnetwork.org", nonce="ddae560be0664e9b2cc83c74f84bdc15", algorithm=MD5, qop="auth,auth-int" Path: <sip:term@pcscf.ims.mnc001.mcc001.3gppnetwork.org:4060;lr> Server: Kamailio S-CSCF Content-Length: 0 ................ 06:34:21.557217 IP 10.0.3.2.49178 > 192.168.56.101.4060: UDP, length 1194 E.......@... .....8e......5.REGISTER sip:ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 Via: SIP/2.0/UDP 127.0.0.1:49178;branch=z9hG4bK22636944;rport From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Contact: <sip:alice@127.0.0.1:49178;transport=udp>;expires=600000;+g.oma.sip-im;language="en,fr";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10208 REGISTER Content-Length: 0 Max-Forwards: 70 Authorization: Digest username="alice(a)ims.mnc001.mcc001.3gppnetwork.org",realm="ims.mnc001.mcc001.3gppnetwork.org",nonce="ddae560be0664e9b2cc83c74f84bdc15",uri="sip:ims.mnc001.mcc001.3gppnetwork.org",response="ef718272941cc1e294e1ddcf6023d712",algorithm=MD5,cnonce="5dd7d99b175120b4e1f76ae10320c721",qop=auth-int,nc=00000001 Allow: INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER Privacy: none P-Access-Network-Info: ADSL;utran-cell-id-3gpp=00000000 User-Agent: IM-client/OMA1.0 Boghe-Win32/v2.0.153.836 P-Preferred-Identity: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Supported: path ................ 06:34:21.557722 IP 192.168.56.101.4060 > 10.0.3.2.49178: UDP, length 549 E..A....@.l...8e ........-.NSIP/2.0 100 Trying Via: SIP/2.0/UDP 127.0.0.1:49178;branch=z9hG4bK22636944;rport=49178;received=10.0.3.2 From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10208 REGISTER Server: Kamailio P-CSCF Content-Length: 0 Warning: 392 192.168.56.101:4060 "Noisy feedback tells: pid=16002 req_src_ip=10.0.3.2 req_src_port=49178 in_uri=sip:ims.mnc001.mcc001.3gppnetwork.org out_uri=sip:ims.mnc001.mcc001.3gppnetwork.org via_cnt==1" ................ 06:34:21.557999 IP 192.168.56.101.4060 > 192.168.56.101.5060: SIP: REGISTER sip:ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 E...7r..@.K{..8e..8e........REGISTER sip:ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 Via: SIP/2.0/UDP 192.168.56.101:4060;branch=z9hG4bK7b2b.a496c2fac4d8daef7f1ca3be76dace27.0 Via: SIP/2.0/UDP 127.0.0.1:49178;received=10.0.3.2;branch=z9hG4bK22636944;rport=49178 From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Contact: <sip:alice@127.0.0.1:49178;transport=udp>;expires=600000;+g.oma.sip-im;language="en,fr";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10208 REGISTER Content-Length: 0 Max-Forwards: 69 Authorization: Digest username="alice(a)ims.mnc001.mcc001.3gppnetwork.org",realm="ims.mnc001.mcc001.3gppnetwork.org",nonce="ddae560be0664e9b2cc83c74f84bdc15",uri="sip:ims.mnc001.mcc001.3gppnetwork.org",response="ef718272941cc1e294e1ddcf6023d712",algorithm=MD5,cnonce="5dd7d99b175120b4e1f76ae10320c721",qop=auth-int,nc=00000001 Allow: INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER Privacy: none P-Access-Network-Info: ADSL;utran-cell-id-3gpp=00000000 User-Agent: IM-client/OMA1.0 Boghe-Win32/v2.0.153.836 P-Preferred-Identity: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Supported: path Path: <sip:term@pcscf.ims.mnc001.mcc001.3gppnetwork.org:4060;lr> Supported: path Require: path P-Visited-Network-ID: ims.mnc001.mcc001.3gppnetwork.org ................ 06:34:21.558266 IP 192.168.56.101.5060 > 192.168.56.101.4060: SIP: SIP/2.0 100 Trying E...7s..@.N...8e..8e........SIP/2.0 100 Trying Via: SIP/2.0/UDP 192.168.56.101:4060;branch=z9hG4bK7b2b.a496c2fac4d8daef7f1ca3be76dace27.0 Via: SIP/2.0/UDP 127.0.0.1:49178;received=10.0.3.2;branch=z9hG4bK22636944;rport=49178 From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10208 REGISTER Server: Kamailio I-CSCF Content-Length: 0 Warning: 392 192.168.56.101:5060 "Noisy feedback tells: pid=15608 req_src_ip=192.168.56.101 req_src_port=4060 in_uri=sip:ims.mnc001.mcc001.3gppnetwork.org out_uri=sip:ims.mnc001.mcc001.3gppnetwork.org via_cnt==2" ................ 06:34:21.745656 IP 192.168.56.101.5060 > 192.168.56.101.4060: SIP: SIP/2.0 200 OK E. 28...@.Fx..8e..8e.... ..JSIP/2.0 200 OK Via: SIP/2.0/UDP 192.168.56.101:4060;branch=z9hG4bK7b2b.a496c2fac4d8daef7f1ca3be76dace27.0 Via: SIP/2.0/UDP 127.0.0.1:49178;received=10.0.3.2;branch=z9hG4bK22636944;rport=49178 From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=4be9d07af59780377285d1aba6f964e3-8e87 Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10208 REGISTER Contact: <sip:alice@127.0.0.1:63775;transport=udp>;q=0;expires=536925;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:59735;transport=udp>;q=0;expires=537092;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:51120;transport=udp>;q=0;expires=537528;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:55888;transport=udp>;q=0;expires=537770;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:52925;transport=udp>;q=0;expires=539181;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:53770;transport=udp>;q=0;expires=539363;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:60390;transport=udp>;q=0;expires=539511;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:55181;transport=udp>;expires=539581;+g.3gpp.cs-voice;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";audio;+g.oma.sip-im.large-message;+g.3gpp.smsip;language="en,fr";+g.oma.sip-im, <sip:alice@127.0.0.1:49178;transport=udp>;expires=540000;+g.3gpp.cs-voice;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";audio;+g.oma.sip-im.large-message;+g.3gpp.smsip;language="en,fr";+g.oma.sip-im Path: <sip:term@pcscf.ims.mnc001.mcc001.3gppnetwork.org:4060;lr> P-Associated-URI: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Service-Route: <sip:orig@scscf.ims.mnc001.mcc001.3gppnetwork.org:6060;lr> Server: Kamailio S-CSCF Content-Length: 0 ................ 06:34:21.746512 IP 192.168.56.101.4060 > 10.0.3.2.49178: UDP, bad length 2490 > 1472 E..... .@.I...8e ....... ...SIP/2.0 200 OK Via: SIP/2.0/UDP 127.0.0.1:49178;received=10.0.3.2;branch=z9hG4bK22636944;rport=49178 From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22642025 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=4be9d07af59780377285d1aba6f964e3-8e87 Call-ID: d0cb661a-aefd-53b6-dc11-aee832fd7123 CSeq: 10208 REGISTER Contact: <sip:alice@127.0.0.1:63775;transport=udp>;q=0;expires=536925;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:59735;transport=udp>;q=0;expires=537092;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:51120;transport=udp>;q=0;expires=537528;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:55888;transport=udp>;q=0;expires=537770;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:52925;transport=udp>;q=0;expires=539181;language="en";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice, <sip:alice@127.0.0.1:53770;transport=udp>;q=0;expires=539363;language="en";+g.3gpp.smsip;+g................. 06:34:21.752187 IP 10.0.3.2.49178 > 192.168.56.101.4060: UDP, length 842 E..f....@... .....8e.....R..SUBSCRIBE sip:alice@ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 Via: SIP/2.0/UDP 127.0.0.1:49178;branch=z9hG4bK22623420;rport From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22629284 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Contact: <sip:alice@127.0.0.1:49178;transport=udp>;+g.oma.sip-im;language="en,fr" Call-ID: 988b1427-88f8-406d-1454-aeff7304dddb CSeq: 24466 SUBSCRIBE Expires: 600000 Content-Length: 0 Max-Forwards: 70 Route: <sip:orig@scscf.ims.mnc001.mcc001.3gppnetwork.org:6060;lr> Event: reg Accept: application/reginfo+xml Allow-Events: refer, presence, presence.winfo, xcap-diff, conference Allow: INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER Privacy: none P-Access-Network-Info: ADSL;utran-cell-id-3gpp=00000000 User-Agent: IM-client/OMA1.0 Boghe-Win32/v2.0.153.836 ser-Agent: IM-cl 06:34:21.758539 IP 10.0.3.2.49178 > 192.168.56.101.4060: UDP, length 865 E..}....@... .....8e.....i..SUBSCRIBE sip:alice@ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 Via: SIP/2.0/UDP 127.0.0.1:49178;branch=z9hG4bK22617074;rport From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22624198 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Contact: <sip:alice@127.0.0.1:49178;transport=udp>;+g.oma.sip-im;language="en,fr" Call-ID: 58052540-fcaa-cdad-9fde-76450602aa9d CSeq: 32393 SUBSCRIBE Expires: 600000 Content-Length: 0 Max-Forwards: 70 Route: <sip:orig@scscf.ims.mnc001.mcc001.3gppnetwork.org:6060;lr> Event: message-summary Accept: application/simple-message-summary Allow-Events: refer, presence, presence.winfo, xcap-diff, conference Allow: INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER Privacy: none P-Access-Network-Info: ADSL;utran-cell-id-3gpp=00000000 User-Agent: IM-client/OMA1.0 Boghe-Win32/v2.0.153.836 ................ 06:34:22.253437 IP 10.0.3.2.49178 > 192.168.56.101.4060: UDP, length 842 E..f....@... .....8e.....R..SUBSCRIBE sip:alice@ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 Via: SIP/2.0/UDP 127.0.0.1:49178;branch=z9hG4bK22623420;rport From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22629284 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Contact: <sip:alice@127.0.0.1:49178;transport=udp>;+g.oma.sip-im;language="en,fr" Call-ID: 988b1427-88f8-406d-1454-aeff7304dddb CSeq: 24466 SUBSCRIBE Expires: 600000 Content-Length: 0 Max-Forwards: 70 Route: <sip:orig@scscf.ims.mnc001.mcc001.3gppnetwork.org:6060;lr> Event: reg Accept: application/reginfo+xml Allow-Events: refer, presence, presence.winfo, xcap-diff, conference Allow: INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER Privacy: none P-Access-Network-Info: ADSL;utran-cell-id-3gpp=00000000 User-Agent: IM-client/OMA1.0 Boghe-Win32/v2.0.153.836 ................ 06:34:22.259972 IP 10.0.3.2.49178 > 192.168.56.101.4060: UDP, length 865 E..}....@... .....8e.....i..SUBSCRIBE sip:alice@ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 Via: SIP/2.0/UDP 127.0.0.1:49178;branch=z9hG4bK22617074;rport From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22624198 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Contact: <sip:alice@127.0.0.1:49178;transport=udp>;+g.oma.sip-im;language="en,fr" Call-ID: 58052540-fcaa-cdad-9fde-76450602aa9d CSeq: 32393 SUBSCRIBE Expires: 600000 Content-Length: 0 Max-Forwards: 70 Route: <sip:orig@scscf.ims.mnc001.mcc001.3gppnetwork.org:6060;lr> Event: message-summary Accept: application/simple-message-summary Allow-Events: refer, presence, presence.winfo, xcap-diff, conference Allow: INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER Privacy: none P-Access-Network-Info: ADSL;utran-cell-id-3gpp=00000000 User-Agent: IM-client/OMA1.0 Boghe-Win32/v2.0.153.836 ................ 06:34:23.255929 IP 10.0.3.2.49178 > 192.168.56.101.4060: UDP, length 842 E..f....@... .....8e.....R..SUBSCRIBE sip:alice@ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 Via: SIP/2.0/UDP 127.0.0.1:49178;branch=z9hG4bK22623420;rport From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22629284 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Contact: <sip:alice@127.0.0.1:49178;transport=udp>;+g.oma.sip-im;language="en,fr" Call-ID: 988b1427-88f8-406d-1454-aeff7304dddb CSeq: 24466 SUBSCRIBE Expires: 600000 Content-Length: 0 Max-Forwards: 70 Route: <sip:orig@scscf.ims.mnc001.mcc001.3gppnetwork.org:6060;lr> Event: reg Accept: application/reginfo+xml Allow-Events: refer, presence, presence.winfo, xcap-diff, conference Allow: INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER Privacy: none P-Access-Network-Info: ADSL;utran-cell-id-3gpp=00000000 User-Agent: IM-client/OMA1.0 Boghe-Win32/v2.0.153.836 ................ 06:34:23.261932 IP 10.0.3.2.49178 > 192.168.56.101.4060: UDP, length 865 E..}....@... .....8e.....i..SUBSCRIBE sip:alice@ims.mnc001.mcc001.3gppnetwork.org SIP/2.0 Via: SIP/2.0/UDP 127.0.0.1:49178;branch=z9hG4bK22617074;rport From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org>;tag=22624198 To: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> Contact: <sip:alice@127.0.0.1:49178;transport=udp>;+g.oma.sip-im;language="en,fr" Call-ID: 58052540-fcaa-cdad-9fde-76450602aa9d CSeq: 32393 SUBSCRIBE Expires: 600000 Content-Length: 0 Max-Forwards: 70 Route: <sip:orig@scscf.ims.mnc001.mcc001.3gppnetwork.org:6060;lr> Event: message-summary Accept: application/simple-message-summary Allow-Events: refer, presence, presence.winfo, xcap-diff, conference Allow: INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER Privacy: none P-Access-Network-Info: ADSL;utran-cell-id-3gpp=00000000 User-Agent: IM-client/OMA1.0 Boghe-Win32/v2.0.153.836 ................ ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@osboxes kamailio_pcscf]# kamailio -v version: kamailio 5.1.4 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 01:00:45 Jun 7 2018 with gcc 4.8.5 ``` * **Operating System**:  ``` [root@osboxes kamailio_pcscf]# uname -a Linux osboxes 3.10.0-862.3.2.el7.x86_64 #1 SMP Mon May 21 23:36:36 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/issues/1556

2 3

git:master:cddcdb3d: ims_registrar_pcscf: fix #1556
by Victor Seva 11 Jun '18

11 Jun '18

Module: kamailio Branch: master Commit: cddcdb3db2745ef43b5b892a20c3bd1aae439bae URL: https://github.com/kamailio/kamailio/commit/cddcdb3db2745ef43b5b892a20c3bd1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-11T09:12:43+02:00 ims_registrar_pcscf: fix #1556 --- Modified: src/modules/ims_registrar_pcscf/service_routes.c --- Diff: https://github.com/kamailio/kamailio/commit/cddcdb3db2745ef43b5b892a20c3bd1… Patch: https://github.com/kamailio/kamailio/commit/cddcdb3db2745ef43b5b892a20c3bd1… --- diff --git a/src/modules/ims_registrar_pcscf/service_routes.c b/src/modules/ims_registrar_pcscf/service_routes.c index 9c5eba8090..bc4a2a0bec 100644 --- a/src/modules/ims_registrar_pcscf/service_routes.c +++ b/src/modules/ims_registrar_pcscf/service_routes.c @@ -130,9 +130,9 @@ int checkcontact(struct sip_msg* _m, pcontact_t * c) { break; } } else if (c->security_temp) { - switch (c->security->type) { + switch (c->security_temp->type) { case SECURITY_IPSEC: - security_server_port = c->security->data.ipsec->port_uc; + security_server_port = c->security_temp->data.ipsec->port_uc; break; case SECURITY_TLS: case SECURITY_NONE:

1 0

git:5.0:6d3c7ba9: core: dns name to IP conversion - actually stop processing in error case
by Henning Westerholt 10 Jun '18

10 Jun '18

Module: kamailio Branch: 5.0 Commit: 6d3c7ba97ef57cb10ae478a1f39ee9da818d827e URL: https://github.com/kamailio/kamailio/commit/6d3c7ba97ef57cb10ae478a1f39ee9d… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-10T22:46:43+02:00 core: dns name to IP conversion - actually stop processing in error case (cherry picked from commit 55d115e255b1d87121922f689b93870b84e1b2b4) --- Modified: src/core/resolve.h --- Diff: https://github.com/kamailio/kamailio/commit/6d3c7ba97ef57cb10ae478a1f39ee9d… Patch: https://github.com/kamailio/kamailio/commit/6d3c7ba97ef57cb10ae478a1f39ee9d… --- diff --git a/src/core/resolve.h b/src/core/resolve.h index 30cce19581..1946d25081 100644 --- a/src/core/resolve.h +++ b/src/core/resolve.h @@ -232,6 +232,7 @@ static inline struct ip_addr* str2ip(str* st) /* just in case that e.g. the VIA parser get confused */ if(unlikely(!st->s || st->len <= 0)) { LM_ERR("invalid name, no conversion to IP address possible\n"); + return 0; } s=(unsigned char*)st->s; @@ -288,6 +289,7 @@ static inline struct ip_addr* str2ip6(str* st) /* just in case that e.g. the VIA parser get confused */ if(unlikely(!st->s || st->len <= 0)) { LM_ERR("invalid name, no conversion to IP address possible\n"); + return 0; } /* init */ if ((st->len) && (st->s[0]=='[')){

1 0

git:5.1:2f63caf7: core: dns name to IP conversion - actually stop processing in error case
by Henning Westerholt 10 Jun '18

10 Jun '18

Module: kamailio Branch: 5.1 Commit: 2f63caf7ac87c1eca9c6f4150dc7418fa9f4fc35 URL: https://github.com/kamailio/kamailio/commit/2f63caf7ac87c1eca9c6f4150dc7418… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-10T22:46:15+02:00 core: dns name to IP conversion - actually stop processing in error case (cherry picked from commit 55d115e255b1d87121922f689b93870b84e1b2b4) --- Modified: src/core/resolve.h --- Diff: https://github.com/kamailio/kamailio/commit/2f63caf7ac87c1eca9c6f4150dc7418… Patch: https://github.com/kamailio/kamailio/commit/2f63caf7ac87c1eca9c6f4150dc7418… --- diff --git a/src/core/resolve.h b/src/core/resolve.h index 30cce19581..1946d25081 100644 --- a/src/core/resolve.h +++ b/src/core/resolve.h @@ -232,6 +232,7 @@ static inline struct ip_addr* str2ip(str* st) /* just in case that e.g. the VIA parser get confused */ if(unlikely(!st->s || st->len <= 0)) { LM_ERR("invalid name, no conversion to IP address possible\n"); + return 0; } s=(unsigned char*)st->s; @@ -288,6 +289,7 @@ static inline struct ip_addr* str2ip6(str* st) /* just in case that e.g. the VIA parser get confused */ if(unlikely(!st->s || st->len <= 0)) { LM_ERR("invalid name, no conversion to IP address possible\n"); + return 0; } /* init */ if ((st->len) && (st->s[0]=='[')){

1 0

git:master:55d115e2: core: dns name to IP conversion - actually stop processing in error case
by Henning Westerholt 10 Jun '18

10 Jun '18

Module: kamailio Branch: master Commit: 55d115e255b1d87121922f689b93870b84e1b2b4 URL: https://github.com/kamailio/kamailio/commit/55d115e255b1d87121922f689b93870… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-10T22:39:35+02:00 core: dns name to IP conversion - actually stop processing in error case --- Modified: src/core/resolve.h --- Diff: https://github.com/kamailio/kamailio/commit/55d115e255b1d87121922f689b93870… Patch: https://github.com/kamailio/kamailio/commit/55d115e255b1d87121922f689b93870… --- diff --git a/src/core/resolve.h b/src/core/resolve.h index e0089d0a19..6b1e6cff24 100644 --- a/src/core/resolve.h +++ b/src/core/resolve.h @@ -226,6 +226,7 @@ static inline struct ip_addr* str2ip(str* st) /* just in case that e.g. the VIA parser get confused */ if(unlikely(!st->s || st->len <= 0)) { LM_ERR("invalid name, no conversion to IP address possible\n"); + return 0; } s=(unsigned char*)st->s; @@ -280,6 +281,7 @@ static inline struct ip_addr* str2ip6(str* st) /* just in case that e.g. the VIA parser get confused */ if(unlikely(!st->s || st->len <= 0)) { LM_ERR("invalid name, no conversion to IP address possible\n"); + return 0; } /* init */ if ((st->len) && (st->s[0]=='[')){

1 0

git:master:dd4dc536: core: udp server - remove deactivated functionality from 2008, not valid anymore
by Henning Westerholt 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: dd4dc5361ae97b743c202360723df3cacac3259f URL: https://github.com/kamailio/kamailio/commit/dd4dc5361ae97b743c202360723df3c… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-09T00:58:54+02:00 core: udp server - remove deactivated functionality from 2008, not valid anymore Remove decaticated functionality related zero terminated SIP messages in UPD server. 15 years ago this was a bug, but now with binary payloads its not valid anymore. No change in functionality. --- Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/dd4dc5361ae97b743c202360723df3c… Patch: https://github.com/kamailio/kamailio/commit/dd4dc5361ae97b743c202360723df3c… --- diff --git a/src/core/udp_server.c b/src/core/udp_server.c index def3ac1861..862bed174d 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -515,19 +515,6 @@ int udp_rcv_loop() continue; } } -/* historically, zero-terminated packets indicated a bug in clients - * that calculated wrongly packet length and included string-terminating - * zero; today clients exist with legitimate binary payloads and we - * shall not check for zero-terminated payloads - */ -#ifdef TRASH_ZEROTERMINATED_PACKETS - if (buf[len-1]==0) { - tmp=ip_addr2a(&ri.src_ip); - LM_WARN("upstream bug - 0-terminated packet from %s %d\n", - tmp, htons(ri.src_port)); - len--; - } -#endif #endif #ifdef DBG_MSG_QA if (!dbg_msg_qa(buf, len)) {

1 0

git:master:1cd6c8da: core: cleanup dns cache DNS_LU_LST define, unchanged since 2007, no function change
by Henning Westerholt 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: 1cd6c8da2f006a1e46ab573b4168bf2415ed2f69 URL: https://github.com/kamailio/kamailio/commit/1cd6c8da2f006a1e46ab573b4168bf2… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-09T00:49:32+02:00 core: cleanup dns cache DNS_LU_LST define, unchanged since 2007, no function change Cleanup DNS caching DNS_LU_LST define, unchanged since 2007. The alternative implementation has been not seen any testing. No change in functionality. --- Modified: src/core/dns_cache.c Modified: src/core/dns_cache.h --- Diff: https://github.com/kamailio/kamailio/commit/1cd6c8da2f006a1e46ab573b4168bf2… Patch: https://github.com/kamailio/kamailio/commit/1cd6c8da2f006a1e46ab573b4168bf2…

1 0

git:master:3741a8ab: docs: remove documentation about removed dns related defines as well
by Henning Westerholt 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: 3741a8abb4b867a6a758be11d27b3d6906978b18 URL: https://github.com/kamailio/kamailio/commit/3741a8abb4b867a6a758be11d27b3d6… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-09T00:09:14+02:00 docs: remove documentation about removed dns related defines as well --- Modified: doc/tutorials/dns.txt --- Diff: https://github.com/kamailio/kamailio/commit/3741a8abb4b867a6a758be11d27b3d6… Patch: https://github.com/kamailio/kamailio/commit/3741a8abb4b867a6a758be11d27b3d6… --- diff --git a/doc/tutorials/dns.txt b/doc/tutorials/dns.txt index a4243087bf..6112954a5e 100644 --- a/doc/tutorials/dns.txt +++ b/doc/tutorials/dns.txt @@ -170,12 +170,6 @@ DNS Resolver Compile Options NAPTR support still has to be enabled from Kamailio's config file (it's off by default). - RESOLVE_DBG - if defined, the resolver will be very verbose: it will log - a lot of debugging information at L_DBG level. - - NAPTR_DBG - if defined the NAPTR related resolver functions will be very - verbose. - DNS Cache and Failover Config Variables --------------------------------------- @@ -307,9 +301,6 @@ DNS Cache Compile Options If this option is not defined (experimental), everything in the AR section will be added to the cache. - DNS_CACHE_DEBUG - if defined the DNS cache will be very verbose (it will - log lots of messages at the L_DBG levell). - Note: To remove a compile options, edit Kamailio's Makefile.defs and remove it from DEFS list. To add a compile options add it to the make command line, e.g.: make proper; make all extra_defs=-DUSE_DNS_FAILOVER

1 0

git:master:f1bcda4e: core: cleanup dns cache defines, no function change
by Henning Westerholt 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: f1bcda4e2e2d37ec2b5556e95b61b03907df6366 URL: https://github.com/kamailio/kamailio/commit/f1bcda4e2e2d37ec2b5556e95b61b03… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-09T00:06:23+02:00 core: cleanup dns cache defines, no function change cleanup core dns cache defines, they were set since 2006 for a bit additional debugging, no change in functionality --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/f1bcda4e2e2d37ec2b5556e95b61b03… Patch: https://github.com/kamailio/kamailio/commit/f1bcda4e2e2d37ec2b5556e95b61b03…

1 0

git:master:e963851b: core: cleanup resolver defines, no function change
by Henning Westerholt 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: e963851b5391e0f6267788d1bdaf5be576ca7466 URL: https://github.com/kamailio/kamailio/commit/e963851b5391e0f6267788d1bdaf5be… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-06-08T23:52:29+02:00 core: cleanup resolver defines, no function change cleanup core resolver defines, they were set since 2007 for a bit additional debugging, no change in functionality --- Modified: src/core/resolve.c Modified: src/core/resolve.h --- Diff: https://github.com/kamailio/kamailio/commit/e963851b5391e0f6267788d1bdaf5be… Patch: https://github.com/kamailio/kamailio/commit/e963851b5391e0f6267788d1bdaf5be…

1 0

[kamailio/kamailio] packaging: Fix typo in kamailio.spec (#1559)
by Edwin Fine 08 Jun '18

08 Jun '18

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to stable branches - _probably_ - [ ] Tested changes locally (_not applicable_) - [ ] Related to issue #XXXX (_not applicable_) #### Description There is a number of occurrences in `pkg/kamailio/obs/kamailio.spec` of `%bcond_with|without rebbitmq`. Note the `e` in `rebbitmq`. Since the condition to include the `rabbitmq` package (line 633) is `%if %{with rabbitmq}` (with an `a`), this conditional statement would not have the intended effect. If this was not a deliberate typo for some reason, this commit addresses the issue by changing all `%bcond_with|without` occurrences of `rebbitmq` to `rabbitmq`. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1559 -- Commit Summary -- * packaging: Fix typo in kamailio.spec -- File Changes -- M pkg/kamailio/obs/kamailio.spec (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1559.patch https://github.com/kamailio/kamailio/pull/1559.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/1559

2 2

git:master:861c52ca: packaging: Fix typo in kamailio.spec
by Henning Westerholt 08 Jun '18

08 Jun '18

Module: kamailio Branch: master Commit: 861c52ca6a9ca3bd6be5e89df92c1f65b46002f4 URL: https://github.com/kamailio/kamailio/commit/861c52ca6a9ca3bd6be5e89df92c1f6… Author: Edwin Fine <efine(a)users.noreply.github.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2018-06-08T21:26:20+02:00 packaging: Fix typo in kamailio.spec There is a number of occurrences of `%bcond_with|without rebbitmq`. Since the condition to include the `rabbitmq` package (line 633) is `%if %{with rabbitmq}`, this conditional statement would not have the intended effect. If this was not a deliberate typo for some reason, this commit fixes the issue by changing all `%bcond_with|without` occurrences of `rebbitmq` to `rabbitmq`. --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/861c52ca6a9ca3bd6be5e89df92c1f6… Patch: https://github.com/kamailio/kamailio/commit/861c52ca6a9ca3bd6be5e89df92c1f6… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index d7f27371d3..cc53dc9e30 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -15,7 +15,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_without perl -%bcond_without rebbitmq +%bcond_without rabbitmq %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -35,7 +35,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_without perl -%bcond_without rebbitmq +%bcond_without rabbitmq %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -55,7 +55,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_without perl -%bcond_without rebbitmq +%bcond_without rabbitmq %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -75,7 +75,7 @@ %bcond_with kazoo %bcond_without memcached %bcond_without perl -%bcond_with rebbitmq +%bcond_with rabbitmq %bcond_with redis %bcond_without sctp %bcond_without websocket @@ -96,7 +96,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_without perl -%bcond_without rebbitmq +%bcond_without rabbitmq %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -116,7 +116,7 @@ %bcond_with kazoo %bcond_without memcached %bcond_without perl -%bcond_with rebbitmq +%bcond_with rabbitmq %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -136,7 +136,7 @@ %bcond_with kazoo %bcond_with memcached %bcond_with perl -%bcond_with rebbitmq +%bcond_with rabbitmq %bcond_with redis %bcond_with sctp %bcond_with websocket @@ -156,7 +156,7 @@ %bcond_with kazoo %bcond_with memcached %bcond_without perl -%bcond_without rebbitmq +%bcond_without rabbitmq %bcond_without redis %bcond_with sctp %bcond_with websocket

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2018