Commit 95fc8189 authored by Steven Murray's avatar Steven Murray
Browse files

Renamed "tape server" to "tape bridge"

parent 69d2da1c
......@@ -23,12 +23,12 @@
* @author Nicola.Bessone@cern.ch Steven.Murray@cern.ch
*****************************************************************************/
#include "castor/tape/tapeserver/BoolFunctor.hpp"
#include "castor/tape/tapebridge/BoolFunctor.hpp"
//-----------------------------------------------------------------------------
// destructor
//-----------------------------------------------------------------------------
castor::tape::tapeserver::BoolFunctor::~BoolFunctor() throw() {
castor::tape::tapebridge::BoolFunctor::~BoolFunctor() throw() {
// Do nothing
}
/******************************************************************************
* castor/tape/tapeserver/BoolFunctor.hpp
* castor/tape/tapebridge/BoolFunctor.hpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
......@@ -22,12 +22,12 @@
*
* @author Nicola.Bessone@cern.ch Steven.Murray@cern.ch
*****************************************************************************/
#ifndef _CASTOR_TAPE_TAPESERVER_BOOLFUNCTOR_HPP_
#define _CASTOR_TAPE_TAPESERVER_BOOLFUNCTOR_HPP_
#ifndef _CASTOR_TAPE_TAPEBRIDGE_BOOLFUNCTOR_HPP_
#define _CASTOR_TAPE_TAPEBRIDGE_BOOLFUNCTOR_HPP_
namespace castor {
namespace tape {
namespace tapeserver {
namespace tapebridge {
/**
* Abstract class specifiying the interface to be followed by functors that
......@@ -48,8 +48,8 @@ namespace tapeserver {
}; // class BoolFunctor
} // namespace tapeserver
} // namespace tapebridge
} // namespace tape
} // namespace castor
#endif // _CASTOR_TAPE_TAPESERVER_BOOLFUNCTOR_HPP_
#endif // _CASTOR_TAPE_TAPEBRIDGE_BOOLFUNCTOR_HPP_
/******************************************************************************
* castor/tape/tapeserver/BridgeProtocolEngine.hpp
* castor/tape/tapebridge/BridgeProtocolEngine.hpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
......@@ -22,14 +22,14 @@
* @author Nicola.Bessone@cern.ch Steven.Murray@cern.ch
*****************************************************************************/
#ifndef CASTOR_TAPE_TAPESERVER_BRIDGEPROTOCOLENGINE
#define CASTOR_TAPE_TAPESERVER_BRIDGEPROTOCOLENGINE
#ifndef CASTOR_TAPE_TAPEBRIDGE_BRIDGEPROTOCOLENGINE
#define CASTOR_TAPE_TAPEBRIDGE_BRIDGEPROTOCOLENGINE
#include "castor/exception/Exception.hpp"
#include "castor/tape/tapeserver/BoolFunctor.hpp"
#include "castor/tape/tapeserver/BridgeSocketCatalogue.hpp"
#include "castor/tape/tapeserver/Constants.hpp"
#include "castor/tape/tapeserver/Counter.hpp"
#include "castor/tape/tapebridge/BoolFunctor.hpp"
#include "castor/tape/tapebridge/BridgeSocketCatalogue.hpp"
#include "castor/tape/tapebridge/Constants.hpp"
#include "castor/tape/tapebridge/Counter.hpp"
#include "castor/tape/legacymsg/CommonMarshal.hpp"
#include "castor/tape/legacymsg/RtcpMarshal.hpp"
#include "castor/tape/tapegateway/Volume.hpp"
......@@ -43,7 +43,7 @@
namespace castor {
namespace tape {
namespace tapeserver {
namespace tapebridge {
/**
* Acts as a bridge between the tape gatway and rtcpd.
......@@ -70,8 +70,8 @@ public:
* this parameter is ignored.
* @param stoppingGracefully Functor that returns true if the daemon is
* stopping gracefully.
* @param tapeserverTransactionCounter The counter used to generate
* tapeserver transaction IDs. These are the
* @param tapebridgeTransactionCounter The counter used to generate
* tapebridge transaction IDs. These are the
* IDS used in requests to the clients.
*/
BridgeProtocolEngine(
......@@ -82,7 +82,7 @@ public:
tapegateway::Volume &volume,
const uint32_t nbFilesOnDestinationTape,
BoolFunctor &stoppingGracefully,
Counter<uint64_t> &tapeserverTransactionCounter) throw();
Counter<uint64_t> &tapebridgeTransactionCounter) throw();
/**
* Run a recall/migration session.
......@@ -135,10 +135,10 @@ private:
BoolFunctor &m_stoppingGracefully;
/**
* The counter used to generate the next tapeserver transaction ID to be used
* The counter used to generate the next tapebridge transaction ID to be used
* in a request to the client.
*/
Counter<uint64_t> &m_tapeserverTransactionCounter;
Counter<uint64_t> &m_tapebridgeTransactionCounter;
/**
* The number of received RTCP_ENDOF_REQ messages.
......@@ -224,7 +224,7 @@ private:
* rtcpd request. If there is no such tape path,
* then the value of this parameter should be set
* to NULL.
* @param aggregatorTransactionId The tapeserver transaction ID associated
* @param aggregatorTransactionId The tapebridge transaction ID associated
* with the request sent to the client. If no
* request was sent then this parameter should be
* set to 0.
......@@ -497,8 +497,8 @@ private:
}; // class BridgeProtocolEngine
} // namespace tapeserver
} // namespace tapebridge
} // namespace tape
} // namespace castor
#endif // CASTOR_TAPE_TAPESERVER_BRIDGEPROTOCOLENGINE
#endif // CASTOR_TAPE_TAPEBRIDGE_BRIDGEPROTOCOLENGINE
/******************************************************************************
* castor/tape/tapeserver/BridgeSocketCatalogue.hpp
* castor/tape/tapebridge/BridgeSocketCatalogue.hpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
......@@ -23,8 +23,8 @@
*****************************************************************************/
#include "castor/exception/Internal.hpp"
#include "castor/tape/tapeserver/BridgeSocketCatalogue.hpp"
#include "castor/tape/tapeserver/Constants.hpp"
#include "castor/tape/tapebridge/BridgeSocketCatalogue.hpp"
#include "castor/tape/tapebridge/Constants.hpp"
#include "castor/tape/utils/utils.hpp"
#include <errno.h>
......@@ -33,7 +33,7 @@
//-----------------------------------------------------------------------------
// constructor
//-----------------------------------------------------------------------------
castor::tape::tapeserver::BridgeSocketCatalogue::BridgeSocketCatalogue() :
castor::tape::tapebridge::BridgeSocketCatalogue::BridgeSocketCatalogue() :
m_listenSock(-1), m_initialRtcpdSock(-1) {
}
......@@ -41,7 +41,7 @@ castor::tape::tapeserver::BridgeSocketCatalogue::BridgeSocketCatalogue() :
//-----------------------------------------------------------------------------
// destructor
//-----------------------------------------------------------------------------
castor::tape::tapeserver::BridgeSocketCatalogue::~BridgeSocketCatalogue() {
castor::tape::tapebridge::BridgeSocketCatalogue::~BridgeSocketCatalogue() {
// Note this destructor does NOT close the listen socket used to accept rtcpd
// connections. This is the responsibility of the VdqmRequestHandler.
......@@ -67,7 +67,7 @@ castor::tape::tapeserver::BridgeSocketCatalogue::~BridgeSocketCatalogue() {
//-----------------------------------------------------------------------------
// addListenSock
//-----------------------------------------------------------------------------
void castor::tape::tapeserver::BridgeSocketCatalogue::addListenSock(
void castor::tape::tapebridge::BridgeSocketCatalogue::addListenSock(
const int listenSock) throw(castor::exception::Exception) {
if(listenSock < 0) {
......@@ -91,7 +91,7 @@ void castor::tape::tapeserver::BridgeSocketCatalogue::addListenSock(
//-----------------------------------------------------------------------------
// addInitialRtcpdConn
//-----------------------------------------------------------------------------
void castor::tape::tapeserver::BridgeSocketCatalogue::addInitialRtcpdConn(
void castor::tape::tapebridge::BridgeSocketCatalogue::addInitialRtcpdConn(
const int initialRtcpdSock) throw(castor::exception::Exception) {
if(initialRtcpdSock < 0) {
......@@ -115,7 +115,7 @@ void castor::tape::tapeserver::BridgeSocketCatalogue::addInitialRtcpdConn(
//-----------------------------------------------------------------------------
// addRtcpdDiskTapeIOControlConn
//-----------------------------------------------------------------------------
void castor::tape::tapeserver::BridgeSocketCatalogue::
void castor::tape::tapebridge::BridgeSocketCatalogue::
addRtcpdDiskTapeIOControlConn(const int rtcpdSock)
throw(castor::exception::Exception) {
......@@ -146,7 +146,7 @@ void castor::tape::tapeserver::BridgeSocketCatalogue::
//-----------------------------------------------------------------------------
// addClientConn
//-----------------------------------------------------------------------------
void castor::tape::tapeserver::BridgeSocketCatalogue::addClientConn(
void castor::tape::tapebridge::BridgeSocketCatalogue::addClientConn(
const int rtcpdSock,
const uint32_t rtcpdReqMagic,
const uint32_t rtcpdReqType,
......@@ -200,7 +200,7 @@ void castor::tape::tapeserver::BridgeSocketCatalogue::addClientConn(
// Store the client-connection
itor->clientSock = clientSock;
// Store the tapeserver transaction ID asscoiated with the request sent
// Store the tapebridge transaction ID asscoiated with the request sent
// to the client
itor->aggregatorTransactionId = aggregatorTransactionId;
......@@ -227,7 +227,7 @@ void castor::tape::tapeserver::BridgeSocketCatalogue::addClientConn(
//-----------------------------------------------------------------------------
// getListenSock
//-----------------------------------------------------------------------------
int castor::tape::tapeserver::BridgeSocketCatalogue::getListenSock()
int castor::tape::tapebridge::BridgeSocketCatalogue::getListenSock()
throw(castor::exception::Exception) {
// Throw an exception if the socket-descriptor of the listen socket does not
......@@ -244,7 +244,7 @@ int castor::tape::tapeserver::BridgeSocketCatalogue::getListenSock()
//-----------------------------------------------------------------------------
// getInitialRtcpdConn
//-----------------------------------------------------------------------------
int castor::tape::tapeserver::BridgeSocketCatalogue::getInitialRtcpdConn()
int castor::tape::tapebridge::BridgeSocketCatalogue::getInitialRtcpdConn()
throw(castor::exception::Exception) {
// Throw an exception if the socket-descriptor of the initial rtcpd
......@@ -261,7 +261,7 @@ int castor::tape::tapeserver::BridgeSocketCatalogue::getInitialRtcpdConn()
//-----------------------------------------------------------------------------
// releaseRtcpdDiskTapeIOControlConn
//-----------------------------------------------------------------------------
int castor::tape::tapeserver::BridgeSocketCatalogue::
int castor::tape::tapebridge::BridgeSocketCatalogue::
releaseRtcpdDiskTapeIOControlConn(const int rtcpdSock)
throw(castor::exception::Exception) {
......@@ -304,7 +304,7 @@ int castor::tape::tapeserver::BridgeSocketCatalogue::
//-----------------------------------------------------------------------------
// releaseClientConn
//-----------------------------------------------------------------------------
int castor::tape::tapeserver::BridgeSocketCatalogue::releaseClientConn(
int castor::tape::tapebridge::BridgeSocketCatalogue::releaseClientConn(
const int rtcpdSock, const int clientSock)
throw(castor::exception::Exception) {
......@@ -378,7 +378,7 @@ int castor::tape::tapeserver::BridgeSocketCatalogue::releaseClientConn(
//-----------------------------------------------------------------------------
// getRtcpdConn
//-----------------------------------------------------------------------------
void castor::tape::tapeserver::BridgeSocketCatalogue::getRtcpdConn(
void castor::tape::tapebridge::BridgeSocketCatalogue::getRtcpdConn(
const int clientSock,
int &rtcpdSock,
uint32_t &rtcpdReqMagic,
......@@ -426,7 +426,7 @@ void castor::tape::tapeserver::BridgeSocketCatalogue::getRtcpdConn(
//-----------------------------------------------------------------------------
// buildReadFdSet
//-----------------------------------------------------------------------------
void castor::tape::tapeserver::BridgeSocketCatalogue::buildReadFdSet(
void castor::tape::tapebridge::BridgeSocketCatalogue::buildReadFdSet(
fd_set &readFdSet, int &maxFd) throw() {
// Clear the file-descriptor set
......@@ -474,7 +474,7 @@ void castor::tape::tapeserver::BridgeSocketCatalogue::buildReadFdSet(
//-----------------------------------------------------------------------------
// getAPendingSock
//-----------------------------------------------------------------------------
int castor::tape::tapeserver::BridgeSocketCatalogue::getAPendingSock(
int castor::tape::tapebridge::BridgeSocketCatalogue::getAPendingSock(
fd_set &readFdSet, SocketType &sockType) throw() {
// If the listen socket is pending, then set the socket type output parameter
......@@ -522,7 +522,7 @@ int castor::tape::tapeserver::BridgeSocketCatalogue::getAPendingSock(
//-----------------------------------------------------------------------------
// getNbDiskTapeIOControlConnections
//-----------------------------------------------------------------------------
int castor::tape::tapeserver::BridgeSocketCatalogue::
int castor::tape::tapebridge::BridgeSocketCatalogue::
getNbDiskTapeIOControlConns() {
return m_rtcpdConnections.size();
......@@ -532,7 +532,7 @@ int castor::tape::tapeserver::BridgeSocketCatalogue::
//-----------------------------------------------------------------------------
// checkForTimeout
//-----------------------------------------------------------------------------
void castor::tape::tapeserver::BridgeSocketCatalogue::checkForTimeout()
void castor::tape::tapebridge::BridgeSocketCatalogue::checkForTimeout()
throw(castor::exception::TimeOut) {
if(!m_clientReqHistory.empty()) {
......
/******************************************************************************
* castor/tape/tapeserver/BridgeSocketCatalogue.hpp
* castor/tape/tapebridge/BridgeSocketCatalogue.hpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
......@@ -22,8 +22,8 @@
* @author Nicola.Bessone@cern.ch Steven.Murray@cern.ch
*****************************************************************************/
#ifndef CASTOR_TAPE_TAPESERVER_BRIDGESOCKETCATALOGUE
#define CASTOR_TAPE_TAPESERVER_BRIDGESOCKETCATALOGUE
#ifndef CASTOR_TAPE_TAPEBRIDGE_BRIDGESOCKETCATALOGUE
#define CASTOR_TAPE_TAPEBRIDGE_BRIDGESOCKETCATALOGUE
#include "castor/exception/Exception.hpp"
#include "castor/exception/TimeOut.hpp"
......@@ -37,7 +37,7 @@
namespace castor {
namespace tape {
namespace tapeserver {
namespace tapebridge {
/**
* The BridgeProtocolEngine is implemented as a single thread spinning in a
......@@ -160,7 +160,7 @@ public:
* sent to rtcpd.
* @param clientSock The socket-descriptor of the client connection
* from which a reply is expected.
* @param aggregatorTransactionId The tapeserver transaction ID associated
* @param aggregatorTransactionId The tapebridge transaction ID associated
* with the client request.
*/
void addClientConn(
......@@ -258,7 +258,7 @@ public:
* the initiating rtcpd request. If there is no
* such tape path, then this parameter is set to
* NULL.
* @param aggregatorTransactionId Output parameter: The tapeserver
* @param aggregatorTransactionId Output parameter: The tapebridge
* transaction ID associated with the request sent
* to the client.
* @param clientReqTimeStamp Output parameter: The time at which the request
......@@ -368,7 +368,7 @@ private:
* client. If there is no such rtcpd request message, then the value of
* this member will be 0.
*
* The primary goal of this member is to enable the tapeserver to send
* The primary goal of this member is to enable the tapebridge to send
* acknowledgement messages to rtcpd with the correct magic number, i.e.
* the same magic number as the initiating rtcpd request message.
*/
......@@ -379,7 +379,7 @@ private:
* If there is no such rtcpd request message, then the value of this member
* will be 0.
*
* The primary goal of this member is to enable the tapeserver to send
* The primary goal of this member is to enable the tapebridge to send
* acknowledgement messages to rtcpd with the correct request type, i.e.
* the same request type as the initiating rtcpd request message.
*/
......@@ -412,7 +412,7 @@ private:
int clientSock;
/**
* If a request has been resent to the client, then this is the tapeserver
* If a request has been resent to the client, then this is the tapebridge
* transaction ID associated with that request. If no message has been
* sent, then the value of this member is 0.
*/
......@@ -460,12 +460,12 @@ private:
* The "good day" shutdown sequence of an rtcpd session is as follows:
* <ol>
* <li>For each rtcpd disk/tape IO control-connection, rtcpd sends an
* RTCP_ENDOF_REQ message which the tapeserver acknowledges and closes
* RTCP_ENDOF_REQ message which the tapebridge acknowledges and closes
* its end of the connection.
* <li>Immediately after the tapeserver closes the last rtcpd disk/tape IO
* <li>Immediately after the tapebridge closes the last rtcpd disk/tape IO
* control-onnection (detected by the size of this this list reaching 0),
* the tapeserver sends an RTCP_ENDOF_REQ message to rtcpd using the
* initial rtpcd connection. The tapeserver then receives an acknowledge
* the tapebridge sends an RTCP_ENDOF_REQ message to rtcpd using the
* initial rtpcd connection. The tapebridge then receives an acknowledge
* from rtcpd and closes its end of the initial callback connection.
* <li>The rtcpd session is now successfully shutdown.
* </ol>
......@@ -507,9 +507,9 @@ private:
}; // class BridgeSocketCatalogue
} // namespace tapeserver
} // namespace tapebridge
} // namespace tape
} // namespace castor
#endif // CASTOR_TAPE_TAPESERVER_BRIDGESOCKETCATALOGUE
#endif // CASTOR_TAPE_TAPEBRIDGE_BRIDGESOCKETCATALOGUE
/******************************************************************************
* castor/tape/tapeserver/ClientTxRx.cpp
* castor/tape/tapebridge/ClientTxRx.cpp
*
* This file is part of the Castor project.
* See http://castor.web.cern.ch/castor
......@@ -25,11 +25,11 @@
#include "castor/Constants.hpp"
#include "castor/exception/Internal.hpp"
#include "castor/io/ClientSocket.hpp"
#include "castor/tape/tapeserver/DlfMessageConstants.hpp"
#include "castor/tape/tapeserver/ClientTxRx.hpp"
#include "castor/tape/tapeserver/Constants.hpp"
#include "castor/tape/tapeserver/LogHelper.hpp"
#include "castor/tape/tapeserver/SynchronizedCounter.hpp"
#include "castor/tape/tapebridge/DlfMessageConstants.hpp"
#include "castor/tape/tapebridge/ClientTxRx.hpp"
#include "castor/tape/tapebridge/Constants.hpp"
#include "castor/tape/tapebridge/LogHelper.hpp"
#include "castor/tape/tapebridge/SynchronizedCounter.hpp"
#include "castor/tape/tapegateway/DumpNotification.hpp"
#include "castor/tape/tapegateway/DumpParametersRequest.hpp"
#include "castor/tape/tapegateway/EndNotification.hpp"
......@@ -55,7 +55,7 @@
// getVolume
//------------------------------------------------------------------------------
castor::tape::tapegateway::Volume
*castor::tape::tapeserver::ClientTxRx::getVolume(
*castor::tape::tapebridge::ClientTxRx::getVolume(
const Cuuid_t &cuuid,
const uint32_t mountTransactionId,
const uint64_t aggregatorTransactionId,
......@@ -72,7 +72,7 @@ castor::tape::tapegateway::Volume
castor::dlf::Param("clientPort" , clientPort ),
castor::dlf::Param("unit" , unit )};
castor::dlf::dlf_writep(cuuid, DLF_LVL_DEBUG,
TAPESERVER_GET_VOLUME_FROM_CLIENT, params);
TAPEBRIDGE_GET_VOLUME_FROM_CLIENT, params);
}
// Prepare the request
......@@ -105,7 +105,7 @@ castor::tape::tapegateway::Volume
aggregatorTransactionId, reply->aggregatorTransactionId());
LogHelper::logMsg(cuuid, DLF_LVL_SYSTEM,
TAPESERVER_GOT_VOLUME_FROM_CLIENT, *reply, connectDuration,
TAPEBRIDGE_GOT_VOLUME_FROM_CLIENT, *reply, connectDuration,
sendRecvDuration);
// Release the reply message from its smart pointer and return it
......@@ -131,7 +131,7 @@ castor::tape::tapegateway::Volume
castor::dlf::Param("clientPort" , clientPort ),
castor::dlf::Param("unit" , unit )};
castor::dlf::dlf_writep(cuuid, DLF_LVL_SYSTEM,
TAPESERVER_GOT_NO_MORE_FILES_FROM_CLIENT, params);
TAPEBRIDGE_GOT_NO_MORE_FILES_FROM_CLIENT, params);
checkTransactionIds("NoMoreFiles",
mountTransactionId , reply->mountTransactionId(),
......@@ -160,7 +160,7 @@ castor::tape::tapegateway::Volume
//-----------------------------------------------------------------------------
// sendFileToMigrateRequest
//-----------------------------------------------------------------------------
int castor::tape::tapeserver::ClientTxRx::sendFileToMigrateRequest(
int castor::tape::tapebridge::ClientTxRx::sendFileToMigrateRequest(
const uint32_t mountTransactionId,
const uint64_t aggregatorTransactionId,
const char *clientHost,
......@@ -193,7 +193,7 @@ int castor::tape::tapeserver::ClientTxRx::sendFileToMigrateRequest(
// receiveFileToMigrateReplyAndClose
//-----------------------------------------------------------------------------
castor::tape::tapegateway::FileToMigrate
*castor::tape::tapeserver::ClientTxRx::receiveFileToMigrateReplyAndClose(
*castor::tape::tapebridge::ClientTxRx::receiveFileToMigrateReplyAndClose(
const uint32_t mountTransactionId,
const uint64_t aggregatorTransactionId,
const int clientSock)
......@@ -262,7 +262,7 @@ castor::tape::tapegateway::FileToMigrate
//-----------------------------------------------------------------------------
// sendFileToRecallRequest
//-----------------------------------------------------------------------------
int castor::tape::tapeserver::ClientTxRx::sendFileToRecallRequest(
int castor::tape::tapebridge::ClientTxRx::sendFileToRecallRequest(
const uint32_t mountTransactionId,
const uint64_t aggregatorTransactionId,
const char *clientHost,
......@@ -295,7 +295,7 @@ int castor::tape::tapeserver::ClientTxRx::sendFileToRecallRequest(
// receiveFileToRecallReplyAndClose
//-----------------------------------------------------------------------------
castor::tape::tapegateway::FileToRecall
*castor::tape::tapeserver::ClientTxRx::receiveFileToRecallReplyAndClose(
*castor::tape::tapebridge::ClientTxRx::receiveFileToRecallReplyAndClose(
const uint32_t mountTransactionId,
const uint64_t aggregatorTransactionId,
const int clientSock)
......@@ -364,7 +364,7 @@ castor::tape::tapegateway::FileToRecall
//-----------------------------------------------------------------------------
// sendFileMigratedNotification
//-----------------------------------------------------------------------------
int castor::tape::tapeserver::ClientTxRx::sendFileMigratedNotification(
int castor::tape::tapebridge::ClientTxRx::sendFileMigratedNotification(
const uint32_t mountTransactionId,
const uint64_t aggregatorTransactionId,
const char *clientHost,
......@@ -421,7 +421,7 @@ int castor::tape::tapeserver::ClientTxRx::sendFileMigratedNotification(
//-----------------------------------------------------------------------------
// sendFileRecalledNotification
//-----------------------------------------------------------------------------
int castor::tape::tapeserver::ClientTxRx::sendFileRecalledNotification(
int castor::tape::tapebridge::ClientTxRx::sendFileRecalledNotification(
const uint32_t mountTransactionId,
const uint64_t aggregatorTransactionId,
const char *clientHost,
......@@ -472,7 +472,7 @@ int castor::tape::tapeserver::ClientTxRx::sendFileRecalledNotification(
//-----------------------------------------------------------------------------
// notifyEndOfSession
//-----------------------------------------------------------------------------
void castor::tape::tapeserver::ClientTxRx::notifyEndOfSession(
void castor::tape::tapebridge::ClientTxRx::notifyEndOfSession(
const Cuuid_t &cuuid,
const uint32_t mountTransactionId,
const uint64_t aggregatorTransactionId,
......@@ -487,7 +487,7 @@ void castor::tape::tapeserver::ClientTxRx::notifyEndOfSession(
castor::dlf::Param("clientHost" , clientHost ),
castor::dlf::Param("clientPort" , clientPort )};
castor::dlf::dlf_writep(cuuid, DLF_LVL_DEBUG,
TAPESERVER_NOTIFY_CLIENT_END_OF_SESSION, params);
TAPEBRIDGE_NOTIFY_CLIENT_END_OF_SESSION, params);
}
// Prepare the request
......@@ -506,7 +506,7 @@ void castor::tape::tapeserver::ClientTxRx::notifyEndOfSession(
castor::dlf::Param("clientHost" , clientHost ),
castor::dlf::Param("clientPort" , clientPort )};
castor::dlf::dlf_writep(cuuid, DLF_LVL_SYSTEM,
TAPESERVER_NOTIFIED_CLIENT_END_OF_SESSION, params);
TAPEBRIDGE_NOTIFIED_CLIENT_END_OF_SESSION, params);
}
}
......@@ -515,7 +515,7 @@ void castor::tape::tapeserver::ClientTxRx::notifyEndOfSession(
// getDumpParameters
//-----------------------------------------------------------------------------
castor::tape::tapegateway::DumpParameters
*castor::tape::tapeserver::ClientTxRx::getDumpParameters(
*castor::tape::tapebridge::ClientTxRx::getDumpParameters(
const Cuuid_t &cuuid,
const uint32_t mountTransactionId,
const uint64_t aggregatorTransactionId,
......@@ -530,7 +530,7 @@ castor::tape::tapegateway::DumpParameters
castor::dlf::Param("clientHost" , clientHost ),
castor::dlf::Param("clientPort" , clientPort )};
castor::dlf::dlf_writep(cuuid, DLF_LVL_DEBUG,
TAPESERVER_GET_DUMP_PARAMETERS_FROM_CLIENT, params);
TAPEBRIDGE_GET_DUMP_PARAMETERS_FROM_CLIENT, params);
}
// Prepare the request
......@@ -558,7 +558,7 @@ castor::tape::tapegateway::DumpParameters
}
LogHelper::logMsg(cuuid, DLF_LVL_SYSTEM,
TAPESERVER_GOT_DUMP_PARAMETERS_FROM_CLIENT, *reply, connectDuration,
TAPEBRIDGE_GOT_DUMP_PARAMETERS_FROM_CLIENT, *reply, connectDuration,
sendRecvDuration);
checkTransactionIds("DumpParameters",
......@@ -590,7 +590,7 @@ castor::tape::tapegateway::DumpParameters
//-----------------------------------------------------------------------------
// notifyDumpMessage
//-----------------------------------------------------------------------------
void castor::tape::tapeserver::ClientTxRx::notifyDumpMessage(
void castor::tape::tapebridge::ClientTxRx::notifyDumpMessage(
const Cuuid_t &cuuid,
const uint32_t mountTransactionId,
const uint64_t aggregatorTransactionId,
......@@ -607,7 +607,7 @@ void castor::tape::tapeserver::ClientTxRx::notifyDumpMessage(
castor::dlf::Param("clientPort" , clientPort ),
castor::dlf::Param("message" , message )};
castor::dlf::dlf_writep(cuuid, DLF_LVL_DEBUG,
TAPESERVER_NOTIFY_CLIENT_DUMP_MESSAGE, params);
TAPEBRIDGE_NOTIFY_CLIENT_DUMP_MESSAGE, params);
}
// Prepare the request
......@@ -628,7 +628,7 @@ void castor::tape::tapeserver::ClientTxRx::notifyDumpMessage(
castor::dlf::Param("clientPort" , clientPort ),
castor::dlf::Param("message" , message )};
castor::dlf::dlf_writep(cuuid, DLF_LVL_DEBUG,
TAPESERVER_NOTIFIED_CLIENT_DUMP_MESSAGE, params);
TAPEBRIDGE_NOTIFIED_CLIENT_DUMP_MESSAGE, params);
}
}
......@@ -636,7 +636,7 @@ void castor::tape::tapeserver::ClientTxRx::notifyDumpMessage(
//-----------------------------------------------------------------------------
// notifyEndOfFailedSession
//-----------------------------------------------------------------------------
void castor::tape::tapeserver::ClientTxRx::notifyEndOfFailedSession(
void castor::tape::tapebridge::ClientTxRx::notifyEndOfFailedSession(
const Cuuid_t &cuuid,
const uint32_t mountTransactionId,
const uint64_t aggregatorTransactionId,
......@@ -652,7 +652,7 @@ void castor::tape::tapeserver::ClientTxRx::notifyEndOfFailedSession(
castor::dlf::Param("clientHost" , clientHost ),
castor::dlf::Param("clientPort" , clientPort )};
castor::dlf::dlf_writep(cuuid, DLF_LVL_DEBUG,
TAPESERVER_NOTIFY_CLIENT_END_OF_FAILED_SESSION, params);
TAPEBRIDGE_NOTIFY_CLIENT_END_OF_FAILED_SESSION, params);
}
// Prepare the request
......@@ -675,7 +675,7 @@ void castor::tape::tapeserver::ClientTxRx::notifyEndOfFailedSession(
castor::dlf::Param("errorCode" , ex.code() ),
castor::dlf::Param("errorrMessage" , ex.getMessage().str() )};
castor::dlf::dlf_writep(cuuid, DLF_LVL_SYSTEM,
TAPESERVER_NOTIFIED_CLIENT_END_OF_FAILED_SESSION, params);
TAPEBRIDGE_NOTIFIED_CLIENT_END_OF_FAILED_SESSION, params);
}
}
......@@ -683,7 +683,7 @@ void castor::tape::tapeserver::ClientTxRx::notifyEndOfFailedSession(
//-----------------------------------------------------------------------------
// ping
//-----------------------------------------------------------------------------
void castor::tape::tapeserver::ClientTxRx::ping(const Cuuid_t &cuuid,
void castor::tape::tapebridge::ClientTxRx::ping(const Cuuid_t &cuuid,
const uint32_t mountTransactionId,
const uint64_t aggregatorTransactionId,
const char *clientHost,
......@@ -697,7 +697,7 @@ void castor::tape::tapeserver::ClientTxRx::ping(const Cuuid_t &cuuid,
castor::dlf::Param("clientHost" , clientHost ),
castor::dlf::Param("clientPort" , clientPort )};
castor::dlf::dlf_writep(cuuid, DLF_LVL_DEBUG,
TAPESERVER_PING_CLIENT, params);
TAPEBRIDGE_PING_CLIENT, params);
}
// Prepare the request
......@@ -716,7 +716,7 @@ void castor::tape::tapeserver::ClientTxRx::ping(const Cuuid_t &cuuid,
castor::dlf::Param("clientHost" , clientHost ),
castor::dlf::Param("clientPort" , clientPort )};
castor::dlf::dlf_writep(cuuid, DLF_LVL_DEBUG,