Mercurial > hg > orthanc

comparison OrthancServer/OrthancInitialization.cpp @ 2099:bcbc9137a535

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactoring
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 07 Oct 2016 11:13:41 +0200
parents 27fd34970c52
children a657f7772e69
comparison
equal deleted inserted replaced
2098:7d184e11043e 2099:bcbc9137a535
48 #include <boost/filesystem.hpp> 48 #include <boost/filesystem.hpp>
49 #include <curl/curl.h> 49 #include <curl/curl.h>
50 #include <boost/thread.hpp> 50 #include <boost/thread.hpp>
51 51
52 52
53 #if ORTHANC_SSL_ENABLED == 1 53 #if ORTHANC_JPEG_ENABLED == 1
54 // For OpenSSL initialization and finalization 54 # include <dcmtk/dcmjpeg/djdecode.h>
55 #include <openssl/conf.h>
56 #include <openssl/engine.h>
57 #include <openssl/err.h>
58 #include <openssl/evp.h>
59 #include <openssl/ssl.h>
60 #endif 55 #endif
61 56
62 57
63 #if ORTHANC_JPEG_ENABLED == 1
64 #include <dcmtk/dcmjpeg/djdecode.h>
65 #endif
66
67
68 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1 58 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1
69 #include <dcmtk/dcmjpls/djdecode.h> 59 # include <dcmtk/dcmjpls/djdecode.h>
70 #endif 60 #endif
71 61
72 62
73 #include <dcmtk/dcmnet/dul.h> 63 #include <dcmtk/dcmnet/dul.h>
74 64
469 459
470 void OrthancInitialize(const char* configurationFile) 460 void OrthancInitialize(const char* configurationFile)
471 { 461 {
472 boost::recursive_mutex::scoped_lock lock(globalMutex_); 462 boost::recursive_mutex::scoped_lock lock(globalMutex_);
473 463
474 #if ORTHANC_SSL_ENABLED == 1 464 HttpClient::InitializeOpenSsl();
475 // https://wiki.openssl.org/index.php/Library_Initialization
476 SSL_library_init();
477 SSL_load_error_strings();
478 OpenSSL_add_all_algorithms();
479 ERR_load_crypto_strings();
480 #endif
481 465
482 InitializeServerEnumerations(); 466 InitializeServerEnumerations();
483 467
484 // Read the user-provided configuration 468 // Read the user-provided configuration
485 ReadGlobalConfiguration(configurationFile); 469 ReadGlobalConfiguration(configurationFile);
529 #if ORTHANC_JPEG_ENABLED == 1 513 #if ORTHANC_JPEG_ENABLED == 1
530 // Unregister JPEG codecs 514 // Unregister JPEG codecs
531 DJDecoderRegistration::cleanup(); 515 DJDecoderRegistration::cleanup();
532 #endif 516 #endif
533 517
534 #if ORTHANC_SSL_ENABLED == 1 518 HttpClient::FinalizeOpenSsl();
535 // Finalize OpenSSL
536 // https://wiki.openssl.org/index.php/Library_Initialization#Cleanup
537 FIPS_mode_set(0);
538 ENGINE_cleanup();
539 CONF_modules_unload(1);
540 EVP_cleanup();
541 CRYPTO_cleanup_all_ex_data();
542 ERR_remove_state(0);
543 ERR_free_strings();
544 #endif
545 } 519 }
546 520
547 521
548 std::string Configuration::GetGlobalStringParameter(const std::string& parameter, 522 std::string Configuration::GetGlobalStringParameter(const std::string& parameter,
549 const std::string& defaultValue) 523 const std::string& defaultValue)