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

Fixed mstpcap for legacy Linux command line port selection.

Browse Source
This commit is contained in:
skarg
2016-03-04 16:23:49 +00:00
parent 0f2399fd21
commit 6903953890
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/mstpcap/main.c
+13 -2
View File
@@ -161,8 +161,7 @@ static void mstp_monitor_i_am(
MSTP_Fill_BACnet_Address(&src, mac); MSTP_Fill_BACnet_Address(&src, mac);
apdu_offset = npdu_decode(&pdu[0], &dest, &src, &npdu_data); apdu_offset = npdu_decode(&pdu[0], &dest, &src, &npdu_data);
if ((!npdu_data.network_layer_message) && (apdu_offset > 0) && if ((!npdu_data.network_layer_message) && (apdu_offset > 0) &&
(apdu_offset < pdu_len) && ((dest.net == 0) || (apdu_offset < pdu_len) && (src.net == 0)) {
(dest.net == BACNET_BROADCAST_NETWORK)) && (src.net == 0)) {
apdu_len = pdu_len - apdu_offset; apdu_len = pdu_len - apdu_offset;
apdu = &pdu[apdu_offset]; apdu = &pdu[apdu_offset];
pdu_type = apdu[0] & 0xF0; pdu_type = apdu[0] & 0xF0;
@@ -1061,6 +1060,7 @@ int main(
} }
RS485_Set_Interface(argv[argi]); RS485_Set_Interface(argv[argi]);
} }
#if defined(_WIN32)
if (strncasecmp(argv[argi], "com", 3) == 0) { if (strncasecmp(argv[argi], "com", 3) == 0) {
/* legacy command line options */ /* legacy command line options */
RS485_Set_Interface(argv[argi]); RS485_Set_Interface(argv[argi]);
@@ -1070,6 +1070,17 @@ int main(
RS485_Set_Baud_Rate(my_baud); RS485_Set_Baud_Rate(my_baud);
} }
} }
#else
if (strncasecmp(argv[argi], "/dev/", 5) == 0) {
/* legacy command line options */
RS485_Set_Interface(argv[argi]);
if ((argi+1) < argc) {
argi++;
my_baud = strtol(argv[argi], NULL, 0);
RS485_Set_Baud_Rate(my_baud);
}
}
#endif
if (strcmp(argv[argi], "--baud") == 0) { if (strcmp(argv[argi], "--baud") == 0) {
argi++; argi++;
if (argi >= argc) { if (argi >= argc) {