Changeset 509

Timestamp:

04/10/06 15:35:52 (3 years ago)

Author:

common

Message:

library
- working on gotek2

Files:

• library/trunk/modules/service-gotek2/service-gotek2.cpp (modified) (4 diffs)
• library/trunk/modules/service-gotek2/service-gotek2.hpp (modified) (6 diffs)

library/trunk/modules/service-gotek2/service-gotek2.cpp

@@ -163 +163 @@
-        m_ConsumeLevel = CL_ASSIGN;
-
-
+           
-        m_ClientType    = GCT_UNKNOWN;
-
-    char szHandshake[2] = 
-                { 
-                        1,                              // high proto 
-                        1,                              // low proto
-                }; 
-
-        m_Socket->doWrite((char *)szHandshake,4);
-
-        m_SessionKey = (((unsigned long long) time(0)) << 48) | (((unsigned long long) (rand() & 0xFF)) << 32);
-    m_SessionKey |= (unsigned long long) rand();
-        m_Socket->doWrite((char *)&m_SessionKey,8);
-
-        char *serversoftware = "Library going gotek";
-        m_Socket->doWrite((char *)serversoftware,strlen(serversoftware)+1);
-
-        char *serverdescription = "none";
-        m_Socket->doWrite((char *)serverdescription,strlen(serverdescription)+1);
-                
-}
-
@@ -211 +193 @@
-        logPF();
-        m_Buffer.append(msg->getMsg(),msg->getSize());
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -261 +471 @@
-bool ServiceGotek2Dialogue::sqlSuccess(SQLResult *sqlresult)
-{
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-bool ServiceGotek2Dialogue::sqlFailure(SQLResult *sqlresult)
-{
+        logPF();
+
+        if ( m_QueryQueue.size() == 0 )
+        {
+                logCrit("unexpected Query callback for query %s\n",sqlresult->getQuery().c_str());
+                m_Socket->setStatus(SS_CLOSED);
+                return false;
+        }
+
+        switch ( m_ClientType )
+        {
+        case GCT_LOGIN:
+                ret = sqlFailureLOGIN(sqlresult);
+                break;
+
+        case GCT_CTRL:
+                ret = sqlFailureCTRL(sqlresult);
+                break;
+
+        case GCT_DATA:
+                ret = sqlFailureDATA(sqlresult);
+                break;
+        }
+}
+
+
+
+bool ServiceGotek2Dialogue::sqlFailureLOGIN(SQLResult *sqlresult)
+{
+        logPF();
+
+        return true;
+}
+
+
+bool ServiceGotek2Dialogue::sqlFailureCTRL(SQLResult *sqlresult)
+{
+        logPF();
+
+        return true;
+}
+
+
+bool ServiceGotek2Dialogue::sqlFailureDATA(SQLResult *sqlresult)
+{
+        logPF();
+
-        return true;
-}
@@ -280 +632 @@
-}
-
+
+

library/trunk/modules/service-gotek2/service-gotek2.hpp

@@ -38 +38 @@
-#include "SQLCallback.hpp"
-
+
-using namespace std;
-
@@ -46 +47 @@
-        class SQLResult;
-        class SQLQuery;
+
+        enum GotekClientType
+        {
+                GCT_LOGIN,
+        GCT_CONTROL,
+            GCT_DATA,
+        };
+
+
+        typedef enum 
+        {
+
+                CCMD_LOGIN,
+                CCMD_NOOP,
+                CCMD_CHECK_PRESENCE,
+                CCMD_STORE_MAGNET,
+                CCMD_REQUEST_NOTIFICATION,
+                CCMD_REQUEST_SILENCE,
+                CCMD_REPORT_INSTANCE,
+
+                CTYPE_CTRL,
+                CTYPE_DATA,
+
+                SCMD_WELCOME,
+                SCMD_PING,
+                SCMD_NOTIFY,
+
+                RPL_AUTHORIZED,
+                RPL_DENIED,
+
+                RPL_ACK,
+                RPL_NACK,
+
+                RPL_PRESENT,
+                RPL_NPRESENT,
+                RPL_UNSUPPORTED,
+
+                RPL_SUCCESSFUL,
+                RPL_FAILED,
+
+                HTYPE_SHA512,
+                HTYPE_MD5,
+                HTYPE_USERDEFINED,
+
+                WMODE_NEW,
+                WMODE_OVERWRITE,
+                WMODE_APPEND,
+
+                DTYPE_MAGNET,
+                DTYPE_SAMPLE_GET,
+                DTYPE_SAMPLE_ADD,
+                DTYPE_SAMPLE_ADD_GZIP
+        }GotekPacketType;
+
-
-        class ServiceGotek2 : public Module , public DialogueFactory
@@ -58 +113 @@
-
-
-        enum GotekClientState
-        {
-                GCS_VIRGIN = 0,
-                GCS_AUTHED,
-                GCS_DATA_RECEIVING,
-                GCS_CTRL_IDLE,
-                GCS_CTRL_PINGED,
-        };
-        
-        enum GotekClientType
-        {
-                GCT_UNKNOWN,
-        GCT_CONTROL,
-            GCT_DATA,
-        };
-
-
-        class ServiceGotek2Dialogue : public Dialogue, public SQLCallback
-        {
@@ -80 +118 @@
-                ServiceGotek2Dialogue(Socket *socket);
-                ~ServiceGotek2Dialogue();
+
-                ConsumeLevel incomingData(Message *msg);
+
+                ConsumeLevel process();
+
+                ConsumeLevel processLOGIN(bool *needmoredata);
+
+                ConsumeLevel processCTRL(bool *needmoredata);
+                ConsumeLevel processCTRL_CHECK_PRESENCE(GotekPacket *gp);
+                ConsumeLevel processCTRL_STORE_MAGNET(GotekPacket *gp);
+                ConsumeLevel processCTRL_REQUEST_NOTIFICATION(GotekPacket *gp);
+                ConsumeLevel processCTRL_REQUEST_SILENCE(GotekPacket *gp);
+                ConsumeLevel processCTRL_REPORT_INSTANCE(GotekPacket *gp);
+
+                ConsumeLevel processDATA(bool *needmoredata);
+                ConsumeLevel processDATA_MAGNET(GotekPacket *gp);
+                ConsumeLevel processDATA_SAMPLE_GET(GotekPacket *gp);
+                ConsumeLevel processDATA_SAMPLE_ADD(GotekPacket *gp);       
+                ConsumeLevel processDATA_SAMPLE_ADD_GZIP(GotekPacket *gp);
+
-                ConsumeLevel handleTimeout(Message *msg);
-                ConsumeLevel connectionLost(Message *msg);
@@ -87 +144 @@
-
-                bool sqlSuccess(SQLResult *result);
+                bool sqlSuccessLOGIN(SQLResult *result);
+                bool sqlSuccessCTRL(SQLResult *result);
+                bool sqlSuccessDATA(SQLResult *result);
+
-                bool sqlFailure(SQLResult *result);
+                bool sqlSuccessLOGIN(SQLResult *result);
+                bool sqlFailureCTRL(SQLResult *result);
+                bool sqlFailureDATA(SQLResult *result);
-
-        protected:
@@ -93 +157 @@
-                list<SQLQuery *>        m_QueryQueue;
-
-                GotekClientState        m_State;
-                GotekClientType         m_ClientType;
-