Mercurial > hg > orthanc

diff OrthancServer/DicomProtocol/ReusableDicomUserConnection.cpp @ 1285:5730f374e4e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Access to called AET and remote AET from Lua scripts
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 03 Feb 2015 15:00:42 +0100
parents 21ea32170764
children 6e7e5ed91c2d
line wrap: on
line diff
--- a/OrthancServer/DicomProtocol/ReusableDicomUserConnection.cpp	Tue Feb 03 14:07:07 2015 +0100
+++ b/OrthancServer/DicomProtocol/ReusableDicomUserConnection.cpp	Tue Feb 03 15:00:42 2015 +0100
@@ -50,10 +50,10 @@
                                          ModalityManufacturer manufacturer)
   {
     if (connection_ != NULL &&
-        connection_->GetDistantApplicationEntityTitle() == remoteAet &&
-        connection_->GetDistantHost() == address &&
-        connection_->GetDistantPort() == port &&
-        connection_->GetDistantManufacturer() == manufacturer)
+        connection_->GetRemoteApplicationEntityTitle() == remoteAet &&
+        connection_->GetRemoteHost() == address &&
+        connection_->GetRemotePort() == port &&
+        connection_->GetRemoteManufacturer() == manufacturer)
     {
       // The current connection can be reused
       LOG(INFO) << "Reusing the previous SCU connection";
@@ -64,10 +64,10 @@
 
     connection_ = new DicomUserConnection();
     connection_->SetLocalApplicationEntityTitle(localAet_);
-    connection_->SetDistantApplicationEntityTitle(remoteAet);
-    connection_->SetDistantHost(address);
-    connection_->SetDistantPort(port);
-    connection_->SetDistantManufacturer(manufacturer);
+    connection_->SetRemoteApplicationEntityTitle(remoteAet);
+    connection_->SetRemoteHost(address);
+    connection_->SetRemotePort(port);
+    connection_->SetRemoteManufacturer(manufacturer);
     connection_->Open();
   }
     
@@ -179,7 +179,7 @@
   void ReusableDicomUserConnection::Unlock()
   {
     if (connection_ != NULL &&
-        connection_->GetDistantManufacturer() == ModalityManufacturer_StoreScp)
+        connection_->GetRemoteManufacturer() == ModalityManufacturer_StoreScp)
     {
       // "storescp" from DCMTK has problems when reusing a
       // connection. Always close.