ifmap message type is known

diff --git a/src/libcharon/plugins/tnc_ifmap2/tnc_ifmap2_soap.c b/src/libcharon/plugins/tnc_ifmap2/tnc_ifmap2_soap.c
index da6dc6aa2f333c8bc7b62c70fe90f6a507c01990..47fd2c8495139e220dfc2373f6f155cf878de4a5 100644 (file)
--- a/src/libcharon/plugins/tnc_ifmap2/tnc_ifmap2_soap.c
+++ b/src/libcharon/plugins/tnc_ifmap2/tnc_ifmap2_soap.c
@@ -104,8 +104,7 @@ METHOD(tnc_ifmap2_soap_t, newSession, bool,
        xmlSetNs(request, this->ns);
 
        soap_msg = tnc_ifmap2_soap_msg_create(this->tls);
-       if (!soap_msg->post(soap_msg, "newSession", request,
-                                                                 "newSessionResult", &result))
+       if (!soap_msg->post(soap_msg, request, "newSessionResult", &result))
        {
                soap_msg->destroy(soap_msg);
                return FALSE;
@@ -143,8 +142,7 @@ METHOD(tnc_ifmap2_soap_t, purgePublisher, bool,
        xmlNewProp(request, "ifmap-publisher-id", this->ifmap_publisher_id);
 
        soap_msg = tnc_ifmap2_soap_msg_create(this->tls);
-       success = soap_msg->post(soap_msg, "purgePublisher", request,
-                                                                          "purgePublisherReceived", NULL);
+       success = soap_msg->post(soap_msg, request, "purgePublisherReceived", NULL);
        soap_msg->destroy(soap_msg);
 
        return success;
@@ -270,8 +268,7 @@ METHOD(tnc_ifmap2_soap_t, publish_device_ip, bool,
        xmlAddChild(update, create_metadata(this, "device-ip"));
 
        soap_msg = tnc_ifmap2_soap_msg_create(this->tls);
-       success = soap_msg->post(soap_msg, "publish", request,
-                                                                          "publishReceived", NULL);
+       success = soap_msg->post(soap_msg, request, "publishReceived", NULL);
        soap_msg->destroy(soap_msg);
 
        return success;

diff --git a/src/libcharon/plugins/tnc_ifmap2/tnc_ifmap2_soap_msg.c b/src/libcharon/plugins/tnc_ifmap2/tnc_ifmap2_soap_msg.c
index b7f8a5ed7440f07dbf504fbae6b6e7f31c1e3220..900516c8f83bc11cb255f37999b97b90c8df5f86 100644 (file)
--- a/src/libcharon/plugins/tnc_ifmap2/tnc_ifmap2_soap_msg.c
+++ b/src/libcharon/plugins/tnc_ifmap2/tnc_ifmap2_soap_msg.c
@@ -146,8 +146,8 @@ static xmlNodePtr find_child(xmlNodePtr parent, const xmlChar* name)
 }
 
 METHOD(tnc_ifmap2_soap_msg_t, post, bool,
-       private_tnc_ifmap2_soap_msg_t *this, char *request_name, xmlNodePtr request,
-       char *result_name, xmlNodePtr *result)
+       private_tnc_ifmap2_soap_msg_t *this, xmlNodePtr request, char *result_name,
+       xmlNodePtr *result)
 {
        xmlDocPtr doc;
        xmlNodePtr env, body, cur, response;
@@ -156,7 +156,7 @@ METHOD(tnc_ifmap2_soap_msg_t, post, bool,
        int len;
        chunk_t in, out;
 
-       DBG2(DBG_TNC, "sending ifmap %s", request_name);
+       DBG2(DBG_TNC, "sending ifmap %s", request->name);
 
        /* Generate XML Document containing SOAP Envelope */
        doc = xmlNewDoc("1.0");

diff --git a/src/libcharon/plugins/tnc_ifmap2/tnc_ifmap2_soap_msg.h b/src/libcharon/plugins/tnc_ifmap2/tnc_ifmap2_soap_msg.h
index 21ab5eecd7d69f5d2e383de1539f434b57c61ee5..058ffb116aba66fd25c5875000e8b15f0755dffa 100644 (file)
--- a/src/libcharon/plugins/tnc_ifmap2/tnc_ifmap2_soap_msg.h
+++ b/src/libcharon/plugins/tnc_ifmap2/tnc_ifmap2_soap_msg.h
@@ -36,13 +36,11 @@ struct tnc_ifmap2_soap_msg_t {
        /**
         * Post an IF-MAP request in a SOAP-XML message and return a result
         *
-        * @param request_name  name of the IF-MAP request
         * @param request               XML-encoded IF-MAP request
         * @param result_name   name of the IF-MAP result
         * @param result                XML-encoded IF-MAP result
         */
-       bool (*post)(tnc_ifmap2_soap_msg_t *this,
-                                char *request_name, xmlNodePtr request,
+       bool (*post)(tnc_ifmap2_soap_msg_t *this, xmlNodePtr request,
                                 char *result_name, xmlNodePtr* result);
 
        /**