sr-dev August 2016

sr-dev@lists.kamailio.org

25 participants
197 discussions

git:master:db15dbfd: dispatcher: free memory on shutdown

by Alex Hermann

Module: kamailio Branch: master Commit: db15dbfd66acaba17d525a391c0973d3fa8a7b4a URL: https://github.com/kamailio/kamailio/commit/db15dbfd66acaba17d525a391c0973d… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: 2016-08-02T12:46:19+02:00 dispatcher: free memory on shutdown Debugging memleaks is easier when the list of alloc'ed shmem is shorter. --- Modified: modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/db15dbfd66acaba17d525a391c0973d… Patch: https://github.com/kamailio/kamailio/commit/db15dbfd66acaba17d525a391c0973d… --- diff --git a/modules/dispatcher/dispatcher.c b/modules/dispatcher/dispatcher.c index 478c96f..892ec18 100644 --- a/modules/dispatcher/dispatcher.c +++ b/modules/dispatcher/dispatcher.c @@ -596,7 +596,8 @@ static void destroy(void) ds_hash_load_destroy(); if(ds_ping_reply_codes) shm_free(ds_ping_reply_codes); - + if(ds_ping_reply_codes_cnt) + shm_free(ds_ping_reply_codes_cnt); } #define GET_VALUE(param_name,param,i_value,s_value,value_flags) do{ \

7 years, 8 months

[kamailio/kamailio] Random fixes (#734)

by Alex Hermann

Creating a PR for each commit is a bit too much work. If not all commits should be merged, please cherry-pick the wanted ones or tell me which patches should be left out. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/734 -- Commit Summary -- * dispatcher: free memory on shutdown * pv: xavp: log error message when memory allocation fails * core: Enable SIGUSR1 for child processes * mqueu: Convert items to single linked list * tmx: Try to get branch_index for all replies * jsonrpc_s: Return an error when JSON parsing fails * core: Don't bind to IPv6 addresses if auto_bind_ipv6 is disabled -- File Changes -- M main.c (15) M modules/dispatcher/dispatcher.c (3) M modules/jsonrpc-s/jsonrpc-s_mod.c (6) M modules/mqueue/mqueue_api.c (8) M modules/pv/pv_xavp.c (9) M modules/tmx/t_var.c (2) M socket_info.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/734.patch https://github.com/kamailio/kamailio/pull/734.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/734

7 years, 8 months

git:master:41477be7: Merge pull request #732 from gaaf/tm-fixes

by GitHub

Module: kamailio Branch: master Commit: 41477be7ff5fbe7cbf115a88557c2cfb04f02253 URL: https://github.com/kamailio/kamailio/commit/41477be7ff5fbe7cbf115a88557c2cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-08-30T13:47:50+02:00 Merge pull request #732 from gaaf/tm-fixes TM fixes for DNS failover and branch_idx --- Modified: modules/tm/t_fwd.c Modified: modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/41477be7ff5fbe7cbf115a88557c2cf… Patch: https://github.com/kamailio/kamailio/commit/41477be7ff5fbe7cbf115a88557c2cf… --- diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index b1a047c..1586ec3 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -1019,6 +1019,10 @@ int add_uac_dns_fallback(struct cell *t, struct sip_msg* msg, /* copy the dns handle into the new uac */ dns_srv_handle_cpy(&t->uac[t->nr_of_outgoings].dns_h, &old_uac->dns_h); + /* copy the onreply and onfailure routes */ + t->uac[t->nr_of_outgoings].on_failure = old_uac->on_failure; + t->uac[t->nr_of_outgoings].on_reply = old_uac->on_reply; + t->uac[t->nr_of_outgoings].on_branch_failure = old_uac->on_branch_failure; if (cfg_get(tm, tm_cfg, reparse_on_dns_failover)){ /* Reuse the old buffer and only replace the via header. diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index bd67000..2e7b9cbe 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -1352,6 +1352,7 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, drop_replies = failure_reply_mode; replies_dropped = 0; + tm_ctx_set_branch_index(picked_branch); /* run ON_FAILURE handlers ( route and callbacks) */ if (unlikely(has_tran_tmcbs( Trans, TMCB_ON_FAILURE_RO|TMCB_ON_FAILURE) || Trans->uac[picked_branch].on_failure )) {

7 years, 8 months

git:master:67b06aed: tm: Copy on_branch_failure to new branch on DNS failover

by Alex Hermann

Module: kamailio Branch: master Commit: 67b06aedb014b3ee5c26326e94df7f319b4f0fd6 URL: https://github.com/kamailio/kamailio/commit/67b06aedb014b3ee5c26326e94df7f3… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: 2016-08-02T12:13:34+02:00 tm: Copy on_branch_failure to new branch on DNS failover --- Modified: modules/tm/t_fwd.c --- Diff: https://github.com/kamailio/kamailio/commit/67b06aedb014b3ee5c26326e94df7f3… Patch: https://github.com/kamailio/kamailio/commit/67b06aedb014b3ee5c26326e94df7f3… --- diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 51335ee..1586ec3 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -1022,6 +1022,7 @@ int add_uac_dns_fallback(struct cell *t, struct sip_msg* msg, /* copy the onreply and onfailure routes */ t->uac[t->nr_of_outgoings].on_failure = old_uac->on_failure; t->uac[t->nr_of_outgoings].on_reply = old_uac->on_reply; + t->uac[t->nr_of_outgoings].on_branch_failure = old_uac->on_branch_failure; if (cfg_get(tm, tm_cfg, reparse_on_dns_failover)){ /* Reuse the old buffer and only replace the via header.

7 years, 8 months

git:master:5d652fa2: tm: copy on_reply and on_failure routes to new branch on DNS based failover

by Alex Hermann

Module: kamailio Branch: master Commit: 5d652fa27cdffd90a5328b725220bc8fdb079fa3 URL: https://github.com/kamailio/kamailio/commit/5d652fa27cdffd90a5328b725220bc8… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: 2016-08-02T12:13:10+02:00 tm: copy on_reply and on_failure routes to new branch on DNS based failover --- Modified: modules/tm/t_fwd.c --- Diff: https://github.com/kamailio/kamailio/commit/5d652fa27cdffd90a5328b725220bc8… Patch: https://github.com/kamailio/kamailio/commit/5d652fa27cdffd90a5328b725220bc8… --- diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index b1a047c..51335ee 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -1019,6 +1019,9 @@ int add_uac_dns_fallback(struct cell *t, struct sip_msg* msg, /* copy the dns handle into the new uac */ dns_srv_handle_cpy(&t->uac[t->nr_of_outgoings].dns_h, &old_uac->dns_h); + /* copy the onreply and onfailure routes */ + t->uac[t->nr_of_outgoings].on_failure = old_uac->on_failure; + t->uac[t->nr_of_outgoings].on_reply = old_uac->on_reply; if (cfg_get(tm, tm_cfg, reparse_on_dns_failover)){ /* Reuse the old buffer and only replace the via header.

7 years, 8 months

git:master:e6044935: tm: Set tcx.branch_index to picked branch before running failure route.

by Alex Hermann

Module: kamailio Branch: master Commit: e604493579440f38f2066c4c8301cdfa88137f74 URL: https://github.com/kamailio/kamailio/commit/e604493579440f38f2066c4c8301cdf… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: 2016-08-02T12:13:04+02:00 tm: Set tcx.branch_index to picked branch before running failure route. This makes the picked branch index available in $T_branch_idx for failure_route. --- Modified: modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/e604493579440f38f2066c4c8301cdf… Patch: https://github.com/kamailio/kamailio/commit/e604493579440f38f2066c4c8301cdf… --- diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index bd67000..2e7b9cbe 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -1352,6 +1352,7 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, drop_replies = failure_reply_mode; replies_dropped = 0; + tm_ctx_set_branch_index(picked_branch); /* run ON_FAILURE handlers ( route and callbacks) */ if (unlikely(has_tran_tmcbs( Trans, TMCB_ON_FAILURE_RO|TMCB_ON_FAILURE) || Trans->uac[picked_branch].on_failure )) {

7 years, 8 months

[kamailio/kamailio] TM fixes for DNS failover and branch_idx (#732)

by Alex Hermann

Set the branch_idx for failure route Make sure the configured on_failure/on_branch_failure/on_reply routes are copied to the new branches created for DNS failover. These are eligible for 4.4 too. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/732 -- Commit Summary -- * tm: Set tcx.branch_index to picked branch before running failure route. * tm: copy on_reply and on_failure routes to new branch on DNS based failover * tm: Copy on_branch_failure to new branch on DNS failover -- File Changes -- M modules/tm/t_fwd.c (4) M modules/tm/t_reply.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/732.patch https://github.com/kamailio/kamailio/pull/732.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/732

7 years, 8 months

git:master:fbdc2299: Merge pull request #727 from gaaf/uac_failover

by GitHub

Module: kamailio Branch: master Commit: fbdc2299420d5247116933a18e78ae6fe6955ab5 URL: https://github.com/kamailio/kamailio/commit/fbdc2299420d5247116933a18e78ae6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-08-30T13:46:46+02:00 Merge pull request #727 from gaaf/uac_failover Implement DNS failover for locally generated requests --- Modified: modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/fbdc2299420d5247116933a18e78ae6… Patch: https://github.com/kamailio/kamailio/commit/fbdc2299420d5247116933a18e78ae6…

7 years, 8 months

git:master:2f080bd3: tm: uac: Add support for onsend route to local request

by Alex Hermann

Module: kamailio Branch: master Commit: 2f080bd3af63678b900f9f537afbd187007eb089 URL: https://github.com/kamailio/kamailio/commit/2f080bd3af63678b900f9f537afbd18… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: 2016-07-28T12:02:15+02:00 tm: uac: Add support for onsend route to local request --- Modified: modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/2f080bd3af63678b900f9f537afbd18… Patch: https://github.com/kamailio/kamailio/commit/2f080bd3af63678b900f9f537afbd18… --- diff --git a/modules/tm/uac.c b/modules/tm/uac.c index 6f165ae..bb4149a 100644 --- a/modules/tm/uac.c +++ b/modules/tm/uac.c @@ -57,6 +57,7 @@ #include "../../action.h" #include "../../onsend.h" #include "t_lookup.h" +#include "t_fwd.h" #endif #define FROM_TAG_LEN (MD5_LEN + 1 /* - */ + CRC16_LEN) /* length of FROM tags */ @@ -590,23 +591,63 @@ int prepare_req_within(uac_req_t *uac_r, return -1; } -static inline void send_prepared_request_impl(struct retr_buf *request, int retransmit) +static inline int send_prepared_request_impl(struct retr_buf *request, int retransmit, int branch) { + struct cell *t; + struct sip_msg *p_msg; + struct ua_client *uac; + struct ip_addr ip; /* logging */ + int ret; + + t = request->my_T; + uac = &t->uac[branch]; + p_msg = t->uas.request; + if (SEND_BUFFER(request) == -1) { LOG(L_ERR, "t_uac: Attempt to send to precreated request failed\n"); } - else if (unlikely(has_tran_tmcbs(request->my_T, TMCB_REQUEST_SENT))) + else if (unlikely(has_tran_tmcbs(t, TMCB_REQUEST_SENT))) /* we don't know the method here */ - run_trans_callbacks_with_buf(TMCB_REQUEST_SENT, request, 0, 0, + run_trans_callbacks_with_buf(TMCB_REQUEST_SENT, &uac->request, 0, 0, TMCB_LOCAL_F); - - if (retransmit && (start_retr(request)!=0)) - LOG(L_CRIT, "BUG: t_uac: failed to start retr. for %p\n", request); + + su2ip_addr(&ip, &uac->request.dst.to); + DBG("send_prepared_request_impl: uac: %p branch: %d to %s:%d\n", + uac, branch, ip_addr2a(&ip), su_getport(&uac->request.dst.to)); + + if (run_onsend(p_msg, &uac->request.dst, uac->request.buffer, + uac->request.buffer_len)==0){ + uac->last_received=408; + su2ip_addr(&ip, &uac->request.dst.to); + DBG("t_uac: onsend_route dropped msg. to %s:%d (%d)\n", + ip_addr2a(&ip), su_getport(&uac->request.dst.to), + uac->request.dst.proto); +#ifdef USE_DNS_FAILOVER + /* if the destination resolves to more ips, add another + * branch/uac */ + ret = add_uac_dns_fallback(t, p_msg, uac, retransmit); + if (ret > 0) { + su2ip_addr(&ip, &uac->request.dst.to); + DBG("t_uac: send on branch %d failed " + "(onsend_route), trying another ip %s:%d (%d)\n", + branch, ip_addr2a(&ip), + su_getport(&uac->request.dst.to), + uac->request.dst.proto); + /* success, return new branch */ + return ret; + } +#endif /* USE_DNS_FAILOVER*/ + return -1; + } + + if (retransmit && (start_retr(&uac->request)!=0)) + LOG(L_CRIT, "BUG: t_uac: failed to start retr. for %p\n", &uac->request); + return 0; } void send_prepared_request(struct retr_buf *request) { - send_prepared_request_impl(request, 1 /* retransmit */); + send_prepared_request_impl(request, 1 /* retransmit */, 0); } /* @@ -628,11 +669,27 @@ int t_uac_with_ids(uac_req_t *uac_r, struct cell *cell; int ret; int is_ack; + int branch_ret; + int i; + branch_bm_t added_branches = 1; ret = t_uac_prepare(uac_r, &request, &cell); if (ret < 0) return ret; is_ack = (uac_r->method->len == 3) && (memcmp("ACK", uac_r->method->s, 3)==0) ? 1 : 0; - send_prepared_request_impl(request, !is_ack /* retransmit */); + + /* equivalent loop to the one in t_forward_nonack */ + for (i=0; i<cell->nr_of_outgoings; i++) { + if (added_branches & (1<<i)) { + branch_ret=send_prepared_request_impl(request, !is_ack /* retransmit */, i); + if (branch_ret>=0){ /* some kind of success */ + if (branch_ret>i) { + /* new branch added */ + added_branches |= 1<<branch_ret; + } + } + } + } + if (is_ack) { if (cell) free_cell(cell); if (ret_index && ret_label)

7 years, 8 months

git:master:a6cf9775: tm: uac: Split t_uac_prepare

by Alex Hermann

Module: kamailio Branch: master Commit: a6cf977568b3b738e786b97109c69fc0c40f5a11 URL: https://github.com/kamailio/kamailio/commit/a6cf977568b3b738e786b97109c69fc… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: 2016-07-28T12:00:36+02:00 tm: uac: Split t_uac_prepare Move the code for local_request event out of the function body. This makes the overly long function easier to read and decreases indenting. Also, deduplicate code for creating a sip msg out of a msg buf. No functional changes. --- Modified: modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/a6cf977568b3b738e786b97109c69fc… Patch: https://github.com/kamailio/kamailio/commit/a6cf977568b3b738e786b97109c69fc…

7 years, 8 months

← Newer
1
...
5
6
7
8
9
10
11
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2016