linuxmsm/qdl
0
0
Fork 0
mirror of https://github.com/linux-msm/qdl.git synced 2026-02-25 13:12:25 -08:00
Code Issues Packages Projects Releases Wiki Activity

qdl: Support multi-xml responses

Browse Source 
Unsolicited log messages are put in the device buffer as independant xml
documents and upon reading the response packet we might get a multiple
of xml documents in one go; we must feed them to the parser one by one.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Bjorn Andersson
2016-09-23 15:04:06 -07:00
parent a29f44cc07
commit c93907cfae
1 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
firehose.c
View File

@@ -91,10 +91,13 @@ static int firehose_read(int fd, int timeout, int (*response_parser)(xmlNode *no
xmlNode *nodes;
xmlNode *node;
int error;
char *msg;
char *end;
bool done = false;
int ret = -ENXIO;
int n;
for (;;) {
while (!done) {
ret = firehose_wait(fd, timeout);
if (ret < 0)
return ret;
@@ -108,29 +111,39 @@ static int firehose_read(int fd, int timeout, int (*response_parser)(xmlNode *no
}
buf[n] = '\0';
// printf("%s\n", buf);
if (qdl_debug)
fprintf(stderr, "FIREHOSE READ: %s\n", buf);
nodes = firehose_response_parse(buf, n, &error);
if (!nodes) {
fprintf(stderr, "unable to parse response\n");
return error;
msg = buf;
for (msg = buf; msg[0]; msg = end) {
end = strstr(msg, "</data>");
if (!end) {
fprintf(stderr, "firehose response truncated\n");
exit(1);
}
end += strlen("</data>");
nodes = firehose_response_parse(msg, end - msg, &error);
if (!nodes) {
fprintf(stderr, "unable to parse response\n");
return error;
}
for (node = nodes; node; node = node->next) {
if (xmlStrcmp(node->name, (xmlChar*)"log") == 0) {
firehose_response_log(node);
} else if (xmlStrcmp(node->name, (xmlChar*)"response") == 0) {
if (!response_parser)
fprintf(stderr, "received response with no parser\n");
else
ret = response_parser(node);
done = true;
}
}
xmlFreeDoc(nodes->doc);
}
ret = -EAGAIN;
for (node = nodes; node; node = node->next) {
if (xmlStrcmp(node->name, (xmlChar*)"log") == 0)
firehose_response_log(node);
else if (response_parser && xmlStrcmp(node->name, (xmlChar*)"response") == 0)
ret = response_parser(node);
}
xmlFreeDoc(nodes->doc);
if (ret == -EAGAIN)
continue;
break;
}
return ret;