[sr-dev] git:master:46c59ce6: Merge pull request #761 from adubovikov/master

[GitHub]

Module: kamailio
Branch: master
Commit: 46c59ce63bec53bc9a59b2553c6ccf8f5b6667d8
URL: https://github.com/kamailio/kamailio/commit/46c59ce63bec53bc9a59b2553c6ccf8f5b6667d8

Author: Alexandr Dubovikov <alexandr.dubovikov at gmail.com>
Committer: GitHub <noreply at 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/46c59ce63bec53bc9a59b2553c6ccf8f5b6667d8.diff
Patch: https://github.com/kamailio/kamailio/commit/46c59ce63bec53bc9a59b2553c6ccf8f5b6667d8.patch

---

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;