honour RFC 5506 by allowing more RTCP packet types leading the group

Change-Id: Ic8d7019e5bcadd9221c913b62e7c89e3042f7316
8 years ago · 6e8d57e528
parent 32e0e2cf25
commit 6e8d57e528
1 changed files with 16 additions and 3 deletions
--- a/daemon/rtcp.c
+++ b/daemon/rtcp.c
@ -799,10 +799,23 @@ int rtcp_payload(struct rtcp_packet **out, str *p, const str *s) {
 	if (rtcp->header.version != 2)
 		goto error;
 	err = "invalid packet type";
-	if (rtcp->header.pt != RTCP_PT_SR
-			&& rtcp->header.pt != RTCP_PT_RR)
-		goto error;
+	switch (rtcp->header.pt) {
+		case RTCP_PT_SR:
+		case RTCP_PT_RR:
+		// RFC 5506
+		case RTCP_PT_SDES:
+		case RTCP_PT_BYE:
+		case RTCP_PT_APP:
+		// RFC 4585 + 5506
+		case RTCP_PT_PSFB:
+		case RTCP_PT_RTPFB:
+		// RFC 3611 + 5506
+		case RTCP_PT_XR:
+			goto ok;
+	}
+	goto error;

+ok:
 	if (!p)
 		goto done;