logging_ok:

  Logging to logging@openlogging.org accepted
SCI_Transporter.hpp, SCI_Transporter.cpp:
  Major fix-up of SCI Transporter, fixed so that it works with single card, fixed wrap around, added lots of DBUG statements, merged with new transporter handling
TransporterRegistry.cpp:
  Some fixes for wrap around needed plus DBUG handling
TCP_Transporter.hpp, TCP_Transporter.cpp:
  Added DBUG statements
SHM_Transporter.hpp, SHM_Transporter.cpp:
  Fixed SHM Transporter
SHM_Buffer.hpp:
  Fixed SHM Buffer to handle wrap around properly
IPCConfig.cpp:
  Fixed up config of SCI
SocketServer.cpp:
  Added DBUG support for SocketServer threads
ConfigInfo.cpp:
  Config changes for SCI
TransporterDefinitions.hpp, mgmapi_config_parameters.h:
  SCI fixes
Makefile.am, type_ndbapitools.mk.am, type_ndbapitest.mk.am:
  Added SCI library path to Makefiles
configure.in:
  Fixed small bug with shared mem and sci together in configure
acinclude.m4:
  Added possibility of providing SCI library path in confgure


acinclude.m4:
  Added possibility of providing SCI library path in confgure
configure.in:
  Fixed small bug with shared mem and sci together in configure
ndb/config/type_ndbapitest.mk.am:
  Added SCI library path to Makefiles
ndb/config/type_ndbapitools.mk.am:
  Added SCI library path to Makefiles
ndb/src/cw/cpcd/Makefile.am:
  Added SCI library path to Makefiles
ndb/src/kernel/Makefile.am:
  Added SCI library path to Makefiles
ndb/src/kernel/blocks/backup/restore/Makefile.am:
  Added SCI library path to Makefiles
ndb/src/mgmsrv/Makefile.am:
  Added SCI library path to Makefiles
sql/Makefile.am:
  Added SCI library path to Makefiles
ndb/src/common/transporter/Makefile.am:
  Added SCI library path to Makefiles
ndb/include/mgmapi/mgmapi_config_parameters.h:
  SCI fixes
ndb/include/transporter/TransporterDefinitions.hpp:
  SCI fixes
ndb/src/mgmsrv/ConfigInfo.cpp:
  Config changes for SCI
ndb/src/common/util/SocketServer.cpp:
  Added DBUG support for SocketServer threads
ndb/src/common/mgmcommon/IPCConfig.cpp:
  Fixed up config of SCI
ndb/src/common/transporter/SHM_Buffer.hpp:
  Fixed SHM Buffer to handle wrap around properly
ndb/src/common/transporter/SHM_Transporter.cpp:
  Fixed SHM Transporter
ndb/src/common/transporter/SHM_Transporter.hpp:
  Fixed SHM Transporter
ndb/src/common/transporter/TCP_Transporter.cpp:
  Added DBUG statements
ndb/src/common/transporter/TCP_Transporter.hpp:
  Added DBUG statements
ndb/src/common/transporter/TransporterRegistry.cpp:
  Some fixes for wrap around needed plus DBUG handling
ndb/src/common/transporter/SCI_Transporter.cpp:
  Major fix-up of SCI Transporter, fixed so that it works with single card, fixed wrap around, added lots of DBUG statements, merged with new transporter handling
ndb/src/common/transporter/SCI_Transporter.hpp:
  Major fix-up of SCI Transporter, fixed so that it works with single card, fixed wrap around, added lots of DBUG statements, merged with new transporter handling
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

1 files changed, 3 insertions, 9 deletions

diff --git a/ndb/include/transporter/TransporterDefinitions.hpp b/ndb/include/transporter/TransporterDefinitions.hpp
index 445e8b889d2..a8da8068552 100644
--- a/ndb/include/transporter/TransporterDefinitions.hpp
+++ b/ndb/include/transporter/TransporterDefinitions.hpp
@@ -59,8 +59,6 @@ struct TCP_TransporterConfiguration {
   NodeId localNodeId;
   Uint32 sendBufferSize;     // Size of SendBuffer of priority B 
   Uint32 maxReceiveSize;     // Maximum no of bytes to receive
-  Uint32 byteOrder;
-  bool compression;
   bool checksum;
   bool signalId;
 };
@@ -72,10 +70,8 @@ struct SHM_TransporterConfiguration {
   Uint32 port; 
   NodeId remoteNodeId;
   NodeId localNodeId;
-  bool compression;
   bool checksum;
   bool signalId;
-  int byteOrder;
   
   Uint32 shmKey;
   Uint32 shmSize;
@@ -89,10 +85,8 @@ struct OSE_TransporterConfiguration {
   const char *localHostName;
   NodeId remoteNodeId;
   NodeId localNodeId;
-  bool compression;
   bool checksum;
   bool signalId;
-  int byteOrder;
   
   Uint32 prioASignalSize;
   Uint32 prioBSignalSize;
@@ -103,20 +97,20 @@ struct OSE_TransporterConfiguration {
  * SCI Transporter Configuration
  */
 struct SCI_TransporterConfiguration {
+  const char *remoteHostName;
+  const char *localHostName;
+  Uint32 port; 
   Uint32 sendLimit;        // Packet size
   Uint32 bufferSize;       // Buffer size
 
   Uint32 nLocalAdapters;   // 1 or 2, the number of adapters on local host
   
-  Uint32 nRemoteAdapters;
   Uint32 remoteSciNodeId0; // SCInodeId for adapter 1
   Uint32 remoteSciNodeId1; // SCInodeId for adapter 2
   
   NodeId localNodeId;      // Local node Id
   NodeId remoteNodeId;     // Remote node Id
 
-  Uint32 byteOrder;
-  bool compression;
   bool checksum;
   bool signalId;