mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 04:01:08 +00:00
Make vmethod to create and accept new clients.
Add some docs.
This commit is contained in:
parent
491b20bedd
commit
74210e67be
2 changed files with 57 additions and 15 deletions
|
@ -41,6 +41,9 @@ static void gst_rtsp_server_get_property (GObject *object, guint propid,
|
||||||
static void gst_rtsp_server_set_property (GObject *object, guint propid,
|
static void gst_rtsp_server_set_property (GObject *object, guint propid,
|
||||||
const GValue *value, GParamSpec *pspec);
|
const GValue *value, GParamSpec *pspec);
|
||||||
|
|
||||||
|
static GstRTSPClient * gst_rtsp_server_accept_client (GstRTSPServer *server,
|
||||||
|
GIOChannel *channel);
|
||||||
|
|
||||||
static void
|
static void
|
||||||
gst_rtsp_server_class_init (GstRTSPServerClass * klass)
|
gst_rtsp_server_class_init (GstRTSPServerClass * klass)
|
||||||
{
|
{
|
||||||
|
@ -83,6 +86,8 @@ gst_rtsp_server_class_init (GstRTSPServerClass * klass)
|
||||||
g_object_class_install_property (gobject_class, PROP_POOL,
|
g_object_class_install_property (gobject_class, PROP_POOL,
|
||||||
g_param_spec_object ("pool", "Pool", "The session pool to use for client session",
|
g_param_spec_object ("pool", "Pool", "The session pool to use for client session",
|
||||||
GST_TYPE_RTSP_SESSION_POOL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
|
GST_TYPE_RTSP_SESSION_POOL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
|
||||||
|
|
||||||
|
klass->accept_client = gst_rtsp_server_accept_client;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -357,6 +362,37 @@ bind_failed:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* default method for creating a new client object in the server to accept and
|
||||||
|
* handle a client connection on this server */
|
||||||
|
static GstRTSPClient *
|
||||||
|
gst_rtsp_server_accept_client (GstRTSPServer *server, GIOChannel *channel)
|
||||||
|
{
|
||||||
|
GstRTSPClient *client;
|
||||||
|
|
||||||
|
/* a new client connected, create a session to handle the client. */
|
||||||
|
client = gst_rtsp_client_new ();
|
||||||
|
|
||||||
|
/* set the session pool that this client should use */
|
||||||
|
gst_rtsp_client_set_session_pool (client, server->pool);
|
||||||
|
|
||||||
|
/* accept connections for that client, this function returns after accepting
|
||||||
|
* the connection and will run the remainder of the communication with the
|
||||||
|
* client asyncronously. */
|
||||||
|
if (!gst_rtsp_client_accept (client, channel))
|
||||||
|
goto accept_failed;
|
||||||
|
|
||||||
|
return client;
|
||||||
|
|
||||||
|
/* ERRORS */
|
||||||
|
accept_failed:
|
||||||
|
{
|
||||||
|
g_error ("Could not accept client on server socket %d: %s (%d)",
|
||||||
|
server->server_sock.fd, g_strerror (errno), errno);
|
||||||
|
gst_object_unref (client);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gst_rtsp_server_io_func:
|
* gst_rtsp_server_io_func:
|
||||||
* @channel: a #GIOChannel
|
* @channel: a #GIOChannel
|
||||||
|
@ -370,20 +406,17 @@ bind_failed:
|
||||||
gboolean
|
gboolean
|
||||||
gst_rtsp_server_io_func (GIOChannel *channel, GIOCondition condition, GstRTSPServer *server)
|
gst_rtsp_server_io_func (GIOChannel *channel, GIOCondition condition, GstRTSPServer *server)
|
||||||
{
|
{
|
||||||
GstRTSPClient *client;
|
GstRTSPClient *client = NULL;
|
||||||
|
GstRTSPServerClass *klass;
|
||||||
|
|
||||||
if (condition & G_IO_IN) {
|
if (condition & G_IO_IN) {
|
||||||
/* a new client connected, create a session to handle the client. */
|
klass = GST_RTSP_SERVER_GET_CLASS (server);
|
||||||
client = gst_rtsp_client_new ();
|
|
||||||
|
|
||||||
/* set the session pool that this client should use */
|
/* a new client connected, create a client object to handle the client. */
|
||||||
gst_rtsp_client_set_session_pool (client, server->pool);
|
if (klass->accept_client)
|
||||||
|
client = klass->accept_client (server, channel);
|
||||||
/* accept connections for that client, this function returns after accepting
|
if (client == NULL)
|
||||||
* the connection and will run the remainder of the communication with the
|
goto client_failed;
|
||||||
* client asyncronously. */
|
|
||||||
if (!gst_rtsp_client_accept (client, channel))
|
|
||||||
goto accept_failed;
|
|
||||||
|
|
||||||
/* can unref the client now, when the request is finished, it will be
|
/* can unref the client now, when the request is finished, it will be
|
||||||
* unreffed async. */
|
* unreffed async. */
|
||||||
|
@ -395,11 +428,9 @@ gst_rtsp_server_io_func (GIOChannel *channel, GIOCondition condition, GstRTSPSer
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
/* ERRORS */
|
/* ERRORS */
|
||||||
accept_failed:
|
client_failed:
|
||||||
{
|
{
|
||||||
g_error ("Could not accept client on server socket %d: %s (%d)",
|
GST_ERROR_OBJECT (server, "failed to create a client");
|
||||||
server->server_sock.fd, g_strerror (errno), errno);
|
|
||||||
gst_object_unref (client);
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,6 +34,7 @@
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
|
|
||||||
#include "rtsp-session-pool.h"
|
#include "rtsp-session-pool.h"
|
||||||
|
#include "rtsp-client.h"
|
||||||
|
|
||||||
#ifndef __GST_RTSP_SERVER_H__
|
#ifndef __GST_RTSP_SERVER_H__
|
||||||
#define __GST_RTSP_SERVER_H__
|
#define __GST_RTSP_SERVER_H__
|
||||||
|
@ -71,8 +72,18 @@ struct _GstRTSPServer {
|
||||||
GstRTSPSessionPool *pool;
|
GstRTSPSessionPool *pool;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GstRTSPServerClass:
|
||||||
|
*
|
||||||
|
* @accept_client: Create, configure, accept and return a new GstRTSPClient
|
||||||
|
* object that handles the new connection on @channel.
|
||||||
|
*
|
||||||
|
* The RTSP server class structure
|
||||||
|
*/
|
||||||
struct _GstRTSPServerClass {
|
struct _GstRTSPServerClass {
|
||||||
GObjectClass parent_class;
|
GObjectClass parent_class;
|
||||||
|
|
||||||
|
GstRTSPClient * (*accept_client) (GstRTSPServer *server, GIOChannel *channel);
|
||||||
};
|
};
|
||||||
|
|
||||||
GType gst_rtsp_server_get_type (void);
|
GType gst_rtsp_server_get_type (void);
|
||||||
|
|
Loading…
Reference in a new issue