X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmiracle%2Fmiracle_server.c;h=652e5331549ff6c9b41831200e004ab167b6b1f9;hb=4580365ba2f57f530aa4bdeb57788822fab09e2f;hp=3c82c3387af4f49bf473a26f59f6a8af54ec5c37;hpb=9390e8b584f3f717f0a326893c0e37cf187a0a51;p=melted

diff --git a/src/miracle/miracle_server.c b/src/miracle/miracle_server.c
index 3c82c33..652e533 100644
--- a/src/miracle/miracle_server.c
+++ b/src/miracle/miracle_server.c
@@ -46,6 +46,24 @@
 
 #define VERSION "0.0.1"
 
+static void miracle_command_received( mlt_listener listener, mlt_properties owner, miracle_server this, void **args )
+{
+	if ( listener != NULL )
+		listener( owner, this, ( valerie_response ** )args[ 0 ], ( char * )args[ 1 ] );
+}
+
+static void miracle_doc_received( mlt_listener listener, mlt_properties owner, miracle_server this, void **args )
+{
+	if ( listener != NULL )
+		listener( owner, this, ( valerie_response ** )args[ 0 ], ( char * )args[ 1 ], ( char * )args[ 2 ] );
+}
+
+static void miracle_push_received( mlt_listener listener, mlt_properties owner, miracle_server this, void **args )
+{
+	if ( listener != NULL )
+		listener( owner, this, ( valerie_response ** )args[ 0 ], ( char * )args[ 1 ], ( mlt_service )args[ 2 ] );
+}
+
 /** Initialise a server structure.
 */
 
@@ -53,15 +71,29 @@ miracle_server miracle_server_init( char *id )
 {
 	miracle_server server = malloc( sizeof( miracle_server_t ) );
 	if ( server != NULL )
-	{
 		memset( server, 0, sizeof( miracle_server_t ) );
+	if ( server != NULL && mlt_properties_init( &server->parent, server ) == 0 )
+	{
 		server->id = id;
 		server->port = DEFAULT_TCP_PORT;
 		server->socket = -1;
+		mlt_events_init( &server->parent );
+		mlt_events_register( &server->parent, "command-received", ( mlt_transmitter )miracle_command_received );
+		mlt_events_register( &server->parent, "doc-received", ( mlt_transmitter )miracle_doc_received );
+		mlt_events_register( &server->parent, "push-received", ( mlt_transmitter )miracle_push_received );
 	}
 	return server;
 }
 
+void miracle_server_set_config( miracle_server server, char *config )
+{
+	if ( server != NULL )
+	{
+		free( server->config );
+		server->config = config != NULL ? strdup( config ) : NULL;
+	}
+}
+
 /** Set the port of the server.
 */
 
@@ -132,6 +164,7 @@ static void *miracle_server_run( void *arg )
 			   our server thread. The thread should free this when it terminates. */
 
 			tmp = (connection_t*) malloc( sizeof(connection_t) );
+			tmp->owner = &server->parent;
 			tmp->parser = server->parser;
 			tmp->fd = accept( server->socket, (struct sockaddr*) &(tmp->sin), &socksize );
 
@@ -209,10 +242,10 @@ int miracle_server_execute( miracle_server server )
 	if ( response != NULL && valerie_response_get_error_code( response ) == 100 )
 	{
 		/* read configuration file */
-		if ( response != NULL && !server->proxy )
+		if ( response != NULL && !server->proxy && server->config != NULL )
 		{
 			valerie_response_close( response );
-			response = valerie_parser_run( server->parser, "/etc/miracle.conf" );
+			response = valerie_parser_run( server->parser, server->config );
 
 			if ( valerie_response_count( response ) > 1 )
 			{
@@ -266,7 +299,22 @@ void miracle_server_shutdown( miracle_server server )
 	{
 		server->shutdown = 1;
 		pthread_join( server->thread, NULL );
+		miracle_server_set_config( server, NULL );
 		valerie_parser_close( server->parser );
+		server->parser = NULL;
 		close( server->socket );
 	}
 }
+
+/** Close the server.
+*/
+
+void miracle_server_close( miracle_server server )
+{
+	if ( server != NULL && mlt_properties_dec_ref( &server->parent ) <= 0 )
+	{
+		mlt_properties_close( &server->parent );
+		miracle_server_shutdown( server );
+		free( server );
+	}
+}