Merge pull request #190 from mathieucarbou/getPort()

Added server.getPort()
hoeken · Sep 28, 2024 · 9ac73f2 · 9ac73f2
2 parents 595d8f3 + cb3c683
commit 9ac73f2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/src/PsychicHttpServer.cpp b/src/PsychicHttpServer.cpp
@@ -77,6 +77,11 @@ void PsychicHttpServer::setPort(uint16_t port)
   this->config.server_port = port;
 }
 
+uint16_t PsychicHttpServer::getPort()
+{
+  return this->config.server_port;
+}
+
 bool PsychicHttpServer::isConnected()
 {
   if (WiFi.softAPIP())
@@ -152,6 +157,8 @@ esp_err_t PsychicHttpServer::start()
   if (ret != ESP_OK)
     ESP_LOGE(PH_TAG, "Add 404 handler failed (%s)", esp_err_to_name(ret));
 
+  ESP_LOGI(PH_TAG, "Server started on port %" PRIu16, getPort());
+
   _running = true;
   return ret;
 }

diff --git a/src/PsychicHttpServer.h b/src/PsychicHttpServer.h
@@ -71,6 +71,7 @@ class PsychicHttpServer
     static void destroy(void* ctx);
 
     virtual void setPort(uint16_t port);
+    virtual uint16_t getPort();
 
     bool isConnected();
     bool isRunning() { return _running; }

diff --git a/src/PsychicHttpsServer.cpp b/src/PsychicHttpsServer.cpp
@@ -29,6 +29,11 @@ void PsychicHttpsServer::setPort(uint16_t port)
   this->ssl_config.port_secure = port;
 }
 
+uint16_t PsychicHttpsServer::getPort()
+{
+  return this->ssl_config.port_secure;
+}
+
 void PsychicHttpsServer::setCertificate(const uint8_t* cert, size_t cert_size, const uint8_t* private_key, size_t private_key_size)
 {
   if (cert) {

diff --git a/src/PsychicHttpsServer.h b/src/PsychicHttpsServer.h
@@ -30,6 +30,7 @@ class PsychicHttpsServer : public PsychicHttpServer
 
     // using PsychicHttpServer::listen; // keep the regular version
     virtual void setPort(uint16_t port) override final;
+    virtual uint16_t getPort() override final;
     // Pointer to certificate data in PEM format
     void setCertificate(const char* cert, const char* private_key = nullptr) { setCertificate((const uint8_t*)cert, strlen(cert) + 1, (const uint8_t*)private_key, private_key ? strlen(private_key) + 1 : 0); }
     // Pointer to certificate data in PEM or DER format. PEM-format must have a terminating NULL-character. DER-format requires the length to be passed in certSize and keySize.