From d025b27b07ee4823a34651cc62762437279d16c7 Mon Sep 17 00:00:00 2001
From: Stefan Wahren <info@lategoodbye.de>
Date: Wed, 20 Jun 2012 00:23:25 +0200
Subject: [PATCH] - fixed check of mbus_sendrecv_request and mbus_recv_frame -
 initialized memory in mbus_sendrecv_request - used defines for special
 address instead of magic numbers

---
 bin/mbus-serial-request-data-multi-reply.c | 4 ++--
 bin/mbus-serial-request-data.c             | 2 +-
 bin/mbus-serial-scan-secondary.c           | 4 ++--
 bin/mbus-tcp-request-data-multi-reply.c    | 2 +-
 bin/mbus-tcp-request-data.c                | 2 +-
 bin/mbus-tcp-scan-secondary.c              | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bin/mbus-serial-request-data-multi-reply.c b/bin/mbus-serial-request-data-multi-reply.c
index 9dd1648..5666527 100644
--- a/bin/mbus-serial-request-data-multi-reply.c
+++ b/bin/mbus-serial-request-data-multi-reply.c
@@ -98,7 +98,7 @@ main(int argc, char **argv)
     }
     
     frame->control = MBUS_CONTROL_MASK_SND_NKE | MBUS_CONTROL_MASK_DIR_M2S;
-    frame->address = MBUS_ADDRESS_BROADCAST_NOREPLY;
+    frame->address = MBUS_ADDRESS_NETWORK_LAYER;
     
     if (debug)
         printf("%s: debug: sending init frame\n", __PRETTY_FUNCTION__);
@@ -147,7 +147,7 @@ main(int argc, char **argv)
     
     // instead of the send and recv, use this sendrecv function that 
     // takes care of the possibility of multi-telegram replies (limit = 16 frames)
-    if (mbus_sendrecv_request(handle, address, &reply, 16) == -1)
+    if (mbus_sendrecv_request(handle, address, &reply, 16) != 0)
     {
         fprintf(stderr, "Failed to send/receive M-Bus request.\n");
         return 1;
diff --git a/bin/mbus-serial-request-data.c b/bin/mbus-serial-request-data.c
index d60a777..219a49d 100644
--- a/bin/mbus-serial-request-data.c
+++ b/bin/mbus-serial-request-data.c
@@ -126,7 +126,7 @@ main(int argc, char **argv)
         }
     }   
 
-    if (mbus_recv_frame(handle, &reply) == -1)
+    if (mbus_recv_frame(handle, &reply) != 0)
     {
         fprintf(stderr, "Failed to receive M-Bus response frame.\n");
         return 1;
diff --git a/bin/mbus-serial-scan-secondary.c b/bin/mbus-serial-scan-secondary.c
index 92dc3d3..960c066 100644
--- a/bin/mbus-serial-scan-secondary.c
+++ b/bin/mbus-serial-scan-secondary.c
@@ -127,7 +127,7 @@ main(int argc, char **argv)
     // init slaves
     //
     frame->control = MBUS_CONTROL_MASK_SND_NKE | MBUS_CONTROL_MASK_DIR_M2S;
-    frame->address = 0xFD;
+    frame->address = MBUS_ADDRESS_NETWORK_LAYER;
 
     if (mbus_send_frame(handle, frame) == -1)
     {
@@ -139,7 +139,7 @@ main(int argc, char **argv)
     (void) mbus_recv_frame(handle, &reply);
 
     frame->control = MBUS_CONTROL_MASK_SND_NKE | MBUS_CONTROL_MASK_DIR_M2S;
-    frame->address = 0xFF;
+    frame->address = MBUS_ADDRESS_BROADCAST_NOREPLY;
 
     if (mbus_send_frame(handle, frame) == -1)
     {
diff --git a/bin/mbus-tcp-request-data-multi-reply.c b/bin/mbus-tcp-request-data-multi-reply.c
index e06c022..7c165c0 100644
--- a/bin/mbus-tcp-request-data-multi-reply.c
+++ b/bin/mbus-tcp-request-data-multi-reply.c
@@ -130,7 +130,7 @@ main(int argc, char **argv)
     
     // instead of the send and recv, use this sendrecv function that 
     // takes care of the possibility of multi-telegram replies (limit = 16 frames)
-    if (mbus_sendrecv_request(handle, address, &reply, 16) == -1)
+    if (mbus_sendrecv_request(handle, address, &reply, 16) != 0)
     {
         fprintf(stderr, "Failed to send/receive M-Bus request.\n");
         return 1;
diff --git a/bin/mbus-tcp-request-data.c b/bin/mbus-tcp-request-data.c
index 7b40f28..fce7b7b 100644
--- a/bin/mbus-tcp-request-data.c
+++ b/bin/mbus-tcp-request-data.c
@@ -111,7 +111,7 @@ main(int argc, char **argv)
         }
     }   
 
-    if (mbus_recv_frame(handle, &reply) == -1)
+    if (mbus_recv_frame(handle, &reply) != 0)
     {
         fprintf(stderr, "Failed to receive M-Bus response frame.\n");
         return 1;
diff --git a/bin/mbus-tcp-scan-secondary.c b/bin/mbus-tcp-scan-secondary.c
index e2cca2a..6a97484 100644
--- a/bin/mbus-tcp-scan-secondary.c
+++ b/bin/mbus-tcp-scan-secondary.c
@@ -75,7 +75,7 @@ main(int argc, char **argv)
     // init slaves
     //
     frame->control = MBUS_CONTROL_MASK_SND_NKE | MBUS_CONTROL_MASK_DIR_M2S;
-    frame->address = 0xFD;
+    frame->address = MBUS_ADDRESS_NETWORK_LAYER;
 
     if (mbus_send_frame(handle, frame) == -1)
     {
@@ -88,7 +88,7 @@ main(int argc, char **argv)
     sleep(1);
 
     frame->control = MBUS_CONTROL_MASK_SND_NKE | MBUS_CONTROL_MASK_DIR_M2S;
-    frame->address = 0xFF;
+    frame->address = MBUS_ADDRESS_BROADCAST_NOREPLY;
 
     if (mbus_send_frame(handle, frame) == -1)
     {