kbe/calls
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sip: media-manager: Include crypto attributes for capabilities

Browse Source 
The API is changed to accept a list of calls_srtp_crypto_attributes
which get inserted into the SDP line.
This commit is contained in:
Evangelos Ribeiro Tzaras
2022-05-03 12:11:24 +02:00
parent 14350a38ed
commit 0e57d31c1e
5 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/sip/calls-sip-call.c
View File

@@ -104,7 +104,7 @@ calls_sip_call_answer (CallsCall *call)
self->ip,
rtp_port,
rtcp_port,
FALSE,
NULL,
self->codecs);
g_assert (local_sdp);

26
plugins/sip/calls-sip-media-manager.c
View File

@@ -27,6 +27,7 @@
#include "calls-settings.h"
#include "calls-sip-media-manager.h"
#include "calls-sip-media-pipeline.h"
#include "calls-srtp-utils.h"
#include "gst-rfc3551.h"
#include "util.h"
@@ -212,7 +213,7 @@ calls_sip_media_manager_default (void)
*
* @self: A #CallsSipMediaManager
* @port: Should eventually come from the ICE stack
* @use_srtp: Whether to use srtp (not really handled)
* @crypto_attributes: A #GList of #calls_srtp_crypto_attribute
* @supported_codecs: A #GList of #MediaCodecInfo
*
* Returns: (transfer full): string describing capabilities
@@ -223,10 +224,10 @@ calls_sip_media_manager_get_capabilities (CallsSipMediaManager *self,
const char *own_ip,
gint rtp_port,
gint rtcp_port,
gboolean use_srtp,
GList *crypto_attributes,
GList *supported_codecs)
{
char *payload_type = use_srtp ? "SAVP" : "AVP";
char *payload_type = crypto_attributes ? "SAVP" : "AVP";
g_autoptr (GString) media_line = NULL;
g_autoptr (GString) attribute_lines = NULL;
@@ -260,6 +261,19 @@ calls_sip_media_manager_get_capabilities (CallsSipMediaManager *self,
"\r\n");
}
for (node = crypto_attributes; node != NULL; node = node->next) {
calls_srtp_crypto_attribute *attr = node->data;
g_autoptr (GError) error = NULL;
g_autofree char *crypto_line =
calls_srtp_print_sdp_crypto_attribute(attr, &error);
if (!crypto_line) {
g_warning ("Could not print SDP crypto line for tag %d: %s", attr->tag, error->message);
continue;
}
g_string_append_printf (attribute_lines, "%s\r\n", crypto_line);
}
g_string_append_printf (attribute_lines, "a=rtcp:%d\r\n", rtcp_port);
done:
@@ -290,7 +304,7 @@ done:
* @self: A #CallsSipMediaManager
* @rtp_port: Port to use for RTP. Should eventually come from the ICE stack
* @rtcp_port: Port to use for RTCP.Should eventually come from the ICE stack
* @use_srtp: Whether to use srtp (not really handled)
* @crypto_attributes: A #GList of #calls_srtp_crypto_attribute
*
* Returns: (transfer full): string describing capabilities
* to be used in the session description (SDP)
@@ -300,7 +314,7 @@ calls_sip_media_manager_static_capabilities (CallsSipMediaManager *self,
const char *own_ip,
gint rtp_port,
gint rtcp_port,
gboolean use_srtp)
GList *crypto_attributes)
{
g_return_val_if_fail (CALLS_IS_SIP_MEDIA_MANAGER (self), NULL);
@@ -308,7 +322,7 @@ calls_sip_media_manager_static_capabilities (CallsSipMediaManager *self,
own_ip,
rtp_port,
rtcp_port,
use_srtp,
crypto_attributes,
self->preferred_codecs);
}

8
plugins/sip/calls-sip-media-manager.h
View File

@@ -34,21 +34,21 @@ G_BEGIN_DECLS
#define CALLS_TYPE_SIP_MEDIA_MANAGER (calls_sip_media_manager_get_type ())
G_DECLARE_FINAL_TYPE (CallsSipMediaManager, calls_sip_media_manager, CALLS, SIP_MEDIA_MANAGER, GObject)
G_DECLARE_FINAL_TYPE (CallsSipMediaManager, calls_sip_media_manager, CALLS, SIP_MEDIA_MANAGER, GObject);
CallsSipMediaManager* calls_sip_media_manager_default (void);
CallsSipMediaManager *calls_sip_media_manager_default (void);
gchar *calls_sip_media_manager_get_capabilities (CallsSipMediaManager *self,
const char *own_ip,
gint rtp_port,
gint rtcp_port,
gboolean use_srtp,
GList *crypto_attributes,
GList *supported_codecs);
gchar *calls_sip_media_manager_static_capabilities (CallsSipMediaManager *self,
const char *own_ip,
gint rtp_port,
gint rtcp_port,
gboolean use_srtp);
GList *crypto_attributes);
gboolean calls_sip_media_manager_supports_media (CallsSipMediaManager *self,
const char *media_type);
GList *calls_sip_media_manager_codec_candidates (CallsSipMediaManager *self);

2
plugins/sip/calls-sip-origin.c
View File

@@ -280,7 +280,7 @@ add_call (CallsSipOrigin *self,
self->own_ip,
rtp_port,
rtcp_port,
FALSE);
NULL);
g_assert (local_sdp);