*** ept96.txt	Fri Apr 18 19:46:20 1997
--- ept97.txt	Fri Apr 18 19:57:32 1997
***************
*** 92,99 ****
         					arglist:	[
         						k1StopBits,				// 1 stop bit
         						kNoParity,				// no parity bit
!        						k7DataBits,				// 8 data bits
!        						k9600bps,	],			// data rate in bps
         					typelist:	['struct,
         						'long,					// stop bits
         						'long,					// parity
--- 92,99 ----
         					arglist:	[
         						k1StopBits,				// 1 stop bit
         						kNoParity,				// no parity bit
!        						k8DataBits,				// 8 data bits
!        						k2400bps,	],			// data rate in bps
         					typelist:	['struct,
         						'long,					// stop bits
         						'long,					// parity
***************
*** 148,159 ****
         	if pos then begin
         		options[pos].data.arglist[kECIndex] := 
         			if theSession.advanced.eCorr then 
!        				kModemECProtocolNone + kModemECProtocolMNP else
!        				kModemECProtocolNone;
         	end;
         	
         	pos := ArrayPos(options, kCMOSerialIOParms, 0, func(a,b) StrEqual(a, b.label));
!        	if pos then begin
         		options[pos].data.arglist[kSerialSpeed] := 
         			kSerialSpeedLookup.(if theSession.advanced exists and theSession.advanced.speed exists then
         				Intern(theSession.advanced.speed) else
--- 148,162 ----
         	if pos then begin
         		options[pos].data.arglist[kECIndex] := 
         			if theSession.advanced.eCorr then 
!        				// This is a documentation bug.
!        				// Using kModemECProtocolNone does NOT work.
!        				// Use '0' instead.
!        				0 + kModemECProtocolMNP else
!        				0;
         	end;
         	
         	pos := ArrayPos(options, kCMOSerialIOParms, 0, func(a,b) StrEqual(a, b.label));
!        	if nil then begin
         		options[pos].data.arglist[kSerialSpeed] := 
         			kSerialSpeedLookup.(if theSession.advanced exists and theSession.advanced.speed exists then
         				Intern(theSession.advanced.speed) else
***************
*** 170,175 ****
--- 173,179 ----
         			kSerialDataLookup.(if theSession.advanced exists and theSession.advanced.data exists then
         				Intern(theSession.advanced.data) else
         				'8);
+        		if kdebugOn then print(options[pos]);
         	end;
         
         	options; 
***************
*** 224,232 ****
         	:MConnectAction(:TBuildConfigOptions(theLinkID));
         end,
       resetTimer:
!        func()
         begin
         	self.sessionStart := TimeInSeconds();
         end,
       SetUpInputSpecs:
         InputSpecsDef := {
--- 228,240 ----
         	:MConnectAction(:TBuildConfigOptions(theLinkID));
         end,
       resetTimer:
!        func(start)
         begin
         	self.sessionStart := TimeInSeconds();
+        	
+        	if start then
+        		self.sessionActualStart := TimeInSeconds();
+        
         end,
       SetUpInputSpecs:
         InputSpecsDef := {
***************
*** 713,723 ****
         		local options := :MBuildConfigOptionsModem();
         		local pos := ArrayPos(options, kCMOSerialIOParms, 0, func(a,b) StrEqual(a, b.label));
         		if (pos) then begin
!        			:Option([options[pos]],nil);
         		end;
         	end;
         
!        	:ResetTimer();
         	:MSetEndPointState(kState_Connected);
         	:MMessage(kMessage_Connected);
         
--- 721,732 ----
         		local options := :MBuildConfigOptionsModem();
         		local pos := ArrayPos(options, kCMOSerialIOParms, 0, func(a,b) StrEqual(a, b.label));
         		if (pos) then begin
!        			// Debugging code.
!        //			:Option([options[pos]],nil);
         		end;
         	end;
         
!        	:ResetTimer(true);
         	:MSetEndPointState(kState_Connected);
         	:MMessage(kMessage_Connected);
         
***************
*** 779,785 ****
         			:MSetEndPointState(kState_Connecting);
         			:MMessage(kMessage_Connecting);
         				local opts := if theSession.type = 'telnet then
!        					:TBuildConnectOptions(theAddress, Floor(StringToNumber(theSession.advanced.portNumber)));
         				else [ fconnectAddress ];
         			:Connect(opts,
         					{	async:			true,
--- 788,795 ----
         			:MSetEndPointState(kState_Connecting);
         			:MMessage(kMessage_Connecting);
         				local opts := if theSession.type = 'telnet then
!        					:TBuildConnectOptions(theAddress, 
!        						Floor(StringToNumber(StringFilter(theSession.advanced.portNumber, "0123456789.", 'passAll))));
         				else [ fconnectAddress ];
         			:Connect(opts,
         					{	async:			true,