From e047fd7a0a3eb8fe78db30ba61ac3391dab19fdd Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@d8a302eb-03bc-478d-80e4-98257eca68ef> Date: Thu, 3 Jul 2014 19:28:37 +0000 Subject: [PATCH] chunks have shorts git-svn-id: svn://elaine/murooma/trunk@59 d8a302eb-03bc-478d-80e4-98257eca68ef --- server.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/server.cpp b/server.cpp index a056bb72..1f726f40 100644 --- a/server.cpp +++ b/server.cpp @@ -31,7 +31,7 @@ int main () { // Initialize random number generator size_t idx(0); char c[2]; - Chunk chunk; + Chunk* chunk = new Chunk(); timeval ts; ts.tv_sec = 0; ts.tv_usec = 0; @@ -42,7 +42,7 @@ int main () { { c[0] = cin.get(); c[1] = cin.get(); - chunk.payload[idx++] = (int)c[0] + ((int)c[1] * 256); + chunk->payload[idx++] = (int)c[0] + ((int)c[1] * 256); if (idx == WIRE_CHUNK_SIZE) { timeval now; @@ -56,10 +56,10 @@ int main () { // else if (diff_ms(now, ts) > 1000) // ts = now; - chunk.tv_sec = now.tv_sec; - chunk.tv_usec = 0;//now.tv_usec; + chunk->tv_sec = (int16_t)now.tv_sec; + chunk->tv_usec = 0;//now.tv_usec; zmq::message_t message(sizeof(Chunk)); - memcpy(message.data(), &chunk, sizeof(Chunk)); + memcpy(message.data(), chunk, sizeof(Chunk)); // snprintf ((char *) message.data(), size, "%05d %d", zipcode, c); // message.data()[0] = c; publisher.send(message); @@ -68,6 +68,7 @@ int main () { // msg[0] = '0'; } } + delete chunk; return 0; }