- Added support for extended sequence numbers (incoming only)

- Changed the behavior on initial connect to support the Clipboard-Server
  and to meet the doc in http://www.thouky.co.uk/software/psifs/plp.html:
  All services except SYS$RFSV now perform registration and connect is
  done when the Psion returned RegisterAck. Then the connect can use the
  service name as presented by the Psion's RegisterAck.

1 files changed, 75 insertions, 70 deletions

diff --git a/ncpd/ncp.h b/ncpd/ncp.h
index 3b82ea8..1c4cbdc 100644
--- a/ncpd/ncp.h
+++ b/ncpd/ncp.h
@@ -1,27 +1,26 @@
-// $Id$
-//
-//  PLP - An implementation of the PSION link protocol
-//
-//  Copyright (C) 1999  Philip Proudman
-//  Modifications for plptools:
-//    Copyright (C) 1999 Fritz Elfert <felfert@to.com>
-//
-//  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
-
+/*-*-c++-*-
+ * $Id$
+ *
+ * This file is part of plptools.
+ *
+ *  Copyright (C) 1999  Philip Proudman <philip.proudman@btinternet.com>
+ *  Copyright (C) 1999-2001 Fritz Elfert <felfert@to.com>
+ *
+ *  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
+ *
+ */
 #ifndef _ncp_h_
 #define _ncp_h_
 
@@ -39,55 +38,61 @@ class IOWatch;
 #define MAX_CHANNEL 8
 
 class ncp {
-	public:
-		ncp(const char *fname, int baud, IOWatch &iow);
-		~ncp();
+public:
+    ncp(const char *fname, int baud, IOWatch &iow);
+    ~ncp();
 
-		int connect(channel *c); // returns channel, or -1 if failure
-		void Register(channel *c);
-		void RegisterAck(int);
-		void disconnect(int channel);
-		void send(int channel, bufferStore &a);
-		void poll();
-		void reset();
-		bool stuffToSend();
-		bool hasFailed();
-		bool gotLinkChannel();
-		void setVerbose(short int);
-		short int getVerbose();
-		void setLinkVerbose(short int);
-		short int getLinkVerbose();
-		void setPktVerbose(short int);
-		short int getPktVerbose();
-		short int getProtocolVersion();
+    int connect(channel *c); // returns channel, or -1 if failure
+    void Register(channel *c);
+    void RegisterAck(int, const char *);
+    void disconnect(int channel);
+    void send(int channel, bufferStore &a);
+    void poll();
+    void reset();
+    bool stuffToSend();
+    bool hasFailed();
+    bool gotLinkChannel();
+    void setVerbose(short int);
+    short int getVerbose();
+    void setLinkVerbose(short int);
+    short int getLinkVerbose();
+    void setPktVerbose(short int);
+    short int getPktVerbose();
+    short int getProtocolVersion();
   
-	private:
-		enum c { MAX_LEN = 200, LAST_MESS = 1, NOT_LAST_MESS = 2 };
-		enum interControllerMessageType {
-			// Inter controller message types
-			NCON_MSG_DATA_XOFF=1,
-			NCON_MSG_DATA_XON=2,
-			NCON_MSG_CONNECT_TO_SERVER=3,
-			NCON_MSG_CONNECT_RESPONSE=4,
-			NCON_MSG_CHANNEL_CLOSED=5,
-			NCON_MSG_NCP_INFO=6,
-			NCON_MSG_CHANNEL_DISCONNECT=7,
-			NCON_MSG_NCP_END=8
-		};
-		enum protocolVersionType { PV_SERIES_5 = 6, PV_SERIES_3 = 3 };
-		int getFirstUnusedChan();
-		void decodeControlMessage(bufferStore &buff);
-		void controlChannel(int chan, enum interControllerMessageType t, bufferStore &command);
-		char * ctrlMsgName(unsigned char);
+private:
+    enum c { MAX_LEN = 200, LAST_MESS = 1, NOT_LAST_MESS = 2 };
+    enum interControllerMessageType {
+	// Inter controller message types
+	NCON_MSG_DATA_XOFF=1,
+	NCON_MSG_DATA_XON=2,
+	NCON_MSG_CONNECT_TO_SERVER=3,
+	NCON_MSG_CONNECT_RESPONSE=4,
+	NCON_MSG_CHANNEL_CLOSED=5,
+	NCON_MSG_NCP_INFO=6,
+	NCON_MSG_CHANNEL_DISCONNECT=7,
+	NCON_MSG_NCP_END=8
+    };
+    enum protocolVersionType { PV_SERIES_5 = 6, PV_SERIES_3 = 3 };
+    int getFirstUnusedChan();
+    void decodeControlMessage(bufferStore &buff);
+    void controlChannel(int chan, enum interControllerMessageType t, bufferStore &command);
+    char * ctrlMsgName(unsigned char);
   
-		link *l;
-		unsigned short verbose;
-		channel *channelPtr[MAX_CHANNEL+1];
-		bufferStore messageList[MAX_CHANNEL+1];
-		int remoteChanList[MAX_CHANNEL+1];
-		bool failed;
-		short int protocolVersion;
-		linkChan *lChan;
+    link *l;
+    unsigned short verbose;
+    channel *channelPtr[MAX_CHANNEL+1];
+    bufferStore messageList[MAX_CHANNEL+1];
+    int remoteChanList[MAX_CHANNEL+1];
+    bool failed;
+    short int protocolVersion;
+    linkChan *lChan;
 };
 
 #endif
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * End:
+ */