Changeset 113 in tmcsimulator for branches

Timestamp:

10/14/2017 09:18:40 AM (9 years ago)

Author:

jtorres

Message:

LinuxVM non-segfaulting FEPSimulator - checkpoint

Location:

branches/FEPSimulator

Files:

• DataPacker.cpp (modified) (4 diffs)
• FEPSim.cpp (modified) (4 diffs)
• build/Debug/GNU-MacOSX/Main.o.d (modified) (1 diff)

branches/FEPSimulator/DataPacker.cpp

@@ -1 +1 @@
 #include "DataPacker.h";
+#include <stdio.h>
 
 unsigned char * DataPacker::msg;
@@ -7 +8 @@
     DataPacker packer;
     msg = packer.staticDataPack(station);
-    pos = packer.dynamicDataPack(station, 5, pos);    
+/*    pos = packer.dynamicDataPack(station, 5, pos);    
     pos = packer.dynamicDataPack(station, 6, pos);
     pos = packer.dynamicDataPack(station, 7, pos);
@@ -19 +20 @@
     // will need to check if queue override is enabled (Currently, no queue
     // ldsMap[i].dataPack[16-1] = ;
-
+*/
     // byte 23: MAINLINE total volume
     msg[23 - 1] = station->MlTotVol;
@@ -30 +31 @@
             packer.chksum(msg, station->length - 1 - 1);
     
-    /*
     for (int j = 0; j < station->length; j++) {
         printf("%02X", msg[j]);
     }
     printf("\n");
-    */
+
+    return msg; 
 }
 

branches/FEPSimulator/FEPSim.cpp

@@ -8 +8 @@
 }
 
-FEPSim::~FEPSim() {
-
+FEPSim::~FEPSim() { 
 }
 
 void FEPSim::handleCallResponse(void *response) {
-    // Failed RPC Call
-    if (response == NULL) {
-        clnt_perror(clnt, "RPC call failed");
+    // Failed RPC Call 
+    if (response == NULL) { clnt_perror(clnt, "RPC call failed");
     }
     // Successful RPC Call
-    else {
-        cout << "Successful RPC call to ATMS..." << endl;
+    else { cout << "Successful RPC call to ATMS..." << endl;
     }
 }
@@ -58 +55 @@
         fepReply.answers.size = 1;
         fepReply.answers.fep_answer_list_u.shortp.count = 1;
-
+        
         // construct a shortanswer for each station in line
         for (int j = 0; j < lines.at(i)->lds.size(); j++) {
@@ -68 +65 @@
             fsa.msg.message[0] = 0x0d;
             fsa.msg.message[1] = 0x0a;
-            for (int k = 0; k < ldsMap.at(index)->length; k++)
+            for (int k = 0; k < ldsMap.at(index)->length; k++) {
+                printf("Adding: %d %02X\n", k, ldsMap.at(index)->dataPack[k]);  
                 fsa.msg.message[2 + k] = ldsMap.at(index)->dataPack[k];
+            }
             int aa = ldsMap.at(index)->length;
             fsa.msg.message[2 + aa] = 0x0d;
             fsa.msg.message[3 + aa] = 0xff;
-
-            // info
+   // info
             fsa.info.poll_error_count = 0;
             fsa.info.poll_user_info1 = ldsMap.at(index)->drop; // drop number
@@ -82 +80 @@
 
             fepReply.answers.fep_answer_list_u.shortp.answers[0] = fsa;
-
             // send out data
             printf("Transferring line=%d, lds_drop_no=%d...\n", lines.at(i)->lineNum, ldsMap.at(index)->drop);

branches/FEPSimulator/build/Debug/GNU-MacOSX/Main.o.d

@@ -1 +1 @@
 build/Debug/GNU-MacOSX/Main.o: Main.cpp FEPSim.h fep.h NetworkReader.h \
-  network.h tinyxml/tinyxml.h tinyxml/tinystr.h DataPacker.h
+ network.h tinyxml/tinyxml.h tinyxml/tinystr.h DataPacker.h
 
 FEPSim.h: