denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed parsing of IF-MAP SOAP responses

Browse Source
This commit is contained in:
Andreas Steffen
2012-03-21 14:25:19 +01:00
parent 3cea55b0c8
commit 80abe22f65
1 changed files with 30 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/tnc_ifmap/tnc_ifmap_soap.c
+30 -35
View File
@@ -70,15 +70,14 @@ struct private_tnc_ifmap_soap_t {
/** /**
* Send request and receive result via SOAP * Send request and receive result via SOAP
*/ */
static bool send_receive(private_tnc_ifmap_soap_t *this, static axiom_element_t* send_receive(private_tnc_ifmap_soap_t *this,
char *request_qname, axiom_node_t *request, char *request_qname, axiom_node_t *request,
char *receipt_qname, axiom_node_t **result) char *receipt_qname, axiom_node_t **result)
{ {
axiom_node_t *parent, *node; axiom_node_t *parent, *node;
axiom_element_t *el; axiom_element_t *parent_el, *el;
axutil_qname_t *qname; axutil_qname_t *qname;
bool success = FALSE;
/* send request and receive result */ /* send request and receive result */
DBG2(DBG_TNC, "sending ifmap %s", request_qname); DBG2(DBG_TNC, "sending ifmap %s", request_qname);
@@ -87,45 +86,44 @@ static bool send_receive(private_tnc_ifmap_soap_t *this,
if (!parent) if (!parent)
{ {
DBG1(DBG_TNC, "no ifmap %s received from MAP server", receipt_qname); DBG1(DBG_TNC, "no ifmap %s received from MAP server", receipt_qname);
return FALSE; return NULL;
} }
DBG2(DBG_TNC, "received ifmap %s", receipt_qname);
/* pre-process result */ /* extract the parent element */
node = axiom_node_get_first_child(parent, this->env); parent_el = (axiom_element_t*)axiom_node_get_data_element(parent, this->env);
if (node && axiom_node_get_node_type(node, this->env) == AXIOM_ELEMENT)
/* look for a child node with the given receipt qname */
qname = axutil_qname_create_from_string(this->env, strdup(receipt_qname));
el = axiom_element_get_first_child_with_qname(parent_el, this->env, qname,
parent, &node);
axutil_qname_free(qname, this->env);
if (el)
{ {
el = (axiom_element_t *)axiom_node_get_data_element(node, this->env); if (result)
{
qname = axiom_element_get_qname(el, this->env, node); *result = parent;
success = streq(receipt_qname, axutil_qname_to_string(qname, this->env));
if (success)
{
DBG2(DBG_TNC, "received ifmap %s", receipt_qname);
if (result)
{
*result = parent;
}
else
{
/* no further processing requested */
axiom_node_free_tree(parent, this->env);
}
return TRUE;
} }
/* TODO proper error handling */ else
DBG1(DBG_TNC, "%s", axiom_element_to_string(el, this->env, node)); {
/* no further processing requested */
axiom_node_free_tree(parent, this->env);
}
return el;
} }
DBG1(DBG_TNC, "child node with qname '%s' not found", receipt_qname);
/* free parent in the error case */ /* free parent in the error case */
axiom_node_free_tree(parent, this->env); axiom_node_free_tree(parent, this->env);
return FALSE; return NULL;
} }
METHOD(tnc_ifmap_soap_t, newSession, bool, METHOD(tnc_ifmap_soap_t, newSession, bool,
private_tnc_ifmap_soap_t *this) private_tnc_ifmap_soap_t *this)
{ {
axiom_node_t *request, *result, *node; axiom_node_t *request, *result;
axiom_element_t *el; axiom_element_t *el;
axiom_namespace_t *ns; axiom_namespace_t *ns;
axis2_char_t *value; axis2_char_t *value;
@@ -136,15 +134,12 @@ METHOD(tnc_ifmap_soap_t, newSession, bool,
el = axiom_element_create(this->env, NULL, "newSession", ns, &request); el = axiom_element_create(this->env, NULL, "newSession", ns, &request);
/* send newSession request and receive newSessionResult */ /* send newSession request and receive newSessionResult */
if (!send_receive(this, "newSession", request, "newSessionResult", &result)) el = send_receive(this, "newSession", request, "newSessionResult", &result);
if (!el)
{ {
return FALSE; return FALSE;
} }
/* process newSessionResult */
node = axiom_node_get_first_child(result, this->env);
el = (axiom_element_t *)axiom_node_get_data_element(node, this->env);
/* get session-id */ /* get session-id */
value = axiom_element_get_attribute_value_by_name(el, this->env, value = axiom_element_get_attribute_value_by_name(el, this->env,
"session-id"); "session-id");