MT#55283 remove unused argument

Unifying the SDP printing use cases makes this unnecessary

Change-Id: I60ee3b7382d06d977c5d6f6777f4e78b711ba209

daemon/call_interfaces.c

@@ -2124,7 +2124,7 @@ static const char *call_offer_answer_ng(ng_buffer *ngbuf, bencode_item_t *input,
 
 	ret = monologue_offer_answer(monologues, &streams, &flags);
 	if (!ret)
-		ret = sdp_replace(chopper, &parsed, to_ml, &flags, true);
+		ret = sdp_replace(chopper, &parsed, to_ml, &flags);
 	if (!ret)
 		save_last_sdp(from_ml, &sdp, &parsed, &streams);
 
@@ -3497,7 +3497,7 @@ const char *call_publish_ng(ng_buffer *ngbuf, bencode_item_t *input, bencode_ite
 	if (ret)
 		ilog(LOG_ERR, "Publish error"); // XXX close call? handle errors?
 
-	ret = sdp_create(&sdp_out, ml, &flags, true);
+	ret = sdp_create(&sdp_out, ml, &flags);
 	if (!ret) {
 		save_last_sdp(ml, &sdp_in, &parsed, &streams);
 		bencode_buffer_destroy_add(output->buffer, g_free, sdp_out.s);
@@ -3573,12 +3573,12 @@ const char *call_subscribe_request_ng(bencode_item_t *input, bencode_item_t *out
 		return "Failed to request subscription";
 
 	if (chopper && sdp_ml) {
-		ret = sdp_replace(chopper, &sdp_ml->last_in_sdp_parsed, dest_ml, &flags, false);
+		ret = sdp_replace(chopper, &sdp_ml->last_in_sdp_parsed, dest_ml, &flags);
 		if (ret)
 			return "Failed to rewrite SDP";
 	} else {
 		/* create new SDP */
-		ret = sdp_create(&sdp_out, dest_ml, &flags, false);
+		ret = sdp_create(&sdp_out, dest_ml, &flags);
 	}
 
 	/* place return output SDP */

daemon/janus.c

@@ -650,7 +650,7 @@ static const char *janus_videoroom_join(struct websocket_message *wm, struct jan
 			return "Subscribe error";
 
 		/* create SDP */
-		ret = sdp_create(jsep_sdp_out, dest_ml, &flags, true);
+		ret = sdp_create(jsep_sdp_out, dest_ml, &flags);
 
 		if (!dest_ml->janus_session)
 			dest_ml->janus_session = obj_get(session);
@@ -880,7 +880,7 @@ static const char *janus_videoroom_configure(struct websocket_message *wm, struc
 		// XXX check there's only one audio and one video stream?
 
 		g_auto(str) sdp_out = STR_NULL;
-		ret = sdp_create(&sdp_out, ml, &flags, true);
+		ret = sdp_create(&sdp_out, ml, &flags);
 		if (ret)
 			return "Publish error";
 

daemon/sdp.c

@@ -3061,8 +3061,7 @@ static struct packet_stream *print_sdp_media_section(GString *s, struct call_med
 		const sdp_ng_flags *flags,
 		packet_stream_list *rtp_ps_link,
 		bool is_active,
-		bool force_end_of_ice,
-		bool print_other_attrs)
+		bool force_end_of_ice)
 {
 	struct packet_stream *rtp_ps = rtp_ps_link->data;
 	struct packet_stream *ps_rtcp = NULL;
@@ -3077,8 +3076,7 @@ static struct packet_stream *print_sdp_media_section(GString *s, struct call_med
 			insert_codec_parameters(s, media, flags);
 
 		/* all unknown type attributes will be added here */
-		if (print_other_attrs)
-			media->sdp_attr_print(s, media, flags);
+		media->sdp_attr_print(s, media, flags);
 
 		/* print sendrecv */
 		if (!flags->original_sendrecv)
@@ -3122,7 +3120,7 @@ static struct packet_stream *print_sdp_media_section(GString *s, struct call_med
 
 static const char *replace_sdp_media_section(struct sdp_chopper *chop, struct call_media *call_media,
 		struct sdp_media *sdp_media, packet_stream_list *rtp_ps_link, sdp_ng_flags *flags,
-		const bool keep_zero_address, bool print_other_attrs)
+		const bool keep_zero_address)
 {
 	const char *err = NULL;
 	struct packet_stream *ps = rtp_ps_link->data;
@@ -3175,7 +3173,7 @@ static const char *replace_sdp_media_section(struct sdp_chopper *chop, struct ca
 
 next:
 	print_sdp_media_section(chop->output, call_media, sdp_media, flags, rtp_ps_link, is_active,
-			attr_get_by_id(&sdp_media->attributes, ATTR_END_OF_CANDIDATES), print_other_attrs);
+			attr_get_by_id(&sdp_media->attributes, ATTR_END_OF_CANDIDATES));
 	return NULL;
 
 error:
@@ -3185,7 +3183,7 @@ error:
 
 /* called with call->master_lock held in W */
 int sdp_replace(struct sdp_chopper *chop, sdp_sessions_q *sessions, struct call_monologue *monologue,
-		sdp_ng_flags *flags, bool print_other_attrs)
+		sdp_ng_flags *flags)
 {
 	struct sdp_session *session;
 	struct sdp_media *sdp_media;
@@ -3341,8 +3339,7 @@ int sdp_replace(struct sdp_chopper *chop, sdp_sessions_q *sessions, struct call_
 					call_media->protocol = prtp;
 					err = replace_sdp_media_section(chop, call_media, sdp_media,
 							rtp_ps_link, flags,
-							keep_zero_address,
-							print_other_attrs);
+							keep_zero_address);
 					*chop = chop_copy;
 					call_media->protocol = proto;
 					if (err)
@@ -3352,8 +3349,7 @@ int sdp_replace(struct sdp_chopper *chop, sdp_sessions_q *sessions, struct call_
 
 			err = replace_sdp_media_section(chop, call_media, sdp_media,
 					rtp_ps_link, flags,
-					keep_zero_address,
-					print_other_attrs);
+					keep_zero_address);
 			if (err)
 				goto error;
 
@@ -3396,9 +3392,7 @@ error:
 	return -1;
 }
 
-int sdp_create(str *out, struct call_monologue *monologue, const sdp_ng_flags *flags,
-		 bool print_other_media_attrs)
-{
+int sdp_create(str *out, struct call_monologue *monologue, const sdp_ng_flags *flags) {
 	const char *err = NULL;
 	GString *s = NULL;
 
@@ -3463,7 +3457,7 @@ int sdp_create(str *out, struct call_monologue *monologue, const sdp_ng_flags *f
 		g_string_append_printf(s, "\r\nc=IN %s %s\r\n",
 				rtp_ps->selected_sfd->local_intf->advertised_address.addr.family->rfc_name,
 				sockaddr_print_buf(&rtp_ps->selected_sfd->local_intf->advertised_address.addr));
-		print_sdp_media_section(s, media, NULL, flags, rtp_ps_link, true, false, print_other_media_attrs);
+		print_sdp_media_section(s, media, NULL, flags, rtp_ps_link, true, false);
 	}
 
 	out->len = s->len;

include/sdp.h

@@ -57,11 +57,9 @@ int sdp_parse(str *body, sdp_sessions_q *sessions, const sdp_ng_flags *);
 int sdp_streams(const sdp_sessions_q *sessions, sdp_streams_q *streams, sdp_ng_flags *);
 void sdp_streams_clear(sdp_streams_q *);
 void sdp_sessions_clear(sdp_sessions_q *sessions);
-int sdp_replace(struct sdp_chopper *, sdp_sessions_q *, struct call_monologue *, sdp_ng_flags *,
-		bool print_other_attrs);
+int sdp_replace(struct sdp_chopper *, sdp_sessions_q *, struct call_monologue *, sdp_ng_flags *);
 int sdp_is_duplicate(sdp_sessions_q *sessions);
-int sdp_create(str *out, struct call_monologue *, const sdp_ng_flags *flags,
-		bool print_other_media_attrs);
+int sdp_create(str *out, struct call_monologue *, const sdp_ng_flags *flags);
 const char *sdp_get_sendrecv(struct call_media *media);
 
 int sdp_parse_candidate(struct ice_candidate *cand, const str *s); // returns -1, 0, 1

t/auto-daemon-tests-pubsub.pl

@@ -3264,6 +3264,9 @@ a=s-baz:quux blah
 m=audio PORT RTP/AVP 0
 c=IN IP4 203.0.113.1
 a=rtpmap:0 PCMU/8000
+a=m-dummy
+a=m-foo:bar
+a=m-baz:quux blah
 a=sendonly
 a=rtcp:PORT
 SDP
@@ -3569,11 +3572,17 @@ t=0 0
 m=audio PORT RTP/AVP 0
 c=IN IP4 203.0.113.1
 a=rtpmap:0 PCMU/8000
+a=m-dummy
+a=m-foo:bar
+a=m-baz:quux blah
 a=sendonly
 a=rtcp:PORT
 m=audio PORT RTP/AVP 0
 c=IN IP4 203.0.113.1
 a=rtpmap:0 PCMU/8000
+a=b-dummy
+a=b-foo:bar
+a=b-baz:quux blah
 a=sendonly
 a=rtcp:PORT
 SDP