Updated prototypes and include as required and found by compile with extra checking. Thanks to Nigel Jones for his "setting a bad example" article.

bacnet-stack/demo/handler/dlenv.c

@@ -33,7 +33,7 @@
 #include "apdu.h"
 #include "datalink.h"
 #include "handlers.h"
-#include "client.h"
+#include "dlenv.h"
 #include "tsm.h"
 
 /** @file dlenv.c  Initialize the DataLink configuration. */

bacnet-stack/demo/handler/h_arf.c

@@ -42,6 +42,7 @@
 #if defined(BACFILE)
 #include "bacfile.h"
 #endif
+#include "handlers.h"
 
 /** @file h_arf.c  Handles Atomic Read File request. */
 

bacnet-stack/demo/handler/h_arf_a.c

@@ -25,7 +25,6 @@
 #include <stddef.h>
 #include <stdint.h>
 #include "config.h"
-#include "config.h"
 #include "txbuf.h"
 #include "bacdef.h"
 #include "bacdcode.h"

bacnet-stack/demo/handler/h_awf.c

@@ -42,6 +42,7 @@
 #if defined(BACFILE)
 #include "bacfile.h"
 #endif
+#include "handlers.h"
 
 /** @file h_awf.c  Handles Atomic Write File request. */
 

bacnet-stack/demo/handler/h_cov.c

@@ -51,6 +51,7 @@
 #if defined(BACFILE)
 #include "bacfile.h"
 #endif
+#include "handlers.h"
 
 /** @file h_cov.c  Handles Change of Value (COV) services. */
 

bacnet-stack/demo/handler/h_dcc.c

@@ -37,6 +37,7 @@
 #include "abort.h"
 #include "reject.h"
 #include "dcc.h"
+#include "handlers.h"
 
 /** @file h_dcc.c  Handles Device Communication Control request. */
 

bacnet-stack/demo/handler/h_getevent.c

@@ -37,6 +37,7 @@
 #include "abort.h"
 #include "event.h"
 #include "getevent.h"
+#include "handlers.h"
 
 /** @file h_getevent.c  Handles Get Event Information request. */
 

bacnet-stack/demo/handler/h_iam.c

@@ -31,6 +31,7 @@
 #include "bacdcode.h"
 #include "iam.h"
 #include "address.h"
+#include "handlers.h"
 
 /** @file h_iam.c  Handles I-Am requests. */
 

bacnet-stack/demo/handler/h_ihave.c

@@ -31,6 +31,7 @@
 #include "bacdcode.h"
 #include "bactext.h"
 #include "ihave.h"
+#include "handlers.h"
 
 /** @file h_ihave.c  Handles incoming I-Have messages. */
 

bacnet-stack/demo/handler/h_npdu.c

@@ -31,6 +31,8 @@
 #include "bits.h"
 #include "npdu.h"
 #include "apdu.h"
+#include "handlers.h"
+#include "client.h"
 
 #if PRINT_ENABLED
 #include <stdio.h>

bacnet-stack/demo/handler/h_pt.c

@@ -44,6 +44,7 @@
 #endif
 #include "mydata.h"
 #include "ptransfer.h"
+#include "handlers.h"
 
 /** @file h_pt.c  Handles Confirmed Private Transfer requests. */
 

bacnet-stack/demo/handler/h_pt_a.c

@@ -44,13 +44,13 @@
 #if defined(BACFILE)
 #include "bacfile.h"
 #endif
+#include "handlers.h"
 
 /** @file h_pt_a.c  Handles Confirmed Private Transfer Acknowledgment. */
 
 extern uint8_t IOBufferPT[300]; /* Somewhere to build the encoded result block for Private Transfers */
 
-
+static void DecodeBlock(
-void DecodeBlock(
     char cBlockNum,
     uint8_t * pData)
 {
@@ -116,9 +116,7 @@ void DecodeBlock(
     printf("  String      : %s\n\n", Response.sMyString);
 }
 
-
+static void ProcessPTA(
-
-void ProcessPTA(
     BACNET_PRIVATE_TRANSFER_DATA * data)
 {
     int iLen;   /* Index to current location in data */

bacnet-stack/demo/handler/h_rd.c

@@ -39,6 +39,7 @@
 #include "rd.h"
 /* custom handling in device object */
 #include "device.h"
+#include "handlers.h"
 
 /** @file h_rd.c  Handles Reinitialize Device requests. */
 

bacnet-stack/demo/handler/h_rp.c

@@ -40,6 +40,7 @@
 #include "rp.h"
 /* device object has custom handler for all objects */
 #include "device.h"
+#include "handlers.h"
 
 /** @file h_rp.c  Handles Read Property requests. */
 

bacnet-stack/demo/handler/h_rp_a.c

@@ -26,7 +26,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include "config.h"
-#include "config.h"
 #include "txbuf.h"
 #include "bacdef.h"
 #include "bacdcode.h"

bacnet-stack/demo/handler/h_rpm_a.c

@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <assert.h>
 #include "config.h"
-#include "config.h"
 #include "txbuf.h"
 #include "bacdef.h"
 #include "bacdcode.h"

bacnet-stack/demo/handler/h_rr.c

@@ -37,6 +37,7 @@
 #include "abort.h"
 #include "readrange.h"
 #include "device.h"
+#include "handlers.h"
 
 /** @file h_rr.c  Handles Read Range requests. */
 
@@ -44,7 +45,7 @@ static uint8_t Temp_Buf[MAX_APDU] = { 0 };
 
 /* Encodes the property APDU and returns the length,
    or sets the error, and returns -1 */
-int Encode_RR_payload(
+static int Encode_RR_payload(
     uint8_t * apdu,
     BACNET_READ_RANGE_DATA * pRequest)
 {

bacnet-stack/demo/handler/h_rr_a.c

@@ -25,7 +25,6 @@
 #include <stddef.h>
 #include <stdint.h>
 #include "config.h"
-#include "config.h"
 #include "txbuf.h"
 #include "bacdef.h"
 #include "bacdcode.h"

bacnet-stack/demo/handler/h_ts.c

@@ -30,6 +30,7 @@
 #include "bacdef.h"
 #include "bacdcode.h"
 #include "timesync.h"
+#include "handlers.h"
 
 /** @file h_ts.c  Handles TimeSync requests. */
 

bacnet-stack/demo/handler/h_ucov.c

@@ -37,6 +37,7 @@
 /* special for this module */
 #include "cov.h"
 #include "bactext.h"
+#include "handlers.h"
 
 #ifndef MAX_COV_PROPERTIES
 #define MAX_COV_PROPERTIES 2

bacnet-stack/demo/handler/h_upt.c

@@ -35,6 +35,7 @@
 #include "npdu.h"
 #include "abort.h"
 #include "ptransfer.h"
+#include "handlers.h"
 
 /** @file h_upt.c  Handles Unconfirmed Private Transfer requests. */
 

bacnet-stack/demo/handler/h_whohas.c

@@ -34,6 +34,7 @@
 #include "whohas.h"
 #include "device.h"
 #include "client.h"
+#include "handlers.h"
 
 /** @file h_whohas.c  Handles Who-Has requests. */
 

bacnet-stack/demo/handler/h_whois.c

@@ -36,6 +36,7 @@
 #include "device.h"
 #include "client.h"
 #include "txbuf.h"
+#include "handlers.h"
 
 /** @file h_whois.c  Handles Who-Is requests. */
 

bacnet-stack/demo/handler/h_wp.c

@@ -38,6 +38,7 @@
 #include "wp.h"
 /* device object has the handling for all objects */
 #include "device.h"
+#include "handlers.h"
 
 /** @file h_wp.c  Handles Write Property requests. */
 

bacnet-stack/demo/handler/noserv.c

@@ -33,6 +33,7 @@
 #include "apdu.h"
 #include "npdu.h"
 #include "reject.h"
+#include "handlers.h"
 
 /** @file noserv.c  Handles an unrecognized/unsupported service. */
 

bacnet-stack/demo/handler/s_ack_alarm.c

@@ -27,7 +27,6 @@
 #include <errno.h>
 #include <string.h>
 #include "config.h"
-#include "config.h"
 #include "txbuf.h"
 #include "bacdef.h"
 #include "bacdcode.h"
@@ -43,6 +42,7 @@
 #include "handlers.h"
 #include "txbuf.h"
 #include "alarm_ack.h"
+#include "client.h"
 
 /** @file s_ack_alarm.c  Send an Alarm Acknowledgment. */
 

bacnet-stack/demo/handler/s_arfs.c

@@ -27,7 +27,6 @@
 #include <errno.h>
 #include <string.h>
 #include "config.h"
-#include "config.h"
 #include "txbuf.h"
 #include "bacdef.h"
 #include "bacdcode.h"
@@ -42,6 +41,7 @@
 /* some demo stuff needed */
 #include "handlers.h"
 #include "txbuf.h"
+#include "client.h"
 
 /** @file s_arfs.c  Send part of an Atomic Read File Stream. */
 

bacnet-stack/demo/handler/s_awfs.c

@@ -27,7 +27,6 @@
 #include <errno.h>
 #include <string.h>
 #include "config.h"
-#include "config.h"
 #include "txbuf.h"
 #include "bacdef.h"
 #include "bacdcode.h"
@@ -42,6 +41,7 @@
 /* some demo stuff needed */
 #include "handlers.h"
 #include "txbuf.h"
+#include "client.h"
 
 /** @file s_awfs.c  Send part of an Atomic Write File Stream request. */
 

bacnet-stack/demo/handler/s_cevent.c

@@ -33,6 +33,7 @@
 /* some demo stuff needed */
 #include "handlers.h"
 #include "txbuf.h"
+#include "client.h"
 
 /** @file s_cevent.c  Send a ConfirmedEventNotification Request. */
 

bacnet-stack/demo/handler/s_cov.c

@@ -40,6 +40,7 @@
 /* some demo stuff needed */
 #include "handlers.h"
 #include "txbuf.h"
+#include "client.h"
 
 /** @file s_cov.c  Send a Change of Value (COV) update or a Subscribe COV request. */
 

bacnet-stack/demo/handler/s_dcc.c

@@ -27,7 +27,6 @@
 #include <errno.h>
 #include <string.h>
 #include "config.h"
-#include "config.h"
 #include "txbuf.h"
 #include "bacdef.h"
 #include "bacdcode.h"
@@ -41,6 +40,7 @@
 /* some demo stuff needed */
 #include "handlers.h"
 #include "txbuf.h"
+#include "client.h"
 
 /** @file s_dcc.c  Send a Device Communication Control (DCC) request. */
 

bacnet-stack/demo/handler/s_iam.c

@@ -39,6 +39,7 @@
 #include "iam.h"
 /* some demo stuff needed */
 #include "handlers.h"
+#include "client.h"
 
 /** @file s_iam.c  Send an I-Am message. */
 

bacnet-stack/demo/handler/s_ihave.c

@@ -27,7 +27,6 @@
 #include <errno.h>
 #include <string.h>
 #include "config.h"
-#include "config.h"
 #include "txbuf.h"
 #include "bacdef.h"
 #include "bacdcode.h"
@@ -42,6 +41,7 @@
 /* some demo stuff needed */
 #include "handlers.h"
 #include "txbuf.h"
+#include "client.h"
 
 /** @file s_ihave.c  Send an I-Have (property) message. */
 

bacnet-stack/demo/handler/s_lso.c

@@ -27,7 +27,6 @@
 #include <errno.h>
 #include <string.h>
 #include "config.h"
-#include "config.h"
 #include "txbuf.h"
 #include "bacdef.h"
 #include "bacdcode.h"
@@ -43,6 +42,7 @@
 #include "handlers.h"
 #include "txbuf.h"
 #include "lso.h"
+#include "client.h"
 
 /** @file s_lso.c  Send BACnet Life Safety Operation message. */
 

bacnet-stack/demo/handler/s_ptransfer.c

@@ -28,7 +28,6 @@
 #include <errno.h>
 #include <string.h>
 #include "config.h"
-#include "config.h"
 #include "txbuf.h"
 #include "bacdef.h"
 #include "bacdcode.h"
@@ -44,6 +43,7 @@
 #include "handlers.h"
 #include "txbuf.h"
 #include "mydata.h"
+#include "client.h"
 
 /** @file s_ptransfer.c  Send a Private Transfer request. */
 

bacnet-stack/demo/handler/s_rd.c

@@ -27,7 +27,6 @@
 #include <errno.h>
 #include <string.h>
 #include "config.h"
-#include "config.h"
 #include "txbuf.h"
 #include "bacdef.h"
 #include "bacdcode.h"
@@ -42,6 +41,7 @@
 /* some demo stuff needed */
 #include "handlers.h"
 #include "txbuf.h"
+#include "client.h"
 
 /** @file s_rd.c  Send a Reinitialize Device request. */
 

bacnet-stack/demo/handler/s_readrange.c

@@ -27,7 +27,6 @@
 #include <errno.h>
 #include <string.h>
 #include "config.h"
-#include "config.h"
 #include "txbuf.h"
 #include "bacdef.h"
 #include "bacdcode.h"
@@ -43,6 +42,7 @@
 #include "handlers.h"
 #include "txbuf.h"
 #include "readrange.h"
+#include "client.h"
 
 /** @file s_readrange.c  Send a ReadRange request. */
 

bacnet-stack/demo/handler/s_router.c

@@ -27,7 +27,6 @@
 #include <errno.h>
 #include <string.h>
 #include "config.h"
-#include "config.h"
 #include "txbuf.h"
 #include "bacdef.h"
 #include "bacdcode.h"
@@ -40,6 +39,7 @@
 /* some demo stuff needed */
 #include "handlers.h"
 #include "txbuf.h"
+#include "client.h"
 
 /** @file s_router.c  Send BACnet Router requests. */
 

bacnet-stack/demo/handler/s_rp.c

@@ -27,7 +27,6 @@
 #include <errno.h>
 #include <string.h>
 #include "config.h"
-#include "config.h"
 #include "txbuf.h"
 #include "bacdef.h"
 #include "bacdcode.h"
@@ -42,6 +41,7 @@
 /* some demo stuff needed */
 #include "handlers.h"
 #include "txbuf.h"
+#include "client.h"
 
 /** @file s_rp.c  Send Read Property request. */
 

bacnet-stack/demo/handler/s_rpm.c

@@ -27,7 +27,6 @@
 #include <errno.h>
 #include <string.h>
 #include "config.h"
-#include "config.h"
 #include "txbuf.h"
 #include "bacdef.h"
 #include "bacdcode.h"
@@ -42,6 +41,7 @@
 /* some demo stuff needed */
 #include "handlers.h"
 #include "sbuf.h"
+#include "client.h"
 
 /** @file s_rpm.c  Send Read Property Multiple request. */
 

bacnet-stack/demo/handler/s_ts.c

@@ -27,7 +27,6 @@
 #include <errno.h>
 #include <string.h>
 #include "config.h"
-#include "config.h"
 #include "txbuf.h"
 #include "bacdef.h"
 #include "bacdcode.h"
@@ -42,6 +41,7 @@
 /* some demo stuff needed */
 #include "handlers.h"
 #include "txbuf.h"
+#include "client.h"
 
 /** @file s_ts.c  Send TimeSync requests. */
 

bacnet-stack/demo/handler/s_uevent.c

@@ -27,6 +27,7 @@
 #include <errno.h>
 #include "event.h"
 #include "datalink.h"
+#include "client.h"
 
 /** @file s_uevent.c  Send an Unconfirmed Event Notification. */
 

bacnet-stack/demo/handler/s_upt.c

@@ -27,7 +27,6 @@
 #include <errno.h>
 #include <string.h>
 #include "config.h"
-#include "config.h"
 #include "txbuf.h"
 #include "bacdef.h"
 #include "bacdcode.h"
@@ -42,6 +41,7 @@
 /* some demo stuff needed */
 #include "handlers.h"
 #include "txbuf.h"
+#include "client.h"
 
 /** @file s_upt.c  Send an Unconfirmed Private Transfer request. */
 

bacnet-stack/demo/handler/s_whohas.c

@@ -27,7 +27,6 @@
 #include <errno.h>
 #include <string.h>
 #include "config.h"
-#include "config.h"
 #include "txbuf.h"
 #include "bacdef.h"
 #include "bacdcode.h"
@@ -42,6 +41,7 @@
 /* some demo stuff needed */
 #include "handlers.h"
 #include "txbuf.h"
+#include "client.h"
 
 /** @file s_whohas.c  Send Who-Has requests. */
 

bacnet-stack/demo/handler/s_whois.c

@@ -27,7 +27,6 @@
 #include <errno.h>
 #include <string.h>
 #include "config.h"
-#include "config.h"
 #include "txbuf.h"
 #include "bacdef.h"
 #include "bacdcode.h"
@@ -43,6 +42,7 @@
 /* some demo stuff needed */
 #include "handlers.h"
 #include "txbuf.h"
+#include "client.h"
 
 /** @file s_whois.c  Send a Who-Is request. */
 

bacnet-stack/demo/handler/s_wp.c

@@ -27,7 +27,6 @@
 #include <errno.h>
 #include <string.h>
 #include "config.h"
-#include "config.h"
 #include "txbuf.h"
 #include "bacdef.h"
 #include "bacdcode.h"
@@ -42,6 +41,7 @@
 /* some demo stuff needed */
 #include "handlers.h"
 #include "txbuf.h"
+#include "client.h"
 
 /** @file s_wp.c  Send a Write Property request. */
 

bacnet-stack/include/client.h

@@ -39,6 +39,7 @@
 #include "lso.h"
 #include "alarm_ack.h"
 #include "ptransfer.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -53,6 +54,11 @@ extern "C" {
     void Send_I_Am_Unicast(
         uint8_t * buffer,
         BACNET_ADDRESS * src);
+    int iam_unicast_encode_pdu(
+        uint8_t * buffer,
+        BACNET_ADDRESS * src,
+        BACNET_ADDRESS * dest,
+        BACNET_NPDU_DATA * npdu_data);
 
     void Send_WhoIs(
         int32_t low_limit,
@@ -101,6 +107,11 @@ extern "C" {
         BACNET_ADDRESS * dest,
         BACNET_NPDU_DATA * npdu_data,
         BACNET_COV_DATA * cov_data);
+    uint8_t Send_COV_Subscribe(
+        uint32_t device_id,
+        BACNET_SUBSCRIBE_COV_DATA * cov_data);
+
+
 
 /* returns the invoke ID for confirmed request, or 0 if failed */
     uint8_t Send_Read_Property_Request(

bacnet-stack/include/handlers.h

@@ -139,6 +139,8 @@ extern "C" {
         uint16_t service_len,
         BACNET_ADDRESS * src,
         BACNET_CONFIRMED_SERVICE_DATA * service_data);
+    void handler_dcc_password_set(
+        char *new_password);
 
     void handler_i_have(
         uint8_t * service_request,

bacnet-stack/include/timesync.h

@@ -42,7 +42,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-/* encode service */
+    /* encode service */
     int timesync_utc_encode_apdu(
         uint8_t * apdu,
         BACNET_DATE * my_date,
@@ -51,7 +51,12 @@ extern "C" {
         uint8_t * apdu,
         BACNET_DATE * my_date,
         BACNET_TIME * my_time);
-/* decode the service request only */
+    int timesync_encode_apdu_service(
+        uint8_t * apdu,
+        BACNET_UNCONFIRMED_SERVICE service,
+        BACNET_DATE * my_date,
+        BACNET_TIME * my_time);
+    /* decode the service request only */
     int timesync_decode_service_request(
         uint8_t * apdu,
         unsigned apdu_len,

bacnet-stack/src/address.c

@@ -135,7 +135,7 @@ void address_remove_device(
  *****************************************************************************/
 
 
-struct Address_Cache_Entry *address_remove_oldest(
+static struct Address_Cache_Entry *address_remove_oldest(
     void)
 {
     struct Address_Cache_Entry *pMatch;
@@ -198,7 +198,7 @@ note: useful for MS/TP Slave static binding
 */
 static const char *Address_Cache_Filename = "address_cache";
 
-void address_file_init(
+static void address_file_init(
     const char *pFilename)
 {
     FILE *pFile = NULL; /* stream pointer */

bacnet-stack/src/debug.c

@@ -37,6 +37,7 @@
 #include <stdio.h>      /* Standard I/O */
 #include <stdlib.h>     /* Standard Library */
 #include <stdarg.h>
+#include "debug.h"
 
 /** @file debug.c  Debug print function */
 

bacnet-stack/src/iam.c

@@ -39,6 +39,7 @@
 #include "device.h"
 #include "bacdcode.h"
 #include "address.h"
+#include "iam.h"
 
 /** @file iam.c  Encode/Decode I-Am service */
 

bacnet-stack/src/reject.c

@@ -35,6 +35,7 @@
 #include "bacenum.h"
 #include "bacdcode.h"
 #include "bacdef.h"
+#include "reject.h"
 
 /** @file reject.c  Encode/Decode Reject APDUs */
 

bacnet-stack/src/whois.c

@@ -35,6 +35,7 @@
 #include "bacenum.h"
 #include "bacdcode.h"
 #include "bacdef.h"
+#include "whois.h"
 
 /** @file whois.c  Encode/Decode Who-Is requests  */