dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make most of functions const correct (#714)

Browse Source 
* Make most of the functions const correct

Used clang-tidy and sonarlint to help find places where const could
pretty easily applied. Also lot of hand work.

This commit does not yet touch handlers and typedefs of those.

* Fix Arduino uno handler_who_is() has extra parenthesis

For some reason there is extra parenthesis. Remove it this is more
likely buildable.

* Bugfix/bacapp: Fix uninitilized array_index

We have changed bacapp_snprintf_value() to be const correct. After that
we got

```
/home/runner/work/bacnet-stack/bacnet-stack/src/bacnet/bacapp.c:3183:27: warning: 4th function call argument is an uninitialized value [core.CallAndMessage]
                ret_val = bacapp_snprintf_weeklyschedule(
                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
```

So analyzer could now spot that we do not actually initilize array_index
at all. Fix this by setting array_index to zero. Note that I actually do
not know if zeroing is right thing to do here. I choose zero as if this
has worked before it is most likely that it will work with zero value.

* cmake: Add and ignore Wwrite-strings compiler option

Wwrite-strings helps find places where const correctness is broken.

Example it will warn about these

```C

void func1(char* str);

func("test") /* "test" is const so we should not pass it to func1().

char* func2()
{
  return "test"; /* func2() should return const char*.
}
```

We still need to ignore it as not all are fixed but let's add it already
so we remember that it should be opened at some point.

---------

Co-authored-by: Kari Argillander <kari.argillander@fidelix.com>
This commit is contained in:
Kari Argillander
2024-08-29 22:08:02 +03:00
committed by GitHub
parent 0177c59f4a
commit a2f1d6959d
408 changed files with 2608 additions and 2336 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/datalink/bacsec.c
+26 -18
View File
@@ -141,7 +141,8 @@ int encode_security_wrapper(
}
#endif
int encode_challenge_request(uint8_t *apdu, BACNET_CHALLENGE_REQUEST *bc_req)
int encode_challenge_request(
uint8_t *apdu, const BACNET_CHALLENGE_REQUEST *bc_req)
{
int curr = 0;
@@ -152,7 +153,8 @@ int encode_challenge_request(uint8_t *apdu, BACNET_CHALLENGE_REQUEST *bc_req)
return curr;
}
int encode_security_payload(uint8_t *apdu, BACNET_SECURITY_PAYLOAD *payload)
int encode_security_payload(
uint8_t *apdu, const BACNET_SECURITY_PAYLOAD *payload)
{
encode_unsigned16(&apdu[0], payload->payload_length);
memcpy(&apdu[2], payload->payload, payload->payload_length);
@@ -160,7 +162,7 @@ int encode_security_payload(uint8_t *apdu, BACNET_SECURITY_PAYLOAD *payload)
return (int)(2 + payload->payload_length);
}
int encode_security_response(uint8_t *apdu, BACNET_SECURITY_RESPONSE *resp)
int encode_security_response(uint8_t *apdu, const BACNET_SECURITY_RESPONSE *resp)
{
int curr = 0;
int i;
@@ -232,7 +234,7 @@ int encode_security_response(uint8_t *apdu, BACNET_SECURITY_RESPONSE *resp)
return curr;
}
int encode_request_key_update(uint8_t *apdu, BACNET_REQUEST_KEY_UPDATE *req)
int encode_request_key_update(uint8_t *apdu, const BACNET_REQUEST_KEY_UPDATE *req)
{
int curr = 0;
@@ -247,7 +249,7 @@ int encode_request_key_update(uint8_t *apdu, BACNET_REQUEST_KEY_UPDATE *req)
return curr;
}
int encode_key_entry(uint8_t *apdu, BACNET_KEY_ENTRY *entry)
int encode_key_entry(uint8_t *apdu, const BACNET_KEY_ENTRY *entry)
{
int curr = 0;
@@ -259,7 +261,7 @@ int encode_key_entry(uint8_t *apdu, BACNET_KEY_ENTRY *entry)
return curr;
}
int encode_update_key_set(uint8_t *apdu, BACNET_UPDATE_KEY_SET *key_set)
int encode_update_key_set(uint8_t *apdu, const BACNET_UPDATE_KEY_SET *key_set)
{
int curr = 0;
int i, res;
@@ -330,7 +332,7 @@ int encode_update_key_set(uint8_t *apdu, BACNET_UPDATE_KEY_SET *key_set)
}
int encode_update_distribution_key(
uint8_t *apdu, BACNET_UPDATE_DISTRIBUTION_KEY *dist_key)
uint8_t *apdu, const BACNET_UPDATE_DISTRIBUTION_KEY *dist_key)
{
int curr = 0;
int res;
@@ -345,7 +347,7 @@ int encode_update_distribution_key(
}
int encode_request_master_key(
uint8_t *apdu, BACNET_REQUEST_MASTER_KEY *req_master_key)
uint8_t *apdu, const BACNET_REQUEST_MASTER_KEY *req_master_key)
{
int curr = 0;
@@ -356,7 +358,7 @@ int encode_request_master_key(
return (int)(curr + req_master_key->no_supported_algorithms);
}
int encode_set_master_key(uint8_t *apdu, BACNET_SET_MASTER_KEY *set_master_key)
int encode_set_master_key(uint8_t *apdu, const BACNET_SET_MASTER_KEY *set_master_key)
{
return encode_key_entry(apdu, &set_master_key->key);
}
@@ -473,7 +475,7 @@ int decode_security_wrapper_safe(int bytes_before,
}
#endif
int decode_challenge_request_safe(uint8_t *apdu,
int decode_challenge_request_safe(const uint8_t *apdu,
uint32_t apdu_len_remaining,
BACNET_CHALLENGE_REQUEST *bc_req)
{
@@ -489,7 +491,7 @@ int decode_challenge_request_safe(uint8_t *apdu,
return curr; /* always 9! */
}
int decode_security_payload_safe(uint8_t *apdu,
int decode_security_payload_safe(const uint8_t *apdu,
uint32_t apdu_len_remaining,
BACNET_SECURITY_PAYLOAD *payload)
{
@@ -505,7 +507,9 @@ int decode_security_payload_safe(uint8_t *apdu,
}
int decode_security_response_safe(
uint8_t *apdu, uint32_t apdu_len_remaining, BACNET_SECURITY_RESPONSE *resp)
const uint8_t *apdu,
uint32_t apdu_len_remaining,
BACNET_SECURITY_RESPONSE *resp)
{
int curr = 0;
int i;
@@ -613,7 +617,9 @@ int decode_security_response_safe(
}
int decode_request_key_update_safe(
uint8_t *apdu, uint32_t apdu_len_remaining, BACNET_REQUEST_KEY_UPDATE *req)
const uint8_t *apdu,
uint32_t apdu_len_remaining,
BACNET_REQUEST_KEY_UPDATE *req)
{
int curr = 0;
@@ -632,7 +638,7 @@ int decode_request_key_update_safe(
}
int decode_key_entry_safe(
uint8_t *apdu, uint32_t apdu_len_remaining, BACNET_KEY_ENTRY *entry)
const uint8_t *apdu, uint32_t apdu_len_remaining, BACNET_KEY_ENTRY *entry)
{
int curr = 0;
@@ -652,7 +658,9 @@ int decode_key_entry_safe(
}
int decode_update_key_set_safe(
uint8_t *apdu, uint32_t apdu_len_remaining, BACNET_UPDATE_KEY_SET *key_set)
const uint8_t *apdu,
uint32_t apdu_len_remaining,
BACNET_UPDATE_KEY_SET *key_set)
{
int curr = 0;
int i, res;
@@ -743,7 +751,7 @@ int decode_update_key_set_safe(
return curr;
}
int decode_update_distribution_key_safe(uint8_t *apdu,
int decode_update_distribution_key_safe(const uint8_t *apdu,
uint32_t apdu_len_remaining,
BACNET_UPDATE_DISTRIBUTION_KEY *dist_key)
{
@@ -762,7 +770,7 @@ int decode_update_distribution_key_safe(uint8_t *apdu,
return curr + res;
}
int decode_request_master_key_safe(uint8_t *apdu,
int decode_request_master_key_safe(const uint8_t *apdu,
uint32_t apdu_len_remaining,
BACNET_REQUEST_MASTER_KEY *req_master_key)
{
@@ -781,7 +789,7 @@ int decode_request_master_key_safe(uint8_t *apdu,
return (int)(curr + req_master_key->no_supported_algorithms);
}
int decode_set_master_key_safe(uint8_t *apdu,
int decode_set_master_key_safe(const uint8_t *apdu,
uint32_t apdu_len_remaining,
BACNET_SET_MASTER_KEY *set_master_key)
{
src/bacnet/datalink/bacsec.h
+18 -18
View File
@@ -228,31 +228,31 @@ extern "C" {
/* BACNET_SECURITY_WRAPPER * wrapper); */
BACNET_STACK_EXPORT
int encode_challenge_request(uint8_t * apdu,
BACNET_CHALLENGE_REQUEST * bc_req);
const BACNET_CHALLENGE_REQUEST * bc_req);
BACNET_STACK_EXPORT
int encode_security_payload(uint8_t * apdu,
BACNET_SECURITY_PAYLOAD * payload);
const BACNET_SECURITY_PAYLOAD * payload);
BACNET_STACK_EXPORT
int encode_security_response(uint8_t * apdu,
BACNET_SECURITY_RESPONSE * resp);
const BACNET_SECURITY_RESPONSE * resp);
BACNET_STACK_EXPORT
int encode_request_key_update(uint8_t * apdu,
BACNET_REQUEST_KEY_UPDATE * req);
const BACNET_REQUEST_KEY_UPDATE * req);
BACNET_STACK_EXPORT
int encode_key_entry(uint8_t * apdu,
BACNET_KEY_ENTRY * entry);
const BACNET_KEY_ENTRY * entry);
BACNET_STACK_EXPORT
int encode_update_key_set(uint8_t * apdu,
BACNET_UPDATE_KEY_SET * key_set);
const BACNET_UPDATE_KEY_SET * key_set);
BACNET_STACK_EXPORT
int encode_update_distribution_key(uint8_t * apdu,
BACNET_UPDATE_DISTRIBUTION_KEY * dist_key);
const BACNET_UPDATE_DISTRIBUTION_KEY * dist_key);
BACNET_STACK_EXPORT
int encode_request_master_key(uint8_t * apdu,
BACNET_REQUEST_MASTER_KEY * req_master_key);
const BACNET_REQUEST_MASTER_KEY * req_master_key);
BACNET_STACK_EXPORT
int encode_set_master_key(uint8_t * apdu,
BACNET_SET_MASTER_KEY * set_master_key);
const BACNET_SET_MASTER_KEY * set_master_key);
/* safe decoders */
/* BACNET_STACK_EXPORT */
@@ -261,39 +261,39 @@ extern "C" {
/* uint32_t apdu_len_remaining, */
/* BACNET_SECURITY_WRAPPER * wrapper); */
BACNET_STACK_EXPORT
int decode_challenge_request_safe(uint8_t * apdu,
int decode_challenge_request_safe(const uint8_t * apdu,
uint32_t apdu_len_remaining,
BACNET_CHALLENGE_REQUEST * bc_req);
BACNET_STACK_EXPORT
int decode_security_payload_safe(uint8_t * apdu,
int decode_security_payload_safe(const uint8_t * apdu,
uint32_t apdu_len_remaining,
BACNET_SECURITY_PAYLOAD * payload);
BACNET_STACK_EXPORT
int decode_security_response_safe(uint8_t * apdu,
int decode_security_response_safe(const uint8_t * apdu,
uint32_t apdu_len_remaining,
BACNET_SECURITY_RESPONSE * resp);
BACNET_STACK_EXPORT
int decode_request_key_update_safe(uint8_t * apdu,
int decode_request_key_update_safe(const uint8_t * apdu,
uint32_t apdu_len_remaining,
BACNET_REQUEST_KEY_UPDATE * req);
BACNET_STACK_EXPORT
int decode_key_entry_safe(uint8_t * apdu,
int decode_key_entry_safe(const uint8_t * apdu,
uint32_t apdu_len_remaining,
BACNET_KEY_ENTRY * entry);
BACNET_STACK_EXPORT
int decode_update_key_set_safe(uint8_t * apdu,
int decode_update_key_set_safe(const uint8_t * apdu,
uint32_t apdu_len_remaining,
BACNET_UPDATE_KEY_SET * key_set);
BACNET_STACK_EXPORT
int decode_update_distribution_key_safe(uint8_t * apdu,
int decode_update_distribution_key_safe(const uint8_t * apdu,
uint32_t apdu_len_remaining,
BACNET_UPDATE_DISTRIBUTION_KEY * dist_key);
BACNET_STACK_EXPORT
int decode_request_master_key_safe(uint8_t * apdu,
int decode_request_master_key_safe(const uint8_t * apdu,
uint32_t apdu_len_remaining,
BACNET_REQUEST_MASTER_KEY * req_master_key);
BACNET_STACK_EXPORT
int decode_set_master_key_safe(uint8_t * apdu,
int decode_set_master_key_safe(const uint8_t * apdu,
uint32_t apdu_len_remaining,
BACNET_SET_MASTER_KEY * set_master_key);
src/bacnet/datalink/bip.h
+5 -4
View File
@@ -33,7 +33,7 @@ extern "C" {
bool bip_init(char *ifname);
BACNET_STACK_EXPORT
void bip_set_interface(char *ifname);
void bip_set_interface(const char *ifname);
BACNET_STACK_EXPORT
void bip_cleanup(void);
@@ -56,7 +56,8 @@ extern "C" {
/* implement in ports module */
BACNET_STACK_EXPORT
int bip_send_mpdu(BACNET_IP_ADDRESS *dest, uint8_t *mtu, uint16_t mtu_len);
int bip_send_mpdu(
const BACNET_IP_ADDRESS *dest, const uint8_t *mtu, uint16_t mtu_len);
BACNET_STACK_EXPORT
uint16_t bip_receive(BACNET_ADDRESS *src,
@@ -76,7 +77,7 @@ extern "C" {
uint16_t bip_get_port(void);
BACNET_STACK_EXPORT
bool bip_set_addr(BACNET_IP_ADDRESS *addr);
bool bip_set_addr(const BACNET_IP_ADDRESS *addr);
BACNET_STACK_EXPORT
bool bip_get_addr(BACNET_IP_ADDRESS *addr);
@@ -85,7 +86,7 @@ extern "C" {
bool bip_get_addr_by_name(const char *host_name, BACNET_IP_ADDRESS *addr);
BACNET_STACK_EXPORT
bool bip_set_broadcast_addr(BACNET_IP_ADDRESS *addr);
bool bip_set_broadcast_addr(const BACNET_IP_ADDRESS *addr);
BACNET_STACK_EXPORT
bool bip_get_broadcast_addr(BACNET_IP_ADDRESS *addr);
src/bacnet/datalink/bip6.h
+5 -5
View File
@@ -66,11 +66,11 @@ extern "C" {
BACNET_STACK_EXPORT
bool bip6_address_match_self(
BACNET_IP6_ADDRESS *addr);
const BACNET_IP6_ADDRESS *addr);
BACNET_STACK_EXPORT
bool bip6_set_addr(
BACNET_IP6_ADDRESS *addr);
const BACNET_IP6_ADDRESS *addr);
BACNET_STACK_EXPORT
bool bip6_get_addr(
BACNET_IP6_ADDRESS *addr);
@@ -84,7 +84,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool bip6_set_broadcast_addr(
BACNET_IP6_ADDRESS *addr);
const BACNET_IP6_ADDRESS *addr);
/* returns network byte order */
BACNET_STACK_EXPORT
bool bip6_get_broadcast_addr(
@@ -92,8 +92,8 @@ extern "C" {
BACNET_STACK_EXPORT
int bip6_send_mpdu(
BACNET_IP6_ADDRESS *addr,
uint8_t * mtu,
const BACNET_IP6_ADDRESS *addr,
const uint8_t * mtu,
uint16_t mtu_len);
BACNET_STACK_EXPORT
bool bip6_send_pdu_queue_empty(
src/bacnet/datalink/bvlc.c
+54 -51
View File
@@ -56,7 +56,7 @@ int bvlc_encode_header(
*
* @return number of bytes decoded
*/
int bvlc_decode_header(uint8_t *pdu,
int bvlc_decode_header(const uint8_t *pdu,
uint16_t pdu_len,
uint8_t *message_type,
uint16_t *message_length)
@@ -127,7 +127,8 @@ int bvlc_encode_result(uint8_t *pdu, uint16_t pdu_size, uint16_t result_code)
*
* @return number of bytes decoded
*/
int bvlc_decode_result(uint8_t *pdu, uint16_t pdu_len, uint16_t *result_code)
int bvlc_decode_result(
const uint8_t *pdu, uint16_t pdu_len, uint16_t *result_code)
{
int bytes_consumed = 0;
const uint16_t length = 2;
@@ -150,7 +151,7 @@ int bvlc_decode_result(uint8_t *pdu, uint16_t pdu_len, uint16_t *result_code)
*/
bool bvlc_broadcast_distribution_mask_copy(
BACNET_IP_BROADCAST_DISTRIBUTION_MASK *dst,
BACNET_IP_BROADCAST_DISTRIBUTION_MASK *src)
const BACNET_IP_BROADCAST_DISTRIBUTION_MASK *src)
{
bool status = false;
unsigned int i = 0;
@@ -172,8 +173,8 @@ bool bvlc_broadcast_distribution_mask_copy(
* @return true if the masks are different
*/
bool bvlc_broadcast_distribution_mask_different(
BACNET_IP_BROADCAST_DISTRIBUTION_MASK *dst,
BACNET_IP_BROADCAST_DISTRIBUTION_MASK *src)
const BACNET_IP_BROADCAST_DISTRIBUTION_MASK *dst,
const BACNET_IP_BROADCAST_DISTRIBUTION_MASK *src)
{
bool status = false;
unsigned int i = 0;
@@ -196,8 +197,8 @@ bool bvlc_broadcast_distribution_mask_different(
* @return true if the addresses are different
*/
bool bvlc_broadcast_distribution_table_entry_different(
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *dst,
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *src)
const BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *dst,
const BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *src)
{
bool status = false;
@@ -220,7 +221,7 @@ bool bvlc_broadcast_distribution_table_entry_different(
*/
bool bvlc_broadcast_distribution_table_entry_copy(
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *dst,
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *src)
const BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *src)
{
bool status = false;
@@ -327,7 +328,7 @@ void bvlc_broadcast_distribution_table_link_array(
*/
bool bvlc_broadcast_distribution_table_entry_append(
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_list,
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_new)
const BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_new)
{
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_entry = NULL;
bool status = false;
@@ -363,8 +364,8 @@ bool bvlc_broadcast_distribution_table_entry_append(
*/
bool bvlc_broadcast_distribution_table_entry_set(
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_entry,
BACNET_IP_ADDRESS *addr,
BACNET_IP_BROADCAST_DISTRIBUTION_MASK *mask)
const BACNET_IP_ADDRESS *addr,
const BACNET_IP_BROADCAST_DISTRIBUTION_MASK *mask)
{
bool status = false;
@@ -405,7 +406,8 @@ bool bvlc_broadcast_distribution_mask_from_host(
* @return true if the broadcast distribution was retrieved
*/
bool bvlc_broadcast_distribution_mask_to_host(
uint32_t *broadcast_mask, BACNET_IP_BROADCAST_DISTRIBUTION_MASK *mask)
uint32_t *broadcast_mask,
const BACNET_IP_BROADCAST_DISTRIBUTION_MASK *mask)
{
bool status = false;
@@ -449,7 +451,7 @@ void bvlc_broadcast_distribution_mask_set(
* @param addr3 - broadcast distribution mask octet
*/
void bvlc_broadcast_distribution_mask_get(
BACNET_IP_BROADCAST_DISTRIBUTION_MASK *mask,
const BACNET_IP_BROADCAST_DISTRIBUTION_MASK *mask,
uint8_t *addr0,
uint8_t *addr1,
uint8_t *addr2,
@@ -485,7 +487,7 @@ void bvlc_broadcast_distribution_mask_get(
*/
bool bvlc_broadcast_distribution_table_entry_forward_address(
BACNET_IP_ADDRESS *addr,
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_entry)
const BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_entry)
{
bool status = false;
@@ -582,7 +584,7 @@ int bvlc_broadcast_distribution_table_encode(uint8_t *apdu,
* @param bdt_head - head of a BDT linked list
* @return length of the APDU buffer decoded, or ERROR, REJECT, or ABORT
*/
int bvlc_broadcast_distribution_table_decode(uint8_t *apdu,
int bvlc_broadcast_distribution_table_decode(const uint8_t *apdu,
uint16_t apdu_len,
BACNET_ERROR_CODE *error_code,
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_head)
@@ -769,7 +771,7 @@ int bvlc_encode_write_broadcast_distribution_table(uint8_t *pdu,
*
* @return number of bytes decoded
*/
int bvlc_decode_write_broadcast_distribution_table(uint8_t *pdu,
int bvlc_decode_write_broadcast_distribution_table(const uint8_t *pdu,
uint16_t pdu_len,
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_list)
{
@@ -899,7 +901,7 @@ int bvlc_encode_read_broadcast_distribution_table_ack(uint8_t *pdu,
*
* @return number of bytes decoded
*/
int bvlc_decode_read_broadcast_distribution_table_ack(uint8_t *pdu,
int bvlc_decode_read_broadcast_distribution_table_ack(const uint8_t *pdu,
uint16_t pdu_len,
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_list)
{
@@ -956,8 +958,8 @@ int bvlc_decode_read_broadcast_distribution_table_ack(uint8_t *pdu,
*/
int bvlc_encode_forwarded_npdu(uint8_t *pdu,
uint16_t pdu_size,
BACNET_IP_ADDRESS *bip_address,
uint8_t *npdu,
const BACNET_IP_ADDRESS *bip_address,
const uint8_t *npdu,
uint16_t npdu_len)
{
int bytes_encoded = 0;
@@ -997,7 +999,7 @@ int bvlc_encode_forwarded_npdu(uint8_t *pdu,
*
* @return number of bytes decoded
*/
int bvlc_decode_forwarded_npdu(uint8_t *pdu,
int bvlc_decode_forwarded_npdu(const uint8_t *pdu,
uint16_t pdu_len,
BACNET_IP_ADDRESS *bip_address,
uint8_t *npdu,
@@ -1076,7 +1078,7 @@ int bvlc_encode_register_foreign_device(
* @return number of bytes decoded
*/
int bvlc_decode_register_foreign_device(
uint8_t *pdu, uint16_t pdu_len, uint16_t *ttl_seconds)
const uint8_t *pdu, uint16_t pdu_len, uint16_t *ttl_seconds)
{
int bytes_consumed = 0;
const uint16_t length = 2;
@@ -1187,8 +1189,8 @@ int bvlc_encode_read_foreign_device_table(uint8_t *pdu, uint16_t pdu_size)
* @return true if the entries are different
*/
bool bvlc_foreign_device_table_entry_different(
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *entry1,
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *entry2)
const BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *entry1,
const BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *entry2)
{
if (entry1 && entry2) {
if (bvlc_address_different(
@@ -1208,7 +1210,7 @@ bool bvlc_foreign_device_table_entry_different(
*/
bool bvlc_foreign_device_table_entry_copy(
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *entry1,
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *entry2)
const BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *entry2)
{
bool status = false;
@@ -1257,7 +1259,8 @@ void bvlc_foreign_device_table_maintenance_timer(
* @return true if the Foreign Device entry was found and removed.
*/
bool bvlc_foreign_device_table_entry_delete(
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *fdt_list, BACNET_IP_ADDRESS *addr)
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *fdt_list,
const BACNET_IP_ADDRESS *addr)
{
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *fdt_entry = NULL;
bool status = false;
@@ -1287,7 +1290,7 @@ bool bvlc_foreign_device_table_entry_delete(
*/
bool bvlc_foreign_device_table_entry_add(
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *fdt_list,
BACNET_IP_ADDRESS *addr,
const BACNET_IP_ADDRESS *addr,
uint16_t ttl_seconds)
{
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *fdt_entry = NULL;
@@ -1471,7 +1474,7 @@ int bvlc_encode_read_foreign_device_table_ack(uint8_t *pdu,
*
* @return number of bytes decoded
*/
int bvlc_decode_read_foreign_device_table_ack(uint8_t *pdu,
int bvlc_decode_read_foreign_device_table_ack(const uint8_t *pdu,
uint16_t pdu_len,
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *fdt_list)
{
@@ -1521,7 +1524,7 @@ int bvlc_decode_read_foreign_device_table_ack(uint8_t *pdu,
* of the table entry to be deleted.
*/
int bvlc_encode_delete_foreign_device(
uint8_t *pdu, uint16_t pdu_size, BACNET_IP_ADDRESS *ip_address)
uint8_t *pdu, uint16_t pdu_size, const BACNET_IP_ADDRESS *ip_address)
{
int bytes_encoded = 0;
const uint16_t length = 0x000A;
@@ -1552,7 +1555,7 @@ int bvlc_encode_delete_foreign_device(
* @return number of bytes decoded
*/
int bvlc_decode_delete_foreign_device(
uint8_t *pdu, uint16_t pdu_len, BACNET_IP_ADDRESS *ip_address)
const uint8_t *pdu, uint16_t pdu_len, BACNET_IP_ADDRESS *ip_address)
{
int bytes_consumed = 0;
const uint16_t length = BIP_ADDRESS_MAX;
@@ -1586,7 +1589,7 @@ int bvlc_decode_delete_foreign_device(
* BACnet NPDU from Originating Device: Variable length
*/
int bvlc_encode_distribute_broadcast_to_network(
uint8_t *pdu, uint16_t pdu_size, uint8_t *npdu, uint16_t npdu_len)
uint8_t *pdu, uint16_t pdu_size, const uint8_t *npdu, uint16_t npdu_len)
{
int bytes_encoded = 0;
uint16_t length = 1 + 1 + 2;
@@ -1620,7 +1623,7 @@ int bvlc_encode_distribute_broadcast_to_network(
*
* @return number of bytes decoded
*/
int bvlc_decode_distribute_broadcast_to_network(uint8_t *pdu,
int bvlc_decode_distribute_broadcast_to_network(const uint8_t *pdu,
uint16_t pdu_len,
uint8_t *npdu,
uint16_t npdu_size,
@@ -1661,7 +1664,7 @@ int bvlc_decode_distribute_broadcast_to_network(uint8_t *pdu,
* BACnet NPDU: Variable length
*/
int bvlc_encode_original_unicast(
uint8_t *pdu, uint16_t pdu_size, uint8_t *npdu, uint16_t npdu_len)
uint8_t *pdu, uint16_t pdu_size, const uint8_t *npdu, uint16_t npdu_len)
{
int bytes_encoded = 0;
uint16_t length = 4;
@@ -1695,7 +1698,7 @@ int bvlc_encode_original_unicast(
*
* @return number of bytes decoded
*/
int bvlc_decode_original_unicast(uint8_t *pdu,
int bvlc_decode_original_unicast(const uint8_t *pdu,
uint16_t pdu_len,
uint8_t *npdu,
uint16_t npdu_size,
@@ -1736,7 +1739,7 @@ int bvlc_decode_original_unicast(uint8_t *pdu,
* BACnet NPDU: Variable length
*/
int bvlc_encode_original_broadcast(
uint8_t *pdu, uint16_t pdu_size, uint8_t *npdu, uint16_t npdu_len)
uint8_t *pdu, uint16_t pdu_size, const uint8_t *npdu, uint16_t npdu_len)
{
int bytes_encoded = 0;
uint16_t length = 4;
@@ -1770,7 +1773,7 @@ int bvlc_encode_original_broadcast(
*
* @return number of bytes decoded
*/
int bvlc_decode_original_broadcast(uint8_t *pdu,
int bvlc_decode_original_broadcast(const uint8_t *pdu,
uint16_t pdu_len,
uint8_t *npdu,
uint16_t npdu_size,
@@ -1811,7 +1814,7 @@ int bvlc_decode_original_broadcast(uint8_t *pdu,
* Security Wrapper: Variable length
*/
int bvlc_encode_secure_bvll(
uint8_t *pdu, uint16_t pdu_size, uint8_t *sbuf, uint16_t sbuf_len)
uint8_t *pdu, uint16_t pdu_size, const uint8_t *sbuf, uint16_t sbuf_len)
{
int bytes_encoded = 0;
uint16_t length = 1 + 1 + 2;
@@ -1845,7 +1848,7 @@ int bvlc_encode_secure_bvll(
*
* @return number of bytes decoded
*/
int bvlc_decode_secure_bvll(uint8_t *pdu,
int bvlc_decode_secure_bvll(const uint8_t *pdu,
uint16_t pdu_len,
uint8_t *sbuf,
uint16_t sbuf_size,
@@ -1914,7 +1917,7 @@ int bvlc_encode_address(
* @return number of bytes decoded
*/
int bvlc_decode_address(
uint8_t *pdu, uint16_t pdu_len, BACNET_IP_ADDRESS *bip_address)
const uint8_t *pdu, uint16_t pdu_len, BACNET_IP_ADDRESS *bip_address)
{
int bytes_consumed = 0;
uint16_t length = BIP_ADDRESS_MAX;
@@ -2068,7 +2071,7 @@ bool bvlc_address_set(BACNET_IP_ADDRESS *addr,
*
* @return true if the address is set
*/
bool bvlc_address_get(BACNET_IP_ADDRESS *addr,
bool bvlc_address_get(const BACNET_IP_ADDRESS *addr,
uint8_t *addr0,
uint8_t *addr1,
uint8_t *addr2,
@@ -2201,7 +2204,7 @@ void bvlc_address_from_network(BACNET_IP_ADDRESS *dst, uint32_t addr)
* @return true if a valid address was set
*/
bool bvlc_ip_address_to_bacnet_local(
BACNET_ADDRESS *addr, BACNET_IP_ADDRESS *ipaddr)
BACNET_ADDRESS *addr, const BACNET_IP_ADDRESS *ipaddr)
{
bool status = false;
@@ -2239,7 +2242,7 @@ bool bvlc_ip_address_to_bacnet_local(
* @return true if a valid address was set
*/
bool bvlc_ip_address_from_bacnet_local(
BACNET_IP_ADDRESS *ipaddr, BACNET_ADDRESS *addr)
BACNET_IP_ADDRESS *ipaddr, const BACNET_ADDRESS *addr)
{
bool status = false;
@@ -2266,7 +2269,7 @@ bool bvlc_ip_address_from_bacnet_local(
* @return true if a valid address was set
*/
bool bvlc_ip_address_to_bacnet_remote(
BACNET_ADDRESS *addr, uint16_t dnet, BACNET_IP_ADDRESS *ipaddr)
BACNET_ADDRESS *addr, uint16_t dnet, const BACNET_IP_ADDRESS *ipaddr)
{
bool status = false;
@@ -2298,7 +2301,7 @@ bool bvlc_ip_address_to_bacnet_remote(
* @return true if a valid address was set
*/
bool bvlc_ip_address_from_bacnet_remote(
BACNET_IP_ADDRESS *ipaddr, uint16_t *dnet, BACNET_ADDRESS *addr)
BACNET_IP_ADDRESS *ipaddr, uint16_t *dnet, const BACNET_ADDRESS *addr)
{
bool status = false;
@@ -2335,7 +2338,7 @@ bool bvlc_ip_address_from_bacnet_remote(
*/
int bvlc_encode_broadcast_distribution_mask(uint8_t *pdu,
uint16_t pdu_size,
BACNET_IP_BROADCAST_DISTRIBUTION_MASK *bd_mask)
const BACNET_IP_BROADCAST_DISTRIBUTION_MASK *bd_mask)
{
int bytes_encoded = 0;
unsigned i = 0;
@@ -2363,7 +2366,7 @@ int bvlc_encode_broadcast_distribution_mask(uint8_t *pdu,
*
* @return number of bytes decoded
*/
int bvlc_decode_broadcast_distribution_mask(uint8_t *pdu,
int bvlc_decode_broadcast_distribution_mask(const uint8_t *pdu,
uint16_t pdu_len,
BACNET_IP_BROADCAST_DISTRIBUTION_MASK *bd_mask)
{
@@ -2398,7 +2401,7 @@ int bvlc_decode_broadcast_distribution_mask(uint8_t *pdu,
*/
int bvlc_encode_broadcast_distribution_table_entry(uint8_t *pdu,
uint16_t pdu_size,
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_entry)
const BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_entry)
{
int bytes_encoded = 0;
int len = 0;
@@ -2437,7 +2440,7 @@ int bvlc_encode_broadcast_distribution_table_entry(uint8_t *pdu,
*
* @return number of bytes decoded
*/
int bvlc_decode_broadcast_distribution_table_entry(uint8_t *pdu,
int bvlc_decode_broadcast_distribution_table_entry(const uint8_t *pdu,
uint16_t pdu_len,
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_entry)
{
@@ -2479,7 +2482,7 @@ int bvlc_decode_broadcast_distribution_table_entry(uint8_t *pdu,
*/
int bvlc_encode_foreign_device_table_entry(uint8_t *pdu,
uint16_t pdu_size,
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *fdt_entry)
const BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *fdt_entry)
{
int bytes_encoded = 0;
int len = 0;
@@ -2521,7 +2524,7 @@ int bvlc_encode_foreign_device_table_entry(uint8_t *pdu,
*
* @return number of bytes decoded
*/
int bvlc_decode_foreign_device_table_entry(uint8_t *pdu,
int bvlc_decode_foreign_device_table_entry(const uint8_t *pdu,
uint16_t pdu_len,
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *fdt_entry)
{
@@ -2598,7 +2601,7 @@ const char *bvlc_result_code_name(uint16_t result_code)
* @return length of the APDU buffer
*/
int bvlc_foreign_device_bbmd_host_address_encode(
uint8_t *apdu, uint16_t apdu_size, BACNET_IP_ADDRESS *ip_address)
uint8_t *apdu, uint16_t apdu_size, const BACNET_IP_ADDRESS *ip_address)
{
BACNET_HOST_N_PORT address = { 0 };
int apdu_len = 0;
@@ -2623,7 +2626,7 @@ int bvlc_foreign_device_bbmd_host_address_encode(
* @param ip_address - IP address and port number
* @return length of the APDU buffer decoded, or ERROR, REJECT, or ABORT
*/
int bvlc_foreign_device_bbmd_host_address_decode(uint8_t *apdu,
int bvlc_foreign_device_bbmd_host_address_decode(const uint8_t *apdu,
uint16_t apdu_len,
BACNET_ERROR_CODE *error_code,
BACNET_IP_ADDRESS *ip_address)
src/bacnet/datalink/bvlc.h
+56 -51
View File
@@ -155,7 +155,7 @@ extern "C" {
BACNET_STACK_EXPORT
int bvlc_decode_address(
uint8_t *pdu, uint16_t pdu_len, BACNET_IP_ADDRESS *ip_address);
const uint8_t *pdu, uint16_t pdu_len, BACNET_IP_ADDRESS *ip_address);
BACNET_STACK_EXPORT
bool bvlc_address_copy(BACNET_IP_ADDRESS *dst, const BACNET_IP_ADDRESS *src);
@@ -182,7 +182,7 @@ extern "C" {
uint8_t addr3);
BACNET_STACK_EXPORT
bool bvlc_address_get(BACNET_IP_ADDRESS *addr,
bool bvlc_address_get(const BACNET_IP_ADDRESS *addr,
uint8_t *addr0,
uint8_t *addr1,
uint8_t *addr2,
@@ -190,37 +190,37 @@ extern "C" {
BACNET_STACK_EXPORT
bool bvlc_ip_address_to_bacnet_local(
BACNET_ADDRESS *addr, BACNET_IP_ADDRESS *ipaddr);
BACNET_ADDRESS *addr, const BACNET_IP_ADDRESS *ipaddr);
BACNET_STACK_EXPORT
bool bvlc_ip_address_from_bacnet_local(
BACNET_IP_ADDRESS *ipaddr, BACNET_ADDRESS *addr);
BACNET_IP_ADDRESS *ipaddr, const BACNET_ADDRESS *addr);
BACNET_STACK_EXPORT
bool bvlc_ip_address_to_bacnet_remote(
BACNET_ADDRESS *addr, uint16_t dnet, BACNET_IP_ADDRESS *ipaddr);
BACNET_ADDRESS *addr, uint16_t dnet, const BACNET_IP_ADDRESS *ipaddr);
BACNET_STACK_EXPORT
bool bvlc_ip_address_from_bacnet_remote(
BACNET_IP_ADDRESS *ipaddr, uint16_t *dnet, BACNET_ADDRESS *addr);
BACNET_IP_ADDRESS *ipaddr, uint16_t *dnet, const BACNET_ADDRESS *addr);
BACNET_STACK_EXPORT
int bvlc_encode_broadcast_distribution_mask(uint8_t *pdu,
uint16_t pdu_size,
BACNET_IP_BROADCAST_DISTRIBUTION_MASK *bd_mask);
const BACNET_IP_BROADCAST_DISTRIBUTION_MASK *bd_mask);
BACNET_STACK_EXPORT
int bvlc_decode_broadcast_distribution_mask(uint8_t *pdu,
int bvlc_decode_broadcast_distribution_mask(const uint8_t *pdu,
uint16_t pdu_len,
BACNET_IP_BROADCAST_DISTRIBUTION_MASK *bd_mask);
BACNET_STACK_EXPORT
int bvlc_encode_broadcast_distribution_table_entry(uint8_t *pdu,
uint16_t pdu_size,
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_entry);
const BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_entry);
BACNET_STACK_EXPORT
int bvlc_decode_broadcast_distribution_table_entry(uint8_t *pdu,
int bvlc_decode_broadcast_distribution_table_entry(const uint8_t *pdu,
uint16_t pdu_len,
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_entry);
@@ -243,39 +243,39 @@ extern "C" {
BACNET_STACK_EXPORT
bool bvlc_broadcast_distribution_table_entry_different(
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *dst,
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *src);
const BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *dst,
const BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *src);
BACNET_STACK_EXPORT
bool bvlc_broadcast_distribution_table_entry_copy(
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *dst,
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *src);
const BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *src);
BACNET_STACK_EXPORT
bool bvlc_broadcast_distribution_mask_different(
BACNET_IP_BROADCAST_DISTRIBUTION_MASK *dst,
BACNET_IP_BROADCAST_DISTRIBUTION_MASK *src);
const BACNET_IP_BROADCAST_DISTRIBUTION_MASK *dst,
const BACNET_IP_BROADCAST_DISTRIBUTION_MASK *src);
BACNET_STACK_EXPORT
bool bvlc_broadcast_distribution_mask_copy(
BACNET_IP_BROADCAST_DISTRIBUTION_MASK *dst,
BACNET_IP_BROADCAST_DISTRIBUTION_MASK *src);
const BACNET_IP_BROADCAST_DISTRIBUTION_MASK *src);
BACNET_STACK_EXPORT
bool bvlc_broadcast_distribution_table_entry_append(
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_list,
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_entry);
const BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_entry);
BACNET_STACK_EXPORT
bool bvlc_broadcast_distribution_table_entry_set(
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_entry,
BACNET_IP_ADDRESS *addr,
BACNET_IP_BROADCAST_DISTRIBUTION_MASK *mask);
const BACNET_IP_ADDRESS *addr,
const BACNET_IP_BROADCAST_DISTRIBUTION_MASK *mask);
BACNET_STACK_EXPORT
bool bvlc_broadcast_distribution_table_entry_forward_address(
BACNET_IP_ADDRESS *addr,
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_entry);
const BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_entry);
BACNET_STACK_EXPORT
bool bvlc_address_mask(
@@ -288,7 +288,8 @@ extern "C" {
BACNET_STACK_EXPORT
bool bvlc_broadcast_distribution_mask_to_host(
uint32_t *broadcast_mask, BACNET_IP_BROADCAST_DISTRIBUTION_MASK *mask);
uint32_t *broadcast_mask,
const BACNET_IP_BROADCAST_DISTRIBUTION_MASK *mask);
BACNET_STACK_EXPORT
void bvlc_broadcast_distribution_mask_set(
@@ -300,14 +301,14 @@ extern "C" {
BACNET_STACK_EXPORT
void bvlc_broadcast_distribution_mask_get(
BACNET_IP_BROADCAST_DISTRIBUTION_MASK *mask,
const BACNET_IP_BROADCAST_DISTRIBUTION_MASK *mask,
uint8_t *addr0,
uint8_t *addr1,
uint8_t *addr2,
uint8_t *addr3);
BACNET_STACK_EXPORT
int bvlc_broadcast_distribution_table_decode(uint8_t *apdu,
int bvlc_broadcast_distribution_table_decode(const uint8_t *apdu,
uint16_t apdu_len,
BACNET_ERROR_CODE *error_code,
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_head);
@@ -323,7 +324,7 @@ extern "C" {
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_list);
BACNET_STACK_EXPORT
int bvlc_decode_write_broadcast_distribution_table(uint8_t *pdu,
int bvlc_decode_write_broadcast_distribution_table(const uint8_t *pdu,
uint16_t pdu_len,
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_list);
@@ -337,7 +338,7 @@ extern "C" {
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_list);
BACNET_STACK_EXPORT
int bvlc_decode_read_broadcast_distribution_table_ack(uint8_t *pdu,
int bvlc_decode_read_broadcast_distribution_table_ack(const uint8_t *pdu,
uint16_t pdu_len,
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_list);
@@ -347,7 +348,10 @@ extern "C" {
BACNET_STACK_EXPORT
int bvlc_decode_header(
uint8_t *pdu, uint16_t pdu_len, uint8_t *message_type, uint16_t *length);
const uint8_t *pdu,
uint16_t pdu_len,
uint8_t *message_type,
uint16_t *length);
BACNET_STACK_EXPORT
@@ -368,32 +372,32 @@ extern "C" {
BACNET_STACK_EXPORT
bool bvlc_foreign_device_table_entry_different(
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *dst,
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *src);
const BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *dst,
const BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *src);
BACNET_STACK_EXPORT
bool bvlc_foreign_device_table_entry_copy(
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *dst,
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *src);
const BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *src);
BACNET_STACK_EXPORT
bool bvlc_foreign_device_table_entry_delete(
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *fdt_list,
BACNET_IP_ADDRESS *ip_address);
const BACNET_IP_ADDRESS *ip_address);
BACNET_STACK_EXPORT
bool bvlc_foreign_device_table_entry_add(
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *fdt_list,
BACNET_IP_ADDRESS *ip_address,
const BACNET_IP_ADDRESS *ip_address,
uint16_t ttl_seconds);
BACNET_STACK_EXPORT
int bvlc_encode_foreign_device_table_entry(uint8_t *pdu,
uint16_t pdu_size,
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *fdt_entry);
const BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *fdt_entry);
BACNET_STACK_EXPORT
int bvlc_decode_foreign_device_table_entry(uint8_t *pdu,
int bvlc_decode_foreign_device_table_entry(const uint8_t *pdu,
uint16_t pdu_len,
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *fdt_entry);
@@ -411,7 +415,7 @@ extern "C" {
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *fdt_list);
BACNET_STACK_EXPORT
int bvlc_decode_read_foreign_device_table_ack(uint8_t *pdu,
int bvlc_decode_read_foreign_device_table_ack(const uint8_t *pdu,
uint16_t pdu_len,
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY *fdt_list);
@@ -419,14 +423,15 @@ extern "C" {
int bvlc_encode_result(uint8_t *pdu, uint16_t pdu_size, uint16_t result_code);
BACNET_STACK_EXPORT
int bvlc_decode_result(uint8_t *pdu, uint16_t pdu_len, uint16_t *result_code);
int bvlc_decode_result(
const uint8_t *pdu, uint16_t pdu_len, uint16_t *result_code);
BACNET_STACK_EXPORT
int bvlc_encode_original_unicast(
uint8_t *pdu, uint16_t pdu_size, uint8_t *npdu, uint16_t npdu_len);
uint8_t *pdu, uint16_t pdu_size, const uint8_t *npdu, uint16_t npdu_len);
BACNET_STACK_EXPORT
int bvlc_decode_original_unicast(uint8_t *pdu,
int bvlc_decode_original_unicast(const uint8_t *pdu,
uint16_t pdu_len,
uint8_t *npdu,
uint16_t npdu_size,
@@ -434,10 +439,10 @@ extern "C" {
BACNET_STACK_EXPORT
int bvlc_encode_original_broadcast(
uint8_t *pdu, uint16_t pdu_size, uint8_t *npdu, uint16_t npdu_len);
uint8_t *pdu, uint16_t pdu_size, const uint8_t *npdu, uint16_t npdu_len);
BACNET_STACK_EXPORT
int bvlc_decode_original_broadcast(uint8_t *pdu,
int bvlc_decode_original_broadcast(const uint8_t *pdu,
uint16_t pdu_len,
uint8_t *npdu,
uint16_t npdu_size,
@@ -446,12 +451,12 @@ extern "C" {
BACNET_STACK_EXPORT
int bvlc_encode_forwarded_npdu(uint8_t *pdu,
uint16_t pdu_size,
BACNET_IP_ADDRESS *address,
uint8_t *npdu,
const BACNET_IP_ADDRESS *address,
const uint8_t *npdu,
uint16_t npdu_len);
BACNET_STACK_EXPORT
int bvlc_decode_forwarded_npdu(uint8_t *pdu,
int bvlc_decode_forwarded_npdu(const uint8_t *pdu,
uint16_t pdu_len,
BACNET_IP_ADDRESS *address,
uint8_t *npdu,
@@ -464,22 +469,22 @@ extern "C" {
BACNET_STACK_EXPORT
int bvlc_decode_register_foreign_device(
uint8_t *pdu, uint16_t pdu_len, uint16_t *ttl_seconds);
const uint8_t *pdu, uint16_t pdu_len, uint16_t *ttl_seconds);
BACNET_STACK_EXPORT
int bvlc_encode_delete_foreign_device(
uint8_t *pdu, uint16_t pdu_size, BACNET_IP_ADDRESS *ip_address);
uint8_t *pdu, uint16_t pdu_size, const BACNET_IP_ADDRESS *ip_address);
BACNET_STACK_EXPORT
int bvlc_decode_delete_foreign_device(
uint8_t *pdu, uint16_t pdu_len, BACNET_IP_ADDRESS *ip_address);
const uint8_t *pdu, uint16_t pdu_len, BACNET_IP_ADDRESS *ip_address);
BACNET_STACK_EXPORT
int bvlc_encode_secure_bvll(
uint8_t *pdu, uint16_t pdu_size, uint8_t *sbuf, uint16_t sbuf_len);
uint8_t *pdu, uint16_t pdu_size, const uint8_t *sbuf, uint16_t sbuf_len);
BACNET_STACK_EXPORT
int bvlc_decode_secure_bvll(uint8_t *pdu,
int bvlc_decode_secure_bvll(const uint8_t *pdu,
uint16_t pdu_len,
uint8_t *sbuf,
uint16_t sbuf_size,
@@ -487,10 +492,10 @@ extern "C" {
BACNET_STACK_EXPORT
int bvlc_encode_distribute_broadcast_to_network(
uint8_t *pdu, uint16_t pdu_size, uint8_t *npdu, uint16_t npdu_len);
uint8_t *pdu, uint16_t pdu_size, const uint8_t *npdu, uint16_t npdu_len);
BACNET_STACK_EXPORT
int bvlc_decode_distribute_broadcast_to_network(uint8_t *pdu,
int bvlc_decode_distribute_broadcast_to_network(const uint8_t *pdu,
uint16_t pdu_len,
uint8_t *npdu,
uint16_t npdu_size,
@@ -502,10 +507,10 @@ extern "C" {
BACNET_STACK_EXPORT
int bvlc_foreign_device_bbmd_host_address_encode(uint8_t *apdu,
uint16_t apdu_size,
BACNET_IP_ADDRESS *ip_address);
const BACNET_IP_ADDRESS *ip_address);
BACNET_STACK_EXPORT
int bvlc_foreign_device_bbmd_host_address_decode(uint8_t *apdu,
int bvlc_foreign_device_bbmd_host_address_decode(const uint8_t *apdu,
uint16_t apdu_len,
BACNET_ERROR_CODE *error_code,
BACNET_IP_ADDRESS *ip_address);
src/bacnet/datalink/bvlc6.c
+42 -32
View File
@@ -53,7 +53,10 @@ int bvlc6_encode_header(
* @return number of bytes decoded
*/
int bvlc6_decode_header(
uint8_t *pdu, uint16_t pdu_len, uint8_t *message_type, uint16_t *length)
const uint8_t *pdu,
uint16_t pdu_len,
uint8_t *message_type,
uint16_t *length)
{
int bytes_consumed = 0;
@@ -124,7 +127,10 @@ int bvlc6_encode_result(
* @return number of bytes decoded
*/
int bvlc6_decode_result(
uint8_t *pdu, uint16_t pdu_len, uint32_t *vmac, uint16_t *result_code)
const uint8_t *pdu,
uint16_t pdu_len,
uint32_t *vmac,
uint16_t *result_code)
{
int bytes_consumed = 0;
@@ -166,7 +172,7 @@ int bvlc6_encode_original_unicast(uint8_t *pdu,
uint16_t pdu_size,
uint32_t vmac_src,
uint32_t vmac_dst,
uint8_t *npdu,
const uint8_t *npdu,
uint16_t npdu_len)
{
int bytes_encoded = 0;
@@ -205,7 +211,7 @@ int bvlc6_encode_original_unicast(uint8_t *pdu,
*
* @return number of bytes decoded
*/
int bvlc6_decode_original_unicast(uint8_t *pdu,
int bvlc6_decode_original_unicast(const uint8_t *pdu,
uint16_t pdu_len,
uint32_t *vmac_src,
uint32_t *vmac_dst,
@@ -261,7 +267,7 @@ int bvlc6_decode_original_unicast(uint8_t *pdu,
int bvlc6_encode_original_broadcast(uint8_t *pdu,
uint16_t pdu_size,
uint32_t vmac,
uint8_t *npdu,
const uint8_t *npdu,
uint16_t npdu_len)
{
int bytes_encoded = 0;
@@ -297,7 +303,7 @@ int bvlc6_encode_original_broadcast(uint8_t *pdu,
*
* @return number of bytes decoded
*/
int bvlc6_decode_original_broadcast(uint8_t *pdu,
int bvlc6_decode_original_broadcast(const uint8_t *pdu,
uint16_t pdu_len,
uint32_t *vmac,
uint8_t *npdu,
@@ -376,7 +382,7 @@ int bvlc6_encode_address_resolution(
* @return number of bytes decoded
*/
int bvlc6_decode_address_resolution(
uint8_t *pdu, uint16_t pdu_len, uint32_t *vmac_src, uint32_t *vmac_target)
const uint8_t *pdu, uint16_t pdu_len, uint32_t *vmac_src, uint32_t *vmac_target)
{
int bytes_consumed = 0;
@@ -407,7 +413,7 @@ int bvlc6_decode_address_resolution(
* @return number of bytes encoded
*/
int bvlc6_encode_address(
uint8_t *pdu, uint16_t pdu_size, BACNET_IP6_ADDRESS *bip6_address)
uint8_t *pdu, uint16_t pdu_size, const BACNET_IP6_ADDRESS *bip6_address)
{
int bytes_encoded = 0;
uint16_t length = BIP6_ADDRESS_MAX;
@@ -433,7 +439,7 @@ int bvlc6_encode_address(
* @return number of bytes decoded
*/
int bvlc6_decode_address(
uint8_t *pdu, uint16_t pdu_len, BACNET_IP6_ADDRESS *bip6_address)
const uint8_t *pdu, uint16_t pdu_len, BACNET_IP6_ADDRESS *bip6_address)
{
int bytes_consumed = 0;
uint16_t length = BIP6_ADDRESS_MAX;
@@ -462,7 +468,7 @@ int bvlc6_decode_address(
*
* @return true if the address was copied
*/
bool bvlc6_address_copy(BACNET_IP6_ADDRESS *dst, BACNET_IP6_ADDRESS *src)
bool bvlc6_address_copy(BACNET_IP6_ADDRESS *dst, const BACNET_IP6_ADDRESS *src)
{
bool status = false;
unsigned int i = 0;
@@ -490,7 +496,8 @@ bool bvlc6_address_copy(BACNET_IP6_ADDRESS *dst, BACNET_IP6_ADDRESS *src)
*
* @return true if the addresses are different
*/
bool bvlc6_address_different(BACNET_IP6_ADDRESS *dst, BACNET_IP6_ADDRESS *src)
bool bvlc6_address_different(
const BACNET_IP6_ADDRESS *dst, const BACNET_IP6_ADDRESS *src)
{
bool status = false;
unsigned int i = 0;
@@ -574,7 +581,7 @@ bool bvlc6_address_set(BACNET_IP6_ADDRESS *addr,
*
* @return true if the address is set
*/
bool bvlc6_address_get(BACNET_IP6_ADDRESS *addr,
bool bvlc6_address_get(const BACNET_IP6_ADDRESS *addr,
uint16_t *addr0,
uint16_t *addr1,
uint16_t *addr2,
@@ -672,7 +679,7 @@ static int snprintf_shift(int len, char **buf, size_t *buf_size)
* input, excluding the trailing null.
* @note buf and buf_size may be null and zero to return only the size
*/
int bvlc6_address_to_ascii(BACNET_IP6_ADDRESS *addr, char *buf, size_t buf_size)
int bvlc6_address_to_ascii(const BACNET_IP6_ADDRESS *addr, char *buf, size_t buf_size)
{
uint16_t a;
unsigned int i;
@@ -836,7 +843,7 @@ bool bvlc6_vmac_address_set(BACNET_ADDRESS *addr, uint32_t device_id)
*
* @return true if the address is set
*/
bool bvlc6_vmac_address_get(BACNET_ADDRESS *addr, uint32_t *device_id)
bool bvlc6_vmac_address_get(const BACNET_ADDRESS *addr, uint32_t *device_id)
{
bool status = false;
@@ -875,7 +882,7 @@ int bvlc6_encode_forwarded_address_resolution(uint8_t *pdu,
uint16_t pdu_size,
uint32_t vmac_src,
uint32_t vmac_target,
BACNET_IP6_ADDRESS *bip6_address)
const BACNET_IP6_ADDRESS *bip6_address)
{
int bytes_encoded = 0;
uint16_t length = 0x001C;
@@ -909,7 +916,7 @@ int bvlc6_encode_forwarded_address_resolution(uint8_t *pdu,
*
* @return number of bytes decoded
*/
int bvlc6_decode_forwarded_address_resolution(uint8_t *pdu,
int bvlc6_decode_forwarded_address_resolution(const uint8_t *pdu,
uint16_t pdu_len,
uint32_t *vmac_src,
uint32_t *vmac_target,
@@ -1007,7 +1014,10 @@ int bvlc6_encode_address_resolution_ack(
* @return number of bytes decoded
*/
int bvlc6_decode_address_resolution_ack(
uint8_t *pdu, uint16_t pdu_len, uint32_t *vmac_src, uint32_t *vmac_dst)
const uint8_t *pdu,
uint16_t pdu_len,
uint32_t *vmac_src,
uint32_t *vmac_dst)
{
int bytes_consumed = 0;
const uint16_t length = 6;
@@ -1070,7 +1080,7 @@ int bvlc6_encode_virtual_address_resolution(
* @return number of bytes decoded
*/
int bvlc6_decode_virtual_address_resolution(
uint8_t *pdu, uint16_t pdu_len, uint32_t *vmac_src)
const uint8_t *pdu, uint16_t pdu_len, uint32_t *vmac_src)
{
int bytes_consumed = 0;
@@ -1118,7 +1128,7 @@ int bvlc6_encode_virtual_address_resolution_ack(
* @return number of bytes decoded
*/
int bvlc6_decode_virtual_address_resolution_ack(
uint8_t *pdu, uint16_t pdu_len, uint32_t *vmac_src, uint32_t *vmac_dst)
const uint8_t *pdu, uint16_t pdu_len, uint32_t *vmac_src, uint32_t *vmac_dst)
{
return bvlc6_decode_address_resolution_ack(
pdu, pdu_len, vmac_src, vmac_dst);
@@ -1150,8 +1160,8 @@ int bvlc6_decode_virtual_address_resolution_ack(
int bvlc6_encode_forwarded_npdu(uint8_t *pdu,
uint16_t pdu_size,
uint32_t vmac_src,
BACNET_IP6_ADDRESS *bip6_address,
uint8_t *npdu,
const BACNET_IP6_ADDRESS *bip6_address,
const uint8_t *npdu,
uint16_t npdu_len)
{
int bytes_encoded = 0;
@@ -1193,7 +1203,7 @@ int bvlc6_encode_forwarded_npdu(uint8_t *pdu,
*
* @return number of bytes decoded
*/
int bvlc6_decode_forwarded_npdu(uint8_t *pdu,
int bvlc6_decode_forwarded_npdu(const uint8_t *pdu,
uint16_t pdu_len,
uint32_t *vmac_src,
BACNET_IP6_ADDRESS *bip6_address,
@@ -1282,7 +1292,7 @@ int bvlc6_encode_register_foreign_device(
* @return number of bytes decoded
*/
int bvlc6_decode_register_foreign_device(
uint8_t *pdu, uint16_t pdu_len, uint32_t *vmac_src, uint16_t *ttl_seconds)
const uint8_t *pdu, uint16_t pdu_len, uint32_t *vmac_src, uint16_t *ttl_seconds)
{
int bytes_consumed = 0;
const uint16_t length = 5;
@@ -1325,7 +1335,7 @@ int bvlc6_decode_register_foreign_device(
int bvlc6_encode_delete_foreign_device(uint8_t *pdu,
uint16_t pdu_size,
uint32_t vmac_src,
BACNET_IP6_ADDRESS *bip6_address)
const BACNET_IP6_ADDRESS *bip6_address)
{
int bytes_encoded = 0;
const uint16_t length = 0x0019;
@@ -1359,7 +1369,7 @@ int bvlc6_encode_delete_foreign_device(uint8_t *pdu,
*
* @return number of bytes decoded
*/
int bvlc6_decode_delete_foreign_device(uint8_t *pdu,
int bvlc6_decode_delete_foreign_device(const uint8_t *pdu,
uint16_t pdu_len,
uint32_t *vmac_src,
BACNET_IP6_ADDRESS *bip6_address)
@@ -1402,7 +1412,7 @@ int bvlc6_decode_delete_foreign_device(uint8_t *pdu,
* Security Wrapper: Variable length
*/
int bvlc6_encode_secure_bvll(
uint8_t *pdu, uint16_t pdu_size, uint8_t *sbuf, uint16_t sbuf_len)
uint8_t *pdu, uint16_t pdu_size, const uint8_t *sbuf, uint16_t sbuf_len)
{
int bytes_encoded = 0;
uint16_t length = 4;
@@ -1435,7 +1445,7 @@ int bvlc6_encode_secure_bvll(
*
* @return number of bytes decoded
*/
int bvlc6_decode_secure_bvll(uint8_t *pdu,
int bvlc6_decode_secure_bvll(const uint8_t *pdu,
uint16_t pdu_len,
uint8_t *sbuf,
uint16_t sbuf_size,
@@ -1486,7 +1496,7 @@ int bvlc6_decode_secure_bvll(uint8_t *pdu,
int bvlc6_encode_distribute_broadcast_to_network(uint8_t *pdu,
uint16_t pdu_size,
uint32_t vmac,
uint8_t *npdu,
const uint8_t *npdu,
uint16_t npdu_len)
{
int bytes_encoded = 0;
@@ -1522,7 +1532,7 @@ int bvlc6_encode_distribute_broadcast_to_network(uint8_t *pdu,
*
* @return number of bytes decoded
*/
int bvlc6_decode_distribute_broadcast_to_network(uint8_t *pdu,
int bvlc6_decode_distribute_broadcast_to_network(const uint8_t *pdu,
uint16_t pdu_len,
uint32_t *vmac,
uint8_t *npdu,
@@ -1560,7 +1570,7 @@ int bvlc6_decode_distribute_broadcast_to_network(uint8_t *pdu,
* @return length of the APDU buffer
*/
int bvlc6_foreign_device_bbmd_host_address_encode(
uint8_t *apdu, uint16_t apdu_size, BACNET_IP6_ADDRESS *ip6_address)
uint8_t *apdu, uint16_t apdu_size, const BACNET_IP6_ADDRESS *ip6_address)
{
BACNET_HOST_N_PORT address = { 0 };
int apdu_len = 0;
@@ -1598,7 +1608,7 @@ int bvlc6_foreign_device_bbmd_host_address_encode(
* @return length of the APDU buffer
*/
int bvlc6_broadcast_distribution_table_entry_encode(uint8_t *apdu,
BACNET_IP6_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_entry)
const BACNET_IP6_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_entry)
{
int len = 0;
int apdu_len = 0;
@@ -1722,7 +1732,7 @@ int bvlc6_broadcast_distribution_table_encode(uint8_t *apdu,
* @return length of the APDU buffer
*/
int bvlc6_foreign_device_table_entry_encode(uint8_t *apdu,
BACNET_IP6_FOREIGN_DEVICE_TABLE_ENTRY *fdt_entry)
const BACNET_IP6_FOREIGN_DEVICE_TABLE_ENTRY *fdt_entry)
{
int len = 0;
int apdu_len = 0;
src/bacnet/datalink/bvlc6.h
+33 -33
View File
@@ -167,23 +167,23 @@ extern "C" {
int bvlc6_encode_address(
uint8_t * pdu,
uint16_t pdu_size,
BACNET_IP6_ADDRESS * ip6_address);
const BACNET_IP6_ADDRESS * ip6_address);
BACNET_STACK_EXPORT
int bvlc6_decode_address(
uint8_t * pdu,
const uint8_t * pdu,
uint16_t pdu_len,
BACNET_IP6_ADDRESS * ip6_address);
BACNET_STACK_EXPORT
bool bvlc6_address_copy(
BACNET_IP6_ADDRESS * dst,
BACNET_IP6_ADDRESS * src);
const BACNET_IP6_ADDRESS * src);
BACNET_STACK_EXPORT
bool bvlc6_address_different(
BACNET_IP6_ADDRESS * dst,
BACNET_IP6_ADDRESS * src);
const BACNET_IP6_ADDRESS * dst,
const BACNET_IP6_ADDRESS * src);
BACNET_STACK_EXPORT
int bvlc6_address_to_ascii(BACNET_IP6_ADDRESS *addr, char *buf,
int bvlc6_address_to_ascii(const BACNET_IP6_ADDRESS *addr, char *buf,
size_t buf_size);
BACNET_STACK_EXPORT
bool bvlc6_address_from_ascii(
@@ -203,7 +203,7 @@ extern "C" {
uint16_t addr7);
BACNET_STACK_EXPORT
bool bvlc6_address_get(
BACNET_IP6_ADDRESS * addr,
const BACNET_IP6_ADDRESS * addr,
uint16_t *addr0,
uint16_t *addr1,
uint16_t *addr2,
@@ -219,7 +219,7 @@ extern "C" {
uint32_t device_id);
BACNET_STACK_EXPORT
bool bvlc6_vmac_address_get(
BACNET_ADDRESS * addr,
const BACNET_ADDRESS * addr,
uint32_t *device_id);
BACNET_STACK_EXPORT
@@ -230,7 +230,7 @@ extern "C" {
uint16_t length);
BACNET_STACK_EXPORT
int bvlc6_decode_header(
uint8_t * pdu,
const uint8_t * pdu,
uint16_t pdu_len,
uint8_t * message_type,
uint16_t * length);
@@ -243,7 +243,7 @@ extern "C" {
uint16_t result_code);
BACNET_STACK_EXPORT
int bvlc6_decode_result(
uint8_t * pdu,
const uint8_t * pdu,
uint16_t pdu_len,
uint32_t * vmac,
uint16_t * result_code);
@@ -254,11 +254,11 @@ extern "C" {
uint16_t pdu_size,
uint32_t vmac_src,
uint32_t vmac_dst,
uint8_t * npdu,
const uint8_t * npdu,
uint16_t npdu_len);
BACNET_STACK_EXPORT
int bvlc6_decode_original_unicast(
uint8_t * pdu,
const uint8_t * pdu,
uint16_t pdu_len,
uint32_t * vmac_src,
uint32_t * vmac_dst,
@@ -271,11 +271,11 @@ extern "C" {
uint8_t * pdu,
uint16_t pdu_size,
uint32_t vmac,
uint8_t * npdu,
const uint8_t * npdu,
uint16_t npdu_len);
BACNET_STACK_EXPORT
int bvlc6_decode_original_broadcast(
uint8_t * pdu,
const uint8_t * pdu,
uint16_t pdu_len,
uint32_t * vmac,
uint8_t * npdu,
@@ -290,7 +290,7 @@ extern "C" {
uint32_t vmac_target);
BACNET_STACK_EXPORT
int bvlc6_decode_address_resolution(
uint8_t * pdu,
const uint8_t * pdu,
uint16_t pdu_len,
uint32_t * vmac_src,
uint32_t * vmac_target);
@@ -301,10 +301,10 @@ extern "C" {
uint16_t pdu_size,
uint32_t vmac_src,
uint32_t vmac_target,
BACNET_IP6_ADDRESS * bip6_address);
const BACNET_IP6_ADDRESS * bip6_address);
BACNET_STACK_EXPORT
int bvlc6_decode_forwarded_address_resolution(
uint8_t * pdu,
const uint8_t * pdu,
uint16_t pdu_len,
uint32_t * vmac_src,
uint32_t * vmac_target,
@@ -318,7 +318,7 @@ extern "C" {
uint32_t vmac_dst);
BACNET_STACK_EXPORT
int bvlc6_decode_address_resolution_ack(
uint8_t * pdu,
const uint8_t * pdu,
uint16_t pdu_len,
uint32_t * vmac_src,
uint32_t * vmac_dst);
@@ -330,7 +330,7 @@ extern "C" {
uint32_t vmac_src);
BACNET_STACK_EXPORT
int bvlc6_decode_virtual_address_resolution(
uint8_t * pdu,
const uint8_t * pdu,
uint16_t pdu_len,
uint32_t * vmac_src);
@@ -342,7 +342,7 @@ extern "C" {
uint32_t vmac_dst);
BACNET_STACK_EXPORT
int bvlc6_decode_virtual_address_resolution_ack(
uint8_t * pdu,
const uint8_t * pdu,
uint16_t pdu_len,
uint32_t * vmac_src,
uint32_t * vmac_dst);
@@ -352,12 +352,12 @@ extern "C" {
uint8_t * pdu,
uint16_t pdu_size,
uint32_t vmac_src,
BACNET_IP6_ADDRESS * address,
uint8_t * npdu,
const BACNET_IP6_ADDRESS * address,
const uint8_t * npdu,
uint16_t npdu_len);
BACNET_STACK_EXPORT
int bvlc6_decode_forwarded_npdu(
uint8_t * pdu,
const uint8_t * pdu,
uint16_t pdu_len,
uint32_t * vmac_src,
BACNET_IP6_ADDRESS * address,
@@ -373,7 +373,7 @@ extern "C" {
uint16_t ttl_seconds);
BACNET_STACK_EXPORT
int bvlc6_decode_register_foreign_device(
uint8_t * pdu,
const uint8_t * pdu,
uint16_t pdu_len,
uint32_t * vmac_src,
uint16_t * ttl_seconds);
@@ -383,11 +383,11 @@ extern "C" {
uint8_t * pdu,
uint16_t pdu_size,
uint32_t vmac_src,
BACNET_IP6_ADDRESS *bip6_address);
const BACNET_IP6_ADDRESS *bip6_address);
BACNET_STACK_EXPORT
int bvlc6_decode_delete_foreign_device(
uint8_t * pdu,
const uint8_t * pdu,
uint16_t pdu_len,
uint32_t * vmac_src,
BACNET_IP6_ADDRESS *bip6_address);
@@ -396,11 +396,11 @@ extern "C" {
int bvlc6_encode_secure_bvll(
uint8_t * pdu,
uint16_t pdu_size,
uint8_t * sbuf,
const uint8_t * sbuf,
uint16_t sbuf_len);
BACNET_STACK_EXPORT
int bvlc6_decode_secure_bvll(
uint8_t * pdu,
const uint8_t * pdu,
uint16_t pdu_len,
uint8_t * sbuf,
uint16_t sbuf_size,
@@ -411,11 +411,11 @@ extern "C" {
uint8_t * pdu,
uint16_t pdu_size,
uint32_t vmac,
uint8_t * npdu,
const uint8_t * npdu,
uint16_t npdu_len);
BACNET_STACK_EXPORT
int bvlc6_decode_distribute_broadcast_to_network(
uint8_t * pdu,
const uint8_t * pdu,
uint16_t pdu_len,
uint32_t * vmac,
uint8_t * npdu,
@@ -424,11 +424,11 @@ extern "C" {
BACNET_STACK_EXPORT
int bvlc6_foreign_device_bbmd_host_address_encode(uint8_t *apdu,
uint16_t apdu_size,
BACNET_IP6_ADDRESS *ip6_address);
const BACNET_IP6_ADDRESS *ip6_address);
BACNET_STACK_EXPORT
int bvlc6_broadcast_distribution_table_entry_encode(uint8_t *apdu,
BACNET_IP6_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_entry);
const BACNET_IP6_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_entry);
BACNET_STACK_EXPORT
int bvlc6_broadcast_distribution_table_list_encode(uint8_t *apdu,
BACNET_IP6_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_head);
@@ -439,7 +439,7 @@ extern "C" {
BACNET_STACK_EXPORT
int bvlc6_foreign_device_table_entry_encode(uint8_t *apdu,
BACNET_IP6_FOREIGN_DEVICE_TABLE_ENTRY *fdt_entry);
const BACNET_IP6_FOREIGN_DEVICE_TABLE_ENTRY *fdt_entry);
BACNET_STACK_EXPORT
int bvlc6_foreign_device_table_list_encode(uint8_t *apdu,
BACNET_IP6_FOREIGN_DEVICE_TABLE_ENTRY *fdt_head);
src/bacnet/datalink/cobs.c
+1 -1
View File
@@ -295,7 +295,7 @@ size_t cobs_frame_decode(
* Decode the Encoded CRC-32K field
*/
crc_len = cobs_decode(crc_buffer, sizeof(crc_buffer),
(uint8_t *)(from + length - COBS_ENCODED_CRC_SIZE),
from + length - COBS_ENCODED_CRC_SIZE,
COBS_ENCODED_CRC_SIZE, MSTP_PREAMBLE_X55);
/*
* Sanity check length of decoded CRC32K.
src/bacnet/datalink/dlenv.c
+1 -1
View File
@@ -77,7 +77,7 @@ void bip_dl_debug_disable(void)
* @param address - IPv4 address (uint32_t) of BBMD to register with,
* in network byte order.
*/
void dlenv_bbmd_address_set(BACNET_IP_ADDRESS *address)
void dlenv_bbmd_address_set(const BACNET_IP_ADDRESS *address)
{
bvlc_address_copy(&BBMD_Address, address);
BBMD_Address_Valid = true;
src/bacnet/datalink/dlenv.h
+1 -1
View File
@@ -46,7 +46,7 @@ extern "C" {
BACNET_STACK_EXPORT
void dlenv_bbmd_address_set(
BACNET_IP_ADDRESS *address);
const BACNET_IP_ADDRESS *address);
BACNET_STACK_EXPORT
void dlenv_bbmd_ttl_set(
src/bacnet/datalink/dlmstp.c
+3 -3
View File
@@ -124,9 +124,9 @@ uint16_t MSTP_Get_Send(
*/
static bool MSTP_Compare_Data_Expecting_Reply(
volatile struct mstp_port_struct_t *mstp_port,
uint8_t *reply_pdu,
const uint8_t *reply_pdu,
uint16_t reply_pdu_len,
BACNET_ADDRESS *dest_address)
const BACNET_ADDRESS *dest_address)
{
uint16_t offset;
/* One way to check the message is to compare NPDU
@@ -284,7 +284,7 @@ uint16_t MSTP_Get_Reply(
* @param nbytes - number of bytes of data to send
*/
void MSTP_Send_Frame(struct mstp_port_struct_t *mstp_port,
uint8_t *buffer,
const uint8_t *buffer,
uint16_t nbytes)
{
struct dlmstp_user_data_t *user;
src/bacnet/datalink/dlmstp.h
+1 -1
View File
@@ -61,7 +61,7 @@ struct dlmstp_rs485_driver {
void (*init)(void);
/** Prepare & transmit a packet. */
void (*send)(uint8_t *payload, uint16_t payload_len);
void (*send)(const uint8_t *payload, uint16_t payload_len);
/** Check if one received byte is available */
bool (*read)(uint8_t *buf);
src/bacnet/datalink/ethernet.h
+2 -2
View File
@@ -56,7 +56,7 @@ extern "C" {
BACNET_STACK_EXPORT
void ethernet_set_my_address(
BACNET_ADDRESS * my_address);
const BACNET_ADDRESS * my_address);
BACNET_STACK_EXPORT
void ethernet_get_my_address(
BACNET_ADDRESS * my_address);
@@ -68,7 +68,7 @@ extern "C" {
BACNET_STACK_EXPORT
void ethernet_debug_address(
const char *info,
BACNET_ADDRESS * dest);
const BACNET_ADDRESS * dest);
BACNET_STACK_EXPORT
int ethernet_send(
uint8_t * mtu,
src/bacnet/datalink/mstp.c
+7 -8
View File
@@ -98,7 +98,7 @@ static __inline__ void printf_master(const char *format, ...)
x++; \
}
bool MSTP_Line_Active(struct mstp_port_struct_t *mstp_port)
bool MSTP_Line_Active(const struct mstp_port_struct_t *mstp_port)
{
if (!mstp_port) {
return false;
@@ -162,7 +162,7 @@ uint16_t MSTP_Create_Frame(uint8_t *buffer,
uint8_t frame_type,
uint8_t destination,
uint8_t source,
uint8_t *data,
const uint8_t *data,
uint16_t data_len)
{
uint8_t crc8 = 0xFF; /* used to calculate the crc value */
@@ -259,7 +259,7 @@ void MSTP_Create_And_Send_Frame(struct mstp_port_struct_t *mstp_port,
uint8_t frame_type,
uint8_t destination,
uint8_t source,
uint8_t *data,
const uint8_t *data,
uint16_t data_len)
{
uint16_t len = 0; /* number of bytes to send */
@@ -268,7 +268,7 @@ void MSTP_Create_And_Send_Frame(struct mstp_port_struct_t *mstp_port,
MSTP_Create_Frame(mstp_port->OutputBuffer, mstp_port->OutputBufferSize,
frame_type, destination, source, data, data_len);
MSTP_Send_Frame(mstp_port, (uint8_t *)&mstp_port->OutputBuffer[0], len);
MSTP_Send_Frame(mstp_port, &mstp_port->OutputBuffer[0], len);
/* FIXME: be sure to reset SilenceTimer() after each octet is sent! */
}
@@ -778,7 +778,7 @@ bool MSTP_Master_Node_FSM(struct mstp_port_struct_t *mstp_port)
uint8_t frame_type = mstp_port->OutputBuffer[2];
uint8_t destination = mstp_port->OutputBuffer[3];
MSTP_Send_Frame(mstp_port,
(uint8_t *)&mstp_port->OutputBuffer[0], (uint16_t)length);
&mstp_port->OutputBuffer[0], (uint16_t)length);
mstp_port->FrameCount++;
switch (frame_type) {
case FRAME_TYPE_BACNET_DATA_EXPECTING_REPLY:
@@ -1159,7 +1159,7 @@ bool MSTP_Master_Node_FSM(struct mstp_port_struct_t *mstp_port)
* frame */
/* and enter the IDLE state to wait for the next frame. */
MSTP_Send_Frame(mstp_port,
(uint8_t *)&mstp_port->OutputBuffer[0], (uint16_t)length);
&mstp_port->OutputBuffer[0], (uint16_t)length);
mstp_port->master_state = MSTP_MASTER_STATE_IDLE;
/* clear our flag we were holding for comparison */
mstp_port->ReceivedValidFrame = false;
@@ -1255,8 +1255,7 @@ void MSTP_Slave_Node_FSM(struct mstp_port_struct_t *mstp_port)
/* and enter the IDLE state to wait for the next frame.
*/
MSTP_Send_Frame(mstp_port,
(uint8_t *)&mstp_port->OutputBuffer[0],
(uint16_t)length);
&mstp_port->OutputBuffer[0], (uint16_t)length);
/* clear our flag we were holding for comparison */
mstp_port->ReceivedValidFrame = false;
} else if (mstp_port->SilenceTimer((void *)mstp_port) >
src/bacnet/datalink/mstp.h
+4 -4
View File
@@ -230,7 +230,7 @@ void MSTP_Slave_Node_FSM(struct mstp_port_struct_t *mstp_port);
/* returns true if line is active */
BACNET_STACK_EXPORT
bool MSTP_Line_Active(struct mstp_port_struct_t *mstp_port);
bool MSTP_Line_Active(const struct mstp_port_struct_t *mstp_port);
BACNET_STACK_EXPORT
uint16_t MSTP_Create_Frame(uint8_t *buffer,
@@ -238,7 +238,7 @@ uint16_t MSTP_Create_Frame(uint8_t *buffer,
uint8_t frame_type,
uint8_t destination,
uint8_t source,
uint8_t *data,
const uint8_t *data,
uint16_t data_len);
BACNET_STACK_EXPORT
@@ -247,7 +247,7 @@ void MSTP_Create_And_Send_Frame(
uint8_t frame_type,
uint8_t destination,
uint8_t source,
uint8_t *data,
const uint8_t *data,
uint16_t data_len);
BACNET_STACK_EXPORT
@@ -284,7 +284,7 @@ uint16_t MSTP_Get_Reply(struct mstp_port_struct_t *mstp_port,
BACNET_STACK_EXPORT
void MSTP_Send_Frame(
struct mstp_port_struct_t *mstp_port,
uint8_t * buffer,
const uint8_t * buffer,
uint16_t nbytes);
#ifdef __cplusplus