kopia lustrzana https://gitlab.com/sane-project/backends
Porównaj commity
4 Commity
c80d868e11
...
5f7d61dcc4
Autor | SHA1 | Data |
---|---|---|
symphorien | 5f7d61dcc4 | |
ThierryFR | 728ca40272 | |
ThierryFR | 113be50f6b | |
Guillaume Girol | 849e48c58b |
|
@ -1345,7 +1345,7 @@ sane_cancel(SANE_Handle h)
|
||||||
}
|
}
|
||||||
handler->scanner->work = SANE_FALSE;
|
handler->scanner->work = SANE_FALSE;
|
||||||
handler->cancel = SANE_TRUE;
|
handler->cancel = SANE_TRUE;
|
||||||
escl_scanner(handler->device, handler->scanner->scanJob, handler->result);
|
escl_scanner(handler->device, handler->scanner->scanJob, handler->result, SANE_TRUE);
|
||||||
free(handler->result);
|
free(handler->result);
|
||||||
handler->result = NULL;
|
handler->result = NULL;
|
||||||
free(handler->scanner->scanJob);
|
free(handler->scanner->scanJob);
|
||||||
|
@ -1566,6 +1566,7 @@ sane_start(SANE_Handle h)
|
||||||
handler->decompress_scan_data = SANE_FALSE;
|
handler->decompress_scan_data = SANE_FALSE;
|
||||||
handler->end_read = SANE_FALSE;
|
handler->end_read = SANE_FALSE;
|
||||||
if (handler->scanner->work == SANE_FALSE) {
|
if (handler->scanner->work == SANE_FALSE) {
|
||||||
|
escl_reset_all_jobs(handler->device);
|
||||||
SANE_Status st = escl_status(handler->device,
|
SANE_Status st = escl_status(handler->device,
|
||||||
handler->scanner->source,
|
handler->scanner->source,
|
||||||
NULL,
|
NULL,
|
||||||
|
|
|
@ -248,7 +248,11 @@ SANE_Status escl_scan(capabilities_t *scanner,
|
||||||
|
|
||||||
void escl_scanner(const ESCL_Device *device,
|
void escl_scanner(const ESCL_Device *device,
|
||||||
char *scanJob,
|
char *scanJob,
|
||||||
char *result);
|
char *result,
|
||||||
|
SANE_Bool status);
|
||||||
|
|
||||||
|
SANE_Status escl_reset_all_jobs(ESCL_Device *device);
|
||||||
|
|
||||||
|
|
||||||
typedef void CURL;
|
typedef void CURL;
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,32 @@ write_callback(void __sane_unused__*str,
|
||||||
* This function is called in the 'sane_cancel' function.
|
* This function is called in the 'sane_cancel' function.
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
escl_scanner(const ESCL_Device *device, char *scanJob, char *result)
|
escl_delete(const ESCL_Device *device, char *uri)
|
||||||
|
{
|
||||||
|
CURL *curl_handle = NULL;
|
||||||
|
long answer = 0;
|
||||||
|
|
||||||
|
if (uri == NULL)
|
||||||
|
return;
|
||||||
|
curl_handle = curl_easy_init();
|
||||||
|
if (curl_handle != NULL) {
|
||||||
|
escl_curl_url(curl_handle, device, uri);
|
||||||
|
curl_easy_setopt(curl_handle, CURLOPT_CUSTOMREQUEST, "DELETE");
|
||||||
|
if (curl_easy_perform(curl_handle) == CURLE_OK) {
|
||||||
|
curl_easy_getinfo(curl_handle, CURLINFO_RESPONSE_CODE, &answer);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
curl_easy_cleanup(curl_handle);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \fn void escl_scanner(const ESCL_Device *device, char *result)
|
||||||
|
* \brief Function that resets the scanner after each scan, using curl.
|
||||||
|
* This function is called in the 'sane_cancel' function.
|
||||||
|
*/
|
||||||
|
void
|
||||||
|
escl_scanner(const ESCL_Device *device, char *scanJob, char *result, SANE_Bool status)
|
||||||
{
|
{
|
||||||
CURL *curl_handle = NULL;
|
CURL *curl_handle = NULL;
|
||||||
const char *scan_jobs = "/eSCL/";
|
const char *scan_jobs = "/eSCL/";
|
||||||
|
@ -70,10 +95,15 @@ CURL_CALL:
|
||||||
if (i >= 15) return;
|
if (i >= 15) return;
|
||||||
}
|
}
|
||||||
curl_easy_cleanup(curl_handle);
|
curl_easy_cleanup(curl_handle);
|
||||||
if (SANE_STATUS_GOOD != escl_status(device,
|
char* end = strrchr(scan_cmd, '/');
|
||||||
PLATEN,
|
*end = 0;
|
||||||
NULL,
|
escl_delete(device, scan_cmd);
|
||||||
NULL))
|
if (status) {
|
||||||
goto CURL_CALL;
|
if (SANE_STATUS_GOOD != escl_status(device,
|
||||||
|
PLATEN,
|
||||||
|
NULL,
|
||||||
|
NULL))
|
||||||
|
goto CURL_CALL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
#include <libxml/parser.h>
|
#include <libxml/parser.h>
|
||||||
|
|
||||||
|
@ -270,3 +271,135 @@ clean_data:
|
||||||
}
|
}
|
||||||
return (status);
|
return (status);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
print_xml_job_finish(xmlNode *node,
|
||||||
|
SANE_Status *job)
|
||||||
|
{
|
||||||
|
while (node) {
|
||||||
|
if (node->type == XML_ELEMENT_NODE) {
|
||||||
|
if (find_nodes_s(node)) {
|
||||||
|
if (strcmp((const char *)node->name, "JobState") == 0) {
|
||||||
|
const char *state = (const char *)xmlNodeGetContent(node);
|
||||||
|
if (!strcmp(state, "Canceled")) {
|
||||||
|
*job = SANE_STATUS_GOOD;
|
||||||
|
DBG(10, "jobId Completed SANE_STATUS_GOOD\n");
|
||||||
|
}
|
||||||
|
else if (!strcmp(state, "Aborted")) {
|
||||||
|
*job = SANE_STATUS_GOOD;
|
||||||
|
DBG(10, "jobId Completed SANE_STATUS_GOOD\n");
|
||||||
|
}
|
||||||
|
else if (!strcmp(state, "Completed")) {
|
||||||
|
*job = SANE_STATUS_GOOD;
|
||||||
|
DBG(10, "jobId Completed SANE_STATUS_GOOD\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
print_xml_job_finish(node->children, job);
|
||||||
|
node = node->next;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
print_xml_reset_all_jobs (xmlNode *node,
|
||||||
|
ESCL_Device *device)
|
||||||
|
{
|
||||||
|
DBG(10, "print_xml_reset_all_jobs\n");
|
||||||
|
SANE_Status status = SANE_STATUS_DEVICE_BUSY;
|
||||||
|
while (node) {
|
||||||
|
if (node->type == XML_ELEMENT_NODE) {
|
||||||
|
if (find_nodes_s(node)) {
|
||||||
|
if (strcmp((const char *)node->name, "JobUri") == 0) {
|
||||||
|
DBG(10, "print_xml_reset_all_jobs: %s\n", node->name);
|
||||||
|
if (device != NULL) {
|
||||||
|
print_xml_job_finish (node, &status);
|
||||||
|
if (status == SANE_STATUS_DEVICE_BUSY) {
|
||||||
|
char *jobUri = (char *)xmlNodeGetContent(node);
|
||||||
|
char *job = strrchr((const char *)jobUri, '/');
|
||||||
|
char *scanj = NULL;
|
||||||
|
if (job != NULL) {
|
||||||
|
if (strstr(jobUri,"ScanJobs"))
|
||||||
|
scanj = strdup("ScanJobs");
|
||||||
|
else
|
||||||
|
scanj = strdup("ScanJob");
|
||||||
|
DBG(10, "print_xml_reset_all_jobs: %s/%s\n", scanj, job);
|
||||||
|
escl_scanner(device, scanj, job, SANE_FALSE);
|
||||||
|
free(scanj);
|
||||||
|
}
|
||||||
|
DBG(10, "print_xml_reset_all_jobs: sleep to finish the job\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
print_xml_reset_all_jobs (node->children,
|
||||||
|
device);
|
||||||
|
node = node->next;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \fn SANE_Status escl_reset_all_jobs (ESCL_Device *device, , char *scanJob)
|
||||||
|
* \brief Function that forces the end of jobs, using curl.
|
||||||
|
* This function is called in the 'sane_start' function.
|
||||||
|
*
|
||||||
|
* \return status (if everything is OK, status = SANE_STATUS_GOOD, otherwise, SANE_STATUS_NO_MEM/SANE_STATUS_INVAL)
|
||||||
|
*/
|
||||||
|
SANE_Status
|
||||||
|
escl_reset_all_jobs(ESCL_Device *device)
|
||||||
|
{
|
||||||
|
CURL *curl_handle = NULL;
|
||||||
|
xmlDoc *data = NULL;
|
||||||
|
xmlNode *node = NULL;
|
||||||
|
struct idle *var = NULL;
|
||||||
|
const char *scanner_status = "/eSCL/ScannerStatus";
|
||||||
|
SANE_Status status = SANE_STATUS_DEVICE_BUSY;
|
||||||
|
|
||||||
|
DBG(10, "escl_reset_all_jobs\n");
|
||||||
|
if (device == NULL)
|
||||||
|
return (SANE_STATUS_NO_MEM);
|
||||||
|
DBG(10, "1 - escl_reset_all_jobs\n");
|
||||||
|
var = (struct idle*)calloc(1, sizeof(struct idle));
|
||||||
|
if (var == NULL)
|
||||||
|
return (SANE_STATUS_NO_MEM);
|
||||||
|
DBG(10, "2 - escl_reset_all_jobs\n");
|
||||||
|
var->memory = malloc(1);
|
||||||
|
var->size = 0;
|
||||||
|
curl_handle = curl_easy_init();
|
||||||
|
|
||||||
|
escl_curl_url(curl_handle, device, scanner_status);
|
||||||
|
curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, memory_callback_s);
|
||||||
|
curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *)var);
|
||||||
|
curl_easy_setopt(curl_handle, CURLOPT_FOLLOWLOCATION, 1L);
|
||||||
|
curl_easy_setopt(curl_handle, CURLOPT_MAXREDIRS, 3L);
|
||||||
|
CURLcode res = curl_easy_perform(curl_handle);
|
||||||
|
if (res != CURLE_OK) {
|
||||||
|
DBG( 1, "The scanner didn't respond: %s\n", curl_easy_strerror(res));
|
||||||
|
status = SANE_STATUS_INVAL;
|
||||||
|
goto clean_data1;
|
||||||
|
}
|
||||||
|
DBG(10, "3 - escl_reset_all_jobs\n");
|
||||||
|
DBG( 10, "eSCL : Status : %s.\n", var->memory);
|
||||||
|
data = xmlReadMemory(var->memory, var->size, "file.xml", NULL, 0);
|
||||||
|
if (data == NULL) {
|
||||||
|
status = SANE_STATUS_NO_MEM;
|
||||||
|
goto clean_data1;
|
||||||
|
}
|
||||||
|
node = xmlDocGetRootElement(data);
|
||||||
|
if (node == NULL) {
|
||||||
|
status = SANE_STATUS_NO_MEM;
|
||||||
|
goto clean1;
|
||||||
|
}
|
||||||
|
print_xml_reset_all_jobs (node, device);
|
||||||
|
status = SANE_STATUS_GOOD;
|
||||||
|
clean1:
|
||||||
|
xmlFreeDoc(data);
|
||||||
|
clean_data1:
|
||||||
|
xmlCleanupParser();
|
||||||
|
xmlMemoryDump();
|
||||||
|
curl_easy_cleanup(curl_handle);
|
||||||
|
free(var->memory);
|
||||||
|
free(var);
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
|
@ -92,6 +92,18 @@ will request
|
||||||
.B saned
|
.B saned
|
||||||
to detach from the console and run in the background.
|
to detach from the console and run in the background.
|
||||||
|
|
||||||
|
.TP
|
||||||
|
.BR \-n ", " \-\-allow\-network
|
||||||
|
allows
|
||||||
|
.B saned
|
||||||
|
to use network scanners. By default this is forbidden to prevent
|
||||||
|
.B saned
|
||||||
|
from contacting itself. When enabled, the configuration of the
|
||||||
|
.BR sane-net (5)
|
||||||
|
backend should not mention the address on which
|
||||||
|
.B saned
|
||||||
|
is listening.
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.BR \-o ", " \-\-once
|
.BR \-o ", " \-\-once
|
||||||
requests that
|
requests that
|
||||||
|
|
|
@ -254,6 +254,7 @@ static int debug;
|
||||||
static int run_mode;
|
static int run_mode;
|
||||||
static int run_foreground;
|
static int run_foreground;
|
||||||
static int run_once;
|
static int run_once;
|
||||||
|
static int allow_network;
|
||||||
static int data_connect_timeout = 4000;
|
static int data_connect_timeout = 4000;
|
||||||
static Handle *handle;
|
static Handle *handle;
|
||||||
static char *bind_addr;
|
static char *bind_addr;
|
||||||
|
@ -1869,7 +1870,7 @@ process_request (Wire * w)
|
||||||
|
|
||||||
reply.status =
|
reply.status =
|
||||||
sane_get_devices ((const SANE_Device ***) &reply.device_list,
|
sane_get_devices ((const SANE_Device ***) &reply.device_list,
|
||||||
SANE_TRUE);
|
!allow_network);
|
||||||
sanei_w_reply (w, (WireCodecFunc) sanei_w_get_devices_reply, &reply);
|
sanei_w_reply (w, (WireCodecFunc) sanei_w_get_devices_reply, &reply);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -3436,6 +3437,7 @@ static void usage(char *me, int err)
|
||||||
" -a, --alone[=user] equal to `-l -D -u user'\n"
|
" -a, --alone[=user] equal to `-l -D -u user'\n"
|
||||||
" -l, --listen run in standalone mode (listen for connection)\n"
|
" -l, --listen run in standalone mode (listen for connection)\n"
|
||||||
" -u, --user=user run as `user'\n"
|
" -u, --user=user run as `user'\n"
|
||||||
|
" -n, --allow-network allow saned to use network scanners\n"
|
||||||
" -D, --daemonize run in background\n"
|
" -D, --daemonize run in background\n"
|
||||||
" -o, --once exit after first client disconnects\n"
|
" -o, --once exit after first client disconnects\n"
|
||||||
" -d, --debug=level set debug level `level' (default is 2)\n"
|
" -d, --debug=level set debug level `level' (default is 2)\n"
|
||||||
|
@ -3457,6 +3459,7 @@ static struct option long_options[] =
|
||||||
{"alone", optional_argument, 0, 'a'},
|
{"alone", optional_argument, 0, 'a'},
|
||||||
{"listen", no_argument, 0, 'l'},
|
{"listen", no_argument, 0, 'l'},
|
||||||
{"user", required_argument, 0, 'u'},
|
{"user", required_argument, 0, 'u'},
|
||||||
|
{"allow-network", no_argument, 0, 'n'},
|
||||||
{"daemonize", no_argument, 0, 'D'},
|
{"daemonize", no_argument, 0, 'D'},
|
||||||
{"once", no_argument, 0, 'o'},
|
{"once", no_argument, 0, 'o'},
|
||||||
{"debug", required_argument, 0, 'd'},
|
{"debug", required_argument, 0, 'd'},
|
||||||
|
@ -3488,8 +3491,9 @@ main (int argc, char *argv[])
|
||||||
run_mode = SANED_RUN_INETD;
|
run_mode = SANED_RUN_INETD;
|
||||||
run_foreground = SANE_TRUE;
|
run_foreground = SANE_TRUE;
|
||||||
run_once = SANE_FALSE;
|
run_once = SANE_FALSE;
|
||||||
|
allow_network = SANE_FALSE;
|
||||||
|
|
||||||
while((c = getopt_long(argc, argv,"ha::lu:Dod:eb:p:B:", long_options, &long_index )) != -1)
|
while((c = getopt_long(argc, argv,"ha::lu:nDod:eb:p:B:", long_options, &long_index )) != -1)
|
||||||
{
|
{
|
||||||
switch(c) {
|
switch(c) {
|
||||||
case 'a':
|
case 'a':
|
||||||
|
@ -3504,6 +3508,9 @@ main (int argc, char *argv[])
|
||||||
case 'u':
|
case 'u':
|
||||||
user = optarg;
|
user = optarg;
|
||||||
break;
|
break;
|
||||||
|
case 'n':
|
||||||
|
allow_network = SANE_TRUE;
|
||||||
|
break;
|
||||||
case 'D':
|
case 'D':
|
||||||
run_foreground = SANE_FALSE;
|
run_foreground = SANE_FALSE;
|
||||||
break;
|
break;
|
||||||
|
|
Ładowanie…
Reference in New Issue