Fixed RTCP Parsing also for XR reports.

daemon/rtcp_xr.c

@@ -23,19 +23,19 @@
 
 void print_rtcp_xr_common(char* cdrbufcur,pjmedia_rtcp_xr_pkt *rtcp_xr) {
 	cdrbufcur += sprintf(cdrbufcur,"version=%u, padding=%u, count=%u, payloadtype=%u, length=%u, ssrc=%u, ",
-			ntohl(rtcp_xr->common.version),
-			ntohl(rtcp_xr->common.p),
-			ntohl(rtcp_xr->common.count),
-			ntohl(rtcp_xr->common.pt),
-			ntohl(rtcp_xr->common.length),
+			rtcp_xr->common.version,
+			rtcp_xr->common.p,
+			rtcp_xr->common.count,
+			rtcp_xr->common.pt,
+			rtcp_xr->common.length,
 			ntohl(rtcp_xr->common.ssrc));
 }
 
 void print_rtcp_xr_rb_header(char* cdrbufcur,pjmedia_rtcp_xr_rb_header *rb_header) {
 	cdrbufcur += sprintf(cdrbufcur,"rb_header_blocktype=%u, rb_header_blockspecdata=%u, rb_header_blocklength=%u, ",
-			ntohl(rb_header->bt),
-			ntohl(rb_header->specific),
-			ntohl(rb_header->length));
+			rb_header->bt,
+			rb_header->specific,
+			ntohs(rb_header->length));
 }
 
 void print_rtcp_xr_rb_rr_time(char* cdrbufcur,pjmedia_rtcp_xr_rb_rr_time *rb_rr_time) {
@@ -59,7 +59,7 @@ void print_rtcp_xr_rb_stats(char* cdrbufcur,pjmedia_rtcp_xr_rb_stats *rb_stats)
 			"rb_stats_jitter_min=%u, rb_stats_jitter_max=%u, rb_stats_jitter_mean=%u, rb_stats_jitter_deviation=%u,"
 			"rb_stats_toh_min=%u, rb_stats_toh_max=%u, rb_stats_toh_mean=%u, rb_stats_toh_deviation=%u, ",
 			ntohl(rb_stats->ssrc),
-			ntohl(rb_stats->begin_seq),
+			ntohs(rb_stats->begin_seq),
 			ntohl(rb_stats->end_seq),
 			ntohl(rb_stats->lost),
 			ntohl(rb_stats->dup),
@@ -82,26 +82,26 @@ void print_rtcp_xr_rb_voip_mtc(char* cdrbufcur,pjmedia_rtcp_xr_rb_voip_mtc *rb_v
 			"rb_voip_mtc_mos_cq=%u, rb_voip_mtc_rx_config=%u, rb_voip_mtc_jb_nom=%u, rb_voip_mtc_jb_max=%u, "
 			"rb_voip_mtc_jb_abs_max=%u, ",
 			ntohl(rb_voip_mtc->ssrc),
-			ntohl(rb_voip_mtc->loss_rate),
-			ntohl(rb_voip_mtc->discard_rate),
-			ntohl(rb_voip_mtc->burst_den),
-			ntohl(rb_voip_mtc->gap_den),
-			ntohl(rb_voip_mtc->burst_dur),
-			ntohl(rb_voip_mtc->gap_dur),
-			ntohl(rb_voip_mtc->rnd_trip_delay),
-			ntohl(rb_voip_mtc->end_sys_delay),
-			ntohl(rb_voip_mtc->signal_lvl),
-			ntohl(rb_voip_mtc->noise_lvl),
-			ntohl(rb_voip_mtc->rerl),
-			ntohl(rb_voip_mtc->gmin),
-			ntohl(rb_voip_mtc->r_factor),
-			ntohl(rb_voip_mtc->ext_r_factor),
-			ntohl(rb_voip_mtc->mos_lq),
-			ntohl(rb_voip_mtc->mos_cq),
-			ntohl(rb_voip_mtc->rx_config),
-			ntohl(rb_voip_mtc->jb_nom),
-			ntohl(rb_voip_mtc->jb_max),
-			ntohl(rb_voip_mtc->jb_abs_max));
+			rb_voip_mtc->loss_rate,
+			rb_voip_mtc->discard_rate,
+			rb_voip_mtc->burst_den,
+			rb_voip_mtc->gap_den,
+			ntohs(rb_voip_mtc->burst_dur),
+			ntohs(rb_voip_mtc->gap_dur),
+			ntohs(rb_voip_mtc->rnd_trip_delay),
+			ntohs(rb_voip_mtc->end_sys_delay),
+			rb_voip_mtc->signal_lvl,
+			rb_voip_mtc->noise_lvl,
+			rb_voip_mtc->rerl,
+			rb_voip_mtc->gmin,
+			rb_voip_mtc->r_factor,
+			rb_voip_mtc->ext_r_factor,
+			rb_voip_mtc->mos_lq,
+			rb_voip_mtc->mos_cq,
+			rb_voip_mtc->rx_config,
+			ntohs(rb_voip_mtc->jb_nom),
+			ntohs(rb_voip_mtc->jb_max),
+			ntohs(rb_voip_mtc->jb_abs_max));
 }
 
 void pjmedia_rtcp_xr_rx_rtcp_xr(char* cdrbufcur, const void *pkt, size_t size) {