7u83/freewtp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Parsed SoapFault error response

Browse Source
This commit is contained in:
vemax78 2013-08-07 21:48:49 +02:00
parent 46857e8864
commit b15e0148b2
2 changed files with 45 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/ac/ac_soap.c
View File

@ -676,7 +676,6 @@ void ac_soapclient_close_request(struct ac_http_soap_request* httprequest, int c
/* */ /* */
struct ac_soap_response* ac_soapclient_recv_response(struct ac_http_soap_request* httprequest) { struct ac_soap_response* ac_soapclient_recv_response(struct ac_http_soap_request* httprequest) {
char* tagMethod;
struct ac_soap_response* response; struct ac_soap_response* response;
ASSERT(httprequest != NULL); ASSERT(httprequest != NULL);
@ -714,23 +713,46 @@ struct ac_soap_response* ac_soapclient_recv_response(struct ac_http_soap_request
} }
/* Retrieve response */ /* Retrieve response */
tagMethod = capwap_alloc(strlen(httprequest->request->method) + 9); if (response->responsecode == HTTP_RESULT_OK) {
if (!tagMethod) { char* tagMethod = capwap_alloc(strlen(httprequest->request->method) + 9);
capwap_outofmemory(); if (!tagMethod) {
capwap_outofmemory();
}
sprintf(tagMethod, "%sResponse", httprequest->request->method);
response->xmlResponse = ac_xml_search_child(response->xmlBody, NULL, tagMethod);
capwap_free(tagMethod);
if (!response->xmlResponse) {
ac_soapclient_free_response(response);
return NULL;
}
/* Retrieve optional return response */
response->xmlResponseReturn = ac_xml_search_child(response->xmlResponse, NULL, "return");
} else {
/* Retrieve Fault */
response->xmlFault = ac_xml_search_child(response->xmlBody, "SOAP-ENV", "Fault");
if (!response->xmlFault) {
ac_soapclient_free_response(response);
return NULL;
}
/* Retrieve FaultCode */
response->xmlFaultCode = ac_xml_search_child(response->xmlFault, NULL, "faultcode");
if (!response->xmlFaultCode) {
ac_soapclient_free_response(response);
return NULL;
}
/* Retrieve FaultString */
response->xmlFaultString = ac_xml_search_child(response->xmlFault, NULL, "faultstring");
if (!response->xmlFaultString) {
ac_soapclient_free_response(response);
return NULL;
}
} }
sprintf(tagMethod, "%sResponse", httprequest->request->method);
response->xmlResponse = ac_xml_search_child(response->xmlBody, NULL, tagMethod);
capwap_free(tagMethod);
if (!response->xmlResponse) {
ac_soapclient_free_response(response);
return NULL;
}
/* Retrieve optional return response */
response->xmlResponseReturn = ac_xml_search_child(response->xmlResponse, NULL, "return");
return response; return response;
} }

7
src/ac/ac_soap.h
View File

@ -65,8 +65,15 @@ struct ac_soap_response {
xmlDocPtr xmlDocument; xmlDocPtr xmlDocument;
xmlNodePtr xmlRoot; xmlNodePtr xmlRoot;
xmlNodePtr xmlBody; xmlNodePtr xmlBody;
/* Valid response */
xmlNodePtr xmlResponse; xmlNodePtr xmlResponse;
xmlNodePtr xmlResponseReturn; xmlNodePtr xmlResponseReturn;
/* Fault response */
xmlNodePtr xmlFault;
xmlNodePtr xmlFaultCode;
xmlNodePtr xmlFaultString;
}; };
/* */ /* */