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

refactor BACnet Address utility functions (#390)

Browse Source 
* refactor BACnet Address utility functions

---------

Co-authored-by: Steve Karg <skarg@users.sourceforge.net>
This commit is contained in:
Steve Karg
2023-02-04 08:46:31 -06:00
committed by GitHub
parent 85976ee1f8
commit 236c2d1003
17 changed files with 490 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/abort/main.c
+2 -2
View File
@@ -160,7 +160,7 @@ int main(int argc, char *argv[])
}
if (strcmp(argv[argi], "--mac") == 0) {
if (++argi < argc) {
if (address_mac_from_ascii(&mac, argv[argi])) {
if (bacnet_address_mac_from_ascii(&mac, argv[argi])) {
specific_address = true;
}
}
@@ -173,7 +173,7 @@ int main(int argc, char *argv[])
}
} else if (strcmp(argv[argi], "--dadr") == 0) {
if (++argi < argc) {
if (address_mac_from_ascii(&adr, argv[argi])) {
if (bacnet_address_mac_from_ascii(&adr, argv[argi])) {
specific_address = true;
}
}
apps/ack-alarm/main.c
+3 -3
View File
@@ -259,7 +259,7 @@ int main(int argc, char *argv[])
}
if (strcmp(argv[argi], "--mac") == 0) {
if (++argi < argc) {
if (address_mac_from_ascii(&mac, argv[argi])) {
if (bacnet_address_mac_from_ascii(&mac, argv[argi])) {
specific_address = true;
}
}
@@ -272,7 +272,7 @@ int main(int argc, char *argv[])
}
} else if (strcmp(argv[argi], "--dadr") == 0) {
if (++argi < argc) {
if (address_mac_from_ascii(&adr, argv[argi])) {
if (bacnet_address_mac_from_ascii(&adr, argv[argi])) {
specific_address = true;
}
}
@@ -435,4 +435,4 @@ int main(int argc, char *argv[])
}
return 0;
}
}
apps/error/main.c
+2 -2
View File
@@ -163,7 +163,7 @@ int main(int argc, char *argv[])
}
if (strcmp(argv[argi], "--mac") == 0) {
if (++argi < argc) {
if (address_mac_from_ascii(&mac, argv[argi])) {
if (bacnet_address_mac_from_ascii(&mac, argv[argi])) {
specific_address = true;
}
}
@@ -176,7 +176,7 @@ int main(int argc, char *argv[])
}
} else if (strcmp(argv[argi], "--dadr") == 0) {
if (++argi < argc) {
if (address_mac_from_ascii(&adr, argv[argi])) {
if (bacnet_address_mac_from_ascii(&adr, argv[argi])) {
specific_address = true;
}
}
apps/event/main.c
+3 -3
View File
@@ -285,7 +285,7 @@ int main(int argc, char *argv[])
}
if (strcmp(argv[argi], "--mac") == 0) {
if (++argi < argc) {
if (address_mac_from_ascii(&mac, argv[argi])) {
if (bacnet_address_mac_from_ascii(&mac, argv[argi])) {
specific_address = true;
}
}
@@ -298,7 +298,7 @@ int main(int argc, char *argv[])
}
} else if (strcmp(argv[argi], "--dadr") == 0) {
if (++argi < argc) {
if (address_mac_from_ascii(&adr, argv[argi])) {
if (bacnet_address_mac_from_ascii(&adr, argv[argi])) {
specific_address = true;
}
}
@@ -635,4 +635,4 @@ int main(int argc, char *argv[])
}
return 0;
}
}
apps/iam/main.c
+2 -2
View File
@@ -188,7 +188,7 @@ int main(int argc, char *argv[])
}
if (strcmp(argv[argi], "--mac") == 0) {
if (++argi < argc) {
if (address_mac_from_ascii(&mac, argv[argi])) {
if (bacnet_address_mac_from_ascii(&mac, argv[argi])) {
specific_address = true;
}
}
@@ -201,7 +201,7 @@ int main(int argc, char *argv[])
}
} else if (strcmp(argv[argi], "--dadr") == 0) {
if (++argi < argc) {
if (address_mac_from_ascii(&adr, argv[argi])) {
if (bacnet_address_mac_from_ascii(&adr, argv[argi])) {
specific_address = true;
}
}
apps/readprop/main.c
+3 -2
View File
@@ -289,7 +289,7 @@ int main(int argc, char *argv[])
}
if (strcmp(argv[argi], "--mac") == 0) {
if (++argi < argc) {
if (address_mac_from_ascii(&mac, argv[argi])) {
if (bacnet_address_mac_from_ascii(&mac, argv[argi])) {
specific_address = true;
}
}
@@ -302,7 +302,7 @@ int main(int argc, char *argv[])
}
} else if (strcmp(argv[argi], "--dadr") == 0) {
if (++argi < argc) {
if (address_mac_from_ascii(&adr, argv[argi])) {
if (bacnet_address_mac_from_ascii(&adr, argv[argi])) {
specific_address = true;
}
}
@@ -349,6 +349,7 @@ int main(int argc, char *argv[])
}
address_init();
if (specific_address) {
bacnet_address_init(&dest, &mac, dnet, &adr);
if (adr.len && mac.len) {
memcpy(&dest.mac[0], &mac.adr[0], mac.len);
dest.mac_len = mac.len;
apps/readpropm/main.c
+2 -2
View File
@@ -384,7 +384,7 @@ int main(int argc, char *argv[])
}
if (strcmp(argv[argi], "--mac") == 0) {
if (++argi < argc) {
if (address_mac_from_ascii(&mac, argv[argi])) {
if (bacnet_address_mac_from_ascii(&mac, argv[argi])) {
specific_address = true;
}
}
@@ -397,7 +397,7 @@ int main(int argc, char *argv[])
}
} else if (strcmp(argv[argi], "--dadr") == 0) {
if (++argi < argc) {
if (address_mac_from_ascii(&adr, argv[argi])) {
if (bacnet_address_mac_from_ascii(&adr, argv[argi])) {
specific_address = true;
}
}
apps/timesync/main.c
+3 -2
View File
@@ -31,6 +31,7 @@
#include <ctype.h>
#include <errno.h>
#include "bacnet/basic/binding/address.h"
#include "bacnet/bacaddr.h"
#include "bacnet/bactext.h"
#include "bacnet/config.h"
#include "bacnet/bacdef.h"
@@ -185,7 +186,7 @@ int main(int argc, char *argv[])
}
if (strcmp(argv[argi], "--mac") == 0) {
if (++argi < argc) {
if (address_mac_from_ascii(&mac, argv[argi])) {
if (bacnet_address_mac_from_ascii(&mac, argv[argi])) {
global_broadcast = false;
}
}
@@ -200,7 +201,7 @@ int main(int argc, char *argv[])
}
if (strcmp(argv[argi], "--dadr") == 0) {
if (++argi < argc) {
if (address_mac_from_ascii(&adr, argv[argi])) {
if (bacnet_address_mac_from_ascii(&adr, argv[argi])) {
global_broadcast = false;
}
}
apps/uevent/main.c
+2 -2
View File
@@ -138,7 +138,7 @@ int main(int argc, char *argv[])
}
if (strcmp(argv[argi], "--mac") == 0) {
if (++argi < argc) {
if (address_mac_from_ascii(&mac, argv[argi])) {
if (bacnet_address_mac_from_ascii(&mac, argv[argi])) {
specific_address = true;
}
}
@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
}
} else if (strcmp(argv[argi], "--dadr") == 0) {
if (++argi < argc) {
if (address_mac_from_ascii(&adr, argv[argi])) {
if (bacnet_address_mac_from_ascii(&adr, argv[argi])) {
specific_address = true;
}
}
apps/whois/main.c
+2 -2
View File
@@ -385,7 +385,7 @@ int main(int argc, char *argv[])
}
if (strcmp(argv[argi], "--mac") == 0) {
if (++argi < argc) {
if (address_mac_from_ascii(&mac, argv[argi])) {
if (bacnet_address_mac_from_ascii(&mac, argv[argi])) {
global_broadcast = false;
}
}
@@ -398,7 +398,7 @@ int main(int argc, char *argv[])
}
} else if (strcmp(argv[argi], "--dadr") == 0) {
if (++argi < argc) {
if (address_mac_from_ascii(&adr, argv[argi])) {
if (bacnet_address_mac_from_ascii(&adr, argv[argi])) {
global_broadcast = false;
}
}