Fix sim startup.
"long" may be 64 bits, leading to confusion:
hello ack was bad (7f3331455221 vs 31455221)
This changes it to int32_t.
Change-Id: I17e8bd0902eda6aeda36d54f0530bdf02fe3ae9a
diff --git a/simulator/app/MessageStream.cpp b/simulator/app/MessageStream.cpp
index 2397c63..c52e7c4 100644
--- a/simulator/app/MessageStream.cpp
+++ b/simulator/app/MessageStream.cpp
@@ -8,6 +8,7 @@
#include "utils/Log.h"
+#include <stdint.h>
#include <string.h>
#include <assert.h>
@@ -338,7 +339,7 @@
* and capability flags.
*/
if (initiateHello) {
- long data = kHelloMsg;
+ int32_t data = kHelloMsg;
Message msg;
/* send hello */
@@ -357,14 +358,15 @@
return false;
}
- const long* pAck;
- pAck = (const long*) msg.getData();
+ const int32_t* pAck;
+ pAck = (const int32_t*) msg.getData();
if (pAck == NULL || *pAck != kHelloAckMsg) {
- LOG(LOG_WARN, "", "hello ack was bad\n");
+ LOG(LOG_WARN, "", "hello ack was bad (%08x vs %08x)\n",
+ *pAck, kHelloAckMsg);
return false;
}
} else {
- long data = kHelloAckMsg;
+ int32_t data = kHelloAckMsg;
Message msg;
LOG(LOG_DEBUG, "", "waiting for hello from peer\n");
@@ -375,8 +377,8 @@
return false;
}
- const long* pAck;
- pAck = (const long*) msg.getData();
+ const int32_t* pAck;
+ pAck = (const int32_t*) msg.getData();
if (pAck == NULL || *pAck != kHelloMsg) {
LOG(LOG_WARN, "", "hello was bad\n");
return false;