Fix event handling after moving callbacks to mbus handle

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)
     {

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)
     {

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)
     {

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)
     {

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)
     {

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)
     {

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)
     {

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)
     {

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)
     {