Mercurial > hg > orthanc

changeset 4433:4f92f2b3a3ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix build if OpenSSL is disabled
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 04 Jan 2021 16:06:05 +0100
parents fcbac3e8ac1c
children 442c5632177e
files OrthancFramework/Sources/DicomNetworking/DicomAssociation.cpp
diffstat 1 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Sources/DicomNetworking/DicomAssociation.cpp	Mon Jan 04 15:59:32 2021 +0100
+++ b/OrthancFramework/Sources/DicomNetworking/DicomAssociation.cpp	Mon Jan 04 16:06:05 2021 +0100
@@ -253,8 +253,11 @@
 
     assert(net_ == NULL &&
            params_ == NULL &&
-           assoc_ == NULL &&
-           tls_.get() == NULL);
+           assoc_ == NULL);
+
+#if ORTHANC_ENABLE_SSL == 1
+    assert(tls_.get() == NULL);
+#endif
 
     if (proposed_.empty())
     {
@@ -315,7 +318,11 @@
     CheckConnecting(parameters, ASC_setPresentationAddresses(params_, localHost, remoteHostAndPort));
 
     // Set various options
+#if ORTHANC_ENABLE_SSL == 1
     CheckConnecting(parameters, ASC_setTransportLayerType(params_, (tls_.get() != NULL) /*opt_secureConnection*/));
+#else
+    CheckConnecting(parameters, ASC_setTransportLayerType(params_, false /*opt_secureConnection*/));
+#endif
 
     // Setup the list of proposed presentation contexts
     unsigned int presentationContextId = 1;