Bläddra i källkod

Merge pull request #761 from adubovikov/master

modules/sipcapture: fixed priorisation X-RTP headers
Alexandr Dubovikov 9 år sedan
förälder
incheckning
46c59ce63b
1 ändrade filer med 9 tillägg och 10 borttagningar
  1. 9 10
      modules/sipcapture/sipcapture.c

+ 9 - 10
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;