August 2016 - sr-dev - kamailio.org

git:master:fbdc2299: Merge pull request #727 from gaaf/uac_failover
by GitHub 30 Aug '16

30 Aug '16

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…

1 0

git:master:2f080bd3: tm: uac: Add support for onsend route to local request
by Alex Hermann 30 Aug '16

30 Aug '16

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)

1 0

git:master:a6cf9775: tm: uac: Split t_uac_prepare
by Alex Hermann 30 Aug '16

30 Aug '16

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…

1 0

git:master:3636551e: tm: uac: Add failover support for local requests
by Alex Hermann 30 Aug '16

30 Aug '16

Module: kamailio Branch: master Commit: 3636551ec6a97fbfa9bdea551534adf78c1d6770 URL: https://github.com/kamailio/kamailio/commit/3636551ec6a97fbfa9bdea551534adf… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: 2016-07-28T11:53:59+02:00 tm: uac: Add failover support for local requests DNS failover code needs a uas and a dns_h to function. By creating the new cell earlier, dst2dst2 can put the dns_h into the cell instead of in a throwaway variable. The UAS is set to a faked message created from the outgoing request. --- Modified: modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/3636551ec6a97fbfa9bdea551534adf… Patch: https://github.com/kamailio/kamailio/commit/3636551ec6a97fbfa9bdea551534adf…

1 0

[kamailio/kamailio] The changes in this PR implement DNS failover for locally generated requests (#727)
by Alex 30 Aug '16

30 Aug '16

The first patch does the actual failover part. Second is for readability. Third adds onsend_route support for local requests. This fixes #210. As this touches tm, a review would be welcomed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/727 -- Commit Summary -- * tm: uac: Add failover support for local requests * tm: uac: Split t_uac_prepare * tm: uac: Add support for onsend route to local request -- File Changes -- M modules/tm/uac.c (447) -- Patch Links -- https://github.com/kamailio/kamailio/pull/727.patch https://github.com/kamailio/kamailio/pull/727.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/727

2 1

[kamailio] uac module (uac_req_send, register) doesn't do failover (#210)
by Alex 30 Aug '16

30 Aug '16

Requests send with uac module's functions like uac_req_send() and remote registrations use the TM module, but don't actually do (DNS) failover when a destination is unreachable or sends a 503. In the tm's uac.c, t_uac_prepare() function, i can already see that the dns handle is stored in a throwaway variable instead of in the transaction, but fixing the issue isn't as simple as just storing it in the transaction (print_uac_request_from_buf() needs a uas in the transaction). Due to github not supporting attachments to issues, the sample config and debug log are inline.... :( DNS entry: ``` $ host -t SRV _sip._udp.failover.test.speakup.nl _sip._udp.failover.test.speakup.nl has SRV record 10 0 1111 try1.test.speakup.nl. _sip._udp.failover.test.speakup.nl has SRV record 100 0 2222 try2.test.speakup.nl. ``` Log snippet: ```syslog Jun 15 10:00:03 rio UACFailover[18178]: INFO: <script>: Sending OPTIONS request to sip:failover.test.speakup.nl Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: tm [uac.c:249]: t_uac_prepare(): DEBUG:tm:t_uac: next_hop=<sip:failover.test.speakup.nl> Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [dns_cache.c:537]: _dns_hash_find(): (_sip._udp.failover.test.speakup.nl(34), 33), h=825 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [resolve.c:937]: get_record(): skipping 8 NS (p=0x9ea284, end=0x9ea3e9) Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [resolve.c:952]: get_record(): parsing 9 ARs (p=0x9ea335, end=0x9ea3e9) Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [dns_cache.c:1741]: dns_get_related(): (0x7f225233eb38 (_sip._udp.failover.test.speakup.nl, 33), 33, *0x7f2257baf2b8) (0) Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [dns_cache.c:840]: dns_cache_add_unsafe(): adding _sip._udp.failover.test.speakup.nl(34) 33 (flags=0) at 825 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [dns_cache.c:840]: dns_cache_add_unsafe(): adding try1.test.speakup.nl(20) 1 (flags=0) at 310 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [dns_cache.c:840]: dns_cache_add_unsafe(): adding try2.test.speakup.nl(20) 1 (flags=0) at 307 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [dns_cache.c:2336]: dns_srv_get_nxt_rr(): (0x7f225233eb38, 0, 0, 1597643831): selected 0/1 in grp. 0 (rand_w=0, rr=0x7f225233eba0 rd=0x7f225233ebb8 p=10 w=0 rsum=0) Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [dns_cache.c:537]: _dns_hash_find(): (try1.test.speakup.nl(20), 1), h=310 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [dns_cache.c:2926]: dns_a_resolve(): (try1.test.speakup.nl, 0) returning 0 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [dns_cache.c:3169]: dns_srv_resolve_ip(): ("_sip._udp.failover.test.speakup.nl", 0, 0), ret=0, ip=192.168.1.245 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [dns_cache.c:3260]: dns_srv_sip_resolve(): (failover.test.speakup.nl, 0, 0), srv0, ret=0 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: tm [uac.c:150]: dlg2hash(): DEBUG: dlg2hash: 54501 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: tm [uac.c:351]: t_uac_prepare(): executing event_route[tm:local-request] Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [parser/msg_parser.c:606]: parse_msg(): SIP Request: Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [parser/msg_parser.c:608]: parse_msg(): method: <OPTIONS> Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [parser/msg_parser.c:610]: parse_msg(): uri: <sip:failover.test.speakup.nl> Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [parser/msg_parser.c:612]: parse_msg(): version: <SIP/2.0> Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [parser/parse_via.c:1254]: parse_via_param(): Found param type 232, <branch> = <z9hG4bK5e4d.47adbbf5000000000000000000000000.0>; state=16 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [parser/parse_via.c:2642]: parse_via(): end of header reached, state=5 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [parser/msg_parser.c:496]: parse_headers(): parse_headers: Via found, flags=2 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [parser/msg_parser.c:498]: parse_headers(): parse_headers: this is the first via Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [parser/parse_addr_spec.c:894]: parse_addr_spec(): end of header reached, state=10 Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [parser/msg_parser.c:173]: get_hdr_field(): DEBUG: get_hdr_field: <To> [22]; uri=[sip:to.example.com] Jun 15 10:00:03 rio UACFailover[18178]: [97B blob data] Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [parser/msg_parser.c:153]: get_hdr_field(): get_hdr_field: cseq <CSeq>: <10> <OPTIONS> Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: pv [pv_core.c:376]: pv_get_xto_attr(): no Tag parameter Jun 15 10:00:03 rio UACFailover[18178]: INFO: <script>: [udp:172.28.4.128:6789] [10 OPTIONS] Request (cid: 6cd531e47cc63e20-18178(a)172.28.4.128 Branch: -1 ToTag: <null> len:382) To <sip:failover.test.speakup.nl> via <sip:failover.test.speakup.nl> Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [usr_avp.c:631]: destroy_avp_list(): destroying list (nil) Jun 15 10:00:03 rio UACFailover[18178]: DEBUG: <core> [xavp.c:446]: xavp_destroy_list(): destroying xavp list (nil) Jun 15 10:00:05 rio UACFailover[18176]: DEBUG: tm [t_reply.c:1230]: t_should_relay_response(): ->>>>>>>>> T_code=0, new_code=408 Jun 15 10:00:05 rio UACFailover[18176]: WARNING: tm [t_reply.c:957]: run_failure_handlers(): Warning: run_failure_handlers: no UAC support (1, 0) Jun 15 10:00:05 rio UACFailover[18176]: DEBUG: tm [t_reply.c:2016]: local_reply(): DEBUG: local_reply: branch=0, save=0, winner=0 Jun 15 10:00:05 rio UACFailover[18176]: DEBUG: tm [t_reply.c:2053]: local_reply(): DEBUG: local transaction completed ``` Sample config: ```python #------------------ # Flags #------------------ debug=3 memdbg=5 mem_summary=5 #fork=no # This option should not be present to enable forking but disable daemonize, also -D commandline parameter is needed log_stderror=no sip_warning=no listen=172.28.4.128 port=6789 children=2 shm_mem_size=64 log_name="UACFailover" check_via=no # (cmd. line: -v) dns=no # (cmd. line: -r) rev_dns=no # (cmd. line: -R) dns_use_search_list=no use_dns_failover=yes dns_srv_lb=yes disable_tcp=yes mpath="/usr/lib/x86_64-linux-gnu/kamailio/modules/" loadmodule "pv.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "xlog.so" loadmodule "rr.so" loadmodule "uac.so" loadmodule "rtimer.so" # ----------------------------------------------------------------- # Module settings # ----------------------------------------------------------------- modparam("pv", "varset", "server=s:LOGNAME") modparam("tm", "auto_inv_100", 0) # Time until provisional response (eg "100 Trying") is received modparam("tm", "fr_timer", 2000) # Time to await final response on INVITE per branch (eg per branch ring time) modparam("tm", "fr_inv_timer", 10000) # Time to await final response on INVITE (eg ring time) modparam("tm", "max_inv_lifetime", 20000) modparam("tm", "restart_fr_on_each_reply", 0) modparam("tm", "failure_reply_mode", 3) modparam("rtimer", "timer", "name=uac;interval=10;mode=1;") modparam("rtimer", "exec", "timer=uac;route=TIMER") route { xlog("L_NOTICE", "[$pr:$si:$sp] [$cs $rm] Request. (cid: $ci <$fu> => <$ru> len: $ml)"); drop(); } event_route[tm:local-request] { xlog("L_INFO", " [$pr:$si:$sp] [$cs $rm] Request (cid: $ci Branch: $T_branch_idx ToTag: $tt len:$ml) To <$ru> via <$du>"); } onreply_route { xlog("L_INFO", " [$pr:$si:$sp] [$cs $rm] Reply (cid: $ci Branch: $T_branch_idx Status: $rs $rr ToTag: $tt len:$ml)"); } route[TIMER] { if not $var(done) == 1 { $var(done) = 1; $uac_req(method) = "OPTIONS"; $uac_req(ruri) = "sip:failover.test.speakup.nl"; $uac_req(furi) = "sip:from.example.com"; $uac_req(turi) = "sip:to.example.com"; xlog("L_INFO", "Sending $uac_req(method) request to $uac_req(ruri)"); uac_req_send(); } } ``` --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/210

2 3

git:master:597242df: http_async_client: init PV API sooner
by Camille Oudot 30 Aug '16

30 Aug '16

Module: kamailio Branch: master Commit: 597242dfbfd883d136aa49d88266fc9edb6b8e09 URL: https://github.com/kamailio/kamailio/commit/597242dfbfd883d136aa49d88266fc9… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2016-08-30T11:43:26+02:00 http_async_client: init PV API sooner fixes #760 --- Modified: modules/http_async_client/http_async_client_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/597242dfbfd883d136aa49d88266fc9… Patch: https://github.com/kamailio/kamailio/commit/597242dfbfd883d136aa49d88266fc9… --- diff --git a/modules/http_async_client/http_async_client_mod.c b/modules/http_async_client/http_async_client_mod.c index 54a0878..74900d0 100644 --- a/modules/http_async_client/http_async_client_mod.c +++ b/modules/http_async_client/http_async_client_mod.c @@ -54,6 +54,7 @@ #include "../../modules/tm/tm_load.h" #include "../../modules/pv/pv_api.h" + #include "async_http.h" MODULE_VERSION @@ -227,6 +228,18 @@ struct module_exports exports = { }; +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + pv_register_api_t pvra; + + pvra = (pv_register_api_t)find_export("pv_register_api", NO_SCRIPT, 0); + if (!pvra) { + LM_ERR("Cannot import pv functions (pv module must be loaded before this module)\n"); + return -1; + } + pvra(&pv_api); + return 0; +} /** * init module function @@ -234,7 +247,6 @@ struct module_exports exports = { static int mod_init(void) { unsigned int n; - pv_register_api_t pvra; LM_INFO("Initializing Http Async module\n"); #ifdef STATISTICS @@ -295,13 +307,6 @@ static int mod_init(void) memset(&tmb, 0, sizeof(tm_api_t)); } - pvra = (pv_register_api_t)find_export("pv_register_api", NO_SCRIPT, 0); - if (!pvra) { - LM_ERR("Cannot import pv functions (pv module must be loaded before this module)\n"); - return -1; - } - pvra(&pv_api); - /* allocate workers array */ workers = shm_malloc(num_workers * sizeof(*workers)); if(workers == NULL) {

1 0

[kamailio/kamailio] modules/sipcapture: fixed priorisation X-RTP headers (#761)
by Alexandr Dubovikov 29 Aug '16

29 Aug '16

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/761 -- Commit Summary -- * modules/sipcapture fixed priorisation X-RTP headers -- File Changes -- M modules/sipcapture/sipcapture.c (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/761.patch https://github.com/kamailio/kamailio/pull/761.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/761

1 1

git:master:46c59ce6: Merge pull request #761 from adubovikov/master
by GitHub 29 Aug '16

29 Aug '16

Module: kamailio Branch: master Commit: 46c59ce63bec53bc9a59b2553c6ccf8f5b6667d8 URL: https://github.com/kamailio/kamailio/commit/46c59ce63bec53bc9a59b2553c6ccf8… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-08-29T16:37:47+02:00 Merge pull request #761 from adubovikov/master modules/sipcapture: fixed priorisation X-RTP headers --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/46c59ce63bec53bc9a59b2553c6ccf8… Patch: https://github.com/kamailio/kamailio/commit/46c59ce63bec53bc9a59b2553c6ccf8… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 33c96cd..466b7d7 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -1840,8 +1840,16 @@ static int sip_capture(struct sip_msg *msg, str *_table, _capture_mode_data_t * sco.originator_port = 0; } + /* X-RTP-Stat-Add */ + if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat-Add", 14)) != NULL) { + sco.rtp_stat = tmphdr[3]->body; + } + /* X-RTP-Stat-T38 */ + else if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat-T38", 14)) != NULL) { + sco.rtp_stat = tmphdr[3]->body; + } /* X-RTP-Stat */ - if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat", 10)) != NULL) { + else if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat", 10)) != NULL) { sco.rtp_stat = tmphdr[3]->body; } /* P-RTP-Stat */ @@ -1860,17 +1868,8 @@ static int sip_capture(struct sip_msg *msg, str *_table, _capture_mode_data_t * else if((tmphdr[3] = get_hdr_by_name(msg,"RTP-RxStat", 10)) != NULL) { sco.rtp_stat = tmphdr[3]->body; } - /* X-RTP-Stat-Add */ - else if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat-Add", 14)) != NULL) { - sco.rtp_stat = tmphdr[3]->body; - } - /* X-RTP-Stat-T38 */ - else if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat-T38", 14)) != NULL) { - sco.rtp_stat = tmphdr[3]->body; - } else { EMPTY_STR(sco.rtp_stat); } - /* PROTO TYPE */ sco.proto = msg->rcv.proto;

1 0

git:master:8cc1c065: modules/sipcapture fixed priorisation X-RTP headers
by Alexandr Dubovikov 29 Aug '16

29 Aug '16

Module: kamailio Branch: master Commit: 8cc1c0657c6cf95d48e88f90027a4bb051414f68 URL: https://github.com/kamailio/kamailio/commit/8cc1c0657c6cf95d48e88f90027a4bb… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: 2016-08-29T16:36:24+02:00 modules/sipcapture fixed priorisation X-RTP headers --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/8cc1c0657c6cf95d48e88f90027a4bb… Patch: https://github.com/kamailio/kamailio/commit/8cc1c0657c6cf95d48e88f90027a4bb… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 33c96cd..466b7d7 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -1840,8 +1840,16 @@ static int sip_capture(struct sip_msg *msg, str *_table, _capture_mode_data_t * sco.originator_port = 0; } + /* X-RTP-Stat-Add */ + if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat-Add", 14)) != NULL) { + sco.rtp_stat = tmphdr[3]->body; + } + /* X-RTP-Stat-T38 */ + else if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat-T38", 14)) != NULL) { + sco.rtp_stat = tmphdr[3]->body; + } /* X-RTP-Stat */ - if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat", 10)) != NULL) { + else if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat", 10)) != NULL) { sco.rtp_stat = tmphdr[3]->body; } /* P-RTP-Stat */ @@ -1860,17 +1868,8 @@ static int sip_capture(struct sip_msg *msg, str *_table, _capture_mode_data_t * else if((tmphdr[3] = get_hdr_by_name(msg,"RTP-RxStat", 10)) != NULL) { sco.rtp_stat = tmphdr[3]->body; } - /* X-RTP-Stat-Add */ - else if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat-Add", 14)) != NULL) { - sco.rtp_stat = tmphdr[3]->body; - } - /* X-RTP-Stat-T38 */ - else if((tmphdr[3] = get_hdr_by_name(msg,"X-RTP-Stat-T38", 14)) != NULL) { - sco.rtp_stat = tmphdr[3]->body; - } else { EMPTY_STR(sco.rtp_stat); } - /* PROTO TYPE */ sco.proto = msg->rcv.proto;

1 0