Merge branch 'master' into 4.x

Conflicts:
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp

1 files changed, 5 insertions, 2 deletions

diff --git a/src/server/authserver/Server/RealmSocket.h b/src/server/authserver/Server/RealmSocket.h
index c532f016dcb..9682b5e4559 100755
--- a/src/server/authserver/Server/RealmSocket.h
+++ b/src/server/authserver/Server/RealmSocket.h
@@ -52,7 +52,9 @@ public:
 
     bool send(const char *buf, size_t len);
 
-    const std::string& get_remote_address(void) const;
+    const std::string& getRemoteAddress(void) const;
+
+    const uint16 getRemotePort(void) const;
 
     virtual int open(void *);
 
@@ -70,7 +72,8 @@ private:
 
     ACE_Message_Block input_buffer_;
     Session* session_;
-    std::string remote_address_;
+    std::string _remoteAddress;
+    uint16 _remotePort;
 };
 
 #endif /* __REALMSOCKET_H__ */