From 197078cda05c6f3d63c2b94ae4dc8f33b5b0d040 Mon Sep 17 00:00:00 2001 From: Fritz Elfert Date: Mon, 11 Jun 2001 09:33:19 +0000 Subject: Fix for Series 3c. Devlist version can be 1. --- lib/ppsocket.cc | 2 -- lib/rfsv16.cc | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/ppsocket.cc b/lib/ppsocket.cc index 49e02be..a5982b3 100644 --- a/lib/ppsocket.cc +++ b/lib/ppsocket.cc @@ -285,7 +285,6 @@ getBufferStore(bufferStore & a, bool wait) return 0; a.init(); if (recv(&l, sizeof(l), MSG_NOSIGNAL) != sizeof(l)) { -// cerr << "gBS: e=" << strerror(errno) << endl; return -1; } l = ntohl(l); @@ -293,7 +292,6 @@ getBufferStore(bufferStore & a, bool wait) while (l > 0) { int j = recv(bp, l, MSG_NOSIGNAL); if (j == SOCKET_ERROR || j == 0) { -// cerr << "gBS: j=" << j << " e=" << strerror(errno) << endl; delete[]buff; return -1; } diff --git a/lib/rfsv16.cc b/lib/rfsv16.cc index 21fb820..f6518d9 100644 --- a/lib/rfsv16.cc +++ b/lib/rfsv16.cc @@ -392,8 +392,8 @@ devlist(u_int32_t &devbits) if (res) break; u_int16_t version = a.getWord(0); - if (version != 2) { - cerr << "devlist: not version 2" << endl; + if ((version < 1) || (version > 2)) { + cerr << "devlist: not version 1 or 2" << endl; fclose(fileHandle); return E_PSI_GEN_FAIL; // FIXME } -- cgit v1.2.3