Indented.

2007-11-29 15:56:53 +00:00
parent c585241c03
commit 411d6c1b24
236 changed files with 17864 additions and 15724 deletions
@@ -47,12 +47,14 @@
 #include "lsp.h"
 #include "mso.h"
 #if defined(BACFILE)
-    #include "bacfile.h"
+#include "bacfile.h"
 #endif

-void handler_write_property(uint8_t * service_request,
+void handler_write_property(
+    uint8_t * service_request,
    uint16_t service_len,
-    BACNET_ADDRESS * src, BACNET_CONFIRMED_SERVICE_DATA * service_data)
+    BACNET_ADDRESS * src,
+    BACNET_CONFIRMED_SERVICE_DATA * service_data)
 {
    BACNET_WRITE_PROPERTY_DATA wp_data;
    int len = 0;
@@ -79,9 +81,8 @@ void handler_write_property(uint8_t * service_request,
        fprintf(stderr, "WP: Segmented message.  Sending Abort!\n");
 #endif
        goto WP_ABORT;
-    }    /* decode the service request only */
-    len = wp_decode_service_request(service_request,
-        service_len, &wp_data);
+    }   /* decode the service request only */
+    len = wp_decode_service_request(service_request, service_len, &wp_data);
 #if PRINT_ENABLED
    if (len > 0)
        fprintf(stderr, "WP: type=%u instance=%u property=%u index=%d\n",
@@ -99,232 +100,204 @@ void handler_write_property(uint8_t * service_request,
        fprintf(stderr, "WP: Bad Encoding. Sending Abort!\n");
 #endif
        goto WP_ABORT;
-    } 
-    switch (wp_data.object_type) {
-    case OBJECT_DEVICE:
-        if (Device_Write_Property(&wp_data, &error_class, &error_code)) {
-            len =
-                encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
-                service_data->invoke_id,
-                SERVICE_CONFIRMED_WRITE_PROPERTY);
-#if PRINT_ENABLED
-            fprintf(stderr,
-                "WP: Sending Simple Ack for Device!\n");
-#endif
-        } else {
-            len =
-                bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
-                service_data->invoke_id,
-                SERVICE_CONFIRMED_WRITE_PROPERTY, error_class,
-                error_code);
-#if PRINT_ENABLED
-            fprintf(stderr,
-                "WP: Sending Error for Device!\n");
-#endif
-        }
-        break;
-    case OBJECT_ANALOG_INPUT:
-    case OBJECT_BINARY_INPUT:
-        error_class = ERROR_CLASS_PROPERTY;
-        error_code = ERROR_CODE_WRITE_ACCESS_DENIED;
-        len =
-            bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
-            service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY,
-            error_class, error_code);
-#if PRINT_ENABLED
-        fprintf(stderr, "WP: Sending Write Access Error!\n");
-#endif
-        break;
-    case OBJECT_BINARY_OUTPUT:
-        if (Binary_Output_Write_Property(&wp_data, &error_class,
-                &error_code)) {
-            len =
-                encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
-                service_data->invoke_id,
-                SERVICE_CONFIRMED_WRITE_PROPERTY);
-#if PRINT_ENABLED
-            fprintf(stderr,
-                "WP: Sending Simple Ack for BO!\n");
-#endif
-        } else {
-            len =
-                bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
-                service_data->invoke_id,
-                SERVICE_CONFIRMED_WRITE_PROPERTY, error_class,
-                error_code);
-#if PRINT_ENABLED
-            fprintf(stderr, "WP: Sending Write Access Error for BO!\n");
-#endif
-        }
-        break;
-    case OBJECT_BINARY_VALUE:
-        if (Binary_Value_Write_Property(&wp_data, &error_class,
-                &error_code)) {
-            len =
-                encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
-                service_data->invoke_id,
-                SERVICE_CONFIRMED_WRITE_PROPERTY);
-#if PRINT_ENABLED
-            fprintf(stderr,
-                "WP: Sending Simple Ack for BV!\n");
-#endif
-        } else {
-            len =
-                bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
-                service_data->invoke_id,
-                SERVICE_CONFIRMED_WRITE_PROPERTY, error_class,
-                error_code);
-#if PRINT_ENABLED
-            fprintf(stderr, "WP: Sending Write Access Error for BV!\n");
-#endif
-        }
-        break;
-    case OBJECT_ANALOG_OUTPUT:
-        if (Analog_Output_Write_Property(&wp_data, &error_class,
-                &error_code)) {
-            len =
-                encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
-                service_data->invoke_id,
-                SERVICE_CONFIRMED_WRITE_PROPERTY);
-#if PRINT_ENABLED
-            fprintf(stderr,
-                "WP: Sending Simple Ack for AO!\n");
-#endif
-        } else {
-            len =
-                bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
-                service_data->invoke_id,
-                SERVICE_CONFIRMED_WRITE_PROPERTY, error_class,
-                error_code);
-#if PRINT_ENABLED
-            fprintf(stderr, "WP: Sending Write Access Error for AO!\n");
-#endif
-        }
-        break;
-    case OBJECT_ANALOG_VALUE:
-        if (Analog_Value_Write_Property(&wp_data, &error_class,
-                &error_code)) {
-            len =
-                encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
-                service_data->invoke_id,
-                SERVICE_CONFIRMED_WRITE_PROPERTY);
-#if PRINT_ENABLED
-            fprintf(stderr,
-                "WP: Sending Simple Ack for AV!\n");
-#endif
-        } else {
-            len =
-                bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
-                service_data->invoke_id,
-                SERVICE_CONFIRMED_WRITE_PROPERTY, error_class,
-                error_code);
-#if PRINT_ENABLED
-            fprintf(stderr, "WP: Sending Write Access Error for AV!\n");
-#endif
-        }
-        break;
-    case OBJECT_LIFE_SAFETY_POINT:
-        if (Life_Safety_Point_Write_Property(&wp_data, &error_class,
-                &error_code)) {
-            len =
-                encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
-                service_data->invoke_id,
-                SERVICE_CONFIRMED_WRITE_PROPERTY);
-#if PRINT_ENABLED
-            fprintf(stderr,
-                "WP: Sending Simple Ack for LSP!\n");
-#endif
-        } else {
-            len =
-                bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
-                service_data->invoke_id,
-                SERVICE_CONFIRMED_WRITE_PROPERTY, error_class,
-                error_code);
-#if PRINT_ENABLED
-            fprintf(stderr, "WP: Sending Write Access Error for LSP!\n");
-#endif
-        }
-        break;
-    case OBJECT_LOAD_CONTROL:
-        if (Load_Control_Write_Property(&wp_data, &error_class,
-                &error_code)) {
-            len =
-                encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
-                service_data->invoke_id,
-                SERVICE_CONFIRMED_WRITE_PROPERTY);
-#if PRINT_ENABLED
-            fprintf(stderr,
-                "WP: Sending Simple Ack for Load Control!\n");
-#endif
-        } else {
-            len =
-                bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
-                service_data->invoke_id,
-                SERVICE_CONFIRMED_WRITE_PROPERTY, error_class,
-                error_code);
-#if PRINT_ENABLED
-            fprintf(stderr,
-                "WP: Sending Write Access Error for Load Control!\n");
-#endif
-        }
-        break;
-    case OBJECT_MULTI_STATE_OUTPUT:
-        if (Multistate_Output_Write_Property(&wp_data, &error_class,
-                &error_code)) {
-            len =
-                encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
-                service_data->invoke_id,
-                SERVICE_CONFIRMED_WRITE_PROPERTY);
-#if PRINT_ENABLED
-            fprintf(stderr,
-                "WP: Sending Write Property Simple Ack for MSO!\n");
-#endif
-        } else {
-            len =
-                bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
-                service_data->invoke_id,
-                SERVICE_CONFIRMED_WRITE_PROPERTY, error_class,
-                error_code);
-#if PRINT_ENABLED
-            fprintf(stderr, "WP: Sending Write Access Error for MSO!\n");
-#endif
-        }
-        break;
-#if defined(BACFILE)
-    case OBJECT_FILE:
-        if (bacfile_write_property(&wp_data, &error_class,
-                &error_code)) {
-            len =
-                encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
-                service_data->invoke_id,
-                SERVICE_CONFIRMED_WRITE_PROPERTY);
-#if PRINT_ENABLED
-            fprintf(stderr,
-                "WP: Sending Simple Ack for File!\n");
-#endif
-        } else {
-            len =
-                bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
-                service_data->invoke_id,
-                SERVICE_CONFIRMED_WRITE_PROPERTY, error_class,
-                error_code);
-#if PRINT_ENABLED
-            fprintf(stderr, "WP: Sending Write Access Error for File!\n");
-#endif
-        }
-        break;
-#endif                          /* BACFILE */
-    default:
-        len =
-            bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
-            service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY,
-            error_class, error_code);
-#if PRINT_ENABLED
-        fprintf(stderr, "WP: Sending Unknown Object Error!\n");
-#endif
-        break;
    }
-WP_ABORT:
+    switch (wp_data.object_type) {
+        case OBJECT_DEVICE:
+            if (Device_Write_Property(&wp_data, &error_class, &error_code)) {
+                len =
+                    encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
+                    service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY);
+#if PRINT_ENABLED
+                fprintf(stderr, "WP: Sending Simple Ack for Device!\n");
+#endif
+            } else {
+                len =
+                    bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
+                    service_data->invoke_id,
+                    SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, error_code);
+#if PRINT_ENABLED
+                fprintf(stderr, "WP: Sending Error for Device!\n");
+#endif
+            }
+            break;
+        case OBJECT_ANALOG_INPUT:
+        case OBJECT_BINARY_INPUT:
+            error_class = ERROR_CLASS_PROPERTY;
+            error_code = ERROR_CODE_WRITE_ACCESS_DENIED;
+            len =
+                bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
+                service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY,
+                error_class, error_code);
+#if PRINT_ENABLED
+            fprintf(stderr, "WP: Sending Write Access Error!\n");
+#endif
+            break;
+        case OBJECT_BINARY_OUTPUT:
+            if (Binary_Output_Write_Property(&wp_data, &error_class,
+                    &error_code)) {
+                len =
+                    encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
+                    service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY);
+#if PRINT_ENABLED
+                fprintf(stderr, "WP: Sending Simple Ack for BO!\n");
+#endif
+            } else {
+                len =
+                    bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
+                    service_data->invoke_id,
+                    SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, error_code);
+#if PRINT_ENABLED
+                fprintf(stderr, "WP: Sending Write Access Error for BO!\n");
+#endif
+            }
+            break;
+        case OBJECT_BINARY_VALUE:
+            if (Binary_Value_Write_Property(&wp_data, &error_class,
+                    &error_code)) {
+                len =
+                    encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
+                    service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY);
+#if PRINT_ENABLED
+                fprintf(stderr, "WP: Sending Simple Ack for BV!\n");
+#endif
+            } else {
+                len =
+                    bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
+                    service_data->invoke_id,
+                    SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, error_code);
+#if PRINT_ENABLED
+                fprintf(stderr, "WP: Sending Write Access Error for BV!\n");
+#endif
+            }
+            break;
+        case OBJECT_ANALOG_OUTPUT:
+            if (Analog_Output_Write_Property(&wp_data, &error_class,
+                    &error_code)) {
+                len =
+                    encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
+                    service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY);
+#if PRINT_ENABLED
+                fprintf(stderr, "WP: Sending Simple Ack for AO!\n");
+#endif
+            } else {
+                len =
+                    bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
+                    service_data->invoke_id,
+                    SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, error_code);
+#if PRINT_ENABLED
+                fprintf(stderr, "WP: Sending Write Access Error for AO!\n");
+#endif
+            }
+            break;
+        case OBJECT_ANALOG_VALUE:
+            if (Analog_Value_Write_Property(&wp_data, &error_class,
+                    &error_code)) {
+                len =
+                    encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
+                    service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY);
+#if PRINT_ENABLED
+                fprintf(stderr, "WP: Sending Simple Ack for AV!\n");
+#endif
+            } else {
+                len =
+                    bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
+                    service_data->invoke_id,
+                    SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, error_code);
+#if PRINT_ENABLED
+                fprintf(stderr, "WP: Sending Write Access Error for AV!\n");
+#endif
+            }
+            break;
+        case OBJECT_LIFE_SAFETY_POINT:
+            if (Life_Safety_Point_Write_Property(&wp_data, &error_class,
+                    &error_code)) {
+                len =
+                    encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
+                    service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY);
+#if PRINT_ENABLED
+                fprintf(stderr, "WP: Sending Simple Ack for LSP!\n");
+#endif
+            } else {
+                len =
+                    bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
+                    service_data->invoke_id,
+                    SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, error_code);
+#if PRINT_ENABLED
+                fprintf(stderr, "WP: Sending Write Access Error for LSP!\n");
+#endif
+            }
+            break;
+        case OBJECT_LOAD_CONTROL:
+            if (Load_Control_Write_Property(&wp_data, &error_class,
+                    &error_code)) {
+                len =
+                    encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
+                    service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY);
+#if PRINT_ENABLED
+                fprintf(stderr, "WP: Sending Simple Ack for Load Control!\n");
+#endif
+            } else {
+                len =
+                    bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
+                    service_data->invoke_id,
+                    SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, error_code);
+#if PRINT_ENABLED
+                fprintf(stderr,
+                    "WP: Sending Write Access Error for Load Control!\n");
+#endif
+            }
+            break;
+        case OBJECT_MULTI_STATE_OUTPUT:
+            if (Multistate_Output_Write_Property(&wp_data, &error_class,
+                    &error_code)) {
+                len =
+                    encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
+                    service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY);
+#if PRINT_ENABLED
+                fprintf(stderr,
+                    "WP: Sending Write Property Simple Ack for MSO!\n");
+#endif
+            } else {
+                len =
+                    bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
+                    service_data->invoke_id,
+                    SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, error_code);
+#if PRINT_ENABLED
+                fprintf(stderr, "WP: Sending Write Access Error for MSO!\n");
+#endif
+            }
+            break;
+#if defined(BACFILE)
+        case OBJECT_FILE:
+            if (bacfile_write_property(&wp_data, &error_class, &error_code)) {
+                len =
+                    encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
+                    service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY);
+#if PRINT_ENABLED
+                fprintf(stderr, "WP: Sending Simple Ack for File!\n");
+#endif
+            } else {
+                len =
+                    bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
+                    service_data->invoke_id,
+                    SERVICE_CONFIRMED_WRITE_PROPERTY, error_class, error_code);
+#if PRINT_ENABLED
+                fprintf(stderr, "WP: Sending Write Access Error for File!\n");
+#endif
+            }
+            break;
+#endif /* BACFILE */
+        default:
+            len =
+                bacerror_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
+                service_data->invoke_id, SERVICE_CONFIRMED_WRITE_PROPERTY,
+                error_class, error_code);
+#if PRINT_ENABLED
+            fprintf(stderr, "WP: Sending Unknown Object Error!\n");
+#endif
+            break;
+    }
+  WP_ABORT:
    pdu_len += len;
    bytes_sent = datalink_send_pdu(src, &npdu_data,
        &Handler_Transmit_Buffer[0], pdu_len);