Mercurial > hg > orthanc

changeset 128:2a24f43d9dca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix for windows
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 05 Oct 2012 17:49:50 +0200
parents 7517cbe58623
children 5133cfc8db86
files Core/HttpServer/MongooseServer.cpp Core/HttpServer/MongooseServer.h OrthancServer/DicomProtocol/DicomServer.cpp OrthancServer/DicomProtocol/DicomServer.h OrthancServer/main.cpp
diffstat 5 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Core/HttpServer/MongooseServer.cpp	Fri Oct 05 17:45:13 2012 +0200
+++ b/Core/HttpServer/MongooseServer.cpp	Fri Oct 05 17:49:50 2012 +0200
@@ -573,7 +573,7 @@
   }
 
 
-  void MongooseServer::SetPort(uint16_t port)
+  void MongooseServer::SetPortNumber(uint16_t port)
   {
     Stop();
     port_ = port;
--- a/Core/HttpServer/MongooseServer.h	Fri Oct 05 17:45:13 2012 +0200
+++ b/Core/HttpServer/MongooseServer.h	Fri Oct 05 17:49:50 2012 +0200
@@ -57,9 +57,9 @@
 
     ~MongooseServer();
 
-    void SetPort(uint16_t port);
+    void SetPortNumber(uint16_t port);
 
-    uint16_t GetPort() const
+    uint16_t GetPortNumber() const
     {
       return port_;
     }
--- a/OrthancServer/DicomProtocol/DicomServer.cpp	Fri Oct 05 17:45:13 2012 +0200
+++ b/OrthancServer/DicomProtocol/DicomServer.cpp	Fri Oct 05 17:49:50 2012 +0200
@@ -113,13 +113,13 @@
     Stop();
   }
 
-  void DicomServer::SetPort(uint16_t port)
+  void DicomServer::SetPortNumber(uint16_t port)
   {
     Stop();
     port_ = port;
   }
 
-  uint16_t DicomServer::GetPort() const
+  uint16_t DicomServer::GetPortNumber() const
   {
     return port_;
   }
--- a/OrthancServer/DicomProtocol/DicomServer.h	Fri Oct 05 17:45:13 2012 +0200
+++ b/OrthancServer/DicomProtocol/DicomServer.h	Fri Oct 05 17:49:50 2012 +0200
@@ -58,8 +58,8 @@
 
     ~DicomServer();
 
-    void SetPort(uint16_t port);
-    uint16_t GetPort() const;
+    void SetPortNumber(uint16_t port);
+    uint16_t GetPortNumber() const;
 
     void SetThreaded(bool isThreaded);
     bool IsThreaded() const;
--- a/OrthancServer/main.cpp	Fri Oct 05 17:45:13 2012 +0200
+++ b/OrthancServer/main.cpp	Fri Oct 05 17:49:50 2012 +0200
@@ -141,12 +141,12 @@
       DicomServer dicomServer;
       dicomServer.SetCalledApplicationEntityTitleCheck(GetGlobalBoolParameter("DicomCheckCalledAet", false));
       dicomServer.SetStoreRequestHandlerFactory(storeScp);
-      dicomServer.SetPort(GetGlobalIntegerParameter("DicomPort", 4242));
+      dicomServer.SetPortNumber(GetGlobalIntegerParameter("DicomPort", 4242));
       dicomServer.SetApplicationEntityTitle(GetGlobalStringParameter("DicomAet", "ORTHANC"));
 
       // HTTP server
       MongooseServer httpServer;
-      httpServer.SetPort(GetGlobalIntegerParameter("HttpPort", 8000));
+      httpServer.SetPortNumber(GetGlobalIntegerParameter("HttpPort", 8000));
       httpServer.SetRemoteAccessAllowed(GetGlobalBoolParameter("RemoteAccessAllowed", false));
 
       httpServer.SetAuthenticationEnabled(GetGlobalBoolParameter("AuthenticationEnabled", false));
@@ -163,8 +163,8 @@
         httpServer.SetSslEnabled(false);
       }
 
-      LOG(INFO) << "DICOM server listening on port: " << dicomServer.GetPort();
-      LOG(INFO) << "HTTP server listening on port: " << httpServer.GetPort();
+      LOG(INFO) << "DICOM server listening on port: " << dicomServer.GetPortNumber();
+      LOG(INFO) << "HTTP server listening on port: " << httpServer.GetPortNumber();
 
 #if ORTHANC_STANDALONE == 1
       httpServer.RegisterHandler(new EmbeddedResourceHttpHandler("/app", EmbeddedResources::ORTHANC_EXPLORER));