MT#55283 remove a=ssrc-group exception

Fix up tests to match reordered attributes

Change-Id: I1cc71c154a459d568bf4059a87151ad035e0af68

daemon/call.c

@@ -2702,7 +2702,6 @@ static void __media_init_from_flags(struct call_media *other_media, struct call_
 
 	/* moved as plain text attributes, required later by sdp_create()
 	 * ssrc
-	 * ssrc-group
 	 * extmap
 	 * other (unknown type)
 	 */

daemon/sdp.c

@@ -32,7 +32,6 @@ enum attr_id {
 	ATTR_ICE_PWD,
 	ATTR_CRYPTO,
 	ATTR_SSRC,
-	ATTR_SSRC_GROUP,
 	ATTR_INACTIVE,
 	ATTR_SENDRECV,
 	ATTR_SENDONLY,
@@ -1131,9 +1130,6 @@ static int parse_attribute(struct sdp_attribute *a) {
 		case CSH_LOOKUP("rtcp"):
 			ret = parse_attribute_rtcp(a);
 			break;
-		case CSH_LOOKUP("ssrc-group"):
-			a->attr = ATTR_SSRC_GROUP;
-			break;
 		case CSH_LOOKUP("ssrc"):
 			ret = parse_attribute_ssrc(a);
 			break;
@@ -1865,14 +1861,6 @@ int sdp_streams(const sdp_sessions_q *sessions, sdp_streams_q *streams, sdp_ng_f
 			 * Attributes are carried only as plain text.
 			 */
 			{
-				/* a=ssrc-group */
-				attrs = attr_list_get_by_id(&media->attributes, ATTR_SSRC_GROUP);
-				for (__auto_type ll = attrs ? attrs->head : NULL; ll; ll = ll->next) {
-					attr = ll->data;
-					str * ret = str_dup(&attr->line_value);
-					t_queue_push_tail(&sp->attributes, ret);
-				}
-
 				/* a=ssrc */
 				attrs = attr_list_get_by_id(&media->attributes, ATTR_SSRC);
 				for (__auto_type ll = attrs ? attrs->head : NULL; ll; ll = ll->next) {

t/auto-daemon-tests-websocket.py

@@ -1757,7 +1757,6 @@ class TestVideoroom(unittest.TestCase):
                 "a=rtcp-fb:96 ccm fir\r\n"
                 "a=rtcp-fb:96 nack\r\n"
                 "a=rtcp-fb:96 nack pli\r\n"
-                "a=ssrc-group:FID 3005569364 2001490794\r\n"
                 "a=ssrc:3005569364 cname:NMNDwVd66x2SfiO0\r\n"
                 "a=ssrc:3005569364 msid:hJifdaJwqEqHxSG0pVbs1DrLAwiHqz7fKlqC 6d6ec7a7-e3d7-4c82-b03c-45e017713abd\r\n"
                 "a=ssrc:3005569364 mslabel:hJifdaJwqEqHxSG0pVbs1DrLAwiHqz7fKlqC\r\n"
@@ -1779,6 +1778,7 @@ class TestVideoroom(unittest.TestCase):
                 "a=extmap:6 urn:ietf:params:rtp-hdrext:sdes:repaired-rtp-stream-id\r\n"
                 "a=msid:hJifdaJwqEqHxSG0pVbs1DrLAwiHqz7fKlqC 6d6ec7a7-e3d7-4c82-b03c-45e017713abd\r\n"
                 "a=rtcp-rsize\r\n"
+                "a=ssrc-group:FID 3005569364 2001490794\r\n"
                 "a=sendonly\r\n"
                 "a=rtcp-mux\r\n"
                 "a=setup:actpass\r\n"