From 7fb2f6deb568c9d802acd2921cbb368015ebe0f3 Mon Sep 17 00:00:00 2001
From: Henrique Santiago <henrique_santiago93@hotmail.com>
Date: Sun, 12 Aug 2012 01:54:45 -0300
Subject: [PATCH] Add getIp function, remove unused sql function

---
 src/framework/luafunctions.cpp   |  2 +-
 src/framework/net/connection.cpp | 10 ++++++++++
 src/framework/net/connection.h   |  1 +
 src/framework/sql/mysql.cpp      | 19 -------------------
 src/framework/sql/mysql.h        |  1 -
 5 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/framework/luafunctions.cpp b/src/framework/luafunctions.cpp
index a17c3043..b368de91 100644
--- a/src/framework/luafunctions.cpp
+++ b/src/framework/luafunctions.cpp
@@ -660,6 +660,7 @@ void Application::registerLuaFunctions()
 
     // Connection
     g_lua.registerClass<Connection>();
+    g_lua.bindClassMemberFunction<Connection>("getIp", &Connection::getIp);
 
     // Protocol
     g_lua.registerClass<Protocol>();
@@ -737,7 +738,6 @@ void Application::registerLuaFunctions()
     g_lua.bindClassMemberFunction<DBResult>("getDataInt", &DBResult::getDataInt);
     g_lua.bindClassMemberFunction<DBResult>("getDataLong", &DBResult::getDataLong);
     g_lua.bindClassMemberFunction<DBResult>("getDataString", &DBResult::getDataString);
-    //g_lua.bindClassMemberFunction<DBResult>("getDataStream", &DBResult::getDataStream);
     g_lua.bindClassMemberFunction<DBResult>("next", &DBResult::next);
 
     // Mysql
diff --git a/src/framework/net/connection.cpp b/src/framework/net/connection.cpp
index d907a4e8..de3b1019 100644
--- a/src/framework/net/connection.cpp
+++ b/src/framework/net/connection.cpp
@@ -240,3 +240,13 @@ void Connection::handleError(const boost::system::error_code& error)
     }
 }
 
+int Connection::getIp()
+{
+    boost::system::error_code error;
+    const boost::asio::ip::tcp::endpoint ip = m_socket.remote_endpoint(error);
+    if(!error)
+        return boost::asio::detail::socket_ops::host_to_network_long(ip.address().to_v4().to_ulong());
+
+    g_logger.error("Getting remote ip");
+    return 0;
+}
diff --git a/src/framework/net/connection.h b/src/framework/net/connection.h
index 32270685..3bf99bf0 100644
--- a/src/framework/net/connection.h
+++ b/src/framework/net/connection.h
@@ -58,6 +58,7 @@ public:
 
     void setErrorCallback(const ErrorCallback& errorCallback) { m_errorCallback = errorCallback; }
 
+    int getIp();
     boost::system::error_code getError() { return m_error; }
     bool isConnecting() { return m_connecting; }
     bool isConnected() { return m_connected; }
diff --git a/src/framework/sql/mysql.cpp b/src/framework/sql/mysql.cpp
index 7648a045..a9b68893 100644
--- a/src/framework/sql/mysql.cpp
+++ b/src/framework/sql/mysql.cpp
@@ -263,25 +263,6 @@ std::string DBResult::getDataString(const std::string &s)
     return std::string("");
 }
 
-const char* DBResult::getDataStream(const std::string &s, unsigned long &size)
-{
-    ListNames::iterator it = m_listNames.find(s);
-    if(it != m_listNames.end() ) {
-        if(m_row[it->second] == NULL) {
-            size = 0;
-            return NULL;
-        }
-        else {
-            size = mysql_fetch_lengths(m_res)[it->second];
-            return m_row[it->second];
-        }
-    }
-
-    g_logger.error(stdext::format("error during getDataStream(%s).", s));
-    size = 0;
-    return NULL;
-}
-
 bool DBResult::next()
 {
     m_row = mysql_fetch_row(m_res);
diff --git a/src/framework/sql/mysql.h b/src/framework/sql/mysql.h
index d9605679..6add5d80 100644
--- a/src/framework/sql/mysql.h
+++ b/src/framework/sql/mysql.h
@@ -71,7 +71,6 @@ public:
     int32_t getDataInt(const std::string &s);
     int64_t getDataLong(const std::string &s);
     std::string getDataString(const std::string &s);
-    const char* getDataStream(const std::string &s, unsigned long &size);
 
     bool next();