added data service class and lasso_idwsf2_discovery_get_service function
This commit is contained in:
Damien Laniel
parent
ac7aceee47
commit
3ee59ccb42
|
|
@ -13,10 +13,12 @@ noinst_LTLIBRARIES = liblasso-id-wsf2.la
|
|||
|
||||
liblasso_id_wsf2_la_SOURCES = \
|
||||
discovery.c \
|
||||
data_service.c \
|
||||
wsf2_profile.c
|
||||
|
||||
liblassoinclude_HEADERS = \
|
||||
discovery.h \
|
||||
data_service.h \
|
||||
wsf2_profile.h \
|
||||
identity.h \
|
||||
server.h \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,155 @@
|
|||
/* $Id: idwsf2_data_service.c 3101 2007-05-30 11:40:10Z dlaniel $
|
||||
*
|
||||
* Lasso - A free implementation of the Liberty Alliance specifications.
|
||||
*
|
||||
* Copyright (C) 2007 Entr'ouvert
|
||||
* http://lasso.entrouvert.org
|
||||
*
|
||||
* Authors: See AUTHORS file in top-level directory.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
/* #include <libxml/xpath.h> */
|
||||
|
||||
#include <lasso/id-wsf-2.0/discovery.h>
|
||||
#include <lasso/id-wsf-2.0/data_service.h>
|
||||
|
||||
/* #include <lasso/xml/id-wsf-2.0/dst_query.h> */
|
||||
/* #include <lasso/xml/id-wsf-2.0/dst_query_response.h> */
|
||||
|
||||
struct _LassoIdWsf2DataServicePrivate
|
||||
{
|
||||
gboolean dispose_has_run;
|
||||
LassoWsAddrEndpointReference *epr;
|
||||
GList *credentials;
|
||||
};
|
||||
|
||||
/*****************************************************************************/
|
||||
/* public methods */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* private methods */
|
||||
/*****************************************************************************/
|
||||
|
||||
static LassoNodeClass *parent_class = NULL;
|
||||
|
||||
/*****************************************************************************/
|
||||
/* overrided parent class methods */
|
||||
/*****************************************************************************/
|
||||
|
||||
static void
|
||||
dispose(GObject *object)
|
||||
{
|
||||
LassoIdWsf2DataService *service = LASSO_IDWSF2_DATA_SERVICE(object);
|
||||
|
||||
if (service->private_data->dispose_has_run == TRUE)
|
||||
return;
|
||||
service->private_data->dispose_has_run = TRUE;
|
||||
|
||||
G_OBJECT_CLASS(parent_class)->dispose(object);
|
||||
}
|
||||
|
||||
static void
|
||||
finalize(GObject *object)
|
||||
{
|
||||
LassoIdWsf2DataService *service = LASSO_IDWSF2_DATA_SERVICE(object);
|
||||
if (service->private_data->epr) {
|
||||
lasso_node_destroy(LASSO_NODE(service->private_data->epr));
|
||||
service->private_data->epr = NULL;
|
||||
}
|
||||
g_free(service->private_data);
|
||||
service->private_data = NULL;
|
||||
G_OBJECT_CLASS(parent_class)->finalize(object);
|
||||
}
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* instance and class init functions */
|
||||
/*****************************************************************************/
|
||||
|
||||
static void
|
||||
instance_init(LassoIdWsf2DataService *service)
|
||||
{
|
||||
service->data = NULL;
|
||||
service->private_data = g_new0(LassoIdWsf2DataServicePrivate, 1);
|
||||
service->private_data->epr = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
class_init(LassoIdWsf2DataServiceClass *klass)
|
||||
{
|
||||
parent_class = g_type_class_peek_parent(klass);
|
||||
|
||||
G_OBJECT_CLASS(klass)->dispose = dispose;
|
||||
G_OBJECT_CLASS(klass)->finalize = finalize;
|
||||
}
|
||||
|
||||
GType
|
||||
lasso_idwsf2_data_service_get_type()
|
||||
{
|
||||
static GType this_type = 0;
|
||||
|
||||
if (!this_type) {
|
||||
static const GTypeInfo this_info = {
|
||||
sizeof(LassoIdWsf2DataServiceClass),
|
||||
NULL,
|
||||
NULL,
|
||||
(GClassInitFunc) class_init,
|
||||
NULL,
|
||||
NULL,
|
||||
sizeof(LassoIdWsf2DataService),
|
||||
0,
|
||||
(GInstanceInitFunc) instance_init,
|
||||
};
|
||||
|
||||
this_type = g_type_register_static(LASSO_TYPE_WSF2_PROFILE,
|
||||
"LassoIdWsf2DataService", &this_info, 0);
|
||||
}
|
||||
return this_type;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* lasso_idwsf2_data_service_new:
|
||||
*
|
||||
* Creates a new #LassoIdWsf2DataService.
|
||||
*
|
||||
* Return value: a newly created #LassoIdWsf2DataService object
|
||||
**/
|
||||
LassoIdWsf2DataService*
|
||||
lasso_idwsf2_data_service_new()
|
||||
{
|
||||
return g_object_new(LASSO_TYPE_IDWSF2_DATA_SERVICE, NULL);
|
||||
}
|
||||
|
||||
LassoIdWsf2DataService*
|
||||
lasso_idwsf2_data_service_new_full(LassoServer *server, LassoWsAddrEndpointReference *epr)
|
||||
{
|
||||
LassoIdWsf2DataService *service;
|
||||
|
||||
g_return_val_if_fail(LASSO_IS_SERVER(server), NULL);
|
||||
g_return_val_if_fail(LASSO_IS_WSA_ENDPOINT_REFERENCE(epr), NULL);
|
||||
|
||||
service = LASSO_IDWSF2_DATA_SERVICE(g_object_new(LASSO_TYPE_IDWSF2_DATA_SERVICE, NULL));
|
||||
|
||||
LASSO_WSF2_PROFILE(service)->server = g_object_ref(server);
|
||||
service->private_data->epr = g_object_ref(epr);
|
||||
|
||||
return service;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,101 @@
|
|||
/* $Id: idwsf2_data_service.h 2736 2007-05-30 17:59:38Z dlaniel $
|
||||
*
|
||||
* Lasso - A free implementation of the Liberty Alliance specifications.
|
||||
*
|
||||
* Copyright (C) 2007 Entr'ouvert
|
||||
* http://lasso.entrouvert.org
|
||||
*
|
||||
* Authors: See AUTHORS file in top-level directory.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#ifndef __LASSO_IDWSF2_DATA_SERVICE_H__
|
||||
#define __LASSO_IDWSF2_DATA_SERVICE_H__
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#include <lasso/id-wsf-2.0/wsf2_profile.h>
|
||||
|
||||
#include <lasso/xml/ws/wsa_endpoint_reference.h>
|
||||
|
||||
#include <lasso/xml/xml.h>
|
||||
|
||||
#define LASSO_TYPE_IDWSF2_DATA_SERVICE (lasso_idwsf2_data_service_get_type())
|
||||
#define LASSO_IDWSF2_DATA_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
|
||||
LASSO_TYPE_IDWSF2_DATA_SERVICE, LassoIdWsf2DataService))
|
||||
#define LASSO_IDWSF2_DATA_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
|
||||
LASSO_TYPE_IDWSF2_DATA_SERVICE, LassoIdWsf2DataServiceClass))
|
||||
#define LASSO_IS_IDWSF2_DATA_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
|
||||
LASSO_TYPE_IDWSF2_DATA_SERVICE))
|
||||
#define LASSO_IS_IDWSF2_DATA_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
|
||||
LASSO_TYPE_IDWSF2_DATA_SERVICE))
|
||||
#define LASSO_IDWSF2_DATA_SERVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
|
||||
LASSO_TYPE_IDWSF2_DATA_SERVICE, LassoIdWsf2DataServiceClass))
|
||||
|
||||
typedef struct _LassoIdWsf2DataService LassoIdWsf2DataService;
|
||||
typedef struct _LassoIdWsf2DataServiceClass LassoIdWsf2DataServiceClass;
|
||||
typedef struct _LassoIdWsf2DataServicePrivate LassoIdWsf2DataServicePrivate;
|
||||
|
||||
struct _LassoIdWsf2DataService {
|
||||
LassoWsf2Profile parent;
|
||||
|
||||
/*< public >*/
|
||||
xmlNode *data;
|
||||
|
||||
/* gchar *provider_id; */
|
||||
/* gchar *abstract_description; */
|
||||
|
||||
/*< private >*/
|
||||
LassoIdWsf2DataServicePrivate *private_data;
|
||||
};
|
||||
|
||||
struct _LassoIdWsf2DataServiceClass {
|
||||
LassoWsf2ProfileClass parent;
|
||||
};
|
||||
|
||||
LASSO_EXPORT GType lasso_idwsf2_data_service_get_type(void);
|
||||
|
||||
LASSO_EXPORT LassoIdWsf2DataService* lasso_idwsf2_data_service_new();
|
||||
|
||||
LASSO_EXPORT LassoIdWsf2DataService* lasso_idwsf2_data_service_new_full(LassoServer *server,
|
||||
LassoWsAddrEndpointReference *epr);
|
||||
|
||||
/* LASSO_EXPORT gint lasso_idwsf2_data_service_init_query(LassoIdWsf2DataService *service); */
|
||||
|
||||
/* LASSO_EXPORT LassoDstQueryItem* lasso_idwsf2_data_service_add_query_item(LassoIdWsf2DataService *service, */
|
||||
/* const char *select, const char *item_id); */
|
||||
|
||||
/* LASSO_EXPORT gint lasso_idwsf2_data_service_process_query_msg(LassoIdWsf2DataService *service, */
|
||||
/* const char *message); */
|
||||
|
||||
/* LASSO_EXPORT gint lasso_idwsf2_data_service_build_response_msg(LassoIdWsf2DataService *service); */
|
||||
|
||||
/* LASSO_EXPORT gint lasso_idwsf2_data_service_process_query_response_msg(LassoIdWsf2DataService *service, */
|
||||
/* const char *message); */
|
||||
|
||||
/* LASSO_EXPORT xmlNode* lasso_idwsf2_data_service_get_attribute_node(LassoIdWsf2DataService *service, */
|
||||
/* const char *item_id); */
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* __LASSO_IDWSF2_DATA_SERVICE_H__ */
|
||||
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
*
|
||||
* Lasso - A free implementation of the Liberty Alliance specifications.
|
||||
*
|
||||
* Copyright (C) 2004, 2005 Entr'ouvert
|
||||
* Copyright (C) 2007 Entr'ouvert
|
||||
* http://lasso.entrouvert.org
|
||||
*
|
||||
* Authors: See AUTHORS file in top-level directory.
|
||||
|
|
@ -586,6 +586,47 @@ lasso_idwsf2_discovery_process_query_response_msg(LassoIdWsf2Discovery *discover
|
|||
return res;
|
||||
}
|
||||
|
||||
/**
|
||||
* lasso_idwsf2_discovery_get_service:
|
||||
* @discovery: a #LassoIdWsf2Discovery
|
||||
* @service_type: the requested service type
|
||||
*
|
||||
* After a disco:query message, creates a #LassoIdWsf2DataService instance for the
|
||||
* requested @service_type.
|
||||
*
|
||||
* Return value: a newly created #LassoIdWsf2DataService object; or NULL if an
|
||||
* error occured.
|
||||
**/
|
||||
LassoIdWsf2DataService*
|
||||
lasso_idwsf2_discovery_get_service(LassoIdWsf2Discovery *discovery, const char *service_type)
|
||||
{
|
||||
LassoWsf2Profile *profile = LASSO_WSF2_PROFILE(discovery);
|
||||
LassoIdWsf2DiscoQueryResponse *response;
|
||||
LassoWsAddrEndpointReference *epr = NULL;
|
||||
LassoIdWsf2DataService *service;
|
||||
|
||||
g_return_val_if_fail(LASSO_IS_SERVER(profile->server), NULL);
|
||||
|
||||
response = LASSO_IDWSF2_DISCO_QUERY_RESPONSE(profile->response);
|
||||
if (response == NULL) {
|
||||
/* no response; probably called at wrong time */
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* FIXME : foreach on the list instead */
|
||||
if (response->EndpointReference != NULL && response->EndpointReference->data != NULL) {
|
||||
epr = response->EndpointReference->data;
|
||||
} else {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
service = lasso_idwsf2_data_service_new_full(profile->server, epr);
|
||||
|
||||
/* lasso_wsf2_profile_move_credentials(profile, LASSO_WSF2_PROFILE(service)); */
|
||||
|
||||
return service;
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/* private methods */
|
||||
/*****************************************************************************/
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
*
|
||||
* Lasso - A free implementation of the Liberty Alliance specifications.
|
||||
*
|
||||
* Copyright (C) 2004, 2005 Entr'ouvert
|
||||
* Copyright (C) 2007 Entr'ouvert
|
||||
* http://lasso.entrouvert.org
|
||||
*
|
||||
* Authors: See AUTHORS file in top-level directory.
|
||||
|
|
@ -31,12 +31,12 @@ extern "C" {
|
|||
#endif /* __cplusplus */
|
||||
|
||||
#include <lasso/id-wsf-2.0/wsf2_profile.h>
|
||||
#include <lasso/id-wsf-2.0/data_service.h>
|
||||
|
||||
#include <lasso/xml/id-wsf-2.0/disco_query.h>
|
||||
#include <lasso/xml/id-wsf-2.0/disco_query_response.h>
|
||||
#include <lasso/xml/id-wsf-2.0/disco_svc_metadata.h>
|
||||
|
||||
|
||||
#define LASSO_TYPE_IDWSF2_DISCOVERY (lasso_idwsf2_discovery_get_type())
|
||||
#define LASSO_IDWSF2_DISCOVERY(obj) \
|
||||
(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IDWSF2_DISCOVERY, LassoIdWsf2Discovery))
|
||||
|
|
@ -51,7 +51,6 @@ typedef struct _LassoIdWsf2Discovery LassoIdWsf2Discovery;
|
|||
typedef struct _LassoIdWsf2DiscoveryClass LassoIdWsf2DiscoveryClass;
|
||||
typedef struct _LassoIdWsf2DiscoveryPrivate LassoIdWsf2DiscoveryPrivate;
|
||||
|
||||
|
||||
struct _LassoIdWsf2Discovery {
|
||||
LassoWsf2Profile parent;
|
||||
|
||||
|
|
@ -106,8 +105,12 @@ LASSO_EXPORT gint lasso_idwsf2_discovery_process_query_msg(LassoIdWsf2Discovery
|
|||
LASSO_EXPORT gint lasso_idwsf2_discovery_process_query_response_msg(LassoIdWsf2Discovery *discovery,
|
||||
const gchar *message);
|
||||
|
||||
LASSO_EXPORT LassoIdWsf2DataService* lasso_idwsf2_discovery_get_service(
|
||||
LassoIdWsf2Discovery *discovery, const char *service_type);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* __LASSO_IDWSF2_DISCOVERY_H__ */
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue