From 755902d1cd987ba73b28ff827902e3763f650165 Mon Sep 17 00:00:00 2001 From: Henning Geinitz Date: Sat, 5 Jan 2002 11:35:22 +0000 Subject: [PATCH] Fixed race condition between saned sending NET_OPEN reply and net.c flushing the wire. New version: 1.0.6. Henning Meier-Geinitz --- backend/net.c | 6 +++--- backend/net.desc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/net.c b/backend/net.c index 5fac0806b..c7914acdb 100644 --- a/backend/net.c +++ b/backend/net.c @@ -42,7 +42,7 @@ /* Please increase version number with every change (don't forget to update net.desc) */ -#define NET_VERSION "1.0.5" +#define NET_VERSION "1.0.6" #ifdef _AIX # include "../include/lalloca.h" /* MUST come first for AIX! */ @@ -800,11 +800,11 @@ sane_open (SANE_String_Const full_name, SANE_Handle * meta_handle) sanei_w_free (&dev->wire, (WireCodecFunc) sanei_w_open_reply, &reply); - sanei_w_set_dir (&dev->wire, WIRE_DECODE); + if (dev->wire.direction != WIRE_DECODE) + sanei_w_set_dir (&dev->wire, WIRE_DECODE); sanei_w_open_reply (&dev->wire, &reply); continue; - } else sanei_w_free (&dev->wire, (WireCodecFunc) sanei_w_open_reply, &reply); diff --git a/backend/net.desc b/backend/net.desc index b8a777e4b..b419b49c4 100644 --- a/backend/net.desc +++ b/backend/net.desc @@ -1,5 +1,5 @@ :backend "net" ; name of backend -:version "1.0.5" +:version "1.0.6" :status :beta :manpage "sane-net" :url "http://home.nexgo.de/jochen.eisinger/saned/"