Changed casting syntax.

Changed C-style syntax to C++-style(safer than C-style).

diff --git a/src/sslproxyserver.cpp b/src/sslproxyserver.cpp
index ab5a9e0..7514707 100644 (file)
--- a/src/sslproxyserver.cpp
+++ b/src/sslproxyserver.cpp
@@ -347,7 +347,7 @@ sslproxy_server::sslproxy_server(boost::asio::io_service& io_service,
                                                                 sslcontext,
                                                                 target_endpoint_iterator);
                sessionTable.clear();
-               sessionTable[(long)session] = 1;
+               sessionTable[reinterpret_cast<long>(session)]= 1;
                /*-------- DEBUG LOG --------*/
                if (LOG_LV_DEBUG == logger_get_log_level(LOG_CAT_SSLPROXY_SERVER)) {
                        LOGGER_PUT_LOG_DEBUG(LOG_CAT_SSLPROXY_SERVER, 19,
@@ -561,7 +561,7 @@ void sslproxy_server::handle_accept(sslproxy_session* session,
                                                       sslcontext,
                                                       target_endpoint_iterator);
                        pthread_mutex_lock( &sessionTable_mutex );
-                       sessionTable[(long)session] = 1;
+                       sessionTable[reinterpret_cast<long>(session)] = 1;
                        pthread_mutex_unlock( &sessionTable_mutex );
                        /*-------- DEBUG LOG --------*/
                        if (LOG_LV_DEBUG == logger_get_log_level(LOG_CAT_SSLPROXY_SERVER)) {

diff --git a/src/sslproxysession.cpp b/src/sslproxysession.cpp
index 4bb93e9..69df6a5 100644 (file)
--- a/src/sslproxysession.cpp
+++ b/src/sslproxysession.cpp
@@ -252,7 +252,7 @@ void sslproxy_session::start()
        }
 
        try {
-               if(sessionTable.end() != sessionTable.find((long)this)) {
+               if(sessionTable.end() != sessionTable.find(reinterpret_cast<long>(this))) {
                        // Start async handshake and Set handshake handler.
                        client_socket.async_handshake(boost::asio::ssl::stream_base::server,
                                                      boost::bind(&sslproxy_session::handle_handshake,
@@ -318,7 +318,7 @@ void sslproxy_session::start()
 void sslproxy_session::cancel(const boost::system::error_code& error)
 {
        // Check session is not already delete.
-       if(sessionTable.end() != sessionTable.find((long)this)) {
+       if(sessionTable.end() != sessionTable.find(reinterpret_cast<long>(this))) {
                // Check timout and finishing status.
                if (istimeout || finishing) {
                        destroy_session(this);
@@ -335,7 +335,7 @@ void sslproxy_session::cancel(const boost::system::error_code& error)
 
                        if (!error) {
                                // Check session is not already delete.
-                               if(sessionTable.end() != sessionTable.find((long)this)) {
+                               if(sessionTable.end() != sessionTable.find(reinterpret_cast<long>(this))) {
                                        // Check handshaked.
                                        if (!handshaked) {
                                                // When handshake not finished then timer is timeout.
@@ -385,7 +385,7 @@ void sslproxy_session::cancel(const boost::system::error_code& error)
 void sslproxy_session::cache_expire(const boost::system::error_code& error)
 {
        // Check session is not already delete.
-       if(sessionTable.end() != sessionTable.find((long)this)) {
+       if(sessionTable.end() != sessionTable.find(reinterpret_cast<long>(this))) {
                if (!error) {
                        // Server event remain.
                        server_socket.cancel();
@@ -420,12 +420,12 @@ void sslproxy_session::destroy_session(sslproxy_session* session)
        /*------ DEBUG LOG END ------*/
 
        // Check session is not already delete.
-       if(sessionTable.end() != sessionTable.find((long)session)) {
+       if(sessionTable.end() != sessionTable.find(reinterpret_cast<long>(session))) {
                finishing = true;
                if (!c_r_event && !c_w_event && !s_r_event && !s_w_event) {
                        // All event end.
                        pthread_mutex_lock(&sessionTable_mutex);
-                       sessionTable.erase((long)session);
+                       sessionTable.erase(reinterpret_cast<long>(session));
                        pthread_mutex_unlock(&sessionTable_mutex);
                        pthread_mutex_lock(&client_socket_mutex);
                        delete session;