Support for Elvaco CMa10 and CMi Box encryption

.gitignore

@@ -60,6 +60,7 @@ bin/mbus-tcp-scan
 bin/mbus-tcp-scan-secondary
 bin/mbus-tcp-select-secondary
 bin/mbus-tcp-application-reset
+bin/mbus-serial-raw-send
 !*.c
 
 # test binaries
@@ -76,4 +77,4 @@ _build/
 
 # IDE
 /.vscode/
-CMakeLists.txt.user
+CMakeLists.txt.user

README.md

@@ -1,3 +1,13 @@
+This fork contains 3 new things
+
+serial-mbus-send-raw binary (conversion from tcp)
+
+function mbus_send_custom_text in mbus-protocol-aux.c/h
+This works with the popular Elvaco CMa10, you can send text messages to the unit
+
+function mbus_send_global_aes128_key in mbus-protocol-aux 
+This works with the Elvaco CMi-Box, you can send global AES128 decryption key to module. Note; the length isn't enforced, although the key should be 16 bytes. Doublecheck the key before sending it.
+
 # libmbus: M-bus Library from Raditex Control (http://www.rscada.se) <span style="float:right;"><a href="https://travis-ci.org/rscada/libmbus" style="border-bottom:none">![Build Status](https://travis-ci.org/rscada/libmbus.svg?branch=master)</a></span>
 
 libmbus is an open source library for the M-bus (Meter-Bus) protocol.

bin/Makefile.am

@@ -18,7 +18,7 @@ bin_PROGRAMS			= mbus-tcp-scan mbus-tcp-request-data mbus-tcp-request-data-multi
                           mbus-serial-scan mbus-serial-request-data mbus-serial-request-data-multi-reply \
                           mbus-serial-select-secondary mbus-serial-scan-secondary \
                           mbus-serial-switch-baudrate mbus-tcp-raw-send mbus-tcp-application-reset \
-                          mbus-serial-set-address
+                          mbus-serial-set-address mbus-serial-raw-send mbus-serial-custom-text mbus-serial-send-global-aes128-key
 
 # tcp
 mbus_tcp_scan_LDFLAGS	= -L$(top_builddir)/mbus
@@ -78,6 +78,20 @@ mbus_serial_set_address_LDFLAGS = -L$(top_builddir)/mbus
 mbus_serial_set_address_LDADD   = -lmbus -lm
 mbus_serial_set_address_SOURCES = mbus-serial-set-address.c
 
+mbus_serial_raw_send_LDFLAGS = -L$(top_builddir)/mbus
+mbus_serial_raw_send_LDADD	  = -lmbus -lm
+mbus_serial_raw_send_SOURCES = mbus-serial-raw-send.c
+
+mbus_serial_custom_text_LDFLAGS = -L$(top_builddir)/mbus
+mbus_serial_custom_text_LDADD	  = -lmbus -lm
+mbus_serial_custom_text_SOURCES = mbus-serial-custom-text.c
+
+mbus_serial_send_global_aes128_key_LDFLAGS = -L$(top_builddir)/mbus
+mbus_serial_send_global_aes128_key_LDADD	  = -lmbus -lm
+mbus_serial_send_global_aes128_key_SOURCES = mbus-serial-send-global-aes128-key.c
+
+
+
 # man pages
 dist_man_MANS = libmbus.1 \
                 mbus-tcp-scan.1 \
@@ -91,7 +105,10 @@ dist_man_MANS = libmbus.1 \
                 mbus-serial-request-data-multi-reply.1 \
                 mbus-serial-select-secondary.1 \
                 mbus-serial-scan-secondary.1 \
-                mbus-serial-switch-baudrate.1
+                mbus-serial-switch-baudrate.1 \
+		mbus-serial-raw-send.1 \
+		mbus-serial-custom-text.1 \
+		mbus-serial-send-global-aes128-key.1
 
 .pod.1:
 	pod2man --release=$(VERSION) --center=$(PACKAGE) $< \

bin/mbus-serial-custom-text.1

@@ -0,0 +1,2 @@
+.so man1/libmbus.1
+

bin/mbus-serial-custom-text.c

@@ -0,0 +1,149 @@
+//------------------------------------------------------------------------------
+// Copyright (C) 2012, Robert Johansson, Raditex AB
+// All rights reserved.
+//
+// rSCADA
+// http://www.rSCADA.se
+// info@rscada.se
+//
+//------------------------------------------------------------------------------
+
+#include <string.h>
+
+#include <stdio.h>
+#include <mbus/mbus.h>
+
+static int debug = 0;
+
+//------------------------------------------------------------------------------
+// Execution starts here:
+//------------------------------------------------------------------------------
+int
+main(int argc, char **argv)
+{
+    mbus_frame reply, request;
+    mbus_frame_data reply_data;
+    mbus_handle *handle = NULL;
+
+    char *device, *addr_str, matching_addr[16], *text;
+    long baudrate = 9600;
+    int address, result;
+
+    memset((void *)&reply, 0, sizeof(mbus_frame));
+    memset((void *)&reply_data, 0, sizeof(mbus_frame_data));
+
+    if (argc == 4)
+    {
+        addr_str = argv[1];
+        device = argv[2];
+        text = argv[3];
+        debug = 0;
+    }
+    else if (argc == 5 && strcmp(argv[1], "-d") == 0)
+    {
+        addr_str = argv[2];
+        device = argv[3];
+        text = argv[4];
+        debug = 1;
+    }
+    else if (argc == 6 && strcmp(argv[1], "-b") == 0)
+    {
+        baudrate = atol(argv[2]);
+        addr_str = argv[3];
+        device = argv[4];
+        text = argv[5];
+        debug = 0;
+    }
+    else if (argc == 7 && strcmp(argv[1], "-d") == 0 && strcmp(argv[2], "-b") == 0)
+    {
+        baudrate = atol(argv[3]);
+        addr_str = argv[4];
+        device = argv[5];
+        text = argv[6];
+        debug = 1;
+    }
+    else
+    {
+        fprintf(stderr, "usage: %s [-d] [-b BAUDRATE] mbus-address device text \n", argv[0]);
+        fprintf(stderr, "    optional flag -d for debug printout\n");
+        return 0;
+    }
+
+    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)
+    {
+        fprintf(stderr, "Failed to setup connection to M-bus gateway\n%s\n", mbus_error_str());
+        return 1;
+    }
+
+    if (mbus_serial_set_baudrate(handle, baudrate) == -1)
+    {
+        fprintf(stderr, "%s: Error: Failed to set baud rate [%ld].\n", __PRETTY_FUNCTION__, baudrate);
+        mbus_disconnect(handle);
+        mbus_context_free(handle);
+        return 1;
+    }
+
+    if (mbus_is_secondary_address(addr_str))
+    {
+        // secondary addressing
+        int ret;
+
+        ret = mbus_select_secondary_address(handle, addr_str);
+
+        if (ret == MBUS_PROBE_COLLISION)
+        {
+            fprintf(stderr, "%s: Error: The address mask [%s] matches more than one device.\n", __PRETTY_FUNCTION__, addr_str);
+            return 1;
+        }
+        else if (ret == MBUS_PROBE_NOTHING)
+        {
+            fprintf(stderr, "%s: Error: The selected secondary address does not match any device [%s].\n", __PRETTY_FUNCTION__, addr_str);
+            return 1;
+        }
+        else if (ret == MBUS_PROBE_ERROR)
+        {
+            fprintf(stderr, "%s: Error: Failed to select secondary address [%s].\n", __PRETTY_FUNCTION__, addr_str);
+            return 1;
+        }
+        address = MBUS_ADDRESS_NETWORK_LAYER;
+    }
+    else
+    {
+        // primary addressing
+        address = atoi(addr_str);
+    }
+
+    //
+    // send the request
+    //
+    if (mbus_send_custom_text(handle, address, text) == -1)
+    {
+        fprintf(stderr, "Send custom text error: %s\n", mbus_error_str());
+        return 1;
+    }
+
+    //
+    // this should be option:
+    //
+    if (mbus_recv_frame(handle, &reply) != MBUS_RECV_RESULT_OK)
+    {
+        fprintf(stderr, "Failed to receive M-Bus response frame: %s\n", mbus_error_str());
+        return 1;
+    }
+
+    mbus_disconnect(handle);
+    mbus_context_free(handle);
+    return 0;
+}

bin/mbus-serial-raw-send.1

@@ -0,0 +1,2 @@
+.so man1/libmbus.1
+