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

Reorder items of whois addresses to be compatible with address_cache file format

Browse Source 
Also put comment (;) tag at the beginning of header lines on the report
This commit is contained in:
brayra
2009-07-15 19:01:17 +00:00
parent 2a7197f93d
commit 16f7508fac
1 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/whois/main.c
+26 -18
View File
@@ -67,7 +67,7 @@ void MyAbortHandler(
(void) src;
(void) invoke_id;
(void) server;
printf("BACnet Abort: %s\r\n", bactext_abort_reason_name(abort_reason));
fprintf(stderr,"BACnet Abort: %s\r\n", bactext_abort_reason_name(abort_reason));
Error_Detected = true;
}
@@ -79,7 +79,7 @@ void MyRejectHandler(
/* FIXME: verify src and invoke id */
(void) src;
(void) invoke_id;
printf("BACnet Reject: %s\r\n", bactext_reject_reason_name(reject_reason));
fprintf(stderr, "BACnet Reject: %s\r\n", bactext_reject_reason_name(reject_reason));
Error_Detected = true;
}
@@ -110,31 +110,39 @@ static void print_address_cache(
uint32_t device_id = 0;
unsigned max_apdu = 0;
printf("%-7s %-14s %-4s %-5s %-14s\n", "Device", "MAC", "APDU", "SNET",
"SADR");
printf("------- -------------- ---- ----- --------------\n");
// printf("%-7s %-14s %-4s %-5s %-14s\n", "Device", "MAC", "APDU", "SNET", "SADR");
printf(";%-7s %-17s %-5s %-17s %-4s\n", "Device", "MAC", "SNET", "SADR", "APDU");
printf(";------- ----------------- ----- ----------------- ----\n");
for (i = 0; i < MAX_ADDRESS_CACHE; i++) {
if (address_get_by_index(i, &device_id, &max_apdu, &address)) {
printf("%7u ", device_id);
printf(" %-7u ", device_id);
for (j = 0; j < MAX_MAC_LEN; j++) {
if (j < address.mac_len) {
if(j > 0) printf(":");
printf("%02X", address.mac[j]);
} else {
printf(" ");
}
}
printf(" %4hu ", max_apdu);
printf("%5hu ", address.net);
if (address.net) {
for (j = 0; j < MAX_MAC_LEN; j++) {
if (j < address.len) {
printf("%02X", address.adr[j]);
} else {
printf(" ");
}
printf(" ");
}
}
printf("%-5hu ", address.net);
if (address.net) {
for (j = 0; j < MAX_MAC_LEN; j++) {
if (j < address.len) {
if(j > 0) printf(":");
printf("%02X", address.adr[j]);
} else {
printf(" ");
}
//printf(" ");
}
}else{
printf("0 ");
for (j = 2; j < MAX_MAC_LEN; j++) {
printf (" ");
}
printf("");
}
printf("%-4hu ", max_apdu);
printf("\n");
}
}