ran the indent program on the source files to make them consistent.
This commit is contained in:
+96
-131
@@ -37,103 +37,84 @@
|
||||
#include "bacdef.h"
|
||||
|
||||
// encode I-Am service - use -1 for limit if you want unlimited
|
||||
int whois_encode_apdu(
|
||||
uint8_t *apdu,
|
||||
int32_t low_limit,
|
||||
int32_t high_limit)
|
||||
int whois_encode_apdu(uint8_t * apdu,
|
||||
int32_t low_limit, int32_t high_limit)
|
||||
{
|
||||
int len = 0; // length of each encoding
|
||||
int apdu_len = 0; // total length of the apdu, return value
|
||||
int len = 0; // length of each encoding
|
||||
int apdu_len = 0; // total length of the apdu, return value
|
||||
|
||||
if (apdu) {
|
||||
apdu[0] = PDU_TYPE_UNCONFIRMED_SERVICE_REQUEST;
|
||||
apdu[1] = SERVICE_UNCONFIRMED_WHO_IS; // service choice
|
||||
apdu_len = 2;
|
||||
// optional limits - must be used as a pair
|
||||
if ((low_limit >= 0) && (low_limit <= BACNET_MAX_INSTANCE) &&
|
||||
(high_limit >= 0) && (high_limit <= BACNET_MAX_INSTANCE))
|
||||
{
|
||||
len = encode_context_unsigned(
|
||||
&apdu[apdu_len],
|
||||
0,
|
||||
low_limit);
|
||||
apdu_len += len;
|
||||
len = encode_context_unsigned(
|
||||
&apdu[apdu_len],
|
||||
1,
|
||||
high_limit);
|
||||
apdu_len += len;
|
||||
if (apdu) {
|
||||
apdu[0] = PDU_TYPE_UNCONFIRMED_SERVICE_REQUEST;
|
||||
apdu[1] = SERVICE_UNCONFIRMED_WHO_IS; // service choice
|
||||
apdu_len = 2;
|
||||
// optional limits - must be used as a pair
|
||||
if ((low_limit >= 0) && (low_limit <= BACNET_MAX_INSTANCE) &&
|
||||
(high_limit >= 0) && (high_limit <= BACNET_MAX_INSTANCE)) {
|
||||
len = encode_context_unsigned(&apdu[apdu_len], 0, low_limit);
|
||||
apdu_len += len;
|
||||
len = encode_context_unsigned(&apdu[apdu_len], 1, high_limit);
|
||||
apdu_len += len;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return apdu_len;
|
||||
|
||||
return apdu_len;
|
||||
}
|
||||
|
||||
// decode the service request only
|
||||
int whois_decode_service_request(
|
||||
uint8_t *apdu,
|
||||
unsigned apdu_len,
|
||||
int32_t *pLow_limit,
|
||||
int32_t *pHigh_limit)
|
||||
int whois_decode_service_request(uint8_t * apdu,
|
||||
unsigned apdu_len, int32_t * pLow_limit, int32_t * pHigh_limit)
|
||||
{
|
||||
int len = 0;
|
||||
uint8_t tag_number = 0;
|
||||
uint32_t len_value = 0;
|
||||
uint32_t decoded_value = 0;
|
||||
int len = 0;
|
||||
uint8_t tag_number = 0;
|
||||
uint32_t len_value = 0;
|
||||
uint32_t decoded_value = 0;
|
||||
|
||||
// optional limits - must be used as a pair
|
||||
if (apdu_len)
|
||||
{
|
||||
len += decode_tag_number_and_value(&apdu[len], &tag_number, &len_value);
|
||||
if (tag_number != 0)
|
||||
return -1;
|
||||
len += decode_unsigned(&apdu[len], len_value, &decoded_value);
|
||||
if (decoded_value <= BACNET_MAX_INSTANCE)
|
||||
{
|
||||
if (pLow_limit)
|
||||
*pLow_limit = decoded_value;
|
||||
// optional limits - must be used as a pair
|
||||
if (apdu_len) {
|
||||
len +=
|
||||
decode_tag_number_and_value(&apdu[len], &tag_number,
|
||||
&len_value);
|
||||
if (tag_number != 0)
|
||||
return -1;
|
||||
len += decode_unsigned(&apdu[len], len_value, &decoded_value);
|
||||
if (decoded_value <= BACNET_MAX_INSTANCE) {
|
||||
if (pLow_limit)
|
||||
*pLow_limit = decoded_value;
|
||||
}
|
||||
len +=
|
||||
decode_tag_number_and_value(&apdu[len], &tag_number,
|
||||
&len_value);
|
||||
if (tag_number != 1)
|
||||
return -1;
|
||||
len += decode_unsigned(&apdu[len], len_value, &decoded_value);
|
||||
if (decoded_value <= BACNET_MAX_INSTANCE) {
|
||||
if (pHigh_limit)
|
||||
*pHigh_limit = decoded_value;
|
||||
}
|
||||
}
|
||||
len += decode_tag_number_and_value(&apdu[len], &tag_number, &len_value);
|
||||
if (tag_number != 1)
|
||||
return -1;
|
||||
len += decode_unsigned(&apdu[len],
|
||||
len_value, &decoded_value);
|
||||
if (decoded_value <= BACNET_MAX_INSTANCE)
|
||||
{
|
||||
if (pHigh_limit)
|
||||
*pHigh_limit = decoded_value;
|
||||
}
|
||||
}
|
||||
|
||||
return len;
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
int whois_decode_apdu(
|
||||
uint8_t *apdu,
|
||||
unsigned apdu_len,
|
||||
int32_t *pLow_limit,
|
||||
int32_t *pHigh_limit)
|
||||
int whois_decode_apdu(uint8_t * apdu,
|
||||
unsigned apdu_len, int32_t * pLow_limit, int32_t * pHigh_limit)
|
||||
{
|
||||
int len = 0;
|
||||
int len = 0;
|
||||
|
||||
if (!apdu)
|
||||
return -1;
|
||||
// optional checking - most likely was already done prior to this call
|
||||
if (apdu[0] != PDU_TYPE_UNCONFIRMED_SERVICE_REQUEST)
|
||||
return -1;
|
||||
if (apdu[1] != SERVICE_UNCONFIRMED_WHO_IS)
|
||||
return -1;
|
||||
// optional limits - must be used as a pair
|
||||
if (apdu_len > 2)
|
||||
{
|
||||
len = whois_decode_service_request(
|
||||
&apdu[2],
|
||||
apdu_len - 2,
|
||||
pLow_limit,
|
||||
pHigh_limit);
|
||||
}
|
||||
|
||||
return len;
|
||||
if (!apdu)
|
||||
return -1;
|
||||
// optional checking - most likely was already done prior to this call
|
||||
if (apdu[0] != PDU_TYPE_UNCONFIRMED_SERVICE_REQUEST)
|
||||
return -1;
|
||||
if (apdu[1] != SERVICE_UNCONFIRMED_WHO_IS)
|
||||
return -1;
|
||||
// optional limits - must be used as a pair
|
||||
if (apdu_len > 2) {
|
||||
len = whois_decode_service_request(&apdu[2],
|
||||
apdu_len - 2, pLow_limit, pHigh_limit);
|
||||
}
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
#ifdef TEST
|
||||
@@ -143,56 +124,40 @@ int whois_decode_apdu(
|
||||
|
||||
void testWhoIs(Test * pTest)
|
||||
{
|
||||
uint8_t apdu[480] = {0};
|
||||
int len = 0;
|
||||
int apdu_len = 0;
|
||||
int32_t low_limit = -1;
|
||||
int32_t high_limit = -1;
|
||||
int32_t test_low_limit = -1;
|
||||
int32_t test_high_limit = -1;
|
||||
|
||||
len = whois_encode_apdu(
|
||||
&apdu[0],
|
||||
low_limit,
|
||||
high_limit);
|
||||
ct_test(pTest, len != 0);
|
||||
apdu_len = len;
|
||||
uint8_t apdu[480] = { 0 };
|
||||
int len = 0;
|
||||
int apdu_len = 0;
|
||||
int32_t low_limit = -1;
|
||||
int32_t high_limit = -1;
|
||||
int32_t test_low_limit = -1;
|
||||
int32_t test_high_limit = -1;
|
||||
|
||||
len = whois_decode_apdu(
|
||||
&apdu[0],
|
||||
apdu_len,
|
||||
&test_low_limit,
|
||||
&test_high_limit);
|
||||
ct_test(pTest, len != -1);
|
||||
ct_test(pTest, test_low_limit == low_limit);
|
||||
ct_test(pTest, test_high_limit == high_limit);
|
||||
len = whois_encode_apdu(&apdu[0], low_limit, high_limit);
|
||||
ct_test(pTest, len != 0);
|
||||
apdu_len = len;
|
||||
|
||||
for (
|
||||
low_limit = 0;
|
||||
low_limit <= BACNET_MAX_INSTANCE;
|
||||
low_limit += (BACNET_MAX_INSTANCE/4))
|
||||
{
|
||||
for (
|
||||
high_limit = 0;
|
||||
high_limit <= BACNET_MAX_INSTANCE;
|
||||
high_limit += (BACNET_MAX_INSTANCE/4))
|
||||
{
|
||||
len = whois_encode_apdu(
|
||||
&apdu[0],
|
||||
low_limit,
|
||||
high_limit);
|
||||
apdu_len = len;
|
||||
ct_test(pTest, len != 0);
|
||||
len = whois_decode_apdu(
|
||||
&apdu[0],
|
||||
apdu_len,
|
||||
&test_low_limit,
|
||||
&test_high_limit);
|
||||
ct_test(pTest, len != -1);
|
||||
ct_test(pTest, test_low_limit == low_limit);
|
||||
ct_test(pTest, test_high_limit == high_limit);
|
||||
len = whois_decode_apdu(&apdu[0],
|
||||
apdu_len, &test_low_limit, &test_high_limit);
|
||||
ct_test(pTest, len != -1);
|
||||
ct_test(pTest, test_low_limit == low_limit);
|
||||
ct_test(pTest, test_high_limit == high_limit);
|
||||
|
||||
for (low_limit = 0;
|
||||
low_limit <= BACNET_MAX_INSTANCE;
|
||||
low_limit += (BACNET_MAX_INSTANCE / 4)) {
|
||||
for (high_limit = 0;
|
||||
high_limit <= BACNET_MAX_INSTANCE;
|
||||
high_limit += (BACNET_MAX_INSTANCE / 4)) {
|
||||
len = whois_encode_apdu(&apdu[0], low_limit, high_limit);
|
||||
apdu_len = len;
|
||||
ct_test(pTest, len != 0);
|
||||
len = whois_decode_apdu(&apdu[0],
|
||||
apdu_len, &test_low_limit, &test_high_limit);
|
||||
ct_test(pTest, len != -1);
|
||||
ct_test(pTest, test_low_limit == low_limit);
|
||||
ct_test(pTest, test_high_limit == high_limit);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef TEST_WHOIS
|
||||
|
||||
Reference in New Issue
Block a user