From c2a3f4b871e52b9014902e5ea7574e7cd2c4251a Mon Sep 17 00:00:00 2001
From: Stefan Wahren <info@lategoodbye.de>
Date: Sun, 13 Oct 2013 21:56:15 +0200
Subject: [PATCH] Fix event handling after moving callbacks to mbus handle

---
 bin/mbus-serial-request-data-multi-reply.c | 13 ++++++-------
 bin/mbus-serial-request-data.c             | 12 ++++++------
 bin/mbus-serial-scan-secondary.c           | 12 ++++++------
 bin/mbus-serial-scan.c                     | 12 ++++++------
 bin/mbus-tcp-application-reset.c           | 12 ++++++------
 bin/mbus-tcp-raw-send.c                    | 12 ++++++------
 bin/mbus-tcp-request-data-multi-reply.c    | 12 ++++++------
 bin/mbus-tcp-request-data.c                | 12 ++++++------
 bin/mbus-tcp-scan.c                        | 12 ++++++------
 9 files changed, 54 insertions(+), 55 deletions(-)

diff --git a/bin/mbus-serial-request-data-multi-reply.c b/bin/mbus-serial-request-data-multi-reply.c
index bb9e793..e044c09 100755
--- a/bin/mbus-serial-request-data-multi-reply.c
+++ b/bin/mbus-serial-request-data-multi-reply.c
@@ -103,18 +103,17 @@ main(int argc, char **argv)
     device   = argv[c];
     addr_str = argv[c+1];
 
-
-    if (debug)
-    {
-        mbus_register_send_event(&mbus_dump_send_event);
-        mbus_register_recv_event(&mbus_dump_recv_event);
-    }
-
     if ((handle = mbus_context_serial(device)) == NULL)
     {
         fprintf(stderr, "Could not initialize M-Bus context: %s\n",  mbus_error_str());
         return 1;
     }
+    
+    if (debug)
+    {
+        mbus_register_send_event(handle, &mbus_dump_send_event);
+        mbus_register_recv_event(handle, &mbus_dump_recv_event);
+    }
 
     if (mbus_connect(handle) == -1)
     {
diff --git a/bin/mbus-serial-request-data.c b/bin/mbus-serial-request-data.c
index 9b94c83..1152a04 100755
--- a/bin/mbus-serial-request-data.c
+++ b/bin/mbus-serial-request-data.c
@@ -64,17 +64,17 @@ main(int argc, char **argv)
         return 0;
     }
 
-    if (debug)
-    {
-        mbus_register_send_event(&mbus_dump_send_event);
-        mbus_register_recv_event(&mbus_dump_recv_event);
-    }
-
     if ((handle = mbus_context_serial(device)) == NULL)
     {
         fprintf(stderr, "Could not initialize M-Bus context: %s\n",  mbus_error_str());
         return 1;
     }
+    
+    if (debug)
+    {
+        mbus_register_send_event(handle, &mbus_dump_send_event);
+        mbus_register_recv_event(handle, &mbus_dump_recv_event);
+    }
 
     if (mbus_connect(handle) == -1)
     {
diff --git a/bin/mbus-serial-scan-secondary.c b/bin/mbus-serial-scan-secondary.c
index 28e1dbe..894ccf2 100755
--- a/bin/mbus-serial-scan-secondary.c
+++ b/bin/mbus-serial-scan-secondary.c
@@ -116,12 +116,6 @@ main(int argc, char **argv)
         return 0;
     }
 
-    if (debug)
-    {
-        mbus_register_send_event(&mbus_dump_send_event);
-        mbus_register_recv_event(&mbus_dump_recv_event);
-    }
-
     if (addr_mask == NULL)
     {
         fprintf(stderr, "Failed to allocate address mask.\n");
@@ -141,6 +135,12 @@ main(int argc, char **argv)
         free(addr_mask);
         return 1;
     }
+    
+    if (debug)
+    {
+        mbus_register_send_event(handle, &mbus_dump_send_event);
+        mbus_register_recv_event(handle, &mbus_dump_recv_event);
+    }
 
     if (mbus_connect(handle) == -1)
     {
diff --git a/bin/mbus-serial-scan.c b/bin/mbus-serial-scan.c
index 8a16538..8a935c9 100755
--- a/bin/mbus-serial-scan.c
+++ b/bin/mbus-serial-scan.c
@@ -108,17 +108,17 @@ main(int argc, char **argv)
         return 0;
     }
 
-    if (debug)
-    {
-        mbus_register_send_event(&mbus_dump_send_event);
-        mbus_register_recv_event(&mbus_dump_recv_event);
-    }
-
     if ((handle = mbus_context_serial(device)) == NULL)
     {
         fprintf(stderr,"Scan failed: Could not initialize M-Bus context: %s\n",  mbus_error_str());
         return 1;
     }
+    
+    if (debug)
+    {
+        mbus_register_send_event(handle, &mbus_dump_send_event);
+        mbus_register_recv_event(handle, &mbus_dump_recv_event);
+    }
 
     if (mbus_connect(handle) == -1)
     {
diff --git a/bin/mbus-tcp-application-reset.c b/bin/mbus-tcp-application-reset.c
index 106efab..54ca46c 100755
--- a/bin/mbus-tcp-application-reset.c
+++ b/bin/mbus-tcp-application-reset.c
@@ -68,17 +68,17 @@ main(int argc, char **argv)
         return 1;
     }
 
-    if (debug)
-    {
-        mbus_register_send_event(&mbus_dump_send_event);
-        mbus_register_recv_event(&mbus_dump_recv_event);
-    }
-
     if ((handle = mbus_context_tcp(host, port)) == NULL)
     {
         fprintf(stderr, "Could not initialize M-Bus context: %s\n",  mbus_error_str());
         return 1;
     }
+    
+    if (debug)
+    {
+        mbus_register_send_event(handle, &mbus_dump_send_event);
+        mbus_register_recv_event(handle, &mbus_dump_recv_event);
+    }
 
     if (mbus_connect(handle) == -1)
     {
diff --git a/bin/mbus-tcp-raw-send.c b/bin/mbus-tcp-raw-send.c
index fc9ad65..a324378 100644
--- a/bin/mbus-tcp-raw-send.c
+++ b/bin/mbus-tcp-raw-send.c
@@ -79,17 +79,17 @@ main(int argc, char **argv)
         return 1;
     }
 
-    if (debug)
-    {
-        mbus_register_send_event(&mbus_dump_send_event);
-        mbus_register_recv_event(&mbus_dump_recv_event);
-    }
-
     if ((handle = mbus_context_tcp(host, port)) == NULL)
     {
         fprintf(stderr, "Could not initialize M-Bus context: %s\n",  mbus_error_str());
         return 1;
     }
+    
+    if (debug)
+    {
+        mbus_register_send_event(handle, &mbus_dump_send_event);
+        mbus_register_recv_event(handle, &mbus_dump_recv_event);
+    }
 
     if (mbus_connect(handle) == -1)
     {
diff --git a/bin/mbus-tcp-request-data-multi-reply.c b/bin/mbus-tcp-request-data-multi-reply.c
index fa38a35..8cc1d2e 100755
--- a/bin/mbus-tcp-request-data-multi-reply.c
+++ b/bin/mbus-tcp-request-data-multi-reply.c
@@ -105,17 +105,17 @@ main(int argc, char **argv)
         return 1;
     }
 
-    if (debug)
-    {
-        mbus_register_send_event(&mbus_dump_send_event);
-        mbus_register_recv_event(&mbus_dump_recv_event);
-    }
-
     if ((handle = mbus_context_tcp(host, port)) == NULL)
     {
         fprintf(stderr, "Could not initialize M-Bus context: %s\n",  mbus_error_str());
         return 1;
     }
+    
+    if (debug)
+    {
+        mbus_register_send_event(handle, &mbus_dump_send_event);
+        mbus_register_recv_event(handle, &mbus_dump_recv_event);
+    }
 
     if (mbus_connect(handle) == -1)
     {
diff --git a/bin/mbus-tcp-request-data.c b/bin/mbus-tcp-request-data.c
index c0093f8..91ff0c0 100755
--- a/bin/mbus-tcp-request-data.c
+++ b/bin/mbus-tcp-request-data.c
@@ -59,17 +59,17 @@ main(int argc, char **argv)
         return 1;
     }
 
-    if (debug)
-    {
-        mbus_register_send_event(&mbus_dump_send_event);
-        mbus_register_recv_event(&mbus_dump_recv_event);
-    }
-
     if ((handle = mbus_context_tcp(host, port)) == NULL)
     {
         fprintf(stderr, "Could not initialize M-Bus context: %s\n",  mbus_error_str());
         return 1;
     }
+    
+    if (debug)
+    {
+        mbus_register_send_event(handle, &mbus_dump_send_event);
+        mbus_register_recv_event(handle, &mbus_dump_recv_event);
+    }
 
     if (mbus_connect(handle) == -1)
     {
diff --git a/bin/mbus-tcp-scan.c b/bin/mbus-tcp-scan.c
index a7ea01e..70ed102 100755
--- a/bin/mbus-tcp-scan.c
+++ b/bin/mbus-tcp-scan.c
@@ -94,17 +94,17 @@ main(int argc, char **argv)
         return 1;
     }
 
-    if (debug)
-    {
-        mbus_register_send_event(&mbus_dump_send_event);
-        mbus_register_recv_event(&mbus_dump_recv_event);
-    }
-
     if ((handle = mbus_context_tcp(host, port)) == NULL)
     {
         fprintf(stderr,"Scan failed: Could not initialize M-Bus context: %s\n",  mbus_error_str());
         return 1;
     }
+    
+    if (debug)
+    {
+        mbus_register_send_event(handle, &mbus_dump_send_event);
+        mbus_register_recv_event(handle, &mbus_dump_recv_event);
+    }
 
     if (mbus_connect(handle) == -1)
     {