[Zoolib-checkins] CVS: zoolib/src/net ZNet_AppleTalk.cpp,1.3,1.4 ZNet_AppleTalk.h,1.3,1.4 ZNet.cpp,1.3,1.4 ZNet.h,1.4,1.5 ZNet_Internet.cpp,1.4,1.5 ZNet_Internet.h,1.4,1.5

[Andrew G. <ag...@us...>]

Update of /cvsroot/zoolib/zoolib/src/net
In directory usw-pr-cvs1:/tmp/cvs-serv27628/net

Modified Files:
	ZNet_AppleTalk.cpp ZNet_AppleTalk.h ZNet.cpp ZNet.h 
	ZNet_Internet.cpp ZNet_Internet.h 
Log Message:
Renamed CreateConnectedEndpoint to be OpenRW, in line with recent
renaming-fest. More interestingly put an OpenRW on ZNetName, making
it possible to do this
if (ZRef<ZStreamerRW> theEP = ZNetName_Internet("host.com",80").OpenRW())
  {
  // Use theEP.
  }


Index: ZNet_AppleTalk.cpp
===================================================================
RCS file: /cvsroot/zoolib/zoolib/src/net/ZNet_AppleTalk.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ZNet_AppleTalk.cpp	18 May 2002 01:01:51 -0000	1.3
--- ZNet_AppleTalk.cpp	13 Jul 2002 07:28:51 -0000	1.4
***************
*** 62,66 ****
  	{ return new ZNetAddress_AppleTalk(*this); }
  
! ZRef<ZNetEndpoint> ZNetAddress_AppleTalk::CreateConnectedEndpoint() const
  	{ return ZNetEndpoint_ADSP::sCreateConnectedEndpoint(fNet, fNode, fSocket); }
  
--- 62,66 ----
  	{ return new ZNetAddress_AppleTalk(*this); }
  
! ZRef<ZNetEndpoint> ZNetAddress_AppleTalk::OpenRW() const
  	{ return ZNetEndpoint_ADSP::sCreateConnectedEndpoint(fNet, fNode, fSocket); }
  

Index: ZNet_AppleTalk.h
===================================================================
RCS file: /cvsroot/zoolib/zoolib/src/net/ZNet_AppleTalk.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ZNet_AppleTalk.h	18 May 2002 01:01:51 -0000	1.3
--- ZNet_AppleTalk.h	13 Jul 2002 07:28:51 -0000	1.4
***************
*** 46,50 ****
  // From ZNetAddress
  	virtual ZNetAddress* Clone() const;
! 	virtual ZRef<ZNetEndpoint> CreateConnectedEndpoint() const;
  
  private:
--- 46,50 ----
  // From ZNetAddress
  	virtual ZNetAddress* Clone() const;
! 	virtual ZRef<ZNetEndpoint> OpenRW() const;
  
  private:

Index: ZNet.cpp
===================================================================
RCS file: /cvsroot/zoolib/zoolib/src/net/ZNet.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ZNet.cpp	14 May 2002 21:39:05 -0000	1.3
--- ZNet.cpp	13 Jul 2002 07:28:51 -0000	1.4
***************
*** 47,50 ****
--- 47,53 ----
  	{ return nil; };
  
+ ZRef<ZNetEndpoint> ZNetAddress::OpenRW() const
+ 	{ return ZRef<ZNetEndpoint>(); }
+ 
  // ====================================================================================================
  #pragma mark -
***************
*** 70,84 ****
  	{ return nil; };
  
  ZNetAddress* ZNetName::Lookup() const
  	{
- 	ZNetAddress* theAddress;
  	if (ZNetNameLookup* theLookup = this->CreateLookup(1))
  		{
  		theLookup->Start();
  		if (!theLookup->Finished())
! 			theAddress = theLookup->CurrentAddress().Clone();
  		delete theLookup;
  		}
! 	return theAddress;
  	}
  
--- 73,101 ----
  	{ return nil; };
  
+ ZRef<ZNetEndpoint> ZNetName::OpenRW() const
+ 	{
+ 	if (ZNetAddress* theAddress = this->Lookup())
+ 		{
+ 		ZRef<ZNetEndpoint> theEndpoint = theAddress->OpenRW();
+ 		delete theAddress;
+ 		return theEndpoint;
+ 		}
+ 	return ZRef<ZNetEndpoint>();
+ 	}
+ 
  ZNetAddress* ZNetName::Lookup() const
  	{
  	if (ZNetNameLookup* theLookup = this->CreateLookup(1))
  		{
  		theLookup->Start();
  		if (!theLookup->Finished())
! 			{
! 			ZNetAddress* theAddress = theLookup->CurrentAddress().Clone();
! 			delete theLookup;
! 			return theAddress;
! 			}
  		delete theLookup;
  		}
! 	return nil;
  	}
  

Index: ZNet.h
===================================================================
RCS file: /cvsroot/zoolib/zoolib/src/net/ZNet.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ZNet.h	12 Jul 2002 01:23:40 -0000	1.4
--- ZNet.h	13 Jul 2002 07:28:51 -0000	1.5
***************
*** 99,105 ****
  	virtual ~ZNetAddress();
  	virtual ZNetAddress* Clone() const = 0;
- 	virtual ZRef<ZNetEndpoint> CreateConnectedEndpoint() const = 0;
  
  	virtual ZNetAddressLookup* CreateLookup(size_t iMaxNames) const;
  	};
  
--- 99,110 ----
  	virtual ~ZNetAddress();
  	virtual ZNetAddress* Clone() const = 0;
  
  	virtual ZNetAddressLookup* CreateLookup(size_t iMaxNames) const;
+ 
+ 	virtual ZRef<ZNetEndpoint> OpenRW() const;
+ 
+ #if ZCONFIG_Stream_LegacyNames
+ 	ZRef<ZNetEndpoint> CreateConnectedEndpoint() const { return this->OpenRW(); }
+ #endif
  	};
  
***************
*** 149,152 ****
--- 154,159 ----
  
  	virtual ZNetNameLookup* CreateLookup(size_t iMaxAddresses) const;
+ 
+ 	ZRef<ZNetEndpoint> OpenRW() const;
  
  	ZNetAddress* Lookup() const;

Index: ZNet_Internet.cpp
===================================================================
RCS file: /cvsroot/zoolib/zoolib/src/net/ZNet_Internet.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ZNet_Internet.cpp	12 Jul 2002 01:23:40 -0000	1.4
--- ZNet_Internet.cpp	13 Jul 2002 07:28:51 -0000	1.5
***************
*** 64,68 ****
  	{ return new ZNetAddress_Internet(*this); }
  
! ZRef<ZNetEndpoint> ZNetAddress_Internet::CreateConnectedEndpoint() const
  	{ return ZNetEndpoint_TCP::sCreateConnectedEndpoint(fHost, fPort); }
  
--- 64,68 ----
  	{ return new ZNetAddress_Internet(*this); }
  
! ZRef<ZNetEndpoint> ZNetAddress_Internet::OpenRW() const
  	{ return ZNetEndpoint_TCP::sCreateConnectedEndpoint(fHost, fPort); }
  
***************
*** 101,108 ****
  ZNetNameLookup* ZNetName_Internet::CreateLookup(size_t inMaxAddresses) const
  	{
! #if 0 &&  ZCONFIG(API_Net, MacOT)
  	if (ZNet_Internet_MacOT::sHasOpenTransportInternet())
! 		return new ZNetNameLookup_Internet_MacOT(fName, fPort, inMaxAddresses);
! #endif
  
  	#if ZCONFIG(API_Net, MacClassic)
--- 101,117 ----
  ZNetNameLookup* ZNetName_Internet::CreateLookup(size_t inMaxAddresses) const
  	{
! 	#if ZCONFIG(API_Net, MacOT)
  	if (ZNet_Internet_MacOT::sHasOpenTransportInternet())
! 		{
! 		#if ZCONFIG(OS, Carbon)
! 			if (ZMacOSX::sIsMacOSX())
! 				return new ZNetNameLookup_Internet_MacOT_OSX(fName, fPort, inMaxAddresses);
! 			else
! 				return new ZNetNameLookup_Internet_MacOT_Classic(fName, fPort, inMaxAddresses);
! 		#else
! 				return new ZNetNameLookup_Internet_MacOT_Classic(fName, fPort, inMaxAddresses);
! 		#endif
! 		}
! 	#endif
  
  	#if ZCONFIG(API_Net, MacClassic)

Index: ZNet_Internet.h
===================================================================
RCS file: /cvsroot/zoolib/zoolib/src/net/ZNet_Internet.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ZNet_Internet.h	18 May 2002 01:03:11 -0000	1.4
--- ZNet_Internet.h	13 Jul 2002 07:28:51 -0000	1.5
***************
*** 53,57 ****
  // From ZNetAddress
  	virtual ZNetAddress* Clone() const;
! 	virtual ZRef<ZNetEndpoint> CreateConnectedEndpoint() const;
  
  // Our protocol
--- 53,57 ----
  // From ZNetAddress
  	virtual ZNetAddress* Clone() const;
! 	virtual ZRef<ZNetEndpoint> OpenRW() const;
  
  // Our protocol
***************
*** 59,63 ****
  	ip_port GetPort() const { return fPort; }
  
! 	ip_addr GetAddress() const { return fHost; }
  
  private:
--- 59,63 ----
  	ip_port GetPort() const { return fPort; }
  
! //	ip_addr GetAddress() const { return fHost; }
  
  private: