Changing requestor_port to be represented with an unsigned short rather than a short

Sebastiano Merlino · Sebastiano Merlino · commit 9c5bbdb03785 · 2018-03-04T17:58:22.000Z
diff --git a/src/http_utils.cpp b/src/http_utils.cpp
@@ -268,7 +268,7 @@ std::string get_ip_str_new(
     return to_ret;
 }
 
-short get_port(const struct sockaddr* sa)
+unsigned short get_port(const struct sockaddr* sa)
 {
     if(sa)
     {
diff --git a/src/httpserver/http_request.hpp b/src/httpserver/http_request.hpp
@@ -358,7 +358,7 @@ class http_request
          * Method used to get the requestor port used.
          * @return the requestor port
         **/
-        short get_requestor_port() const
+        unsigned short get_requestor_port() const
         {
             return this->requestor_port;
         }
@@ -415,7 +415,7 @@ class http_request
         std::string version;
         std::string requestor;
 
-        short requestor_port;
+        unsigned short requestor_port;
         struct MHD_Connection* underlying_connection;
 
         void set_underlying_connection(struct MHD_Connection* conn)
@@ -537,7 +537,7 @@ class http_request
          * Method used to set the requestor port
          * @param requestor The requestor port to set
         **/
-        void set_requestor_port(short requestor_port)
+        void set_requestor_port(unsigned short requestor_port)
         {
             this->requestor_port = requestor_port;
         }
diff --git a/src/httpserver/http_utils.hpp b/src/httpserver/http_utils.hpp
@@ -79,7 +79,7 @@ class http_utils
 #if defined(__MINGW32__) || defined(__CYGWIN32__)
         INTERNAL_SELECT = MHD_USE_SELECT_INTERNALLY | MHD_USE_POLL,
 #else
-        INTERNAL_SELECT = MHD_USE_SELECT_INTERNALLY | MHD_USE_EPOLL | MHD_USE_EPOLL_TURBO, 
+        INTERNAL_SELECT = MHD_USE_SELECT_INTERNALLY | MHD_USE_EPOLL | MHD_USE_EPOLL_TURBO,
 #endif
         THREAD_PER_CONNECTION = MHD_USE_THREAD_PER_CONNECTION | MHD_USE_POLL
     };
@@ -331,7 +331,7 @@ std::string get_ip_str_new(const struct sockaddr* sa,
  * @param sa The sockaddr object to find the port from
  * @return short representing the port
 **/
-short get_port(const struct sockaddr* sa);
+unsigned short get_port(const struct sockaddr* sa);
 
 /**
  * Method to output the contents of a headers map to a std::ostream

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ std::string get_ip_str_new(`
`268`	`268`	`return to_ret;`
`269`	`269`	`}`
`270`	`270`
`271`		`-short get_port(const struct sockaddr* sa)`
	`271`	`+unsigned short get_port(const struct sockaddr* sa)`
`272`	`272`	`{`
`273`	`273`	`if(sa)`
`274`	`274`	`{`
Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ class http_request`
`358`	`358`	`* Method used to get the requestor port used.`
`359`	`359`	`* @return the requestor port`
`360`	`360`	`**/`
`361`		`- short get_requestor_port() const`
	`361`	`+ unsigned short get_requestor_port() const`
`362`	`362`	`{`
`363`	`363`	`return this->requestor_port;`
`364`	`364`	`}`
`@@ -415,7 +415,7 @@ class http_request`
`415`	`415`	`std::string version;`
`416`	`416`	`std::string requestor;`
`417`	`417`
`418`		`- short requestor_port;`
	`418`	`+ unsigned short requestor_port;`
`419`	`419`	`struct MHD_Connection* underlying_connection;`
`420`	`420`
`421`	`421`	`void set_underlying_connection(struct MHD_Connection* conn)`
`@@ -537,7 +537,7 @@ class http_request`
`537`	`537`	`* Method used to set the requestor port`
`538`	`538`	`* @param requestor The requestor port to set`
`539`	`539`	`**/`
`540`		`- void set_requestor_port(short requestor_port)`
	`540`	`+ void set_requestor_port(unsigned short requestor_port)`
`541`	`541`	`{`
`542`	`542`	`this->requestor_port = requestor_port;`
`543`	`543`	`}`