Skip to content
This repository has been archived by the owner on Jul 12, 2023. It is now read-only.

Commit

Permalink
Revert "DTLS server quick connection fix (#38)" (#39)
Browse files Browse the repository at this point in the history 
Reverts #38

Reason: Code compiles but linker fails:

```
[ 40%] Linking C shared library libkmswebrtcendpointlib.so
CMakeFiles/kmswebrtcendpointlib.dir/kmswebrtctransportsink.c.o: In function `gst_bin_iterate_all_by_element_factory_name':
./src/gst-plugins/webrtcendpoint/./src/gst-plugins/webrtcendpoint/kmswebrtctransportsink.c:59: multiple definition of `gst_bin_iterate_all_by_element_factory_name'
CMakeFiles/kmswebrtcendpointlib.dir/kmswebrtctransportsrc.c.o:./src/gst-plugins/webrtcendpoint/./src/gst-plugins/webrtcendpoint/kmswebrtctransportsrc.c:57: first defined here
collect2: error: ld returned 1 exit status
```
  • Loading branch information
@j1elo
j1elo authored Jul 7, 2022
1 parent dd2d019 commit 70a4f1e
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 512 deletions.
1 change: 0 additions & 1 deletion src/gst-plugins/webrtcendpoint/kmswebrtcbundleconnection.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ kms_webrtc_bundle_connection_add (KmsIRtpConnection * base_rtp_conn,
KmsWebRtcTransport *tr = priv->tr;

kms_webrtc_transport_sink_set_dtls_is_client (tr->sink, active);
kms_webrtc_transport_src_set_dtls_is_client (tr->src, active);

gst_bin_add (bin, GST_ELEMENT (g_object_ref (tr->src)));
gst_bin_add (bin, GST_ELEMENT (g_object_ref (tr->sink)));
Expand Down
1 change: 0 additions & 1 deletion src/gst-plugins/webrtcendpoint/kmswebrtcconnection.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ static void
add_tr (KmsWebRtcTransport * tr, GstBin * bin, gboolean is_client)
{
kms_webrtc_transport_sink_set_dtls_is_client(tr->sink, is_client);
kms_webrtc_transport_src_set_dtls_is_client (tr->src, is_client);

gst_bin_add (bin, GST_ELEMENT (g_object_ref (tr->src)));
gst_bin_add (bin, GST_ELEMENT (g_object_ref (tr->sink)));
Expand Down
1 change: 0 additions & 1 deletion src/gst-plugins/webrtcendpoint/kmswebrtcrtcpmuxconnection.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ kms_webrtc_rtcp_mux_connection_add (KmsIRtpConnection * base_rtp_conn,

/* srcs */
kms_webrtc_transport_sink_set_dtls_is_client(tr->sink, active);
kms_webrtc_transport_src_set_dtls_is_client (tr->src, active);

gst_bin_add (bin, GST_ELEMENT (g_object_ref (tr->src)));
gst_bin_add (bin, GST_ELEMENT (g_object_ref (tr->sink)));
Expand Down
1 change: 0 additions & 1 deletion src/gst-plugins/webrtcendpoint/kmswebrtcsctpconnection.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ kms_webrtc_sctp_connection_add (KmsIRtpConnection * base_conn, GstBin * bin,
KmsWebRtcTransport *tr = priv->tr;

kms_webrtc_transport_sink_set_dtls_is_client(tr->sink, active);
kms_webrtc_transport_src_set_dtls_is_client (tr->src, active);

gst_bin_add (bin, GST_ELEMENT (g_object_ref (self->priv->tr->src)));
gst_bin_add (bin, GST_ELEMENT (g_object_ref (self->priv->tr->sink)));
Expand Down
109 changes: 3 additions & 106 deletions src/gst-plugins/webrtcendpoint/kmswebrtctransportsrc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,85 +29,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
#define kms_webrtc_transport_src_parent_class parent_class
G_DEFINE_TYPE (KmsWebrtcTransportSrc, kms_webrtc_transport_src, GST_TYPE_BIN);

#define SRTPDEC_FACTORY_NAME "srtpdec"


// {{{{ FIXME: This can be deleted when we start using GStreamer >=1.18 for Kurento.
// Code sourced from GStreamer/gstbin.c >=1.18
//
// https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/10f72da5040b74678c8f81723971127ee8bee04f/subprojects/gstreamer/gst/gstbin.c#L4526-4537
static gint
compare_factory_names (const GValue *velement, GValue *factory_name_val)
{
GstElement *element = g_value_get_object (velement);
GstElementFactory *factory = gst_element_get_factory (element);
const gchar *factory_name = g_value_get_string (factory_name_val);

if (factory == NULL)
return -1;

return g_strcmp0 (GST_OBJECT_NAME (factory), factory_name);
}

//
// https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/10f72da5040b74678c8f81723971127ee8bee04f/subprojects/gstreamer/gst/gstbin.c#L4553-4574
GstIterator *
gst_bin_iterate_all_by_element_factory_name (GstBin *bin,
const gchar *factory_name)
{
GstIterator *children;
GstIterator *result;
GValue factory_name_val = G_VALUE_INIT;

g_return_val_if_fail (GST_IS_BIN (bin), NULL);
g_return_val_if_fail (factory_name && *factory_name, NULL);

g_value_init (&factory_name_val, G_TYPE_STRING);
g_value_set_string (&factory_name_val, factory_name);

children = gst_bin_iterate_recurse (bin);
result = gst_iterator_filter (children, (GCompareFunc)compare_factory_names,
&factory_name_val);

g_value_unset (&factory_name_val);

return result;
}
// }}}}

static GstElement *
kms_webrtc_transport_src_get_element_in_dtlssrtpdec (
KmsWebrtcTransportSrc *self,
const gchar *factory_name)
{
GstElement *element = NULL;
GValue velement = G_VALUE_INIT;

GstIterator *iter = gst_bin_iterate_all_by_element_factory_name (
GST_BIN (self->dtlssrtpdec), factory_name);

if (gst_iterator_next (iter, &velement) == GST_ITERATOR_OK) {
// Assume only one element of the given type. This is the case in dtlssrtpdec.
element = g_value_dup_object (&velement);
g_value_reset (&velement);
}

if (gst_iterator_next (iter, &velement) != GST_ITERATOR_DONE) {
GST_WARNING_OBJECT (self,
"BUG: Several elements '%s' found in dtlssrtpdec; code assumes only one",
factory_name);
}

if (element == NULL) {
GST_WARNING_OBJECT (self, "BUG: Element '%s' not found in dtlssrtpdec",
factory_name);
}

g_value_unset (&velement);
gst_iterator_free (iter);

return element;
}
#define SRTPDEC_NAME "srtp-decoder"

static void
kms_webrtc_transport_src_init (KmsWebrtcTransportSrc * self)
Expand All @@ -123,12 +45,12 @@ kms_webrtc_transport_src_connect_elements (KmsWebrtcTransportSrc * self)
gst_bin_add_many (GST_BIN (self), self->src, self->dtlssrtpdec, NULL);
gst_element_link (self->src, self->dtlssrtpdec);

srtpdec = kms_webrtc_transport_src_get_element_in_dtlssrtpdec (self, SRTPDEC_FACTORY_NAME);
srtpdec = gst_bin_get_by_name (GST_BIN (self->dtlssrtpdec), SRTPDEC_NAME);
if (srtpdec != NULL) {
g_object_set (srtpdec, "replay-window-size", RTP_RTX_SIZE, NULL);
g_object_unref (srtpdec);
} else {
GST_WARNING ("Cannot get SRTP DTLS decoder");
GST_WARNING ("Cannot get srtpdec with name %s", SRTPDEC_NAME);
}
}

Expand All @@ -155,27 +77,12 @@ kms_webrtc_transport_src_configure (KmsWebrtcTransportSrc * self,
klass->configure (self, agent, stream_id, component_id);
}

void
kms_webrtc_transport_src_set_dtls_is_client_default (KmsWebrtcTransportSrc * self,
gboolean is_client)
{
// We just need to cache the DTLS client value for later use
self->dtls_client = is_client;

if (is_client) {
GST_DEBUG_OBJECT(self, "Set as DTLS client (handshake initiator)");
} else {
GST_DEBUG_OBJECT(self, "Set as DTLS server (wait for handshake)");
}
}

static void
kms_webrtc_transport_src_class_init (KmsWebrtcTransportSrcClass * klass)
{
GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);

klass->configure = kms_webrtc_transport_src_configure_default;
klass->set_dtls_is_client = kms_webrtc_transport_src_set_dtls_is_client_default;

GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, GST_DEFAULT_NAME, 0,
GST_DEFAULT_NAME);
Expand All @@ -196,13 +103,3 @@ kms_webrtc_transport_src_new ()

return KMS_WEBRTC_TRANSPORT_SRC (obj);
}

void
kms_webrtc_transport_src_set_dtls_is_client (KmsWebrtcTransportSrc * self,
gboolean is_client)
{
KmsWebrtcTransportSrcClass *klass =
KMS_WEBRTC_TRANSPORT_SRC_CLASS (G_OBJECT_GET_CLASS (self));

klass->set_dtls_is_client (self, is_client);
}
9 changes: 0 additions & 9 deletions src/gst-plugins/webrtcendpoint/kmswebrtctransportsrc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ struct _KmsWebrtcTransportSrc
GstElement *src;
GstElement *dtlssrtpdec;
gulong src_probe;

gboolean dtls_client;
};

struct _KmsWebrtcTransportSrcClass
Expand All @@ -58,10 +56,6 @@ struct _KmsWebrtcTransportSrcClass
KmsIceBaseAgent *agent,
const char *stream_id,
guint component_id);

void (*set_dtls_is_client) (KmsWebrtcTransportSrc * self,
gboolean is_client);

};

GType kms_webrtc_transport_src_get_type (void);
Expand All @@ -73,8 +67,5 @@ void kms_webrtc_transport_src_configure (KmsWebrtcTransportSrc * self,
const char *stream_id,
guint component_id);

void kms_webrtc_transport_src_set_dtls_is_client (KmsWebrtcTransportSrc *src,
gboolean is_client);

G_END_DECLS
#endif /* __KMS_WEBRTC_TRANSPORT_SRC_H__ */
Loading

0 comments on commit 70a4f1e

Please sign in to comment.