diff -urN --exclude-from=plptools.exclude plptools-0.4/Makefile.am plptools-0.4-mjg/Makefile.am --- plptools-0.4/Makefile.am Mon Jul 5 22:12:41 1999 +++ plptools-0.4-mjg/Makefile.am Wed Oct 20 18:39:24 1999 @@ -1,7 +1,7 @@ # $Id: Makefile.am,v 1.7 1999/07/05 22:12:41 felfert Exp $ # SUBDIRS = lib ncpd plpnfsd plpftp -EXTRA_DIST = COPYING README TODO INSTALL include/*.h* etc/*magic etc/*.in +EXTRA_DIST = COPYING README TODO INSTALL README.mjg include/*.h* etc/*magic etc/*.in DISTCLEANFILES = etc/psion AUTOMAKE_OPTIONS = foreign diff -urN --exclude-from=plptools.exclude plptools-0.4/README.mjg plptools-0.4-mjg/README.mjg --- plptools-0.4/README.mjg Thu Jan 1 00:00:00 1970 +++ plptools-0.4-mjg/README.mjg Thu Oct 21 18:27:37 1999 @@ -0,0 +1,120 @@ +Retrofitting RFSV 16 to Fritz Elfert's plptools +=============================================== + +These notes updated 21/10/99 + + +I started modifying Fritz' plptools-0.3 with the intention of adding back the +RFSV16 support. Fritz then released 0.4, and so I re-patched 0.4, and did lots +more work, and merged in some patches from Pete Bentley. + +The result is this, plptools-0.4-mjg. + +When it's finished, hopefully Fritz will merge it into the next official +release. + +Release Dates: +plptools-0.4-mjg1 on 23/09/99 +plptools-0.4-mjg2 on 04/10/99 +plptools-0.4-mjg3 on 07/10/99 +plptools-0.4-mjg4 on 10/10/99 +plptools-0.4-mjg5 on 21/10/99 (+ patch against 0.4 original) + +The changes to plptools-0.4 are: +* Now detects which version of the NCP protocol is in use, and records this: + this is how we detect whether the Psion is a Series 3 or Series 5. +* Makefiles updated to include the rfsv16 stuff, the rfsv base class, and the + rfsvfactory object. +* Instantiates either an RFSV32 or RFSV16 object to handle the file server + requests, based on the protocol version returned by the INFO command above. + There is an rfsvfactory object to make this easier in client programs. + This is used in plpftp and plpnfsd. This will obtain the NCP version number + over the socket, by announcing itself as "NCP$INFO.*". The correct RFSV class + will further announce itself as SYS$RFSV.* - this is stored in connectName. + RFSV objects have an opAttr method to output a correct attributes flag for each + protocol. +* Added --with-drive and --with-basedir to the configure.in script, and + include/defs.h.in. These are used in RFSV16, and plpftp now uses these, + instead of the DEFAULT_DRIVE AND DEFAULT_BASE_DIRECTORY of ftp.h +* ncpd/packet.h: verbose is now a short int, to allow packet debugging. +* Pete Bentley's changes. Fixes bogus definition of usleep(); plpftp compiles in + the absence of libreadline and libhistory; accept 3rd parameter in ppsocket is + signed not unsigned; -v all debugging option; (sun) link detection changes; + new PKT_DEBUG_HANDSHAKE debug level added; correct termios.h include for + Solaris; Solaris non-blocking fixes; move the fcntl for O_NONBLOCK; remove + O_NONBLOCK where needed; set SO_REUSEADDR for ncpd. +* Peter Cherriman's "1 hour out" fix (doesn't work for me though... could be my + PC clock) + +Some things to do: +* Finish rfsv16.cc: + fread, fwrite, fseek, copyFromPsion, copyToPsion, fsetsize, mktemp, + fcreatefile, freplacefile, fopendir, fsetmtime + +* Test everything with plpftp and plpnfsd. +* Remove read, write fully? +* Remove unused convertName method in plpftp/ftp.cc,h + +Adding RFSV16 back is still a work in progress.... stay tuned! + + +Building plptools for use with a Psion 3 +======================================== +./configure --with-speed=19200 --with-serial=/dev/ttyS1 --with-drive=M: +# Or whatever port you use. I use ttyS1, since ttyS0 is my mouse. +# The default speed is 115200 bps, which is only for the Lucky S5 owners. +# The S3c can take speeds up to 57600, but my RS232 protocol analyser can't - +# your mileage may vary. +make +make install +plpftp +# NFS access not finished yet + + +Tip for use with a Psion 3 +========================== +Turn the Psion's remote link on first, THEN run ncpd. + +Why this seems to help matters +------------------------------ +This seems to ensure that the Psion will send a request for the LINK.* process, +which is what we must detect to allow other connections to the NCP daemon. It +seems there may be a strange bug when you start ncpd, THEN start the Psion link +- the link request/acknowledge messages are exchanged correctly, followed by +valid INFO/NCP Protocol Version messages - and then the Psion attempts to +connect to the PC's SYS$RFSV.* - IMHO, it should start by attempting to connect +to LINK.* + +Philip Proudman's plp_1.7 always receives the LINK.* connect request, as do +other protocol implementations. + +I haven't managed to work out why the Psion starts by sending a SYS$RFSV.* +connect request with plptools, and not with other implementations, but the above +work-around gets round it. + + +Troubleshooting +=============== +Q. I can't build it on SuSE Linux. +A. You need the gppshare and libgpp packages. (Thanks to der.hans) + + +Acknowledgements +================ +This couldn't have been written without pioneering investigations into the link +protocol by Olaf Flebbe, Michael Pieper, and others. Philip Proudman beat me to +producing a decent, working PLP stack (Thanks, Philip ;-) and Fritz Elfert did +some excellent merging of Rudolf Koenig's p3nfs. Also thanks to the Majordomo +maintainers @geekstuff.co.uk, who host the linux-psion list. + +Finally, the RFSV16 re-merge would still be in my In-tray if my wife Angela +hadn't been away for the week, leaving me to code, and fend for myself. + +Thanks to Pete Bentley for ideas on proxying, his patches, suggestions for +improvement, and a loan Series 5 for testing against. + + +Viola! +-- +Matt Gumbley +matt@gumbley.demon.co.uk diff -urN --exclude-from=plptools.exclude plptools-0.4/configure.in plptools-0.4-mjg/configure.in --- plptools-0.4/configure.in Sat Aug 7 17:18:33 1999 +++ plptools-0.4-mjg/configure.in Thu Oct 21 18:20:57 1999 @@ -6,7 +6,9 @@ AM_PROG_LIBTOOL dnl Enable Mainatiner stuff -AM_MAINTAINER_MODE +dnl **** NOTE **** Matt had to comment the following line out to get it to +dnl ************** build, and doesn't know why - YMMV. +dnl AM_MAINTAINER_MODE dnl checks for programs AC_PROG_MAKE_SET @@ -85,6 +87,26 @@ ] ) AC_SUBST(DPORT) + +AC_ARG_WITH(drive, + [ --with-drive=DRIVE override default Psion drive [M:]], + [ DDRIVE="$withval" + AC_MSG_RESULT(Overriding drive: $DDRIVE) ], + [ DDRIVE='M:' + AC_MSG_RESULT(Using default Psion drive: $DDRIVE) + ] +) +AC_SUBST(DDRIVE) + +AC_ARG_WITH(basedir, + [ --with-basedir=DIR override default Psion directory [\\\\]], + [ DBASEDIR="$withval" + AC_MSG_RESULT(Overriding directory: $DBASEDIR) ], + [ DBASEDIR="\\\\" + AC_MSG_RESULT(Using default Psion directory: $DBASEDIR) + ] +) +AC_SUBST(DBASEDIR) AC_OUTPUT( Makefile diff -urN --exclude-from=plptools.exclude plptools-0.4/include/defs.h.in plptools-0.4-mjg/include/defs.h.in --- plptools-0.4/include/defs.h.in Sun Jul 4 11:59:41 1999 +++ plptools-0.4-mjg/include/defs.h.in Wed Aug 11 21:16:47 1999 @@ -36,6 +36,8 @@ #define DDEV "@DDEV@" #define DSPEED @DSPEED@ #define DPORT @DPORT@ +#define DDRIVE "@DDRIVE@" +#define DBASEDIR "@DBASEDIR@" /* Debugging */ diff -urN --exclude-from=plptools.exclude plptools-0.4/include/mp.h plptools-0.4-mjg/include/mp.h --- plptools-0.4/include/mp.h Sat Aug 7 17:07:48 1999 +++ plptools-0.4-mjg/include/mp.h Fri Oct 1 19:47:40 1999 @@ -122,7 +122,7 @@ #endif /* mp_main.c */ -#if defined(hpux) || defined(__SVR4) +#if defined(hpux) || defined(__SVR4) && !defined(sun) /* HPUX 10.20 declares int usleep( useconds_t useconds); */ # ifndef HPUX10 extern void usleep __P((int usec)); diff -urN --exclude-from=plptools.exclude plptools-0.4/lib/Makefile.am plptools-0.4-mjg/lib/Makefile.am --- plptools-0.4/lib/Makefile.am Sun Jul 4 11:59:42 1999 +++ plptools-0.4-mjg/lib/Makefile.am Wed Sep 15 21:05:01 1999 @@ -1,5 +1,5 @@ lib_LTLIBRARIES = libplp.la libplp_la_LDFLAGS = --debug -version-info 1:0:0 -libplp_la_SOURCES = bufferarray.cc bufferstore.cc iowatch.cc ppsocket.cc rfsv32.cc log.cc -EXTRA_DIST = bool.h bufferarray.h bufferstore.h iowatch.h ppsocket.h rfsv32.h log.h +libplp_la_SOURCES = bufferarray.cc bufferstore.cc iowatch.cc ppsocket.cc rfsv16.cc rfsv32.cc rfsvfactory.cc log.cc +EXTRA_DIST = bool.h bufferarray.h bufferstore.h iowatch.h ppsocket.h rfsv.h rfsv16.h rfsv32.h rfsvfactory.h log.h diff -urN --exclude-from=plptools.exclude plptools-0.4/lib/bufferstore.cc plptools-0.4-mjg/lib/bufferstore.cc --- plptools-0.4/lib/bufferstore.cc Mon Jun 28 23:51:15 1999 +++ plptools-0.4-mjg/lib/bufferstore.cc Thu Oct 21 18:17:17 1999 @@ -19,7 +19,8 @@ // // e-mail philip.proudman@btinternet.com -#include +#include +// That should be iostream.h, but it won't build on Sun WorkShop C++ 5.0 #include #include diff -urN --exclude-from=plptools.exclude plptools-0.4/lib/ppsocket.cc plptools-0.4-mjg/lib/ppsocket.cc --- plptools-0.4/lib/ppsocket.cc Sun Jul 4 11:59:42 1999 +++ plptools-0.4-mjg/lib/ppsocket.cc Sun Oct 10 09:26:09 1999 @@ -30,6 +30,7 @@ #include #include #include +#include #include "defs.h" #include "bool.h" @@ -126,7 +127,6 @@ bool ppsocket:: connect(char *Peer, int PeerPort, char *Host, int HostPort) { - //**************************************************** //* If we aren't already bound set the host and bind * //**************************************************** @@ -172,13 +172,16 @@ m_LastError = lastErrorCode(); return (false); } + // Our accept member function relies on non-blocking accepts, + // so set the flag here (rather than every time around the loop) + fcntl(m_Socket, F_SETFL, O_NONBLOCK); return (true); } ppsocket *ppsocket:: accept(char *Peer, int MaxLen) { - unsigned int len; + int len; ppsocket *accepted; char *peer; @@ -197,7 +200,6 @@ //*********************** len = sizeof(struct sockaddr); - fcntl(m_Socket, F_SETFL, O_NONBLOCK); accepted->m_Socket =::accept(m_Socket, &accepted->m_PeerAddr, &len); if (accepted->m_Socket == INVALID_SOCKET) { @@ -209,6 +211,14 @@ //* Got a connection so fill in the other attributes * //**************************************************** + // Make sure the new socket hasn't inherited O_NONBLOCK + // from the accept socket + int flags = fcntl( accepted->m_Socket, F_GETFL, 0 ); + if( flags >= 0 ) { + flags &= ~O_NONBLOCK; + fcntl( accepted->m_Socket, F_SETFL, flags); + } + accepted->m_HostAddr = m_HostAddr; accepted->m_Bound = true; @@ -503,6 +513,11 @@ return (false); } } + // Set SO_REUSEADDR + int one = 1; + if (setsockopt( m_Socket, SOL_SOCKET, SO_REUSEADDR, + (const char *) &one, sizeof(int)) < 0 ) + cerr << "Warning: Unable to set SO_REUSEADDR option\n"; // If a host name was supplied then use it if (!setHost(Host, Port)) { return (false); diff -urN --exclude-from=plptools.exclude plptools-0.4/lib/rfsv.h plptools-0.4-mjg/lib/rfsv.h --- plptools-0.4/lib/rfsv.h Thu Jan 1 00:00:00 1970 +++ plptools-0.4-mjg/lib/rfsv.h Thu Oct 7 20:41:44 1999 @@ -0,0 +1,49 @@ +#ifndef _rfsv_h_ +#define _rfsv_h_ + +class ppsocket; +class bufferStore; +class bufferArray; + +#define RFSV_SENDLEN 230 + +// Abstract base class of RFSV ; 16-bit and 32-bit variants implement this +// interface +class rfsv { +public: + virtual ~rfsv() {} + virtual void reset() = 0; + virtual void reconnect() = 0; + virtual long getStatus() = 0; + virtual const char *getConnectName() = 0; + virtual long fopen(long attr, const char *name, long &handle) = 0; + virtual long mktemp(long *handle, char *tmpname) = 0; + virtual long fcreatefile(long attr, const char *name, long &handle) = 0; + virtual long freplacefile(long attr, const char *name, long &handle) = 0; + virtual long fopendir(long attr, const char *name, long &handle) = 0; + virtual long fclose(long handle) = 0; + virtual long dir(const char* psionName, bufferArray *files) = 0; + virtual long fgetmtime(const char *name, long *mtime) = 0; + virtual long fsetmtime(const char *name, long mtime) = 0; + virtual long fgetattr(const char *name, long *attr) = 0; + virtual long fgeteattr(const char *name, long *attr, long *size, long *time) =0; + virtual long fsetattr(const char *name, long seta, long unseta) = 0; + virtual long dircount(const char *name, long *count) = 0; + virtual long devlist(long *devbits) = 0; + virtual char *devinfo(int devnum, long *vfree, long *vtotal, long *vattr, long *vuiqueid) = 0; + virtual char *opErr(long status) = 0; + virtual char *opAttr(long status) = 0; + virtual long fread(long handle, char *buf, long len) = 0; + virtual long fwrite(long handle, char *buf, long len) = 0; + virtual long copyFromPsion(const char *from, const char *to) = 0; + virtual long copyToPsion(const char *from, const char *to) = 0; + virtual long fsetsize(long handle, long size) = 0; + virtual long fseek(long handle, long pos, long mode) = 0; + virtual long mkdir(const char* dirName) = 0; + virtual long rmdir(const char *name) = 0; + virtual long rename(const char *oldname, const char *newname) = 0; + virtual long remove(const char *name) = 0; +}; + +#endif + diff -urN --exclude-from=plptools.exclude plptools-0.4/lib/rfsv16.cc plptools-0.4-mjg/lib/rfsv16.cc --- plptools-0.4/lib/rfsv16.cc Thu Jan 1 00:00:00 1970 +++ plptools-0.4-mjg/lib/rfsv16.cc Fri Oct 15 19:56:41 1999 @@ -0,0 +1,887 @@ +// +// RFSV16 - An implementation of the PSION SIBO RFSV Client protocol +// +// Copyright (C) 1999 Philip Proudman +// Modifications for plptools: +// Copyright (C) 1999 Matt J. Gumbley +// Sources: rfsv32.cc by Fritz Elfert, and rfsv16.cc by Philip Proudman +// Descriptions of the RFSV16 protocol by Michael Pieper, Olaf Flebbe & Me. +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// e-mail philip.proudman@btinternet.com + +#include +#include +#include +#include +#include +#include + +#include "defs.h" +#include "bool.h" +#include "rfsv16.h" +#include "bufferstore.h" +#include "ppsocket.h" +#include "bufferarray.h" + +rfsv16::rfsv16(ppsocket *_skt) : serNum(0) +{ + skt = _skt; + reset(); +} + +// move to base class? +rfsv16::~rfsv16() +{ + bufferStore a; + a.addStringT("Close"); + if (status == NO_ERROR) + skt->sendBufferStore(a); + skt->closeSocket(); +} + +// move to base class? +void rfsv16:: +reconnect() +{ +cerr << "rfsv16::reconnect" << endl; + skt->closeSocket(); + skt->reconnect(); + serNum = 0; + reset(); +} + +// move to base class? +void rfsv16:: +reset() +{ +cerr << "rfsv16::reset" << endl; + bufferStore a; + status = E_FILE_DISC; + a.addStringT(getConnectName()); + if (skt->sendBufferStore(a)) { + if (skt->getBufferStore(a) == 1) { + if (!strcmp(a.getString(0), "Ok")) + status = NO_ERROR; + } + } +} + +// move to base class? +long rfsv16:: +getStatus() +{ + return status; +} + +// move to base class? +const char *rfsv16:: +getConnectName() +{ + return "SYS$RFSV.*"; +} + +int rfsv16:: +convertName(const char* orig, char *retVal) +{ + int len = strlen(orig); + char *temp = new char [len+1]; + + // FIXME: need to return 1 if OOM? + for (int i=0; i <= len; i++) { + if (orig[i] == '/') + temp[i] = '\\'; + else + temp[i] = orig[i]; + } + + if (len == 0 || temp[1] != ':') { + // We can automatically supply a drive letter + strcpy(retVal, DDRIVE); + + if (len == 0 || temp[0] != '\\') { + strcat(retVal, DBASEDIR); + } + else { + retVal[strlen(retVal)-1] = 0; + } + + strcat(retVal, temp); + } + else { + strcpy(retVal, temp); + } + + delete [] temp; + cout << retVal << endl; + return 0; +} + +long rfsv16:: +fopen(long attr, const char *name, long &handle) +{ + bufferStore a; + char realName[200]; + int rv = convertName(name, realName); + if (rv) return (long)rv; + + // FIXME: anything that calls fopen should NOT do the name + // conversion - it's just done here. + + a.addWord(attr & 0xFFFF); + a.addString(realName); + a.addByte(0x00); // Needs to be manually Null-Terminated. + if (!sendCommand(FOPEN, a)) + return E_FILE_DISC; + + long res = getResponse(a); + // cerr << "fopen, getword 0 is " << hex << setw(2) << a.getWord(0) << endl; + // cerr << "fopen, getlen is " << hex << setw(2) << a.getLen() << endl; + // cerr << "fopen, res is " << hex << setw(2) << res << endl; + if (!res && a.getLen() == 4 && a.getWord(0) == 0) { + handle = (long)a.getWord(2); + return 0; + } + // cerr << "fopen: Unknown response (" << attr << "," << name << ") " << a < 16) { + int version = a.getWord(0); + if (version != 2) { + cerr << "dir: not version 2" << endl; + return 1; + } + int status = a.getWord(2); + long size = a.getDWord(4); + long date = a.getDWord(8); + const char *s = a.getString(16); + a.discardFirstBytes(17+strlen(s)); + + bufferStore temp; + temp.addDWord(date); + temp.addDWord(size); + temp.addDWord((long)status); + temp.addStringT(s); + files->pushBuffer(temp); + } + } + if ((short int)res == E_FILE_EOF) + res = 0; + fclose(fileHandle); + return res; +} + +char * rfsv16:: +opAttr(long attr) +{ + static char buf[11]; + buf[0] = ((attr & rfsv16::P_FAWRITE) ? 'w' : '-'); + buf[1] = ((attr & rfsv16::P_FAHIDDEN) ? 'h' : '-'); + buf[2] = ((attr & rfsv16::P_FASYSTEM) ? 's' : '-'); + buf[3] = ((attr & rfsv16::P_FAVOLUME) ? 'v' : '-'); + buf[4] = ((attr & rfsv16::P_FADIR) ? 'd' : '-'); + buf[5] = ((attr & rfsv16::P_FAMOD) ? 'm' : '-'); + buf[6] = ((attr & rfsv16::P_FAREAD) ? 'r' : '-'); + buf[7] = ((attr & rfsv16::P_FAEXEC) ? 'x' : '-'); + buf[8] = ((attr & rfsv16::P_FASTREAM) ? 'b' : '-'); + buf[9] = ((attr & rfsv16::P_FATEXT) ? 't' : '-'); + buf[10] = '\0'; + return (char *) (&buf); +} + + +long rfsv16:: +fgetmtime(const char *name, long *mtime) +{ +cerr << "rfsv16::fgetmtime" << endl; + // NB: fgetattr, fgeteattr is almost identical... + bufferStore a; + char realName[200]; + int rv = convertName(name, realName); + if (rv) return rv; + a.addString(realName); + a.addByte(0x00); // needs to be null-terminated, + // and this needs sending in the length word. + if (!sendCommand(FINFO, a)) + return E_FILE_DISC; + + long res = getResponse(a); + if (res != 0) + return res; + if (a.getLen() == 2) { + cerr << "fgetmtime: Error " << a.getWord(0) << " on file " << name << endl; + return 1; + } + else if (a.getLen() == 18 && a.getWord(0) == 0) { + *mtime = a.getDWord(10); + return a.getWord(0); + } + cerr << "fgetmtime: Unknown response (" << name << ") " << a < 16) { + int version = a.getWord(0); + if (version != 2) { + cerr << "dir: not version 2" << endl; + return 1; + } + // int status = a.getWord(2); + // long size = a.getDWord(4); + // long date = a.getDWord(8); + const char *s = a.getString(16); + a.discardFirstBytes(17+strlen(s)); + (*count)++; + } + } + if ((short int)res == E_FILE_EOF) + res = 0; + fclose(fileHandle); + return res; +} + +long rfsv16:: +devlist(long *devbits) +{ + long res; + long fileHandle; + *devbits = 0; + + // The following is taken from a trace between a Series 3c and PsiWin. + // Hope it works! We PARSE to find the correct node, then FOPEN + // (P_FDEVICE) this, FDEVICEREAD each entry, setting the appropriate + // drive-letter-bit in devbits, then FCLOSE. + + bufferStore a; + a.init(); + a.addByte(0x00); // no Name 1 + a.addByte(0x00); // no Name 2 + a.addByte(0x00); // no Name 3 + if (!sendCommand(PARSE, a)) + return E_FILE_DISC; + res = getResponse(a); + if (res) + return res; + + // Find the drive to FOPEN + char name[4] = { 'x', ':', '\\', '\0' } ; + a.discardFirstBytes(8); // Result, fsys, dev, path, file, file, ending, flag + /* This leaves R E M : : M : \ */ + name[0] = (char) a.getByte(5); // the M + long status = fopen(P_FDEVICE, name, fileHandle); + if (status != 0) { + return status; + } + while (1) { + bufferStore a; + a.init(); + a.addWord(fileHandle & 0xFFFF); + if (!sendCommand(FDEVICEREAD, a)) + return E_FILE_DISC; + res = getResponse(a); + if (res) + break; + a.discardFirstBytes(2); // Result + int version = a.getWord(0); + if (version != 2) { + cerr << "devlist: not version 2" << endl; + return 1; // FIXME + } + char drive = a.getByte(64); + if (drive >= 'A' && drive <= 'Z') { + int shift = (drive - 'A'); + (*devbits) |= (long) ( 1 << shift ); + } + else { + cerr << "devlist: non-alphabetic drive letter (" + << drive << ")" << endl; + } + } + if ((short int)res == E_FILE_EOF) + res = 0; + fclose(fileHandle); + return res; +} + +char *rfsv16:: +devinfo(int devnum, long *vfree, long *vtotal, long *vattr, + long *vuniqueid) +{ + bufferStore a; + long res; + long fileHandle; + + // Again, this is taken from an excahnge between PsiWin and a 3c. + // For each drive, we PARSE with its drive letter to get a response + // (which we ignore), then do a STATUSDEVICE to get the info. + + a.init(); + a.addByte((char) (devnum + 'A')); // Name 1 + a.addByte(':'); + a.addByte(0x00); + a.addByte(0x00); // No name 2 + a.addByte(0x00); // No name 3 + if (!sendCommand(PARSE, a)) + return NULL; + res = getResponse(a); + if (res) { + // cerr << "devinfo PARSE res is " << dec << (signed short int) res << endl; + return NULL; + } + + a.init(); + a.addByte((char) (devnum + 'A')); // Name 1 + a.addByte(':'); + a.addByte('\\'); + a.addByte(0x00); + if (!sendCommand(STATUSDEVICE, a)) + return NULL; + res = getResponse(a); + if (res) { + // cerr << "devinfo STATUSDEVICE res is " << dec << (signed short int) res << endl; + return NULL; + } + a.discardFirstBytes(2); // Result + int type = a.getWord(2); + int changeable = a.getWord(4); + long size = a.getDWord(6); + long free = a.getDWord(10); + const char *volume = a.getString(14); + int battery = a.getWord(30); + const char *devicename = a.getString(62); + *vfree = free; + *vtotal = size; + *vattr = type; + *vuniqueid = 0; + static char name[2] = { 'x', '\0' }; + name[0] = (char) (devnum + 'A'); + return strdup(name); +} + +bool rfsv16:: +sendCommand(enum commands cc, bufferStore & data) +{ + bool result; + bufferStore a; + a.addWord(cc); + a.addWord(data.getLen()); + a.addBuff(data); + result = skt->sendBufferStore(a); + if (!result) + status = E_FILE_DISC; + return result; +} + + +long rfsv16:: +getResponse(bufferStore & data) +{ + // getWord(2) is the size field + // which is the body of the response not counting the command (002a) and + // the size word. + if (skt->getBufferStore(data) == 1 && + data.getWord(0) == 0x2a && + data.getWord(2) == data.getLen()-4) { + data.discardFirstBytes(4); + long ret = data.getWord(0); + return ret; + } else + status = E_FILE_DISC; + cerr << "rfsv16::getResponse: duff response. Size field:" << +data.getWord(2) << " Frame size:" << data.getLen()-4 << " Result field:" << +data.getWord(4) << endl; + return status; +} + +char * rfsv16:: +opErr(long status) +{ +cerr << "rfsv16::opErr 0x" << hex << setfill('0') << setw(4) << status << " (" +<< dec << (signed short int)status << ")" << endl; + signed short int statcode = (signed short int) status; + enum errs e = (enum errs) statcode; + switch (e) { + case NO_ERROR: + return "No error occurred"; + case E_FILE_EXIST: + return "File already exists"; + case E_FILE_NXIST: + return "File does not exist"; + case E_FILE_WRITE: + return "Write to file failed"; + case E_FILE_READ: + return "Read from file failed"; + case E_FILE_EOF: + return "Read past end of file"; + case E_FILE_FULL: + return "Disk/serial read buffer full"; + case E_FILE_NAME: + return "Invalid file name"; + case E_FILE_ACCESS: + return "Access denied"; + case E_FILE_LOCKED: + return "Record or file locked"; + case E_FILE_DEVICE: + return "Device does not exist"; + case E_FILE_DIR: + return "Directory does not exist"; + case E_FILE_RECORD: + return "Record too large"; + case E_FILE_RDONLY: + return "File is read-only"; + case E_FILE_INV: + return "Invalid I/O operation"; + case E_FILE_PENDING: + return "I/O pending (not yet completed)"; + case E_FILE_VOLUME: + return "Invalid volume"; + case E_FILE_CANCEL: + return "Async operation was cancelled"; + case E_FILE_ALLOC: + return "No memory for control block"; + case E_FILE_DISC: + return "Link is disconnected"; + case E_FILE_CONNECT: + return "Link already connected"; + case E_FILE_RETRAN: + return "Retransmission threshold exceeded"; + case E_FILE_LINE: + return "Physical link failure"; + case E_FILE_INACT: + return "Inactivity timer expired"; + case E_FILE_PARITY: + return "Serial parity error"; + case E_FILE_FRAME: + return "Serial framing error"; + case E_FILE_OVERRUN: + return "Serial overrun error"; + case E_MDM_CONFAIL: + return "Modem cannot connect to remote modem"; + case E_MDM_BUSY: + return "Remote modem busy"; + case E_MDM_NOANS: + return "Remote modem did not answer"; + case E_MDM_BLACKLIST: + return "Number blacklisted by the modem"; + case E_FILE_NOTREADY: + return "Drive not ready"; + case E_FILE_UNKNOWN: + return "Unknown media in drive"; + case E_FILE_DIRFULL: + return "Root directory full"; + case E_FILE_PROTECT: + return "Device is write-protected"; + case E_FILE_CORRUPT: + return "Media is corrupt"; + case E_FILE_ABORT: + return "User aborted operation"; + case E_FILE_ERASE: + return "Failed to erase flash media"; + case E_FILE_INVALID: + return "Invalid file for DBF system"; + case E_INVALID_OPERATION: + return "Invalid operation for RFSV16"; + default: + return "Unknown error"; + } +} + +long rfsv16:: +fread(long handle, char *buf, long len) +{ +cerr << "rfsv16::fread ***" << endl; + bufferStore a; + long remaining = len; + // Read in blocks of 291 bytes; the maximum payload for an RFSV frame. + // ( As seen in traces ) - this isn't optimal: RFSV can handle + // fragmentation of frames, where only the first FREAD RESPONSE frame + // has a RESPONSE (00 2A), SIZE and RESULT field. Every subsequent frame + // just has data, 297 bytes (or less) of it. + const int maxblock = 291; + long readsofar = 0; + while (remaining) { + long thisblock = (remaining > maxblock) ? maxblock : remaining; +cerr << "fread: " << dec << remaining << " bytes remain. This block is " << thisblock +<< " bytes." << endl; + a.init(); + a.addWord(handle); + a.addWord(thisblock); + sendCommand(FREAD, a); + long res = getResponse(a); + remaining -= a.getLen(); +// copy the data to buf + +cerr << "fread getResponse returned " << dec<< (signed short int) res << " data: " << a << dec < 0) + op.write(buf, len); + } while (len > 0); + + fclose(handle); + op.close(); + return len; +} + +long rfsv16:: +copyToPsion(const char *from, const char *to) +{ +cerr << "rfsv16::copyToPsion" << endl; + long handle; + long res; + + ifstream ip(from); + if (!ip) + return E_FILE_NXIST; + res = fcreatefile(P_FSTREAM | P_FUPDATE, to, handle); + if (res != 0) { + res = freplacefile(P_FSTREAM | P_FUPDATE, to, handle); + if (res != 0) + return res; + } + unsigned char *buff = new unsigned char[RFSV_SENDLEN]; + int total = 0; + while (ip && !ip.eof()) { + ip.read(buff, RFSV_SENDLEN); + bufferStore tmp(buff, ip.gcount()); + total += tmp.getLen(); + if (tmp.getLen() == 0) + break; + bufferStore a; + a.addDWord(handle); + a.addBuff(tmp); + if (!sendCommand(FWRITE, a)) // FIXME: need to check params + return E_FILE_DISC; + res = getResponse(a); + if (res) { + fclose(handle); + return res; + } + } + fclose(handle); + ip.close(); + delete[]buff; + return 0; +} + +long rfsv16:: +fsetsize(long handle, long size) +{ +cerr << "rfsv16::fsetsize ***" << endl; + return 0; +} + +/* + * Unix-like implementation off fseek with one + * exception: If seeking beyond eof, the gap + * contains garbage instead of zeroes. + */ +long rfsv16:: +fseek(long handle, long pos, long mode) +{ +cerr << "rfsv16::fseek ***" << endl; + return 0; +} + +long rfsv16:: +mkdir(const char* dirName) +{ + char realName[200]; + int rv = convertName(dirName, realName); + if (rv) return rv; + bufferStore a; + a.addString(realName); + a.addByte(0x00); // needs to be null-terminated, + // and this needs sending in the length word. + sendCommand(MKDIR, a); + long res = getResponse(a); + if (!res && a.getLen() == 2) { + // Correct response + return a.getWord(0); + } + cerr << "Unknown response from mkdir "<< a <