summaryrefslogtreecommitdiff
path: root/backend/epsonds-cmd.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-07-15 11:29:05 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-07-15 11:29:05 +0200
commit324a8a71bb7d9e4f8bc49b6bc47efaf9fb58282e (patch)
treebd2d48a139bfbe869f4f49359b63097931a45e7b /backend/epsonds-cmd.c
parent2ca8a81bd0d99fe4d75c229d0e988d8ef710285f (diff)
parent1edb02101a9306fc711cd422ed507d18165b1691 (diff)
Merge branch 'release/experimental/1.0.27-1_experimental1'experimental/1.0.27-1_experimental1
Diffstat (limited to 'backend/epsonds-cmd.c')
-rw-r--r--backend/epsonds-cmd.c53
1 files changed, 26 insertions, 27 deletions
diff --git a/backend/epsonds-cmd.c b/backend/epsonds-cmd.c
index b91f3f1..9a4db30 100644
--- a/backend/epsonds-cmd.c
+++ b/backend/epsonds-cmd.c
@@ -21,6 +21,7 @@
#include "epsonds-io.h"
#include "epsonds-cmd.h"
#include "epsonds-ops.h"
+#include "epsonds-net.h"
static SANE_Status
esci2_parse_block(char *buf, int len, void *userdata, SANE_Status (*cb)(void *userdata, char *token, int len))
@@ -132,49 +133,39 @@ static SANE_Status esci2_cmd(epsonds_scanner* s,
{
SANE_Status status;
unsigned int more;
- char rbuf[64];
+ char header[13], rbuf[64]; /* add one more byte for header buffer to correct buffer overflow issue,*/
DBG(8, "%s: %4s len %lu, payload len: %lu\n", __func__, cmd, len, plen);
- if (len < 12) {
- DBG(1, "%s: command is too short (%lu)\n", __func__, len);
+ memset(header, 0x00, sizeof(header));
+ memset(rbuf, 0x00, sizeof(rbuf));
+
+ // extra safety check, will not happen
+ if (len != 12) {
+ DBG(1, "%s: command has wrong size (%lu != 12)\n", __func__, len);
return SANE_STATUS_INVAL;
}
- /* merge the payload size and send the RequestBlock */
- if (payload && plen) {
-
- sprintf(rbuf, "%4.4sx%07x", cmd, (unsigned int)plen);
-
- DBG(8, " %s (%lu)\n", rbuf, plen);
-
- eds_send(s, rbuf, 12, &status);
-
- } else {
- eds_send(s, cmd, len, &status);
- }
+ // merge ParameterBlock size
+ sprintf(header, "%4.4sx%07x", cmd, (unsigned int)plen);
+ // send RequestBlock, request immediate response if there's no payload
+ status = eds_txrx(s, header, len, rbuf, (plen > 0) ? 0 : 64);
if (status != SANE_STATUS_GOOD) {
return status;
}
- /* send ParameterBlock */
- if (payload && plen) {
+ /* send ParameterBlock, request response */
+ if (plen) {
+
+ DBG(8, " %12.12s (%lu)\n", header, plen);
- eds_send(s, payload, plen, &status);
+ status = eds_txrx(s, payload, plen, rbuf, 64);
if (status != SANE_STATUS_GOOD) {
return status;
}
}
- /* receive DataHeaderBlock */
- memset(rbuf, 0x00, sizeof(rbuf));
-
- eds_recv(s, rbuf, 64, &status);
- if (status != SANE_STATUS_GOOD) {
- return status;
- }
-
/* rxbuf holds the DataHeaderBlock, which should be
* parsed to know if we need to read more data
*/
@@ -196,6 +187,10 @@ static SANE_Status esci2_cmd(epsonds_scanner* s,
char *pbuf = malloc(more);
if (pbuf) {
+ if (s->hw->connection == SANE_EPSONDS_NET) {
+ epsonds_net_request_read(s, more);
+ }
+
ssize_t read = eds_recv(s, pbuf, more, &status);
if (read != more) {
}
@@ -853,7 +848,7 @@ esci2_img(struct epsonds_scanner *s, SANE_Int *length)
return SANE_STATUS_CANCELLED;
/* request image data */
- eds_send(s, "IMG x0000000", 12, &status);
+ eds_send(s, "IMG x0000000", 12, &status, 64);
if (status != SANE_STATUS_GOOD) {
return status;
}
@@ -882,6 +877,10 @@ esci2_img(struct epsonds_scanner *s, SANE_Int *length)
}
/* ALWAYS read image data */
+ if (s->hw->connection == SANE_EPSONDS_NET) {
+ epsonds_net_request_read(s, more);
+ }
+
read = eds_recv(s, s->buf, more, &status);
if (status != SANE_STATUS_GOOD) {
return status;