Update of /cvsroot/eas-dev/eas/libeas
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv13583/libeas
Modified Files:
protocol_raw.prg session.prg
Log Message:
Yes! 0.2.1 Release Candidate - it's seem all things to work.
Index: protocol_raw.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/protocol_raw.prg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- protocol_raw.prg 16 Jun 2006 15:22:20 -0000 1.3
+++ protocol_raw.prg 17 Jun 2006 17:00:36 -0000 1.4
@@ -114,9 +114,7 @@
if (session := tcpAccept( self:socket:handle, self:socket:aTimeOut )) != -1
// Create new session
eDebug(10, "NETWORK: Start session: ", session)
- oSession := EASSession( self, session )
- //session_open(oSession)
- threadId := start(@session_open(), oSession) // Begin new thread
+ threadId := start(@session_open(), self, session) // Begin new thread
eDebug(15, "NETWORK: Ready for new connection")
endif
sleep(0.01)
@@ -146,11 +144,13 @@
return .T.
/* Thread function for session open */
-static function session_open( session )
+static function session_open( s, session )
+ local oSession
// Set global variables
set deleted on
set translate path off
-return session:open()
+ oSession := EASSession( s, session )
+return oSession:open()
/** Close connection */
static function c_close( self, params )
Index: session.prg
===================================================================
RCS file: /cvsroot/eas-dev/eas/libeas/session.prg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- session.prg 16 Jun 2006 15:22:20 -0000 1.2
+++ session.prg 17 Jun 2006 17:00:36 -0000 1.3
@@ -27,9 +27,7 @@
_recover_EASSESSION(obj)
setCommand(, 'sys.transport.'+obj:name, 'login', {|p| obj:login(p) } )
- setCommand(, 'sys.transport.default', 'login', {|p| obj:login(p) } )
setCommand(, 'sys.transport.'+obj:name, 'close', {|p| obj:close(p) } )
- setCommand(, 'sys.transport.default', 'close', {|p| obj:close(p) } )
return obj
@@ -73,7 +71,7 @@
elseif valtype(self:access) != 'L'
self:access := .F. // Access denied on any auth component internal error
endif
- eDebug(10, "SECURITY: access: ",self:access )
+ eDebug(10, self:name+" SECURITY: access: ",self:access )
oWrite:answer := self:access
eDebug(16, "Answer:", oWrite:answer)
@@ -82,9 +80,7 @@
/** Close session */
static function c_close( self, params )
removeCommand(, 'sys.transport.'+self:name, 'login' )
- removeCommand(, 'sys.transport.default', 'login' )
removeCommand(, 'sys.transport.'+self:name, 'close' )
- removeCommand(, 'sys.transport.default', 'close' )
self:connection:closeSession( self )
eDebug(15, "Session closing.")
return NIL
@@ -116,6 +112,11 @@
eDebug(10, "ARGS:", obj:args)
+ // Translate session fo sys.transport
+ if lower(obj:receiver) == 'sys.transport.default'
+ obj:receiver := 'sys.transport.'+self:name
+ endif
+
// Check for session.close
if lower(obj:receiver) == 'session' .and. lower(obj:command) == 'close'
//?? "SESSION CLOSE: session.close signal message&\n"
@@ -130,7 +131,7 @@
self:write( oWrite )
// If access denied then close connection
- eDebug(2, "ACCESS:",self:access)
+ eDebug(2, self:name+" ACCESS:",self:access)
if .not. self:access
//?? "SESSION CLOSE: access denied.&\n"
return 2 // Close session
|
