FS-949 --resolve

diff --git a/src/include/switch_rtcp_frame.h b/src/include/switch_rtcp_frame.h
index 1c718a089f1cf18a86feec34bbfc4d8a86599af7..5d06294304ac247d19ecd4e1cd2f8e0fbea01710 100644 (file)
--- a/src/include/switch_rtcp_frame.h
+++ b/src/include/switch_rtcp_frame.h
@@ -38,7 +38,20 @@
 
 #include <switch.h>
 
+#define MAX_REPORT_BLOCKS 5
+
 SWITCH_BEGIN_EXTERN_C
+
+struct switch_rtcp_report_block_frame {
+       uint32_t ssrc; /* The SSRC identifier of the source to which the information in this reception report block pertains. */
+       uint8_t fraction; /* The fraction of RTP data packets from source SSRC_n lost since the previous SR or RR packet was sent */
+       uint32_t lost;  /* The total number of RTP data packets from source SSRC_n that have been lost since the beginning of reception */
+       uint32_t highest_sequence_number_received;
+       uint32_t jitter; /* An estimate of the statistical variance of the RTP data packet interarrival time, measured in timestamp units and expressed as an unsigned integer. */
+       uint32_t lsr; /* The middle 32 bits out of 64 in the NTP timestamp */
+       uint32_t dlsr; /* The delay, expressed in units of 1/65536 seconds, between receiving the last SR packet from source SSRC_n and sending this reception report block */
+};
+
 /*! \brief An abstraction of a rtcp frame */
        struct switch_rtcp_frame {
 
@@ -58,6 +71,10 @@ SWITCH_BEGIN_EXTERN_C
 
        uint32_t octect_count;
 
+       uint32_t nb_reports;
+
+       struct switch_rtcp_report_block_frame reports[MAX_REPORT_BLOCKS];
+
 };
 
 SWITCH_END_EXTERN_C

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index fb4a0cee77f15c616087476380e1eabc51606f58..c058efb9cfe8971ccda1eab07454f4e134bbe295 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -1018,39 +1018,66 @@ static switch_status_t sofia_read_frame(switch_core_session_t *session, switch_f
                                switch_event_t *event;
 
                                if (switch_event_create(&event, SWITCH_EVENT_RECV_RTCP_MESSAGE) == SWITCH_STATUS_SUCCESS) {
-                                       char buf[30];
+                                       char value[30];
+                                       char header[50];
+                                       int i;
 
                                        char *uuid = switch_core_session_get_uuid(session);
                                        if (uuid) {
                                                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Unique-ID", switch_core_session_get_uuid(session));
                                        }
 
-                                       snprintf(buf, sizeof(buf), "%.8x", rtcp_frame.ssrc);
-                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SSRC", buf);
-
-                                       snprintf(buf, sizeof(buf), "%u", rtcp_frame.ntp_msw);
-                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "NTP-Most-Significant-Word", buf);
-
-                                       snprintf(buf, sizeof(buf), "%u", rtcp_frame.ntp_lsw);
-                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "NTP-Least-Significant-Word", buf);
-
-                                       snprintf(buf, sizeof(buf), "%u", rtcp_frame.timestamp);
-                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "RTP-Timestamp", buf);
-
-                                       snprintf(buf, sizeof(buf), "%u", rtcp_frame.packet_count);
-                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Sender-Packet-Count", buf);
-
-                                       snprintf(buf, sizeof(buf), "%u", rtcp_frame.octect_count);
-                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Octect-Packet-Count", buf);
-
-                                       snprintf(buf, sizeof(buf), "%" SWITCH_SIZE_T_FMT, tech_pvt->read_frame.timestamp);
-                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Last-RTP-Timestamp", buf);
-
-                                       snprintf(buf, sizeof(buf), "%u", tech_pvt->read_frame.rate);
-                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "RTP-Rate", buf);
-
-                                       snprintf(buf, sizeof(buf), "%" SWITCH_TIME_T_FMT, switch_time_now());
-                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Capture-Time", buf);
+                                       snprintf(value, sizeof(value), "%.8x", rtcp_frame.ssrc);
+                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "SSRC", value);
+
+                                       snprintf(value, sizeof(value), "%u", rtcp_frame.ntp_msw);
+                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "NTP-Most-Significant-Word", value);
+
+                                       snprintf(value, sizeof(value), "%u", rtcp_frame.ntp_lsw);
+                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "NTP-Least-Significant-Word", value);
+
+                                       snprintf(value, sizeof(value), "%u", rtcp_frame.timestamp);
+                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "RTP-Timestamp", value);
+
+                                       snprintf(value, sizeof(value), "%u", rtcp_frame.packet_count);
+                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Sender-Packet-Count", value);
+
+                                       snprintf(value, sizeof(value), "%u", rtcp_frame.octect_count);
+                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Octect-Packet-Count", value);
+
+                                       snprintf(value, sizeof(value), "%" SWITCH_SIZE_T_FMT, tech_pvt->read_frame.timestamp);
+                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Last-RTP-Timestamp", value);
+
+                                       snprintf(value, sizeof(value), "%u", tech_pvt->read_frame.rate);
+                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "RTP-Rate", value);
+
+                                       snprintf(value, sizeof(value), "%" SWITCH_TIME_T_FMT, switch_time_now());
+                                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Capture-Time", value);
+
+                                        // Add sources info
+                                       for (i = 0; i < rtcp_frame.report_count; i++) {
+                                               snprintf(header, sizeof(header), "Source%u-SSRC", i);
+                                               snprintf(value, sizeof(value), "%.8x", rtcp_frame.reports[i].ssrc);
+                                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header, value);
+                                               snprintf(header, sizeof(header), "Source%u-Fraction", i);
+                                               snprintf(value, sizeof(value), "%u", rtcp_frame.reports[i].fraction);
+                                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header, value);
+                                               snprintf(header, sizeof(header), "Source%u-Lost", i);
+                                               snprintf(value, sizeof(value), "%u", rtcp_frame.reports[i].lost);
+                                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header, value);
+                                               snprintf(header, sizeof(header), "Source%u-Highest-Sequence-Number-Received", i);
+                                               snprintf(value, sizeof(value), "%u", rtcp_frame.reports[i].highest_sequence_number_received);
+                                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header, value);
+                                               snprintf(header, sizeof(header), "Source%u-Jitter", i);
+                                               snprintf(value, sizeof(value), "%u", rtcp_frame.reports[i].jitter);
+                                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header, value);
+                                               snprintf(header, sizeof(header), "Source%u-LSR", i);
+                                               snprintf(value, sizeof(value), "%u", rtcp_frame.reports[i].lsr);
+                                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header, value);
+                                               snprintf(header, sizeof(header), "Source%u-DLSR", i);
+                                               snprintf(value, sizeof(value), "%u", rtcp_frame.reports[i].dlsr);
+                                               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header, value);
+                                       }
 
                                        switch_event_fire(&event);
                                        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG10, "Dispatched RTCP event\n");

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index 99ae2e8edc4ed50f234ba7dc2460570cc1f8c94c..cac5c8f45cfa8b126efb828458d688548b406ecd 100644 (file)
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -36,6 +36,7 @@
 
 #include <switch.h>
 #include <switch_stun.h>
+#include <apr_network_io.h>
 #undef PACKAGE_NAME
 #undef PACKAGE_STRING
 #undef PACKAGE_TARNAME
@@ -456,6 +457,16 @@ static handle_rfc2833_result_t handle_rfc2833(switch_rtp_t *rtp_session, switch_
        return RESULT_CONTINUE;
 }
 
+struct switch_rtcp_report_block {
+       uint32_t ssrc; /* The SSRC identifier of the source to which the information in this reception report block pertains. */
+       unsigned int fraction :8; /* The fraction of RTP data packets from source SSRC_n lost since the previous SR or RR packet was sent */
+       int lost :24; /* The total number of RTP data packets from source SSRC_n that have been lost since the beginning of reception */
+       uint32_t highest_sequence_number_received;
+       uint32_t jitter; /* An estimate of the statistical variance of the RTP data packet interarrival time, measured in timestamp units and expressed as an unsigned integer. */
+       uint32_t lsr; /* The middle 32 bits out of 64 in the NTP timestamp */
+       uint32_t dlsr; /* The delay, expressed in units of 1/65536 seconds, between receiving the last SR packet from source SSRC_n and sending this reception report block */
+};
+
 static int global_init = 0;
 static int rtp_common_write(switch_rtp_t *rtp_session,
                                                        rtp_msg_t *send_msg, void *data, uint32_t datalen, switch_payload_t payload, uint32_t timestamp, switch_frame_flag_t *flags);
@@ -3482,6 +3493,11 @@ SWITCH_DECLARE(switch_status_t) switch_rtcp_zerocopy_read_frame(switch_rtp_t *rt
        /* A fresh frame has been found! */
        if (rtp_session->rtcp_fresh_frame) {
                struct switch_rtcp_senderinfo* sr = (struct switch_rtcp_senderinfo*)rtp_session->rtcp_recv_msg.body;
+               /* we remove the header lenght because with directly have a pointer on the body */
+               unsigned packet_length = (ntohs((uint16_t) rtp_session->rtcp_recv_msg.header.length) + 1) * 4 - sizeof(switch_rtcp_hdr_t);
+               unsigned int reportsOffset = sizeof(struct switch_rtcp_senderinfo);
+               int i = 0;
+
                /* turn the flag off! */
                rtp_session->rtcp_fresh_frame = 0;
 
@@ -3493,6 +3509,22 @@ SWITCH_DECLARE(switch_status_t) switch_rtcp_zerocopy_read_frame(switch_rtp_t *rt
                frame->packet_count =  ntohl(sr->pc);
                frame->octect_count = ntohl(sr->oc);
 
+               for (int offset = reportsOffset; offset < packet_length; offset += sizeof(struct switch_rtcp_report_block)) {
+                       struct switch_rtcp_report_block* report = (struct switch_rtcp_report_block*) (rtp_session->rtcp_recv_msg.body + offset);
+                       frame->reports[i].ssrc = ntohl(report->ssrc);
+                       frame->reports[i].fraction = ntohl(report->fraction);
+                       frame->reports[i].lost = ntohl(report->lost);
+                       frame->reports[i].highest_sequence_number_received = ntohl(report->highest_sequence_number_received);
+                       frame->reports[i].jitter = ntohl(report->jitter);
+                       frame->reports[i].lsr = ntohl(report->lsr);
+                       frame->reports[i].dlsr = ntohl(report->dlsr);
+                       i++;
+                       if (i >= MAX_REPORT_BLOCKS) {
+                               break;
+                       }
+               }
+               frame->report_count = i;
+
                return SWITCH_STATUS_SUCCESS;
        }