Project

General

Profile

Patch #821 ยป dcmtk-3.6.2-TimeoutDatatypes.patch

Michael Onken, 2018-03-30 16:41

View differences:

dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/apps/dcmrecv.cc 2017-12-18 09:53:14.249431248 +0100
storageSCP.setPort(OFstatic_cast(Uint16, opt_port));
storageSCP.setAETitle(opt_aeTitle);
storageSCP.setMaxReceivePDULength(OFstatic_cast(Uint32, opt_maxPDULength));
storageSCP.setACSETimeout(OFstatic_cast(Uint32, opt_acseTimeout));
storageSCP.setDIMSETimeout(OFstatic_cast(Uint32, opt_dimseTimeout));
storageSCP.setACSETimeout(OFstatic_cast(OFTimeValue, opt_acseTimeout));
storageSCP.setDIMSETimeout(OFstatic_cast(OFTimeValue, opt_dimseTimeout));
storageSCP.setDIMSEBlockingMode(opt_blockingMode);
storageSCP.setVerbosePCMode(opt_showPresentationContexts);
storageSCP.setRespondWithCalledAETitle(opt_useCalledAETitle);
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/apps/dcmsend.cc 2017-12-18 09:54:14.868150653 +0100
if (cmd.findOption("--timeout"))
{
app.checkValue(cmd.getValueAndCheckMin(opt_timeout, 1));
dcmConnectionTimeout.set(OFstatic_cast(Sint32, opt_timeout));
dcmConnectionTimeout.set(OFstatic_cast(OFTimeValue, opt_timeout));
}
if (cmd.findOption("--acse-timeout"))
app.checkValue(cmd.getValueAndCheckMin(opt_acseTimeout, 1));
......
storageSCU.setPeerAETitle(opt_peerTitle);
storageSCU.setAETitle(opt_ourTitle);
storageSCU.setMaxReceivePDULength(OFstatic_cast(Uint32, opt_maxReceivePDULength));
storageSCU.setACSETimeout(OFstatic_cast(Uint32, opt_acseTimeout));
storageSCU.setDIMSETimeout(OFstatic_cast(Uint32, opt_dimseTimeout));
storageSCU.setACSETimeout(OFstatic_cast(OFTimeValue, opt_acseTimeout));
storageSCU.setDIMSETimeout(OFstatic_cast(OFTimeValue, opt_dimseTimeout));
storageSCU.setDIMSEBlockingMode(opt_blockMode);
storageSCU.setVerbosePCMode(opt_showPresentationContexts);
storageSCU.setDatasetConversionMode(opt_decompressionMode != DcmStorageSCU::DM_never);
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/apps/echoscu.cc 2017-12-18 09:54:31.175896880 +0100
#define PEERAPPLICATIONTITLE "ANY-SCP"
static T_DIMSE_BlockingMode opt_blockMode = DIMSE_BLOCKING;
static int opt_dimse_timeout = 0;
static OFTimeValue opt_dimse_timeout = 0;
static OFCondition cecho(T_ASC_Association * assoc, unsigned long num_repeat);
......
OFCmdUnsignedInt opt_numPresentationCtx = 1;
OFCmdUnsignedInt maxXferSyntaxes = OFstatic_cast(OFCmdUnsignedInt, (DIM_OF(transferSyntaxes)));
OFBool opt_secureConnection = OFFalse; /* default: no secure connection */
int opt_acse_timeout = 30;
OFTimeValue opt_acse_timeout = 30;
#ifdef WITH_OPENSSL
int opt_keyFileFormat = SSL_FILETYPE_PEM;
......
{
OFCmdSignedInt opt_timeout = 0;
app.checkValue(cmd.getValueAndCheckMin(opt_timeout, 1));
dcmConnectionTimeout.set(OFstatic_cast(Sint32, opt_timeout));
dcmConnectionTimeout.set(OFstatic_cast(OFTimeValue, opt_timeout));
}
if (cmd.findOption("--acse-timeout"))
{
OFCmdSignedInt opt_timeout = 0;
app.checkValue(cmd.getValueAndCheckMin(opt_timeout, 1));
opt_acse_timeout = OFstatic_cast(int, opt_timeout);
opt_acse_timeout = OFstatic_cast(OFTimeValue, opt_timeout);
}
if (cmd.findOption("--dimse-timeout"))
{
OFCmdSignedInt opt_timeout = 0;
app.checkValue(cmd.getValueAndCheckMin(opt_timeout, 1));
opt_dimse_timeout = OFstatic_cast(int, opt_timeout);
opt_dimse_timeout = OFstatic_cast(OFTimeValue, opt_timeout);
opt_blockMode = DIMSE_NONBLOCKING;
}
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/apps/findscu.cc 2017-12-18 09:54:01.209000200 +0100
OFList<OFString> fileNameList;
OFBool opt_abortAssociation = OFFalse;
const char * opt_abstractSyntax = UID_FINDModalityWorklistInformationModel;
int opt_acse_timeout = 30;
OFTimeValue opt_acse_timeout = 30;
T_DIMSE_BlockingMode opt_blockMode = DIMSE_BLOCKING;
OFCmdSignedInt opt_cancelAfterNResponses = -1;
int opt_dimse_timeout = 0;
OFTimeValue opt_dimse_timeout = 0;
int opt_outputResponsesToLogger = 0;
OFBool opt_extractResponsesToFile = OFFalse;
OFString opt_outputDirectory = ".";
......
{
OFCmdSignedInt opt_timeout = 0;
app.checkValue(cmd.getValueAndCheckMin(opt_timeout, 1));
dcmConnectionTimeout.set(OFstatic_cast(Sint32, opt_timeout));
dcmConnectionTimeout.set(OFstatic_cast(OFTimeValue, opt_timeout));
}
if (cmd.findOption("--acse-timeout"))
{
OFCmdSignedInt opt_timeout = 0;
app.checkValue(cmd.getValueAndCheckMin(opt_timeout, 1));
opt_acse_timeout = OFstatic_cast(int, opt_timeout);
opt_acse_timeout = OFstatic_cast(OFTimeValue, opt_timeout);
}
if (cmd.findOption("--dimse-timeout"))
{
OFCmdSignedInt opt_timeout = 0;
app.checkValue(cmd.getValueAndCheckMin(opt_timeout, 1));
opt_dimse_timeout = OFstatic_cast(int, opt_timeout);
opt_dimse_timeout = OFstatic_cast(OFTimeValue, opt_timeout);
opt_blockMode = DIMSE_NONBLOCKING;
}
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/apps/getscu.cc 2017-12-18 09:54:21.251657301 +0100
OFCmdUnsignedInt opt_repeatCount = 1;
QueryModel opt_queryModel = QMPatientRoot;
T_DIMSE_BlockingMode opt_blockMode = DIMSE_BLOCKING;
int opt_dimse_timeout = 0;
int opt_acse_timeout = 30;
OFCmdSignedInt opt_dimse_timeout = 0;
OFCmdSignedInt opt_acse_timeout = 30;
OFString opt_outputDirectory = ".";
static OFList<OFString> overrideKeys;
......
{
OFCmdSignedInt opt_timeout = 0;
app.checkValue(cmd.getValueAndCheckMin(opt_timeout, 1));
dcmConnectionTimeout.set(OFstatic_cast(Sint32, opt_timeout));
dcmConnectionTimeout.set(OFstatic_cast(OFTimeValue, opt_timeout));
}
if (cmd.findOption("--acse-timeout"))
{
OFCmdSignedInt opt_timeout = 0;
app.checkValue(cmd.getValueAndCheckMin(opt_timeout, 1));
opt_acse_timeout = OFstatic_cast(int, opt_timeout);
opt_acse_timeout = OFstatic_cast(OFTimeValue, opt_timeout);
}
if (cmd.findOption("--dimse-timeout"))
{
OFCmdSignedInt opt_timeout = 0;
app.checkValue(cmd.getValueAndCheckMin(opt_timeout, 1));
opt_dimse_timeout = OFstatic_cast(int, opt_timeout);
opt_dimse_timeout = OFstatic_cast(OFTimeValue, opt_timeout);
opt_blockMode = DIMSE_NONBLOCKING;
}
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/apps/movescu.cc 2017-12-18 10:02:34.733733643 +0100
OFCmdSignedInt opt_cancelAfterNResponses = -1;
QueryModel opt_queryModel = QMPatientRoot;
T_DIMSE_BlockingMode opt_blockMode = DIMSE_BLOCKING;
int opt_dimse_timeout = 0;
int opt_acse_timeout = 30;
OFTimeValue opt_dimse_timeout = 0;
OFTimeValue opt_acse_timeout = 30;
OFBool opt_ignorePendingDatasets = OFTrue;
OFString opt_outputDirectory = ".";
int cmove_status_code = EXITCODE_NO_ERROR;
......
{
OFCmdSignedInt opt_timeout = 0;
app.checkValue(cmd.getValueAndCheckMin(opt_timeout, 1));
dcmConnectionTimeout.set(OFstatic_cast(Sint32, opt_timeout));
dcmConnectionTimeout.set(OFstatic_cast(OFTimeValue, opt_timeout));
}
if (cmd.findOption("--acse-timeout"))
{
OFCmdSignedInt opt_timeout = 0;
app.checkValue(cmd.getValueAndCheckMin(opt_timeout, 1));
opt_acse_timeout = OFstatic_cast(int, opt_timeout);
opt_acse_timeout = OFstatic_cast(OFTimeValue, opt_timeout);
}
if (cmd.findOption("--dimse-timeout"))
{
OFCmdSignedInt opt_timeout = 0;
app.checkValue(cmd.getValueAndCheckMin(opt_timeout, 1));
opt_dimse_timeout = OFstatic_cast(int, opt_timeout);
opt_dimse_timeout = OFstatic_cast(OFTimeValue, opt_timeout);
opt_blockMode = DIMSE_NONBLOCKING;
}
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/apps/storescp.cc 2017-12-18 10:43:27.431961396 +0100
OFString lastStudySubdirectoryPathAndName;
static OFBool opt_renameOnEndOfStudy = OFFalse; // default: don't rename any files on end of study
static long opt_endOfStudyTimeout = -1; // default: no end of study timeout
static OFTimeValue opt_endOfStudyTimeout = -1; // default: no end of study timeout
static OFBool endOfStudyThroughTimeoutEvent = OFFalse;
static const char *opt_configFile = NULL;
static const char *opt_profileName = NULL;
T_DIMSE_BlockingMode opt_blockMode = DIMSE_BLOCKING;
int opt_dimse_timeout = 0;
int opt_acse_timeout = 30;
OFCmdSignedInt opt_socket_timeout = 60;
OFTimeValue opt_dimse_timeout = 0;
OFTimeValue opt_acse_timeout = 30;
OFTimeValue opt_socket_timeout = 60;
#if defined(HAVE_FORK) || defined(_WIN32)
OFBool opt_forkMode = OFFalse;
......
if (opt_networkTransferSyntax != EXS_Unknown) opt_acceptAllXfers = OFFalse;
if (cmd.findOption("--socket-timeout"))
app.checkValue(cmd.getValueAndCheckMin(opt_socket_timeout, -1));
{
OFCmdSignedInt opt_timeout = 0;
app.checkValue(cmd.getValueAndCheckMin(opt_timeout, -1));
opt_socket_timeout = OFstatic_cast(OFTimeValue, opt_timeout);
}
// always set the timeout values since the global default might be different
dcmSocketSendTimeout.set(OFstatic_cast(Sint32, opt_socket_timeout));
dcmSocketReceiveTimeout.set(OFstatic_cast(Sint32, opt_socket_timeout));
dcmSocketSendTimeout.set(OFstatic_cast(OFTimeValue, opt_socket_timeout));
dcmSocketReceiveTimeout.set(OFstatic_cast(OFTimeValue, opt_socket_timeout));
if (cmd.findOption("--acse-timeout"))
{
OFCmdSignedInt opt_timeout = 0;
app.checkValue(cmd.getValueAndCheckMin(opt_timeout, 1));
opt_acse_timeout = OFstatic_cast(int, opt_timeout);
opt_acse_timeout = OFstatic_cast(OFTimeValue, opt_timeout);
}
if (cmd.findOption("--dimse-timeout"))
{
OFCmdSignedInt opt_timeout = 0;
app.checkValue(cmd.getValueAndCheckMin(opt_timeout, 1));
opt_dimse_timeout = OFstatic_cast(int, opt_timeout);
opt_dimse_timeout = OFstatic_cast(OFTimeValue, opt_timeout);
opt_blockMode = DIMSE_NONBLOCKING;
}
......
if (cmd.findOption("--eostudy-timeout"))
{
OFCmdSignedInt opt_timeout = -1;
app.checkDependence("--eostudy-timeout", "--sort-conc-studies, --sort-on-study-uid, --sort-on-patientname, --exec-on-eostudy or --rename-on-eostudy",
(opt_sortStudyMode != ESM_None) || (opt_execOnEndOfStudy != NULL) || opt_renameOnEndOfStudy);
app.checkValue(cmd.getValueAndCheckMin(opt_endOfStudyTimeout, 0));
app.checkValue(cmd.getValueAndCheckMin(opt_timeout, 0));
opt_endOfStudyTimeout = OFstatic_cast(OFTimeValue, opt_timeout);
}
if (cmd.findOption("--exec-sync")) opt_execSync = OFTrue;
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/apps/storescu.cc 2017-12-18 09:52:48.410514654 +0100
static const char *opt_configFile = NULL;
static const char *opt_profileName = NULL;
T_DIMSE_BlockingMode opt_blockMode = DIMSE_BLOCKING;
int opt_dimse_timeout = 0;
int opt_acse_timeout = 30;
OFCmdSignedInt opt_socket_timeout = 60;
OFTimeValue opt_dimse_timeout = 0;
OFTimeValue opt_acse_timeout = 30;
OFTimeValue opt_socket_timeout = 60;
#ifdef WITH_ZLIB
static OFCmdUnsignedInt opt_compressionLevel = 0;
......
{
OFCmdSignedInt opt_timeout = 0;
app.checkValue(cmd.getValueAndCheckMin(opt_timeout, 1));
dcmConnectionTimeout.set(OFstatic_cast(Sint32, opt_timeout));
dcmConnectionTimeout.set(OFstatic_cast(OFTimeValue, opt_timeout));
}
if (cmd.findOption("--socket-timeout"))
app.checkValue(cmd.getValueAndCheckMin(opt_socket_timeout, -1));
{
OFCmdSignedInt opt_timeout = 0;
app.checkValue(cmd.getValueAndCheckMin(opt_timeout, -1));
opt_socket_timeout = OFstatic_cast(OFTimeValue, opt_timeout);
}
// always set the timeout values since the global default might be different
dcmSocketSendTimeout.set(OFstatic_cast(Sint32, opt_socket_timeout));
dcmSocketReceiveTimeout.set(OFstatic_cast(Sint32, opt_socket_timeout));
dcmSocketSendTimeout.set(OFstatic_cast(OFTimeValue, opt_socket_timeout));
dcmSocketReceiveTimeout.set(OFstatic_cast(OFTimeValue, opt_socket_timeout));
if (cmd.findOption("--acse-timeout"))
{
OFCmdSignedInt opt_timeout = 0;
app.checkValue(cmd.getValueAndCheckMin(opt_timeout, 1));
opt_acse_timeout = OFstatic_cast(int, opt_timeout);
opt_acse_timeout = OFstatic_cast(OFTimeValue, opt_timeout);
}
if (cmd.findOption("--dimse-timeout"))
{
OFCmdSignedInt opt_timeout = 0;
app.checkValue(cmd.getValueAndCheckMin(opt_timeout, 1));
opt_dimse_timeout = OFstatic_cast(int, opt_timeout);
opt_dimse_timeout = OFstatic_cast(OFTimeValue, opt_timeout);
opt_blockMode = DIMSE_NONBLOCKING;
}
......
static int
secondsSince1970()
{
time_t t = time(NULL);
return OFstatic_cast(int, t);
OFTimeValue t = time(NULL);
return OFstatic_cast(OFTimeValue, t);
}
static OFString
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/include/dcmtk/dcmnet/assoc.h 2017-12-18 10:01:06.739834102 +0100
DCMTK_DCMNET_EXPORT OFCondition ASC_initializeNetwork(
T_ASC_NetworkRole role,
int acceptorPort,
int timeout,
OFTimeValue timeout,
T_ASC_Network ** network,
unsigned long options = 0);
......
*/
DCMTK_DCMNET_EXPORT OFBool
ASC_associationWaiting(T_ASC_Network * network, int timeout);
ASC_associationWaiting(T_ASC_Network * network, OFTimeValue timeout);
DCMTK_DCMNET_EXPORT OFBool
ASC_dataWaiting(T_ASC_Association * association, int timeout);
ASC_dataWaiting(T_ASC_Association * association, OFTimeValue timeout);
DCMTK_DCMNET_EXPORT OFBool
ASC_selectReadableAssociation(
T_ASC_Association* assocs[],
int assocCount, int timeout);
int assocCount, OFTimeValue timeout);
/*
* Association Messages
......
void **associatePDU=NULL,
unsigned long *associatePDUlength=NULL,
DUL_BLOCKOPTIONS block=DUL_BLOCK,
int timeout=0);
OFTimeValue timeout=0);
DCMTK_DCMNET_EXPORT OFCondition
ASC_receiveAssociation(
......
unsigned long *associatePDUlength=NULL,
OFBool useSecureLayer=OFFalse,
DUL_BLOCKOPTIONS block=DUL_BLOCK,
int timeout=0);
OFTimeValue timeout=0);
DCMTK_DCMNET_EXPORT OFCondition
ASC_acknowledgeAssociation(
......
ASC_abortAssociation(T_ASC_Association * association);
DCMTK_DCMNET_EXPORT OFCondition
ASC_dropSCPAssociation(T_ASC_Association * association, int timeout = DUL_TIMEOUT);
ASC_dropSCPAssociation(T_ASC_Association * association, OFTimeValue timeout = DUL_TIMEOUT);
DCMTK_DCMNET_EXPORT OFCondition
ASC_dropAssociation(T_ASC_Association * association);
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/include/dcmtk/dcmnet/dcmtrans.h 2017-12-18 09:59:42.311584772 +0100
* disables the call of the corresponding setsockopt() function, so that the
* system's default behavior remains unchanged.
*/
extern DCMTK_DCMNET_EXPORT OFGlobal<Sint32> dcmSocketSendTimeout; /* default: 60 */
extern DCMTK_DCMNET_EXPORT OFGlobal<OFTimeValue> dcmSocketSendTimeout; /* default: 60 */
/** Global timeout in seconds for receiving data on a socket from a remote host.
* The default value is 60, which is useful in cases where the receiver (e.g.
......
* disables the call of the corresponding setsockopt() function, so that the
* system's default behavior remains unchanged.
*/
extern DCMTK_DCMNET_EXPORT OFGlobal<Sint32> dcmSocketReceiveTimeout; /* default: 60 */
extern DCMTK_DCMNET_EXPORT OFGlobal<OFTimeValue> dcmSocketReceiveTimeout; /* default: 60 */
/** this class represents a TCP/IP based transport connection
* which can be a transparent TCP/IP socket communication or a
......
* If this parameter is 0, the function does not block.
* @returns OFTrue if data is available, OFFalse otherwise.
*/
virtual OFBool networkDataAvailable(int timeout) = 0;
virtual OFBool networkDataAvailable(OFTimeValue timeout) = 0;
/** returns OFTrue if this connection is a transparent TCP connection,
* OFFalse if the connection is a secure connection.
......
* @return OFTrue if one or more connections are readable upon return from
* this method, OFFalse if no connection is ready for reading.
*/
static OFBool selectReadableAssociation(DcmTransportConnection *connections[], int connCount, int timeout);
static OFBool selectReadableAssociation(DcmTransportConnection *connections[], int connCount, OFTimeValue timeout);
protected:
......
* @return OFTrue if one or more connections are readable upon return from
* this method, OFFalse if no connection is ready for reading.
*/
static OFBool safeSelectReadableAssociation(DcmTransportConnection *connections[], int connCount, int timeout);
static OFBool safeSelectReadableAssociation(DcmTransportConnection *connections[], int connCount, OFTimeValue timeout);
/** indicates which of the specified transport connections is ready for
* reading. If none of the specified transport connections is ready
......
* @return OFTrue if one or more connections are readable upon return from
* this method, OFFalse if no connection is ready for reading.
*/
static OFBool fastSelectReadableAssociation(DcmTransportConnection *connections[], int connCount, int timeout);
static OFBool fastSelectReadableAssociation(DcmTransportConnection *connections[], int connCount, OFTimeValue timeout);
/// the socket file descriptor/handle used by the transport connection.
DcmNativeSocketType theSocket;
......
* If this parameter is 0, the function does not block.
* @returns OFTrue if data is available, OFFalse otherwise.
*/
virtual OFBool networkDataAvailable(int timeout);
virtual OFBool networkDataAvailable(OFTimeValue timeout);
/** returns OFTrue if this connection is a transparent TCP connection,
* OFFalse if the connection is a secure connection.
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/include/dcmtk/dcmnet/dfindscu.h 2017-12-18 09:59:24.521476478 +0100
* @param acse_timeout timeout for ACSE operations, in seconds
* @return EC_Normal if successful, an error code otherwise
*/
OFCondition initializeNetwork(int acse_timeout);
OFCondition initializeNetwork(OFTimeValue acse_timeout);
/** enable user-defined transport layer. This method is needed when
* the network association should use a non-default transport layer
......
const char *abstractSyntax,
E_TransferSyntax preferredTransferSyntax,
T_DIMSE_BlockingMode blockMode,
int dimse_timeout,
OFTimeValue dimse_timeout,
Uint32 maxReceivePDULength,
OFBool secureConnection,
OFBool abortAssociation,
......
int repeatCount,
const char *abstractSyntax,
T_DIMSE_BlockingMode blockMode,
int dimse_timeout,
OFTimeValue dimse_timeout,
OFBool extractResponsesToFile,
int cancelAfterNResponses,
OFList<OFString> *overrideKeys,
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/include/dcmtk/dcmnet/dimse.h 2017-12-18 09:59:55.810650112 +0100
/* in */
T_ASC_Association *assoc, DIC_US msgId,
/* blocking info for response */
T_DIMSE_BlockingMode blockMode, int timeout,
T_DIMSE_BlockingMode blockMode, OFTimeValue timeout,
/* out */
DIC_US *status, DcmDataset **statusDetail);
......
const char *imageFileName, DcmDataset *imageDataSet,
DIMSE_StoreUserCallback callback, void *callbackData,
/* blocking info for response */
T_DIMSE_BlockingMode blockMode, int timeout,
T_DIMSE_BlockingMode blockMode, OFTimeValue timeout,
/* out */
T_DIMSE_C_StoreRSP *response,
DcmDataset **statusDetail,
......
DcmDataset **imageDataSet,
DIMSE_StoreProviderCallback callback, void *callbackData,
/* blocking info for data set */
T_DIMSE_BlockingMode blockMode, int timeout);
T_DIMSE_BlockingMode blockMode, OFTimeValue timeout);
DCMTK_DCMNET_EXPORT OFCondition
DIMSE_sendStoreResponse(T_ASC_Association * assoc,
......
T_DIMSE_C_FindRQ *request, DcmDataset *requestIdentifiers,
DIMSE_FindUserCallback callback, void *callbackData,
/* blocking info for response */
T_DIMSE_BlockingMode blockMode, int timeout,
T_DIMSE_BlockingMode blockMode, OFTimeValue timeout,
/* out */
T_DIMSE_C_FindRSP *response, DcmDataset **statusDetail);
......
T_DIMSE_C_FindRQ *request,
DIMSE_FindProviderCallback callback, void *callbackData,
/* blocking info for data set */
T_DIMSE_BlockingMode blockMode, int timeout);
T_DIMSE_BlockingMode blockMode, OFTimeValue timeout);
DCMTK_DCMNET_EXPORT OFCondition
DIMSE_sendFindResponse(T_ASC_Association * assoc,
......
DcmDataset *requestIdentifiers,
DIMSE_MoveUserCallback callback, void *callbackData,
/* blocking info for response */
T_DIMSE_BlockingMode blockMode, int timeout,
T_DIMSE_BlockingMode blockMode, OFTimeValue timeout,
/* sub-operation provider callback */
T_ASC_Network *net,
DIMSE_SubOpProviderCallback subOpCallback, void *subOpCallbackData,
......
T_DIMSE_C_MoveRQ *request,
DIMSE_MoveProviderCallback callback, void *callbackData,
/* blocking info for data set */
T_DIMSE_BlockingMode blockMode, int timeout);
T_DIMSE_BlockingMode blockMode, OFTimeValue timeout);
DCMTK_DCMNET_EXPORT OFCondition
DIMSE_sendMoveResponse(T_ASC_Association * assoc,
......
DcmDataset *requestIdentifiers,
DIMSE_GetUserCallback callback, void *callbackData,
/* blocking info for response */
T_DIMSE_BlockingMode blockMode, int timeout,
T_DIMSE_BlockingMode blockMode, OFTimeValue timeout,
/* sub-operation provider callback */
T_ASC_Network *net,
DIMSE_SubOpProviderCallback subOpCallback, void *subOpCallbackData,
......
T_DIMSE_C_GetRQ *request,
DIMSE_GetProviderCallback callback, void *callbackData,
/* blocking info for data set */
T_DIMSE_BlockingMode blockMode, int timeout);
T_DIMSE_BlockingMode blockMode, OFTimeValue timeout);
DCMTK_DCMNET_EXPORT OFCondition
DIMSE_sendGetResponse(T_ASC_Association * assoc,
......
DCMTK_DCMNET_EXPORT OFCondition
DIMSE_receiveCommand(T_ASC_Association *association,
T_DIMSE_BlockingMode blocking,
int timeout,
OFTimeValue timeout,
T_ASC_PresentationContextID *presID,
T_DIMSE_Message *msg,
DcmDataset **statusDetail,
......
DCMTK_DCMNET_EXPORT OFCondition
DIMSE_receiveDataSetInMemory(T_ASC_Association *association,
T_DIMSE_BlockingMode blocking,
int timeout,
OFTimeValue timeout,
T_ASC_PresentationContextID *presID,
DcmDataset **dataObject,
DIMSE_ProgressCallback callback,
......
DCMTK_DCMNET_EXPORT OFCondition
DIMSE_receiveDataSetInFile(T_ASC_Association *assoc,
T_DIMSE_BlockingMode blocking, int timeout,
T_DIMSE_BlockingMode blocking, OFTimeValue timeout,
T_ASC_PresentationContextID *presID,
DcmOutputStream *filestream,
DIMSE_ProgressCallback callback, void *callbackData);
......
DCMTK_DCMNET_EXPORT OFCondition
DIMSE_ignoreDataSet( T_ASC_Association * assoc,
T_DIMSE_BlockingMode blocking,
int timeout,
OFTimeValue timeout,
DIC_UL * bytesRead,
DIC_UL * pdvCount);
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/include/dcmtk/dcmnet/dul.h 2017-12-18 10:01:41.378579710 +0100
/** Global timeout in seconds for connecting to remote hosts.
* Default value is -1, which selects infinite timeout, i.e. blocking connect().
*/
extern DCMTK_DCMNET_EXPORT OFGlobal<Sint32> dcmConnectionTimeout; /* default: -1 */
extern DCMTK_DCMNET_EXPORT OFGlobal<OFTimeValue> dcmConnectionTimeout; /* default: -1 */
/** This global flag allows to set an already opened socket file descriptor which
* will be used by dcmnet the next time receiveTransportConnectionTCP() is called.
......
DUL_InitializeNetwork(
const char *mode,
void *param,
int timeout,
OFTimeValue timeout,
unsigned long
options,
DUL_NETWORKKEY ** network);
......
DUL_ReceiveAssociationRQ(
DUL_NETWORKKEY ** network,
DUL_BLOCKOPTIONS block,
int timeout,
OFTimeValue timeout,
DUL_ASSOCIATESERVICEPARAMETERS * parameters,
DUL_ASSOCIATIONKEY ** association,
int activatePDUStorage);
......
DUL_RequestAssociation(
DUL_NETWORKKEY ** network,
DUL_BLOCKOPTIONS block,
int timeout,
OFTimeValue timeout,
DUL_ASSOCIATESERVICEPARAMETERS * params,
DUL_ASSOCIATIONKEY ** association,
int activatePDUStorage);
......
*/
DCMTK_DCMNET_EXPORT OFCondition
DUL_ReadPDVs(DUL_ASSOCIATIONKEY ** association,
DUL_PDVLIST * pdvList, DUL_BLOCKOPTIONS block, int timeout);
DUL_PDVLIST * pdvList, DUL_BLOCKOPTIONS block, OFTimeValue timeout);
DCMTK_DCMNET_EXPORT OFCondition
DUL_WritePDVs(DUL_ASSOCIATIONKEY ** association,
DUL_PDVLIST * pdvList);
......
*/
DCMTK_DCMNET_EXPORT OFBool
DUL_dataWaiting(DUL_ASSOCIATIONKEY * callerAssociation, int timeout);
DUL_dataWaiting(DUL_ASSOCIATIONKEY * callerAssociation, OFTimeValue timeout);
DCMTK_DCMNET_EXPORT DcmNativeSocketType DUL_networkSocket(DUL_NETWORKKEY * callerNet);
DCMTK_DCMNET_EXPORT OFBool
DUL_associationWaiting(DUL_NETWORKKEY * callerNet, int timeout);
DUL_associationWaiting(DUL_NETWORKKEY * callerNet, OFTimeValue timeout);
/*
* functions allowing to retrieve raw A-ASSOCIATE PDUs from the DUL layer
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/include/dcmtk/dcmnet/scpcfg.h 2017-12-18 10:00:40.759875502 +0100
* for DIMSE blocking mode messaging (see also setDIMSEBlockingMode().
* @param dimseTimeout [in] DIMSE receive timeout in seconds
*/
void setDIMSETimeout(const Uint32 dimseTimeout);
void setDIMSETimeout(const OFTimeValue dimseTimeout);
/** Set the timeout used during ACSE messaging protocol.
* @param acseTimeout [in] ACSE timeout in seconds.
*/
void setACSETimeout(const Uint32 acseTimeout);
void setACSETimeout(const OFTimeValue acseTimeout);
/** Set the timeout that should be waited for connection requests.
* Only relevant in non-blocking mode (default).
* @param timeout [in] TCP/IP connection timeout in seconds.
*/
void setConnectionTimeout(const Uint32 timeout);
void setConnectionTimeout(const OFTimeValue timeout);
/** Set whether to show presentation contexts in verbose or debug mode
* @param mode [in] Show presentation contexts in verbose mode if OFTrue. By default, the
......
/** Returns DIMSE timeout (only applicable in blocking mode)
* @return DIMSE timeout in seconds
*/
Uint32 getDIMSETimeout() const;
OFTimeValue getDIMSETimeout() const;
/** Returns ACSE timeout
* @return ACSE timeout in seconds
*/
Uint32 getACSETimeout() const;
OFTimeValue getACSETimeout() const;
/** Returns connection timeout
* @return TCP/IP connection timeout in seconds
*/
Uint32 getConnectionTimeout() const;
OFTimeValue getConnectionTimeout() const;
/** Returns the verbose presentation context mode configured specifying whether details on
* the presentation contexts (negotiated during association setup) should be shown in
......
/// Timeout for DIMSE operations in seconds. Maximum time in DIMSE non-blocking mode to
/// wait for incoming DIMSE data.
Uint32 m_dimseTimeout;
OFTimeValue m_dimseTimeout;
/// Timeout for ACSE operations in seconds. Maximum time during association negotiation
/// which is given for the SCU to follow the ACSE protocol.
Uint32 m_acseTimeout;
OFTimeValue m_acseTimeout;
/// Verbose PC mode. Flags specifying whether details on the presentation contexts
/// (negotiated during association setup) should be shown in verbose or debug mode.
......
/// Timeout in seconds that should be waited for an incoming TCP/IP connection until
/// the call returns. It is only relevant if the the SCP is set to non-blocking
/// connection mode. Otherwise, the timeout is ignored. Default is 1000 seconds.
Uint32 m_connectionTimeout;
OFTimeValue m_connectionTimeout;
/// If set, the AE title as received in the request (called AE title) is used in response
/// (default: OFTrue).
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/include/dcmtk/dcmnet/scp.h 2017-12-18 10:00:50.157454869 +0100
/// Process ID
int processId;
/// Start time
time_t startTime;
OFTimeValue startTime;
/// Indicator if process has storage ability
OFBool hasStorageAbility;
};
......
* for DIMSE blocking mode messaging (see also setDIMSEBlockingMode()).
* @param dimseTimeout [in] DIMSE receive timeout in seconds
*/
void setDIMSETimeout(const Uint32 dimseTimeout);
void setDIMSETimeout(const OFTimeValue dimseTimeout);
/** Set the timeout used during ACSE messaging protocol.
* @param acseTimeout [in] ACSE timeout in seconds.
*/
void setACSETimeout(const Uint32 acseTimeout);
void setACSETimeout(const OFTimeValue acseTimeout);
/** Set the timeout that should be waited for connection requests.
* Only relevant in non-blocking mode (default).
* @param timeout [in] TCP/IP connection timeout in seconds.
*/
void setConnectionTimeout(const Uint32 timeout);
void setConnectionTimeout(const OFTimeValue timeout);
/** Set whether to show presentation contexts in verbose or debug mode
* @param mode [in] Show presentation contexts in verbose mode if OFTrue. By default, the
......
/** Returns DIMSE timeout (only applicable in blocking mode)
* @return DIMSE timeout in seconds
*/
Uint32 getDIMSETimeout() const;
OFTimeValue getDIMSETimeout() const;
/** Returns ACSE timeout
* @return ACSE timeout in seconds
*/
Uint32 getACSETimeout() const;
OFTimeValue getACSETimeout() const;
/** Returns connection timeout
* @return TCP/IP connection timeout in seconds
*/
Uint32 getConnectionTimeout() const;
OFTimeValue getConnectionTimeout() const;
/** Returns the verbose presentation context mode configured specifying whether details on
* the presentation contexts (negotiated during association setup) should be shown in
......
T_DIMSE_Message *message,
DcmDataset **statusDetail,
DcmDataset **commandSet = NULL,
const Uint32 timeout = 0);
const OFTimeValue timeout = 0);
/** Receive one dataset (of instance data) via network from another DICOM application
* @param presID [out] Contains in the end the ID of the presentation context
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/include/dcmtk/dcmnet/scu.h 2017-12-18 09:59:05.778331249 +0100
*/
virtual OFCondition handleEVENTREPORTRequest(DcmDataset *&reqDataset,
Uint16 &eventTypeID,
const int timeout = 0);
const OFTimeValue timeout = 0);
/** Closes the association created by this SCU. Also resets the current association.
* @deprecated The use of this method is deprecated. Please use releaseAssociation()
......
* will try to read data from the incoming socket stream
* for the number of seconds configured.
*/
void setDIMSETimeout(const Uint32 dimseTimeout);
void setDIMSETimeout(const OFTimeValue dimseTimeout);
/** Set timeout for receiving ACSE messages
* @param acseTimeout [in] ACSE timeout in seconds used by timer for message timeouts
* during association negotiation
*/
void setACSETimeout(const Uint32 acseTimeout);
void setACSETimeout(const OFTimeValue acseTimeout);
/** Set global timeout for connecting to the SCP. Note that this is a global
* DCMTK setting i.e. it affects all code that uses dcmnet to start a DICOM
......
* @param connectionTimeout [in] Connection Timeout in seconds when connecting
* to SCPs. -1 will wait forever (blocking mode).
*/
void setConnectionTimeout(const Sint32 connectionTimeout);
void setConnectionTimeout(const OFTimeValue connectionTimeout);
/** Set an association configuration file and profile to be used
......
* the incoming socket stream for the number of seconds configured.
* @return The DIMSE timeout (in seconds) configured
*/
Uint32 getDIMSETimeout() const;
OFTimeValue getDIMSETimeout() const;
/** Returns ACSE timeout in seconds used by timer for message timeouts during
* association negotiation.
* @return The ACSE timeout (in seconds) configured
*/
Uint32 getACSETimeout() const;
OFTimeValue getACSETimeout() const;
/** Returns the timeout configured defining how long SCU will wait for the
* SCP when requesting an association. -1 means infinite waiting (blocking),
* 0 means no waiting at all. Note that this is currently a global DCMTK setting.
* @return The connection timeout (in seconds)
*/
Sint32 getConnectionTimeout() const;
OFTimeValue getConnectionTimeout() const;
/** Returns the storage directory used for storing objects received with C-STORE requests
* in the context of C-GET sessions. Default is empty string which refers to the current
......
T_DIMSE_Message *msg,
DcmDataset **statusDetail,
DcmDataset **commandSet = NULL,
const Uint32 timeout = 0);
const OFTimeValue timeout = 0);
/** Receives one dataset (of instance data) via network from another DICOM application
* @param presID [out] Contains in the end the ID of the presentation context which
......
Uint16 m_peerPort;
/// DIMSE timeout (default: unlimited)
Uint32 m_dimseTimeout;
OFTimeValue m_dimseTimeout;
/// ACSE timeout (default: 30 seconds)
Uint32 m_acseTimeout;
OFTimeValue m_acseTimeout;
/// Storage directory for objects received with C-STORE due to a running
/// C-GET session. By default, the received objects are stored in the current
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/libsrc/assoc.cc 2017-12-18 10:02:51.203822623 +0100
OFCondition
ASC_initializeNetwork(T_ASC_NetworkRole role,
int acceptorPort,
int timeout,
OFTimeValue timeout,
T_ASC_Network ** network,
unsigned long options)
{
......
OFBool
ASC_selectReadableAssociation(T_ASC_Association* assocs[],
int assocCount, int timeout)
int assocCount, OFTimeValue timeout)
{
if (assocCount <= 0) return OFFalse;
......
}
OFBool
ASC_dataWaiting(T_ASC_Association * association, int timeout)
ASC_dataWaiting(T_ASC_Association * association, OFTimeValue timeout)
{
return DUL_dataWaiting(association->DULassociation, timeout);
}
OFBool
ASC_associationWaiting(T_ASC_Network * network, int timeout)
ASC_associationWaiting(T_ASC_Network * network, OFTimeValue timeout)
{
#ifdef _WIN32
SOCKET s;
......
unsigned long *associatePDUlength,
OFBool useSecureLayer,
DUL_BLOCKOPTIONS block,
int timeout)
OFTimeValue timeout)
{
T_ASC_Parameters *params;
DUL_ASSOCIATIONKEY *DULassociation;
......
void **associatePDU,
unsigned long *associatePDUlength,
DUL_BLOCKOPTIONS block,
int timeout)
OFTimeValue timeout)
{
OFCondition cond = EC_Normal;
long sendLen;
......
OFCondition
ASC_dropSCPAssociation(T_ASC_Association * association, int timeout)
ASC_dropSCPAssociation(T_ASC_Association * association, OFTimeValue timeout)
{
/* if already dead don't worry */
if (association == NULL) return EC_Normal;
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/libsrc/dcmtrans.cc 2017-12-18 09:55:50.467676106 +0100
#endif
};
OFGlobal<Sint32> dcmSocketSendTimeout(60);
OFGlobal<Sint32> dcmSocketReceiveTimeout(60);
OFGlobal<OFTimeValue> dcmSocketSendTimeout(60);
OFGlobal<OFTimeValue> dcmSocketReceiveTimeout(60);
DcmTransportConnection::DcmTransportConnection(DcmNativeSocketType openSocket)
: theSocket(openSocket)
......
#warning The macro DISABLE_SEND_TIMEOUT is not supported anymore. See "macros.txt" for details.
#endif
/* get global timeout for the send() function */
const Sint32 sendTimeout = dcmSocketSendTimeout.get();
const OFTimeValue sendTimeout = dcmSocketSendTimeout.get();
if (sendTimeout >= 0)
{
if (sendTimeout == 0)
......
DCMNET_DEBUG("setting network send timeout to " << sendTimeout << " seconds");
#ifdef HAVE_WINSOCK_H
// for Windows, specify send timeout in milliseconds
int timeoutVal = sendTimeout * 1000;
OFTimeValue timeoutVal = sendTimeout * 1000;
if (setsockopt(theSocket, SOL_SOCKET, SO_SNDTIMEO, (char *) &timeoutVal, sizeof(timeoutVal)) < 0)
#else
// for other systems, specify send timeout as timeval struct
......
#warning The macro DISABLE_RECV_TIMEOUT is not supported anymore. See "macros.txt" for details.
#endif
/* get global timeout for the recv() function */
const Sint32 recvTimeout = dcmSocketReceiveTimeout.get();
const OFTimeValue recvTimeout = dcmSocketReceiveTimeout.get();
if (recvTimeout >= 0)
{
if (recvTimeout == 0)
......
DCMNET_DEBUG("setting network receive timeout to " << recvTimeout << " seconds");
#ifdef HAVE_WINSOCK_H
// for Windows, specify receive timeout in milliseconds
int timeoutVal = recvTimeout * 1000;
OFTimeValue timeoutVal = recvTimeout * 1000;
if (setsockopt(theSocket, SOL_SOCKET, SO_RCVTIMEO, (char *) &timeoutVal, sizeof(timeoutVal)) < 0)
#else
// for other systems, specify receive timeout as timeval struct
......
{
}
OFBool DcmTransportConnection::safeSelectReadableAssociation(DcmTransportConnection *connections[], int connCount, int timeout)
OFBool DcmTransportConnection::safeSelectReadableAssociation(DcmTransportConnection *connections[], int connCount, OFTimeValue timeout)
{
int numberOfRounds = timeout+1;
if (numberOfRounds < 0) numberOfRounds = 0xFFFF; /* a long time */
......
return found;
}
OFBool DcmTransportConnection::fastSelectReadableAssociation(DcmTransportConnection *connections[], int connCount, int timeout)
OFBool DcmTransportConnection::fastSelectReadableAssociation(DcmTransportConnection *connections[], int connCount, OFTimeValue timeout)
{
#ifdef _WIN32
......
fd_set fdset;
FD_ZERO(&fdset);
OFTimer timer;
int lTimeout = timeout;
OFTimeValue lTimeout = timeout;
for (i=0; i<connCount; i++)
{
......
// check for interrupt call
if (OFStandard::getLastNetworkErrorCode().value() == DCMNET_EINTR)
{
int diff = OFstatic_cast(int, timer.getDiff());
OFTimeValue diff = OFstatic_cast(OFTimeValue, timer.getDiff());
if (diff < timeout)
{
lTimeout = timeout - diff;
......
return OFTrue;
}
OFBool DcmTransportConnection::selectReadableAssociation(DcmTransportConnection *connections[], int connCount, int timeout)
OFBool DcmTransportConnection::selectReadableAssociation(DcmTransportConnection *connections[], int connCount, OFTimeValue timeout)
{
OFBool canUseFastMode = OFTrue;
for (int i=0; i<connCount; i++)
......
return 0;
}
OFBool DcmTCPConnection::networkDataAvailable(int timeout)
OFBool DcmTCPConnection::networkDataAvailable(OFTimeValue timeout)
{
struct timeval t;
fd_set fdset;
int nfound;
OFTimer timer;
int lTimeout = timeout;
OFTimeValue lTimeout = timeout;
FD_ZERO(&fdset);
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/libsrc/dfindscu.cc 2017-12-18 09:56:23.078032504 +0100
dropNetwork();
}
OFCondition DcmFindSCU::initializeNetwork(int acse_timeout)
OFCondition DcmFindSCU::initializeNetwork(OFTimeValue acse_timeout)
{
return ASC_initializeNetwork(NET_REQUESTOR, 0, acse_timeout, &net_);
}
......
const char *abstractSyntax,
E_TransferSyntax preferredTransferSyntax,
T_DIMSE_BlockingMode blockMode,
int dimse_timeout,
OFTimeValue dimse_timeout,
Uint32 maxReceivePDULength,
OFBool secureConnection,
OFBool abortAssociation,
......
int repeatCount,
const char *abstractSyntax,
T_DIMSE_BlockingMode blockMode,
int dimse_timeout,
OFTimeValue dimse_timeout,
OFBool extractResponsesToFile,
int cancelAfterNResponses,
OFList<OFString> *overrideKeys,
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/libsrc/dimecho.cc 2017-12-18 09:54:57.316774411 +0100
/* in */
T_ASC_Association *assoc, DIC_US msgId,
/* blocking info for response */
T_DIMSE_BlockingMode blockMode, int timeout,
T_DIMSE_BlockingMode blockMode, OFTimeValue timeout,
/* out */
DIC_US *status, DcmDataset **statusDetail)
{
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/libsrc/dimfind.cc 2017-12-18 09:54:43.072781023 +0100
T_ASC_PresentationContextID presID,
T_DIMSE_C_FindRQ *request, DcmDataset *requestIdentifiers,
DIMSE_FindUserCallback callback, void *callbackData,
T_DIMSE_BlockingMode blockMode, int timeout,
T_DIMSE_BlockingMode blockMode, OFTimeValue timeout,
T_DIMSE_C_FindRSP *response, DcmDataset **statusDetail)
/*
* This function sends a C-FIND-RQ message and data set information containing the given
......
T_ASC_PresentationContextID presIdCmd,
T_DIMSE_C_FindRQ *request,
DIMSE_FindProviderCallback callback, void *callbackData,
T_DIMSE_BlockingMode blockMode, int timeout)
T_DIMSE_BlockingMode blockMode, OFTimeValue timeout)
/*
* This function receives a data set which represents the search mask over the network and
* stores this data in memory. Then, it tries to select corresponding records which match the
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/libsrc/dimget.cc 2017-12-18 09:55:06.556984368 +0100
static int
selectReadable(T_ASC_Association *assoc,
T_ASC_Network *net, T_ASC_Association *subAssoc,
T_DIMSE_BlockingMode blockMode, int timeout)
T_DIMSE_BlockingMode blockMode, OFTimeValue timeout)
{
T_ASC_Association *assocList[2];
int assocCount = 0;
......
DcmDataset *requestIdentifiers,
DIMSE_GetUserCallback callback, void *callbackData,
/* blocking info for response */
T_DIMSE_BlockingMode blockMode, int timeout,
T_DIMSE_BlockingMode blockMode, OFTimeValue timeout,
/* sub-operation provider callback */
T_ASC_Network *net,
DIMSE_SubOpProviderCallback subOpCallback, void *subOpCallbackData,
......
T_DIMSE_C_GetRQ *request,
DIMSE_GetProviderCallback callback, void *callbackData,
/* blocking info for data set */
T_DIMSE_BlockingMode blockMode, int timeout)
T_DIMSE_BlockingMode blockMode, OFTimeValue timeout)
{
T_ASC_PresentationContextID presIdData;
DcmDataset *statusDetail = NULL;
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/libsrc/dimmove.cc 2017-12-18 09:56:32.771040565 +0100
T_ASC_Association *assoc,
T_ASC_Network *net,
T_ASC_Association *subAssoc,
T_DIMSE_BlockingMode blockMode, int timeout)
T_DIMSE_BlockingMode blockMode, OFTimeValue timeout)
{
T_ASC_Association *assocList[2];
int assocCount = 0;
......
DcmDataset *requestIdentifiers,
DIMSE_MoveUserCallback callback, void *callbackData,
/* blocking info for response */
T_DIMSE_BlockingMode blockMode, int timeout,
T_DIMSE_BlockingMode blockMode, OFTimeValue timeout,
/* sub-operation provider callback */
T_ASC_Network *net,
DIMSE_SubOpProviderCallback subOpCallback, void *subOpCallbackData,
......
T_DIMSE_C_MoveRQ *request,
DIMSE_MoveProviderCallback callback, void *callbackData,
/* blocking info for data set */
T_DIMSE_BlockingMode blockMode, int timeout)
T_DIMSE_BlockingMode blockMode, OFTimeValue timeout)
{
OFCondition cond = EC_Normal;
T_ASC_PresentationContextID presIdData;
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/libsrc/dimse.cc 2017-12-18 10:03:25.377656301 +0100
DIMSE_readNextPDV(
T_ASC_Association *assoc,
T_DIMSE_BlockingMode blocking,
int timeout,
OFTimeValue timeout,
DUL_PDV *pdv)
/*
* This function returns the next PDV which was (earlier or just now) received on the incoming
......
OFCondition DIMSE_ignoreDataSet(
T_ASC_Association *assoc,
T_DIMSE_BlockingMode blocking,
int timeout,
OFTimeValue timeout,
DIC_UL *bytesRead,
DIC_UL *pdvCount)
{
......
DIMSE_receiveCommand(
T_ASC_Association *assoc,
T_DIMSE_BlockingMode blocking,
int timeout,
OFTimeValue timeout,
T_ASC_PresentationContextID*presID,
T_DIMSE_Message *msg,
DcmDataset **statusDetail,
......
DIMSE_receiveDataSetInFile(
T_ASC_Association *assoc,
T_DIMSE_BlockingMode blocking,
int timeout,
OFTimeValue timeout,
T_ASC_PresentationContextID *presID,
DcmOutputStream *filestream,
DIMSE_ProgressCallback callback,
......
DIMSE_receiveDataSetInMemory(
T_ASC_Association *assoc,
T_DIMSE_BlockingMode blocking,
int timeout,
OFTimeValue timeout,
T_ASC_PresentationContextID *presID,
DcmDataset **dataObject,
DIMSE_ProgressCallback callback,
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/libsrc/dimstore.cc 2017-12-18 09:55:16.943757870 +0100
T_DIMSE_C_StoreRQ *request,
const char *imageFileName, DcmDataset *imageDataSet,
DIMSE_StoreUserCallback callback, void *callbackData,
T_DIMSE_BlockingMode blockMode, int timeout,
T_DIMSE_BlockingMode blockMode, OFTimeValue timeout,
T_DIMSE_C_StoreRSP *response,
DcmDataset **statusDetail,
T_DIMSE_DetectedCancelParameters *checkForCancelParams,
......
const char* imageFileName, int writeMetaheader,
DcmDataset **imageDataSet,
DIMSE_StoreProviderCallback callback, void *callbackData,
T_DIMSE_BlockingMode blockMode, int timeout)
T_DIMSE_BlockingMode blockMode, OFTimeValue timeout)
/*
* This function receives a data set over the network and either stores this data in a file (exactly as it was
* received) or it stores this data in memory. Before, during and after the process of receiving data, the callback
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/libsrc/dul.cc 2017-12-18 10:03:06.887415448 +0100
#include "dcmtk/ofstd/ofnetdb.h"
OFGlobal<OFBool> dcmDisableGethostbyaddr(OFFalse);
OFGlobal<Sint32> dcmConnectionTimeout(-1);
OFGlobal<OFTimeValue> dcmConnectionTimeout(-1);
OFGlobal<DcmNativeSocketType> dcmExternalSocketHandle(DCMNET_INVALID_SOCKET);
OFGlobal<const char *> dcmTCPWrapperDaemonName((const char *)NULL);
OFGlobal<unsigned long> dcmEnableBackwardCompatibility(0);
......
static int networkInitialized = 0;
static OFCondition
createNetworkKey(const char *mode, int timeout, unsigned long opt,
createNetworkKey(const char *mode, OFTimeValue timeout, unsigned long opt,
PRIVATE_NETWORKKEY ** k);
static OFCondition
createAssociationKey(PRIVATE_NETWORKKEY ** network, const char *node,
......
static OFCondition
receiveTransportConnection(PRIVATE_NETWORKKEY ** network,
DUL_BLOCKOPTIONS block,
int timeout,
OFTimeValue timeout,
DUL_ASSOCIATESERVICEPARAMETERS * params,
PRIVATE_ASSOCIATIONKEY ** association);
static OFCondition
receiveTransportConnectionTCP(PRIVATE_NETWORKKEY ** network,
DUL_BLOCKOPTIONS block,
int timeout,
OFTimeValue timeout,
DUL_ASSOCIATESERVICEPARAMETERS * params,
PRIVATE_ASSOCIATIONKEY ** association);
......
*/
OFCondition
DUL_InitializeNetwork(const char *mode,
void *networkParameter, int timeout, unsigned long opt,
void *networkParameter, OFTimeValue timeout, unsigned long opt,
DUL_NETWORKKEY ** networkKey)
{
// default return value if something goes wrong
......
DUL_RequestAssociation(
DUL_NETWORKKEY ** callerNetworkKey,
DUL_BLOCKOPTIONS block,
int timeout,
OFTimeValue timeout,
DUL_ASSOCIATESERVICEPARAMETERS * params,
DUL_ASSOCIATIONKEY ** callerAssociation,
int activatePDUStorage)
......
DUL_ReceiveAssociationRQ(
DUL_NETWORKKEY ** callerNetworkKey,
DUL_BLOCKOPTIONS block,
int timeout,
OFTimeValue timeout,
DUL_ASSOCIATESERVICEPARAMETERS * params,
DUL_ASSOCIATIONKEY ** callerAssociation,
int activatePDUStorage)
......
*/
OFCondition
DUL_ReadPDVs(DUL_ASSOCIATIONKEY ** callerAssociation,
DUL_PDVLIST * pdvList, DUL_BLOCKOPTIONS block, int timeout)
DUL_PDVLIST * pdvList, DUL_BLOCKOPTIONS block, OFTimeValue timeout)
{
PRIVATE_ASSOCIATIONKEY
** association;
......
static OFCondition
receiveTransportConnection(PRIVATE_NETWORKKEY ** network,
DUL_BLOCKOPTIONS block,
int timeout,
OFTimeValue timeout,
DUL_ASSOCIATESERVICEPARAMETERS * params,
PRIVATE_ASSOCIATIONKEY ** association)
{
......
static OFCondition
receiveTransportConnectionTCP(PRIVATE_NETWORKKEY ** network,
DUL_BLOCKOPTIONS block,
int timeout,
OFTimeValue timeout,
DUL_ASSOCIATESERVICEPARAMETERS * params,
PRIVATE_ASSOCIATIONKEY ** association)
{
......
*/
static OFCondition
createNetworkKey(const char *mode,
int timeout, unsigned long opt, PRIVATE_NETWORKKEY ** key)
OFTimeValue timeout, unsigned long opt, PRIVATE_NETWORKKEY ** key)
{
if (strcmp(mode, AE_REQUESTOR) != 0 &&
strcmp(mode, AE_ACCEPTOR) != 0 &&
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/libsrc/dulextra.cc 2017-12-18 09:54:52.468089513 +0100
#include "dcmtk/dcmnet/diutil.h"
OFBool
DUL_dataWaiting(DUL_ASSOCIATIONKEY * callerAssociation, int timeout)
DUL_dataWaiting(DUL_ASSOCIATIONKEY * callerAssociation, OFTimeValue timeout)
{
PRIVATE_ASSOCIATIONKEY * association = (PRIVATE_ASSOCIATIONKEY *)callerAssociation;
if ((association==NULL)||(association->connection == NULL)) return OFFalse;
......
}
OFBool
DUL_associationWaiting(DUL_NETWORKKEY * callerNet, int timeout)
DUL_associationWaiting(DUL_NETWORKKEY * callerNet, OFTimeValue timeout)
{
PRIVATE_NETWORKKEY *net;
DcmNativeSocketType s;
dcmtk-for-dcmjp2k-3.6.2-unix.patched/dcmnet/libsrc/dulfsm.cc 2017-12-18 10:41:57.049202070 +0100
static OFCondition
readPDUHead(PRIVATE_ASSOCIATIONKEY ** association,
unsigned char *buffer, unsigned long maxlength,
DUL_BLOCKOPTIONS block, int timeout,
DUL_BLOCKOPTIONS block, OFTimeValue timeout,
unsigned char *PDUtype, unsigned char *PDUreserved,
unsigned long *PDULength);
static OFCondition
readPDU(PRIVATE_ASSOCIATIONKEY ** association, DUL_BLOCKOPTIONS block,
int timeout, unsigned char **buffer,
OFTimeValue timeout, unsigned char **buffer,
unsigned char *pduType, unsigned char *pduReserved,
unsigned long *pduLength);
static OFCondition
readPDUBody(PRIVATE_ASSOCIATIONKEY ** association,
DUL_BLOCKOPTIONS block, int timeout,
DUL_BLOCKOPTIONS block, OFTimeValue timeout,
unsigned char *buffer, unsigned long maxLength,
unsigned char *pduType, unsigned char *pduReserved,
unsigned long *pduLength);
static OFCondition
readPDUHeadTCP(PRIVATE_ASSOCIATIONKEY ** association,
unsigned char *buffer, unsigned long maxLength,
DUL_BLOCKOPTIONS block, int timeout,
DUL_BLOCKOPTIONS block, OFTimeValue timeout,
unsigned char *PDUtype, unsigned char *PDUreserved,
unsigned long *PDULength);
static OFCondition
readPDUBodyTCP(PRIVATE_ASSOCIATIONKEY ** association,
DUL_BLOCKOPTIONS block, int timeout,
DUL_BLOCKOPTIONS block, OFTimeValue timeout,
unsigned char *buffer, unsigned long maxLength,
unsigned char *pduType, unsigned char *pduReserved,
unsigned long *pduLength);
static OFCondition
defragmentTCP(DcmTransportConnection *connection, DUL_BLOCKOPTIONS block, time_t timerStart,
int timeout, void *b, unsigned long l, unsigned long *rtnLen);
defragmentTCP(DcmTransportConnection *connection, DUL_BLOCKOPTIONS block, OFTimeValue timerStart,
OFTimeValue timeout, void *b, unsigned long l, unsigned long *rtnLen);
static OFString dump_pdu(const char *type, void *buffer, unsigned long length);
......
server.sin_port = (unsigned short) htons(port);
// get global connection timeout
Sint32 connectTimeout = dcmConnectionTimeout.get();
OFTimeValue connectTimeout = dcmConnectionTimeout.get();
#ifdef HAVE_WINSOCK_H
u_long arg = TRUE;
......
OFCondition
PRV_NextPDUType(PRIVATE_ASSOCIATIONKEY ** association, DUL_BLOCKOPTIONS block,
int timeout, unsigned char *pduType)
OFTimeValue timeout, unsigned char *pduType)
{
OFCondition cond = EC_Normal;
......
static OFCondition
readPDU(PRIVATE_ASSOCIATIONKEY ** association, DUL_BLOCKOPTIONS block,
int timeout, unsigned char **buffer,
OFTimeValue timeout, unsigned char **buffer,
unsigned char *pduType, unsigned char *pduReserved,
unsigned long *pduLength)
{
......
static OFCondition
readPDUHead(PRIVATE_ASSOCIATIONKEY ** association,
unsigned char *buffer, unsigned long maxLength,
DUL_BLOCKOPTIONS block, int timeout,
DUL_BLOCKOPTIONS block, OFTimeValue timeout,
unsigned char *PDUType, unsigned char *PDUReserved,
unsigned long *PDULength)
{
......
static OFCondition
readPDUBody(PRIVATE_ASSOCIATIONKEY ** association,
DUL_BLOCKOPTIONS block, int timeout,
DUL_BLOCKOPTIONS block, OFTimeValue timeout,
unsigned char *buffer, unsigned long maxLength,
unsigned char *pduType, unsigned char *pduReserved,
unsigned long *pduLength)
......
static OFCondition
readPDUHeadTCP(PRIVATE_ASSOCIATIONKEY ** association,
unsigned char *buffer, unsigned long maxLength,
DUL_BLOCKOPTIONS block, int timeout,
DUL_BLOCKOPTIONS block, OFTimeValue timeout,
unsigned char *type, unsigned char *reserved, unsigned long *pduLength)
{
unsigned long
......
static OFCondition
readPDUBodyTCP(PRIVATE_ASSOCIATIONKEY ** association,
DUL_BLOCKOPTIONS block, int timeout,
DUL_BLOCKOPTIONS block, OFTimeValue timeout,
unsigned char *buffer, unsigned long maxLength,
unsigned char *pduType, unsigned char *pduReserved,
unsigned long *pduLength)
......
static OFCondition
defragmentTCP(DcmTransportConnection *connection, DUL_BLOCKOPTIONS block, time_t timerStart,
int timeout, void *p, unsigned long l, unsigned long *rtnLen)
defragmentTCP(DcmTransportConnection *connection, DUL_BLOCKOPTIONS block, OFTimeValue timerStart,
OFTimeValue timeout, void *p, unsigned long l, unsigned long *rtnLen)
{
unsigned char *b;
int bytesRead;
......
if (block == DUL_NOBLOCK)
{
/* determine remaining time to wait */
timeToWait = timeout - (int) (time(NULL) - timerStart);
timeToWait = timeout - (time(NULL) - timerStart);
... This diff was truncated because it exceeds the maximum size that can be displayed.
    (1-1/1)