indented using indent.sh script to get uniform looking code for release
This commit is contained in:
skarg
+190
-218
@@ -63,7 +63,7 @@ static bool Error_Detected = false;
|
||||
#define BAC_ADDRESS_MULT 1
|
||||
|
||||
struct address_entry {
|
||||
struct address_entry * next;
|
||||
struct address_entry *next;
|
||||
uint8_t Flags;
|
||||
uint32_t device_id;
|
||||
unsigned max_apdu;
|
||||
@@ -71,38 +71,41 @@ struct address_entry {
|
||||
};
|
||||
|
||||
static struct address_table {
|
||||
struct address_entry * first;
|
||||
struct address_entry * last;
|
||||
} Address_Table = {0};
|
||||
struct address_entry *first;
|
||||
struct address_entry *last;
|
||||
} Address_Table = {
|
||||
0};
|
||||
|
||||
|
||||
struct address_entry * alloc_address_entry(void)
|
||||
struct address_entry *alloc_address_entry(
|
||||
void)
|
||||
{
|
||||
struct address_entry * rval;
|
||||
rval = (struct address_entry *)calloc(1, sizeof(struct address_entry));
|
||||
if(Address_Table.first == 0)
|
||||
{
|
||||
Address_Table.first = Address_Table.last = rval;
|
||||
}
|
||||
else
|
||||
{
|
||||
Address_Table.last->next = rval;
|
||||
Address_Table.last = rval;
|
||||
}
|
||||
return rval;
|
||||
struct address_entry *rval;
|
||||
rval = (struct address_entry *) calloc(1, sizeof(struct address_entry));
|
||||
if (Address_Table.first == 0) {
|
||||
Address_Table.first = Address_Table.last = rval;
|
||||
} else {
|
||||
Address_Table.last->next = rval;
|
||||
Address_Table.last = rval;
|
||||
}
|
||||
return rval;
|
||||
}
|
||||
|
||||
|
||||
|
||||
bool bacnet_address_matches(BACNET_ADDRESS * a1, BACNET_ADDRESS * a2)
|
||||
bool bacnet_address_matches(
|
||||
BACNET_ADDRESS * a1,
|
||||
BACNET_ADDRESS * a2)
|
||||
{
|
||||
int i = 0;
|
||||
if(a1->net != a2->net) return false;
|
||||
if(a1->len != a2->len) return false;
|
||||
for(;i<a1->len;i++)
|
||||
if(a1->adr[i]!=a2->adr[i])
|
||||
return false;
|
||||
return true;
|
||||
int i = 0;
|
||||
if (a1->net != a2->net)
|
||||
return false;
|
||||
if (a1->len != a2->len)
|
||||
return false;
|
||||
for (; i < a1->len; i++)
|
||||
if (a1->adr[i] != a2->adr[i])
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
void address_table_add(
|
||||
@@ -111,21 +114,20 @@ void address_table_add(
|
||||
BACNET_ADDRESS * src)
|
||||
{
|
||||
struct address_entry *pMatch;
|
||||
uint8_t flags = 0;
|
||||
uint8_t flags = 0;
|
||||
|
||||
pMatch = Address_Table.first;
|
||||
pMatch = Address_Table.first;
|
||||
while (pMatch) {
|
||||
if (pMatch->device_id == device_id)
|
||||
{
|
||||
if (pMatch->device_id == device_id) {
|
||||
if (bacnet_address_matches(&pMatch->address, src))
|
||||
return;
|
||||
flags |= BAC_ADDRESS_MULT;
|
||||
pMatch->Flags |= BAC_ADDRESS_MULT;
|
||||
return;
|
||||
flags |= BAC_ADDRESS_MULT;
|
||||
pMatch->Flags |= BAC_ADDRESS_MULT;
|
||||
}
|
||||
pMatch = pMatch->next;
|
||||
}
|
||||
|
||||
pMatch = alloc_address_entry();
|
||||
pMatch = alloc_address_entry();
|
||||
|
||||
pMatch->Flags = flags;
|
||||
pMatch->device_id = device_id;
|
||||
@@ -219,124 +221,107 @@ static void init_service_handlers(
|
||||
apdu_set_reject_handler(MyRejectHandler);
|
||||
}
|
||||
|
||||
void print_macaddr(uint8_t * addr, int len)
|
||||
void print_macaddr(
|
||||
uint8_t * addr,
|
||||
int len)
|
||||
{
|
||||
int j = 0;
|
||||
int j = 0;
|
||||
|
||||
while(j < len)
|
||||
{
|
||||
if (j != 0) {
|
||||
printf(":");
|
||||
}
|
||||
printf("%02X", addr[j]);
|
||||
j++;
|
||||
}
|
||||
while(j < MAX_MAC_LEN)
|
||||
{
|
||||
printf(" ");
|
||||
j++;
|
||||
}
|
||||
while (j < len) {
|
||||
if (j != 0) {
|
||||
printf(":");
|
||||
}
|
||||
printf("%02X", addr[j]);
|
||||
j++;
|
||||
}
|
||||
while (j < MAX_MAC_LEN) {
|
||||
printf(" ");
|
||||
j++;
|
||||
}
|
||||
}
|
||||
|
||||
static void print_address_cache(
|
||||
void)
|
||||
void)
|
||||
{
|
||||
BACNET_ADDRESS address;
|
||||
unsigned total_addresses = 0;
|
||||
unsigned dup_addresses = 0;
|
||||
struct address_entry *addr;
|
||||
uint8_t local_sadr = 0;
|
||||
BACNET_ADDRESS address;
|
||||
unsigned total_addresses = 0;
|
||||
unsigned dup_addresses = 0;
|
||||
struct address_entry *addr;
|
||||
uint8_t local_sadr = 0;
|
||||
|
||||
/* NOTE: this string format is parsed by src/address.c,
|
||||
so these must be compatible. */
|
||||
/* NOTE: this string format is parsed by src/address.c,
|
||||
so these must be compatible. */
|
||||
|
||||
printf(";%-7s %-20s %-5s %-20s %-4s\n",
|
||||
"Device", "MAC (hex)", "SNET", "SADR (hex)", "APDU");
|
||||
printf(";-------- -------------------- ----- -------------------- ----\n");
|
||||
printf(";%-7s %-20s %-5s %-20s %-4s\n", "Device", "MAC (hex)", "SNET",
|
||||
"SADR (hex)", "APDU");
|
||||
printf(";-------- -------------------- ----- -------------------- ----\n");
|
||||
|
||||
|
||||
addr = Address_Table.first;
|
||||
while (addr)
|
||||
{
|
||||
bacnet_address_copy(&address, &addr->address);
|
||||
total_addresses++;
|
||||
if(addr->Flags & BAC_ADDRESS_MULT)
|
||||
{
|
||||
dup_addresses++;
|
||||
printf(";");
|
||||
}
|
||||
else
|
||||
{
|
||||
printf(" ");
|
||||
}
|
||||
printf(" %-7u ", addr->device_id);
|
||||
print_macaddr(address.mac, address.mac_len);
|
||||
printf(" %-5hu ", address.net);
|
||||
if (address.net) {
|
||||
print_macaddr(address.adr, address.len);
|
||||
} else {
|
||||
print_macaddr(&local_sadr, 1);
|
||||
}
|
||||
printf(" %-4hu ", addr->max_apdu);
|
||||
printf("\n");
|
||||
addr = Address_Table.first;
|
||||
while (addr) {
|
||||
bacnet_address_copy(&address, &addr->address);
|
||||
total_addresses++;
|
||||
if (addr->Flags & BAC_ADDRESS_MULT) {
|
||||
dup_addresses++;
|
||||
printf(";");
|
||||
} else {
|
||||
printf(" ");
|
||||
}
|
||||
printf(" %-7u ", addr->device_id);
|
||||
print_macaddr(address.mac, address.mac_len);
|
||||
printf(" %-5hu ", address.net);
|
||||
if (address.net) {
|
||||
print_macaddr(address.adr, address.len);
|
||||
} else {
|
||||
print_macaddr(&local_sadr, 1);
|
||||
}
|
||||
printf(" %-4hu ", addr->max_apdu);
|
||||
printf("\n");
|
||||
|
||||
addr = addr->next;
|
||||
}
|
||||
printf(";\n; Total Devices: %u\n", total_addresses);
|
||||
if (dup_addresses) {
|
||||
printf("; * Duplicate Devices: %u\n", dup_addresses);
|
||||
}
|
||||
addr = addr->next;
|
||||
}
|
||||
printf(";\n; Total Devices: %u\n", total_addresses);
|
||||
if (dup_addresses) {
|
||||
printf("; * Duplicate Devices: %u\n", dup_addresses);
|
||||
}
|
||||
}
|
||||
|
||||
static int print_usage(char* exe_name){
|
||||
printf(
|
||||
"Usage:\n"
|
||||
"\n"
|
||||
"%s [[network]:[address]] "
|
||||
"[device-instance-min [device-instance-max]] [--help]\n" ,
|
||||
exe_name);
|
||||
return 1;
|
||||
static int print_usage(
|
||||
char *exe_name)
|
||||
{
|
||||
printf("Usage:\n" "\n" "%s [[network]:[address]] "
|
||||
"[device-instance-min [device-instance-max]] [--help]\n", exe_name);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
static int print_help(char* exe_name){
|
||||
printf(
|
||||
"Usage:\n"
|
||||
"\n"
|
||||
"%s [[network]:[address]] "
|
||||
"[device-instance-min [device-instance-max]] [--help]\n"
|
||||
"\n"
|
||||
" Send BACnet WhoIs service request to a device or multiple devices, and wait\n"
|
||||
" for responses. Displays any devices found and their network information.\n"
|
||||
"\n"
|
||||
"device-instance:\r\n"
|
||||
" BACnet Device Object Instance number that you are trying to send a Who-Is\n"
|
||||
" service request. The value should be in the range of 0 to 4194303. A range\n"
|
||||
" of values can also be specified by using a minimum value and a maximum value.\n"
|
||||
"\n"
|
||||
"network:\n"
|
||||
" BACnet network number for directed requests. Valid range is from 0 to 65535\n"
|
||||
" where 0 is the local connection and 65535 is network broadcast.\n"
|
||||
"\n"
|
||||
"address:\n"
|
||||
" BACnet mac address number. Valid ranges are from 0 to 255 or a IP connection \n"
|
||||
" string including port number like 10.1.2.3:47808.\n"
|
||||
"\n"
|
||||
"Examples:\n\n"
|
||||
"To send a WhoIs request to Network 123:\n"
|
||||
"%s 123:\n\n"
|
||||
"To send a WhoIs request to Network 123 Address 5:\n"
|
||||
"%s 123:5\n\n"
|
||||
"To send a WhoIs request to Device 123:\n"
|
||||
"%s 123\n\n"
|
||||
"To send a WhoIs request to Devices from 1000 to 9000:\n"
|
||||
"%s 1000 9000\n\n"
|
||||
"To send a WhoIs request to Devices from 1000 to 9000 on Network 123:\n"
|
||||
"%s 123: 1000 9000\n\n"
|
||||
"To send a WhoIs request to all devices:\n"
|
||||
"%s\n\n",
|
||||
exe_name,exe_name,exe_name,exe_name,exe_name,exe_name,exe_name);
|
||||
return 1;
|
||||
static int print_help(
|
||||
char *exe_name)
|
||||
{
|
||||
printf("Usage:\n" "\n" "%s [[network]:[address]] "
|
||||
"[device-instance-min [device-instance-max]] [--help]\n" "\n"
|
||||
" Send BACnet WhoIs service request to a device or multiple devices, and wait\n"
|
||||
" for responses. Displays any devices found and their network information.\n"
|
||||
"\n" "device-instance:\r\n"
|
||||
" BACnet Device Object Instance number that you are trying to send a Who-Is\n"
|
||||
" service request. The value should be in the range of 0 to 4194303. A range\n"
|
||||
" of values can also be specified by using a minimum value and a maximum value.\n"
|
||||
"\n" "network:\n"
|
||||
" BACnet network number for directed requests. Valid range is from 0 to 65535\n"
|
||||
" where 0 is the local connection and 65535 is network broadcast.\n"
|
||||
"\n" "address:\n"
|
||||
" BACnet mac address number. Valid ranges are from 0 to 255 or a IP connection \n"
|
||||
" string including port number like 10.1.2.3:47808.\n" "\n"
|
||||
"Examples:\n\n" "To send a WhoIs request to Network 123:\n"
|
||||
"%s 123:\n\n" "To send a WhoIs request to Network 123 Address 5:\n"
|
||||
"%s 123:5\n\n" "To send a WhoIs request to Device 123:\n" "%s 123\n\n"
|
||||
"To send a WhoIs request to Devices from 1000 to 9000:\n"
|
||||
"%s 1000 9000\n\n"
|
||||
"To send a WhoIs request to Devices from 1000 to 9000 on Network 123:\n"
|
||||
"%s 123: 1000 9000\n\n" "To send a WhoIs request to all devices:\n"
|
||||
"%s\n\n", exe_name, exe_name, exe_name, exe_name, exe_name, exe_name,
|
||||
exe_name);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -345,47 +330,39 @@ static int print_help(char* exe_name){
|
||||
** @return length of address parsed in bytes
|
||||
*/
|
||||
static int parse_bac_address(
|
||||
BACNET_ADDRESS *dest, /* [out] BACNET Address*/
|
||||
char *src /* [in] nul terminated string to parse */
|
||||
)
|
||||
BACNET_ADDRESS * dest, /* [out] BACNET Address */
|
||||
char *src /* [in] nul terminated string to parse */
|
||||
)
|
||||
{
|
||||
int i = 0;
|
||||
uint16_t s;
|
||||
int a[4],p;
|
||||
int c = sscanf(src,"%u.%u.%u.%u:%u",&a[0],&a[1],&a[2],&a[3],&p);
|
||||
int i = 0;
|
||||
uint16_t s;
|
||||
int a[4], p;
|
||||
int c = sscanf(src, "%u.%u.%u.%u:%u", &a[0], &a[1], &a[2], &a[3], &p);
|
||||
|
||||
dest->len = 0;
|
||||
dest->len = 0;
|
||||
|
||||
if (c==1)
|
||||
{
|
||||
if( a[0] < 256 ) /* mstp */
|
||||
{
|
||||
dest->adr[0] = a[0];
|
||||
dest->len = 1;
|
||||
}
|
||||
else if ( a[0] < 0x0FFFF ) /* lon */
|
||||
{
|
||||
s = htons((uint16_t)a[0]);
|
||||
memcpy(&dest->adr[0], &s, 2);
|
||||
dest->len = 2;
|
||||
}
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
else if (c==5) /* ip address */
|
||||
{
|
||||
for(i=0;i<4;i++)
|
||||
{
|
||||
if(a[i] == 0 || a[i] > 255)
|
||||
return 0;
|
||||
if (c == 1) {
|
||||
if (a[0] < 256) { /* mstp */
|
||||
dest->adr[0] = a[0];
|
||||
dest->len = 1;
|
||||
} else if (a[0] < 0x0FFFF) { /* lon */
|
||||
s = htons((uint16_t) a[0]);
|
||||
memcpy(&dest->adr[0], &s, 2);
|
||||
dest->len = 2;
|
||||
} else
|
||||
return 0;
|
||||
} else if (c == 5) { /* ip address */
|
||||
for (i = 0; i < 4; i++) {
|
||||
if (a[i] == 0 || a[i] > 255)
|
||||
return 0;
|
||||
|
||||
dest->adr[i] = a[i];
|
||||
}
|
||||
s = htons((uint16_t)p);
|
||||
memcpy(&dest->adr[i], &s, 2);
|
||||
dest->len = 6;
|
||||
}
|
||||
return dest->len;
|
||||
dest->adr[i] = a[i];
|
||||
}
|
||||
s = htons((uint16_t) p);
|
||||
memcpy(&dest->adr[i], &s, 2);
|
||||
dest->len = 6;
|
||||
}
|
||||
return dest->len;
|
||||
}
|
||||
|
||||
|
||||
@@ -404,68 +381,62 @@ int main(
|
||||
time_t last_seconds = 0;
|
||||
time_t current_seconds = 0;
|
||||
time_t timeout_seconds = 0;
|
||||
BACNET_ADDRESS dest;
|
||||
int argi;
|
||||
BACNET_ADDRESS dest;
|
||||
int argi;
|
||||
|
||||
/* print help if requested */
|
||||
for (argi = 1; argi < argc; argi++)
|
||||
{
|
||||
if (strcmp(argv[argi], "--help") == 0) {
|
||||
print_help(filename_remove_path(argv[0]));
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
datalink_get_broadcast_address(&dest);
|
||||
|
||||
/* decode the command line parameters */
|
||||
if (argc >= 2) {
|
||||
char *s;
|
||||
long v = strtol(argv[1], &s, 0);
|
||||
if(*s++ == ':')
|
||||
{
|
||||
if(argv[1][0] != ':')
|
||||
dest.net = (uint16_t) v;
|
||||
dest.mac_len = 0;
|
||||
if(isdigit(*s))
|
||||
parse_bac_address(&dest,s);
|
||||
}
|
||||
else
|
||||
{
|
||||
Target_Object_Instance_Min = Target_Object_Instance_Max = v;
|
||||
}
|
||||
/* print help if requested */
|
||||
for (argi = 1; argi < argc; argi++) {
|
||||
if (strcmp(argv[argi], "--help") == 0) {
|
||||
print_help(filename_remove_path(argv[0]));
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (argc <= 2){
|
||||
/* empty */
|
||||
} else if (argc == 3){
|
||||
if(Target_Object_Instance_Min == -1)
|
||||
Target_Object_Instance_Min =
|
||||
Target_Object_Instance_Max = strtol(argv[2], NULL, 0);
|
||||
else
|
||||
Target_Object_Instance_Max = strtol(argv[2], NULL, 0);
|
||||
} else if (argc == 4){
|
||||
datalink_get_broadcast_address(&dest);
|
||||
|
||||
/* decode the command line parameters */
|
||||
if (argc >= 2) {
|
||||
char *s;
|
||||
long v = strtol(argv[1], &s, 0);
|
||||
if (*s++ == ':') {
|
||||
if (argv[1][0] != ':')
|
||||
dest.net = (uint16_t) v;
|
||||
dest.mac_len = 0;
|
||||
if (isdigit(*s))
|
||||
parse_bac_address(&dest, s);
|
||||
} else {
|
||||
Target_Object_Instance_Min = Target_Object_Instance_Max = v;
|
||||
}
|
||||
}
|
||||
|
||||
if (argc <= 2) {
|
||||
/* empty */
|
||||
} else if (argc == 3) {
|
||||
if (Target_Object_Instance_Min == -1)
|
||||
Target_Object_Instance_Min = Target_Object_Instance_Max =
|
||||
strtol(argv[2], NULL, 0);
|
||||
else
|
||||
Target_Object_Instance_Max = strtol(argv[2], NULL, 0);
|
||||
} else if (argc == 4) {
|
||||
Target_Object_Instance_Min = strtol(argv[2], NULL, 0);
|
||||
Target_Object_Instance_Max = strtol(argv[3], NULL, 0);
|
||||
} else {
|
||||
print_usage(filename_remove_path(argv[0]));
|
||||
print_usage(filename_remove_path(argv[0]));
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (Target_Object_Instance_Min > BACNET_MAX_INSTANCE) {
|
||||
fprintf(stderr,
|
||||
"device-instance-min=%u - it must be less than %u\r\n",
|
||||
fprintf(stderr, "device-instance-min=%u - it must be less than %u\r\n",
|
||||
Target_Object_Instance_Min, BACNET_MAX_INSTANCE + 1);
|
||||
return 1;
|
||||
}
|
||||
if (Target_Object_Instance_Max > BACNET_MAX_INSTANCE) {
|
||||
fprintf(stderr,
|
||||
"device-instance-max=%u - it must be less than %u\r\n",
|
||||
fprintf(stderr, "device-instance-max=%u - it must be less than %u\r\n",
|
||||
Target_Object_Instance_Max, BACNET_MAX_INSTANCE + 1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* setup my info */
|
||||
/* setup my info */
|
||||
Device_Set_Object_Instance_Number(BACNET_MAX_INSTANCE);
|
||||
init_service_handlers();
|
||||
address_init();
|
||||
@@ -475,8 +446,9 @@ int main(
|
||||
last_seconds = time(NULL);
|
||||
timeout_seconds = apdu_timeout() / 1000;
|
||||
/* send the request */
|
||||
Send_WhoIs_To_Network(&dest,Target_Object_Instance_Min, Target_Object_Instance_Max);
|
||||
/* loop forever */
|
||||
Send_WhoIs_To_Network(&dest, Target_Object_Instance_Min,
|
||||
Target_Object_Instance_Max);
|
||||
/* loop forever */
|
||||
for (;;) {
|
||||
/* increment timer - exit if timed out */
|
||||
current_seconds = time(NULL);
|
||||
|
||||
Reference in New Issue
Block a user