Common error handling for RTU and TCP.

Stéphane Raimbault
1 parent 14749913
Showing 2 changed files with 13 additions and 15 deletions
modbus/modbus.c
modbus/modbus.h
@@ -140,13 +140,12 @@ static void error_treat(int code, const char *string, modbus_param_t *mb_param)
                 perror(string);
         printf("\n\nERROR %s\n\n", string);
-        // FIXME Create a new FLUSH_OR_RECONNECT_ON_ERROR
         // FIXME Filter on code
-        if (mb_param->type_com == RTU) {
-                tcflush(mb_param->fd, TCIOFLUSH);
-        } else {
-                if (mb_param->error_handling == RECONNECT_ON_ERROR) {
+        if (mb_param->error_handling == FLUSH_OR_RECONNECT_ON_ERROR) {
+                if (mb_param->type_com == RTU) {
+                        tcflush(mb_param->fd, TCIOFLUSH);
+                } else {
                         modbus_close(mb_param);
                         modbus_connect(mb_param);
                 }
@@ -1224,23 +1223,22 @@ void modbus_init_tcp(modbus_param_t *mb_param, char *ip, uint16_t port)
         mb_param->type_com = TCP;
         mb_param->header_length = HEADER_LENGTH_TCP;
         mb_param->checksum_size = CHECKSUM_SIZE_TCP;
-        mb_param->error_handling = RECONNECT_ON_ERROR;
+        mb_param->error_handling = FLUSH_OR_RECONNECT_ON_ERROR;
 }
-/* By default, the error handling mode used is RECONNECT_ON_ERROR.
+/* By default, the error handling mode used is FLUSH_OR_RECONNECT_ON_ERROR.
-   With RECONNECT_ON_ERROR, the library will attempt an immediate
-   reconnection which may hang for several seconds if the network to
-   the remote target unit is down.
+   With FLUSH_OR_RECONNECT_ON_ERROR, the library will flush to I/O
+   port in RTU mode or attempt an immediate reconnection which may
+   hang for several seconds if the network to the remote target unit
+   is down in TCP mode.
    With NOP_ON_ERROR, it is expected that the application will
-   check for network error returns and deal with them as necessary.
-
-   This function is only useful in TCP mode. 
+   check for error returns and deal with them as necessary.
 */
 void modbus_set_error_handling(modbus_param_t *mb_param, error_handling_t error_handling)
 {
-        if (error_handling == RECONNECT_ON_ERROR ||
+        if (error_handling == FLUSH_OR_RECONNECT_ON_ERROR ||
             error_handling == NOP_ON_ERROR) {
                 mb_param->error_handling = error_handling;
         } else {
@@ -110,7 +110,7 @@
 #define MSG_SIZE_UNDEFINED -1
 typedef enum { RTU, TCP } type_com_t;
-typedef enum { RECONNECT_ON_ERROR, NOP_ON_ERROR } error_handling_t;
+typedef enum { FLUSH_OR_RECONNECT_ON_ERROR, NOP_ON_ERROR } error_handling_t;
 /* This structure is byte-aligned */
 typedef struct {