Commit Graph

  • dcc9e2c2b4 fix indent Stefan Wahren 2013-07-03 20:52:27 +02:00
  • 7b897494fd Improve wildcard search - handle collisions after request for secondary address - check frame type correctly - ignore M-Bus devices without secondary address Stefan Wahren 2013-07-03 20:46:47 +02:00
  • 70f23567a8 fix potential segmentation fault Stefan Wahren 2013-07-03 20:36:43 +02:00
  • 551176911f fix memory leaks in error case Stefan Wahren 2013-07-03 20:34:30 +02:00
  • 8dd1d4e4ae bugfix for +1 error in VIFE parser now VIFE and DIFE behave equal Stefan Wahren 2013-07-03 20:30:20 +02:00
  • 88b2b9fafa bugfix in VIFE parser Robert Johansson 2013-07-03 22:50:03 +09:00
  • 0a0403988c improve error message in request data programs Robert Johansson 2013-07-03 22:31:57 +09:00
  • e1164c87c9 error message if secondary address generation fails Robert Johansson 2013-07-03 22:20:44 +09:00
  • 31f17ab4c2 use error_str instead of direct console output Robert Johansson 2013-07-03 22:18:06 +09:00
  • 973cc7ba30 use MBUS_ERROR instead of fprintf(stderr Robert Johansson 2013-07-03 22:11:13 +09:00
  • 655e3c897d Merge pull request #55 from lategoodbye/master Robert Johansson 2013-07-01 07:09:18 -07:00
  • 8b9d6e735e sync mbus-tcp-request-data-multi-reply with serial make init_slaves and parse_abort static fix return value of parse_abort remove unused variables free resources before exit Stefan Wahren 2013-07-01 08:16:20 +02:00
  • 2ca73eefa1 add new parameter f to man page add range for TCP port Stefan Wahren 2013-07-01 08:09:01 +02:00
  • 0f0882d4fa Merge pull request #54 from lategoodbye/master Robert Johansson 2013-06-29 07:13:06 -07:00
  • 18987c7887 Merge pull request #53 from minusinf/master Robert Johansson 2013-06-29 07:12:56 -07:00
  • 2c03cab529 Add missing file mbus-tcp-application-reset from issue #42. Stefan Wahren 2013-06-28 18:59:04 +02:00
  • a61714d26d Added frame option to mbus-serial-request-data-multi-reply Improved parsing Pascal Spoerri 2013-06-28 14:10:15 +00:00
  • 158208c2b1 Merge pull request #51 from lategoodbye/master Robert Johansson 2013-06-22 02:47:17 -07:00
  • dd56a08811 Improve data parsing - add length defines for variable data header and fixed data - add size check for fixed data - avoid problems with memory alignment / padding in mbus structures (improve portability) - abort parsing if there are too many DIFE or VIFEs - check for premature end of variable data - check size of variable length VIF Stefan Wahren 2013-06-22 11:50:36 +02:00
  • 3381d1b41d test cases for invalid telegrams - too short fixed data length (invalid_length2.hex) - premature end of record at data (premature_end_of_data1.hex, premature_end_of_data2.hex) - premature end of record at DIF (premature_end_of_dif1.hex, premature_end_of_dif2.hex) - premature end of record at variable length VIF (premature_end_of_var_vif1.hex) - premature end of record at VIF (premature_end_of_vif1.hex) - too long variable length VIF (too_long_var_vif.hex) - too many DIFE (too_many_dife.hex) - too many VIFE (too_many_vife.hex) - too short variable header (too_short_header.hex) Stefan Wahren 2013-06-21 08:45:22 +02:00
  • c4ceb5c057 Merge pull request #50 from lategoodbye/master Robert Johansson 2013-06-16 05:24:15 -07:00
  • 687ea60f54 Fixed correction in mbus_vib_unit_normalize Stefan Wahren 2013-06-09 23:14:08 +02:00
  • 73464cdc59 Merge pull request #49 from lategoodbye/master Robert Johansson 2013-05-13 01:53:55 -07:00
  • d7168a4ea4 Fix return value and error message Stefan Wahren 2013-05-13 08:47:19 +02:00
  • 858aea33ab add more checks in lower layers to avoid segmentation faults, out of bounds access and integer overflow make parseable for splint suppress splint warnings about datatype cc_t fix type of return value for read() add checks before accessing tty Stefan Wahren 2013-05-13 08:41:38 +02:00
  • a640295d1b Merge remote-tracking branch 'origin/master' Stefan Wahren 2013-05-12 21:27:55 +02:00
  • 4d85dad403 change TCP port datatype from int to uint16_t because int doesn't match the range add range check in every TCP binary Stefan Wahren 2013-05-12 21:26:38 +02:00
  • ddd15c0373 extend baudrate from int to long because 38400 baud could be bigger than INT_MAX Stefan Wahren 2013-05-12 16:23:27 +02:00
  • b0dff87093 Merge pull request #48 from lategoodbye/master Robert Johansson 2013-05-12 01:26:39 -07:00
  • c59e763a84 minor fixes remove unreachable code add parameter checks to mbus_data_bcd_encode init time structure in mbus_data_tm_decode as possible mark falltrough for splint remove unused variable val fix removed realloc Stefan Wahren 2013-05-04 22:43:23 +02:00
  • ee209023b8 fix memleaks avoid memleak if memory is full fix "memleak" at the end of mbus_parse_hex Stefan Wahren 2013-05-04 19:17:27 +02:00
  • 3935b4013e make parseable for splint - replace non standard u_char with unsigned char (ANSI) - advice splint to ignore variadic macros - move declarations from the middle to top of functions (C90) - replace local library includes <> to "" Stefan Wahren 2013-05-04 18:14:18 +02:00
  • d6ac241d2f Merge pull request #47 from lategoodbye/master Robert Johansson 2013-05-04 07:21:23 -07:00
  • 0d6bb583c2 add missing initialization (thanks to valgrind) Stefan Wahren 2013-05-03 17:23:18 +02:00
  • f7e5898636 Merge pull request #46 from lategoodbye/master Robert Johansson 2013-04-29 19:12:46 -07:00
  • e1657399ff add new function to send application reset incl. subcode fix typo in comment add new program to test experimental feature application reset add mbus-tcp-application-reset to build process Stefan Wahren 2013-04-27 13:16:44 +02:00
  • f6601ca40f print all errors on stderr in all binaries Stefan Wahren 2013-04-26 08:18:17 +02:00
  • ea0c6c3455 add new parameter to specify retries for mbus-serial-scan and mbus-tcp-scan make primary scan to retransmit SND_NKE in case of timeout so it's more reliable but also slowlier keep default behaviour, no retransmission equalize mbus-serial-scan and mbus-tcp-scan update man page Stefan Wahren 2013-04-25 21:19:41 +02:00
  • 65c036f0d2 Merge pull request #45 from lategoodbye/master Robert Johansson 2013-04-18 08:24:30 -07:00
  • 153828268a combine typedef and struct to avoid same comments combine enum and struct to avoid same comments add comments for mbus_context_option add missing parameters in comments Stefan Wahren 2013-04-17 22:46:04 +02:00
  • 36223255b8 Merge pull request #44 from lategoodbye/master Robert Johansson 2013-04-13 03:41:22 -07:00
  • 5d4002f423 revert last commit Stefan Wahren 2013-04-11 22:17:53 +02:00
  • f07d4fc579 Merge remote-tracking branch 'upstream/master' Stefan Wahren 2013-04-11 22:12:16 +02:00
  • 5500db0898 add missing checks after memory allocation add missing memset after memory allocation Stefan Wahren 2013-04-11 22:05:08 +02:00
  • 903460846a Merge pull request #41 from tpltnt/master Robert Johansson 2013-04-09 07:39:48 -07:00
  • db72e2dd49 Merge pull request #43 from lategoodbye/master Robert Johansson 2013-04-09 07:37:25 -07:00
  • 72ee386e10 version string as const char* tpltnt 2013-04-09 10:18:27 +02:00
  • a3018692dc mbus_ prefix added tpltnt 2013-04-06 19:05:45 +02:00
  • 8fcdf3bf3b function declaration added tpltnt 2013-04-05 15:13:18 +02:00
  • 450ac7b9f4 fix build error with automake 1.11 and should work with automake 1.12 too Stefan Wahren 2013-04-04 21:20:37 +02:00
  • c6fc41484f small function to get current version added tpltnt 2013-04-04 00:49:03 +02:00
  • 29b85226e1 Merge pull request #40 from lategoodbye/master Robert Johansson 2013-03-30 19:29:07 -07:00
  • 80df5ce086 Merge remote-tracking branch 'upstream/master' Stefan Wahren 2013-03-29 16:51:05 +01:00
  • 31d8d829c6 add spec file for rpm based systems Stefan Wahren 2013-03-29 16:47:18 +01:00
  • 43f8a2caf3 Merge pull request #39 from tpltnt/master Robert Johansson 2013-03-20 01:23:02 -07:00
  • 55218f05ef AM_PROG_AR added tpltnt 2013-03-19 23:33:51 +01:00
  • 7bceca6c60 configure.ac improved after lots of hints tpltnt 2013-03-19 23:28:54 +01:00
  • a7ac8c3136 Merge pull request #38 from keepfocus/master Robert Johansson 2013-03-17 01:40:14 -07:00
  • 6166553755 Make my last change more readable. Jakob Skov-Pedersen 2013-03-17 09:15:43 +01:00
  • 363f59a149 Ignore filler DIF (= 0x2F) Jakob Skov-Pedersen 2013-03-11 09:22:52 +01:00
  • 91f0c87207 Merge pull request #37 from lategoodbye/master Robert Johansson 2013-03-02 16:34:58 -08:00
  • b1063db3bc replace magic numbers with defines fix MBUS_MAX_PRIMARY_SLAVES to 250 Stefan Wahren 2013-03-02 18:03:31 +01:00
  • b67ed06ffc Merge pull request #36 from tmtom/pkgconfig Robert Johansson 2013-02-09 20:04:50 -08:00
  • 70a4ef7f92 Updated pkgconfig - added math lib dependency Tmtom 2013-02-09 22:35:16 +01:00
  • be6e49db16 Merge pull request #35 from aleax/bugfix Robert Johansson 2013-01-14 02:37:42 -08:00
  • 4cd114e911 Fix undeclared variable Alexey Bondarchuk 2013-01-14 12:28:14 +02:00
  • 86a7305f5e Merge pull request #34 from lategoodbye/master Robert Johansson 2013-01-01 06:18:42 -08:00
  • 312eca72e5 fix logic of secondary address check Stefan Wahren 2012-12-31 13:53:40 +01:00
  • e248d6e421 replace address parameter checks with new helper functions Stefan Wahren 2012-12-31 13:44:03 +01:00
  • 898ee57d41 replace address parameter checks with new helper functions Stefan Wahren 2012-12-31 13:42:27 +01:00
  • 61fd2aa1c7 add new helper functions to check primary and secondary addresses Stefan Wahren 2012-12-31 13:37:17 +01:00
  • a8cc7b0acd Merge pull request #33 from aleax/debian Robert Johansson 2012-12-29 23:44:51 -08:00
  • a409a917b9 Merge pull request #32 from lategoodbye/master Robert Johansson 2012-12-29 23:44:40 -08:00
  • 9c9c0201f9 add exploit for invalid length Stefan Wahren 2012-12-29 11:57:13 +01:00
  • 94e5c93299 Add libmbus1-dbg package. Alexey Bondarchuk 2012-12-25 11:49:20 +02:00
  • 2335deb742 Fix segmentation fault - check if L Field is at least 3 to avoid crash (MBDOC48.PDF, page 23) Stefan Wahren 2012-12-22 00:08:59 +01:00
  • ded841eeb5 Merge pull request #31 from lategoodbye/master Robert Johansson 2012-12-21 05:27:51 -08:00
  • 1080031879 Merge remote-tracking branch 'origin/master' Stefan Wahren 2012-12-20 20:57:33 +01:00
  • 404e245af5 replace magic number with define Stefan Wahren 2012-12-20 20:42:10 +01:00
  • a4e92f6eab replace magic number with define Stefan Wahren 2012-12-20 20:12:19 +01:00
  • b3a3dfec0b Merge remote-tracking branch 'origin/master' Stefan Wahren 2012-12-19 21:21:28 +01:00
  • 48a5b2bab7 Extend clean up script (based on the changes from tmtom) Stefan Wahren 2012-12-19 21:20:38 +01:00
  • c5661ba35f Add mbus-tcp-raw-send to clean up script Stefan Wahren 2012-12-19 11:30:17 +01:00
  • 6f2986ee79 Merge pull request #30 from lategoodbye/master Robert Johansson 2012-12-17 03:23:56 -08:00
  • 746e611236 Merge remote-tracking branch 'upstream/master' Stefan Wahren 2012-12-12 18:06:40 +01:00
  • 5dccbf4197 Merge pull request #29 from aleax/debian Robert Johansson 2012-12-12 04:43:41 -08:00
  • 343c62e503 Merge pull request #28 from aleax/cplusplus Robert Johansson 2012-12-12 04:43:06 -08:00
  • 59ed4e8612 Merge branch 'master' of git+ssh://git@github.com/lategoodbye/libmbus.git Stefan Wahren 2012-12-11 20:24:31 +01:00
  • 9b94df16b9 - add new type for context options - add new function mbus_context_set_option to set context specific options like retransmission or echo cancelation Stefan Wahren 2012-12-11 20:22:26 +01:00
  • 410471e248 correct doxygen comment Stefan Wahren 2012-12-10 21:55:13 +01:00
  • a266c96a2f - remove unnecessary POSIX header - change file handling from POSIX to ANSI C Stefan Wahren 2012-12-10 21:37:42 +01:00
  • be68f84d38 remove unnecessary POSIX header Stefan Wahren 2012-12-10 21:35:02 +01:00
  • dc948566db remove unnecessary POSIX header Stefan Wahren 2012-12-10 21:26:48 +01:00
  • 72868fdc3f add a new helper function ( mbus_hex2bin ) to convert hex values into binary values Stefan Wahren 2012-12-10 21:16:46 +01:00
  • 49c5c751ee Improve debian build scripts aleax 2012-12-05 21:38:12 +02:00
  • 72341baea5 Modify C header files to include from C++ code aleax 2012-12-05 21:24:58 +02:00
  • ee6241c331 Merge pull request #26 from lategoodbye/master Robert Johansson 2012-10-25 07:39:08 -07:00
  • ad6297cb05 experimental command-line tool for sending raw (hex) frames to a select mbus unit Robert Johansson 2012-10-23 21:34:38 +09:00
  • cfa35db086 Fixed potential segmentation fault Stefan Wahren 2012-10-22 23:35:45 +02:00
  • 688f0d3bc0 Added product name mapping for Elvaco meters Stefan Wahren 2012-10-21 23:24:04 +02:00