The TLI device name was changed from a hardcoded "dev/tcp" to a name

that can be set from a platform's config file (ACE_TLI_TCP_DEVICE).
HP-UX's config sets this to /dev/inet_cots.

5 files changed, 22 insertions, 6 deletions

diff --git a/ace/README b/ace/README
index 44d26768fb3..1052ad06434 100644
--- a/ace/README
+++ b/ace/README
@@ -185,7 +185,8 @@ ACE_HAS_TID_T				Platform supports the tid_t type (e.g., AIX)
 ACE_HAS_TIMEZONE_GETTIMEOFDAY		Platform/compiler supports timezone * as second parameter to gettimeofday()
 ACE_HAS_TIMOD_H				Platform supports TLI timod STREAMS module
 ACE_HAS_TIUSER_H			Platform supports TLI tiuser header
-ACE_HAS_TLI				Platform supports TLI
+ACE_HAS_TLI				Platform supports TLI.  Also see
+					ACE_TLI_TCP_DEVICE.
 ACE_HAS_TLI_PROTOTYPES			Platform provides TLI function prototypes
 ACE_HAS_TSS_EMULATION                   ACE provides TSS emulation.  See also ACE_DEFAULT_THREAD_KEYS.
 ACE_HAS_UALARM				Platform supports ualarm()
@@ -293,6 +294,8 @@ ACE_TEMPLATES_REQUIRE_SOURCE		Compiler's template mechanim must see source code
 ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION Compiler's template instantiation mechanism supports the use of explicit C++ specializations for all used templates. This is also used for GNU G++ if you don't use the "repo" patches.
 ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA   Compiler's template instantiation mechanism supports the use of "#pragma instantiate".  Edison Design Group compilers, e.g., SGI C++ and Green Hills 1.8.8 and later, support this.
 ACE_REQUIRES_FUNC_DEFINITIONS           Compiler requires a definition for a "hidden" function, e.g., a private, unimplemented copy constructor or assignment operator.  The SGI C++ compiler needs this, in template classes, with ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA.
+ACE_TLI_TCP_DEVICE			Device the platform uses for TCP on
+					TLI.  Only needed if not /dev/tcp.
 ACE_USE_POLL				Use the poll() event demultiplexor rather than select().
 ACE_USES_ASM_SYMBOL_IN_DLSYM		Platform uses assembly symbols instead of C symbols in dlsym()
 ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB	Platform has its standard c++ library in the namespace std.
diff --git a/ace/TLI.h b/ace/TLI.h
index 6ba333c9ca2..6e87c3e256b 100644
--- a/ace/TLI.h
+++ b/ace/TLI.h
@@ -22,6 +22,14 @@
 #include "ace/Addr.h"
 
 #if defined (ACE_HAS_TLI)
+
+// There's not a universal device name for TLI devices.  If the platform
+// needs something other than /dev/tcp, it needs to be set up in the config.h
+// file as ACE_TLI_TCP_DEVICE.
+#ifndef ACE_TLI_TCP_DEVICE
+#define ACE_TLI_TCP_DEVICE "/dev/tcp"
+#endif
+
 class ACE_Export ACE_TLI : public ACE_IPC_SAP
   // = TITLE
   //     Defines the member functions for the base class of the
diff --git a/ace/TLI_Acceptor.h b/ace/TLI_Acceptor.h
index 355d8079c66..d3ef9c42598 100644
--- a/ace/TLI_Acceptor.h
+++ b/ace/TLI_Acceptor.h
@@ -50,7 +50,7 @@ public:
 		    int oflag = O_RDWR, 
 		    struct t_info *info = 0, 
 		    int backlog = 5,
-		    const char device[] = "/dev/tcp");
+		    const char device[] = ACE_TLI_TCP_DEVICE);
   // Initiate a passive mode socket.
 
   ACE_HANDLE open (const ACE_Addr &remote_sap, 
@@ -58,7 +58,7 @@ public:
 		   int oflag = O_RDWR, 
 		   struct t_info *info = 0, 
 		   int backlog = 5,
-		   const char device[] = "/dev/tcp");
+		   const char device[] = ACE_TLI_TCP_DEVICE);
   // Initiate a passive mode socket.
 
   int close (void);
diff --git a/ace/TLI_Connector.h b/ace/TLI_Connector.h
index 4036943eb54..ba4d1202ee8 100644
--- a/ace/TLI_Connector.h
+++ b/ace/TLI_Connector.h
@@ -37,7 +37,7 @@ public:
 		     int reuse_addr = 0,
 		     int flags = O_RDWR, 
 		     int perms = 0,
-		     const char device[] = "/dev/tcp", 
+		     const char device[] = ACE_TLI_TCP_DEVICE, 
 		     struct t_info *info = 0, 
 		     int rw_flag = 1,
 		     struct netbuf *udata = 0,
@@ -63,7 +63,7 @@ public:
 	       int reuse_addr = 0,
 	       int flags = O_RDWR, 
 	       int perms = 0,
-	       const char device[] = "/dev/tcp", 
+	       const char device[] = ACE_TLI_TCP_DEVICE, 
 	       struct t_info *info = 0, 
 	       int rw_flag = 1,
 	       struct netbuf *udata = 0,
diff --git a/ace/config-hpux-10.x.h b/ace/config-hpux-10.x.h
index c5d276c28a0..fcbe4a22275 100644
--- a/ace/config-hpux-10.x.h
+++ b/ace/config-hpux-10.x.h
@@ -153,14 +153,19 @@ extern int h_errno;	/* This isn't declared in a header file on HP-UX */
 //
 ////////////////////////////////////////////////////////////////////////
 
-// Platform supports ACE_TLI.
+// Platform supports ACE_TLI, including SVR4 facilities.
 #define ACE_HAS_TLI
+// ACE_HAS_SVR4_TLI should work on HP-UX, but doesn't yet.  Riverace
+// problem ID P27.
+//#define ACE_HAS_SVR4_TLI
 // Platform supports ACE_TLI tiuser header.
 #define ACE_HAS_TIUSER_H
 // But it has _terrno() outside the extern "C" stuff.
 #define ACE_HAS_TIUSER_H_BROKEN_EXTERN_C
 // Platform provides ACE_TLI function prototypes.
 #define ACE_HAS_TLI_PROTOTYPES
+// Platform uses a TCP TLI device other than /dev/tcp.  Uses XTI only.
+#define ACE_TLI_TCP_DEVICE  "/dev/inet_cots"
 
 /////////////////////////////////////////////////////////////////////////
 //