Changeset 197

Timestamp:

07/28/10 16:40:08 (22 months ago)

Author:

frank

Message:

Add a TCP/IP servercore to Kraken.

Location:

tinkering/Kraken

Files:

• Fragment.cpp (modified) (1 diff)
• Kraken.cpp (modified) (11 diffs)
• Kraken.h (modified) (4 diffs)
• ServerCore.cpp (added)
• ServerCore.h (added)
• build.sh (modified) (1 diff)

tinkering/Kraken/Fragment.cpp

@@ -97 +97 @@
         if (start_round<0) {
             /* Found */
-            printf("Found %016llx @ %i\n", result, mBitPos);
+            char msg[128];
+            snprintf(msg,128,"Found %016llx @ %i    (table:%i)\n", result, mBitPos, mAdvance);
+            printf("%s",msg);
+            Kraken::getInstance()->reportFind(string(msg));
         }
         return Kraken::getInstance()->removeFragment(this);

tinkering/Kraken/Kraken.cpp

@@ -5 +5 @@
 #include <assert.h>
 #include <string.h>
+#include <stdlib.h>
 #include "../a5_cpu/A5CpuStubs.h"
 #include "../a5_ati/A5AtiStubs.h"
@@ -10 +11 @@
 Kraken* Kraken::mInstance = NULL;
 
-Kraken::Kraken(const char* config) :
+Kraken::Kraken(const char* config, int server_port) :
     mNumDevices(0)
 {
@@ -80 +81 @@
     sem_init( &mMutex, 0, 1 );
 
-    
     A5CpuInit(8, 12, 4);
     
@@ -91 +91 @@
         mUsingAti = false;
     }
+
     mBusy = false;
+    mCurrentClient = 0;
+    mServer = NULL;
+    if (server_port) {
+        mServer = new ServerCore(server_port, serverCmd);
+    }
 }
 
@@ -115 +121 @@
 }
 
-void Kraken::Crack(const char* plaintext)
+void Kraken::Crack(int client, const char* plaintext)
 {
     sem_wait(&mMutex);
     mWorkOrders.push(string(plaintext));
+    mWorkClients.push(client);
     sem_post(&mMutex);
 }
@@ -148 +155 @@
             mBusy = true;
             mWorkOrders.pop();
+            mCurrentClient = mWorkClients.front();
+            mWorkClients.pop();
             const char* plaintext = work.c_str();
+            if (mCurrentClient && mServer) {
+                string txt = string("Cracking ")+work+string("\n");
+                mServer->Write(mCurrentClient, txt);
+            }
             printf("Cracking %s\n", plaintext );
 
@@ -180 +193 @@
             sem_post(&mMutex);
             if (mBusy) {
+                char msg[128];
                 struct timeval tv;
                 gettimeofday(&tv, NULL);
                 unsigned long diff = 1000000*(tv.tv_sec-mStartTime.tv_sec);
                 diff += tv.tv_usec-mStartTime.tv_usec;
-                printf("crack took %i msec\n",(int)(diff/1000));            
+                snprintf(msg,128,"crack took %i msec\n",(int)(diff/1000));
+                printf("%s",msg);
+                if (mCurrentClient&&mServer) {
+                    mServer->Write(mCurrentClient, string(msg));
+                }
                 mBusy = false;
             }
@@ -205 +223 @@
 }
 
+void Kraken::reportFind(string found)
+{
+    if (mCurrentClient && mServer) {
+        mServer->Write(mCurrentClient, found);
+    }
+}
+
+void Kraken::serverCmd(int clientID, string cmd)
+{
+    const char* command = cmd.c_str();
+    if (strncmp(command,"crack",5)==0) {
+        const char* ch = command+5;
+        while (*ch && (*ch!='0') && (*ch!='1')) ch++;
+        int len = strlen(ch);
+        if (len>63) {
+            getInstance()->Crack(clientID, ch);
+        }
+    }
+}
+
 int main(int argc, char* argv[])
 {
     if (argc<2) {
-        printf("usage: %s index_path\n", argv[0] );
+        printf("usage: %s index_path (server port)\n", argv[0] );
         return -1;
     }
 
-    Kraken kr(argv[1]);
     char command[256];
+    int server_port = 0;
+    if (argc>2) server_port=atoi(argv[2]);
+    Kraken kr(argv[1], server_port);
 
     printf("Commands are: crack test quit\n");
@@ -220 +260 @@
         if (busy) {
             usleep(500);
-        } else {
+        } else if (server_port==0) {
             printf("\nKraken> ");
             char* ch = fgets(command, 256 , stdin);
@@ -234 +274 @@
             if (strncmp(command,"test",4)==0) {
                 // Test frame 998
-                kr.Crack("001101110011000000001000001100011000100110110110011011010011110001101010100100101111111010111100000110101001101011"); 
+                kr.Crack(0, "001101110011000000001000001100011000100110110110011011010011110001101010100100101111111010111100000110101001101011"); 
             } else if (strncmp(command,"crack",5)==0) {
                 ch = command+5;
@@ -240 +280 @@
                 len = strlen(ch);
                 if (len>63) {
-                    kr.Crack(ch);
+                    kr.Crack(0, ch);
                 }
             } else if (strncmp(command,"quit",4)==0) {

tinkering/Kraken/Kraken.h

@@ -14 +14 @@
 #include <string>
 #include <sys/time.h>
+#include "ServerCore.h"
 
 using namespace std;
@@ -19 +20 @@
 class Kraken {
 public:
-    Kraken(const char* config);
+    Kraken(const char* config, int server_port=0);
     ~Kraken();
 
-    void Crack(const char* plaintext);
+    void Crack(int client, const char* plaintext);
     bool Tick();
 
@@ -29 +30 @@
 
     bool isUsingAti() {return mUsingAti;}
+
+    void reportFind(string);
+    static void serverCmd(int, string);
 
 private:
@@ -39 +43 @@
     sem_t mMutex;
     queue<string> mWorkOrders;
+    queue<int> mWorkClients;
+    int mCurrentClient;
     bool mUsingAti;
     bool mBusy;
     struct timeval mStartTime;
+    ServerCore* mServer;
 };
 

tinkering/Kraken/build.sh

@@ -2 +2 @@
 cd ../a5_cpu/;./build.sh;cd ../Kraken/;cp ../a5_cpu/A5Cpu.so .
 
-g++ -O2 -o kraken Kraken.cpp NcqDevice.cpp DeltaLookup.cpp Fragment.cpp ../a5_cpu/A5CpuStubs.cpp ../a5_ati/A5AtiStubs.cpp -lpthread -ldl
+g++ -O2 -o kraken Kraken.cpp NcqDevice.cpp DeltaLookup.cpp Fragment.cpp ServerCore.cpp ../a5_cpu/A5CpuStubs.cpp ../a5_ati/A5AtiStubs.cpp -lpthread -ldl