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

Fixed up dos eol and svn eol type.

Browse Source
This commit is contained in:
skarg
2009-04-18 20:48:08 +00:00
parent ebdf8f9e22
commit 6656304d37
3 changed files with 395 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/handler/h_lso.c
+121 -121
View File
@@ -1,121 +1,121 @@
/************************************************************************** /**************************************************************************
* *
* Copyright (C) 2005 Steve Karg <skarg@users.sourceforge.net> * Copyright (C) 2005 Steve Karg <skarg@users.sourceforge.net>
* *
* Permission is hereby granted, free of charge, to any person obtaining * Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the * a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including * "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish, * without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to * distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to * permit persons to whom the Software is furnished to do so, subject to
* the following conditions: * the following conditions:
* *
* The above copyright notice and this permission notice shall be included * The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software. * in all copies or substantial portions of the Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* *
*********************************************************************/ *********************************************************************/
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include "config.h" #include "config.h"
#include "txbuf.h" #include "txbuf.h"
#include "bacdef.h" #include "bacdef.h"
#include "bacdcode.h" #include "bacdcode.h"
#include "apdu.h" #include "apdu.h"
#include "npdu.h" #include "npdu.h"
#include "abort.h" #include "abort.h"
#include "lso.h" #include "lso.h"
#include "handlers.h" #include "handlers.h"
bool handler_lso( bool handler_lso(
uint8_t * service_request, uint8_t * service_request,
uint16_t service_len, uint16_t service_len,
BACNET_ADDRESS * src, BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_DATA * service_data) BACNET_CONFIRMED_SERVICE_DATA * service_data)
{ {
BACNET_LSO_DATA data; BACNET_LSO_DATA data;
int len = 0; int len = 0;
int pdu_len = 0; int pdu_len = 0;
BACNET_NPDU_DATA npdu_data; BACNET_NPDU_DATA npdu_data;
int bytes_sent = 0; int bytes_sent = 0;
BACNET_ADDRESS my_address; BACNET_ADDRESS my_address;
/* encode the NPDU portion of the packet */ /* encode the NPDU portion of the packet */
datalink_get_my_address(&my_address); datalink_get_my_address(&my_address);
npdu_encode_npdu_data(&npdu_data, false, MESSAGE_PRIORITY_NORMAL); npdu_encode_npdu_data(&npdu_data, false, MESSAGE_PRIORITY_NORMAL);
pdu_len = pdu_len =
npdu_encode_pdu(&Handler_Transmit_Buffer[0], src, &my_address, npdu_encode_pdu(&Handler_Transmit_Buffer[0], src, &my_address,
&npdu_data); &npdu_data);
if (service_data->segmented_message) { if (service_data->segmented_message) {
/* we don't support segmentation - send an abort */ /* we don't support segmentation - send an abort */
len = len =
abort_encode_apdu(&Handler_Transmit_Buffer[pdu_len], abort_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, service_data->invoke_id, ABORT_REASON_SEGMENTATION_NOT_SUPPORTED,
true); true);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "LSO: Segmented message. Sending Abort!\n"); fprintf(stderr, "LSO: Segmented message. Sending Abort!\n");
#endif #endif
goto LSO_ABORT; goto LSO_ABORT;
} }
len = lso_decode_service_request(service_request, service_len, &data); len = lso_decode_service_request(service_request, service_len, &data);
#if PRINT_ENABLED #if PRINT_ENABLED
if (len <= 0) if (len <= 0)
fprintf(stderr, "LSO: Unable to decode Request!\n"); fprintf(stderr, "LSO: Unable to decode Request!\n");
#endif #endif
if (len < 0) { if (len < 0) {
/* bad decoding - send an abort */ /* bad decoding - send an abort */
len = len =
abort_encode_apdu(&Handler_Transmit_Buffer[pdu_len], abort_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, ABORT_REASON_OTHER, true); service_data->invoke_id, ABORT_REASON_OTHER, true);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, "LSO: Bad Encoding. Sending Abort!\n"); fprintf(stderr, "LSO: Bad Encoding. Sending Abort!\n");
#endif #endif
goto LSO_ABORT; goto LSO_ABORT;
} }
/* /*
** Process Life Safety Operation Here ** Process Life Safety Operation Here
*/ */
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, fprintf(stderr,
"Life Safety Operation: Received operation %d from process id %d for object %id\n", "Life Safety Operation: Received operation %d from process id %d for object %id\n",
data.operation, data.operation,
data.processId, data.processId,
data.targetObject.instance); data.targetObject.instance);
#endif #endif
len = len =
encode_simple_ack(&Handler_Transmit_Buffer[pdu_len], encode_simple_ack(&Handler_Transmit_Buffer[pdu_len],
service_data->invoke_id, service_data->invoke_id,
SERVICE_CONFIRMED_LIFE_SAFETY_OPERATION); SERVICE_CONFIRMED_LIFE_SAFETY_OPERATION);
#if PRINT_ENABLED #if PRINT_ENABLED
fprintf(stderr, fprintf(stderr,
"Life Safety Operation: " "Sending Simple Ack!\n"); "Life Safety Operation: " "Sending Simple Ack!\n");
#endif #endif
LSO_ABORT: LSO_ABORT:
pdu_len += len; pdu_len += len;
bytes_sent = bytes_sent =
datalink_send_pdu(src, &npdu_data, &Handler_Transmit_Buffer[0], datalink_send_pdu(src, &npdu_data, &Handler_Transmit_Buffer[0],
pdu_len); pdu_len);
#if PRINT_ENABLED #if PRINT_ENABLED
if (bytes_sent <= 0) if (bytes_sent <= 0)
fprintf(stderr, fprintf(stderr,
"Life Safety Operation: " "Failed to send PDU (%s)!\n", "Life Safety Operation: " "Failed to send PDU (%s)!\n",
strerror(errno)); strerror(errno));
#endif #endif
return; return;
} }
bacnet-stack/include/lso.h
+78 -78
View File
@@ -1,78 +1,78 @@
/*####COPYRIGHTBEGIN#### /*####COPYRIGHTBEGIN####
------------------------------------------- -------------------------------------------
Copyright (C) 2006 John Minack Copyright (C) 2006 John Minack
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2 as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version. of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to: along with this program; if not, write to:
The Free Software Foundation, Inc. The Free Software Foundation, Inc.
59 Temple Place - Suite 330 59 Temple Place - Suite 330
Boston, MA 02111-1307, USA. Boston, MA 02111-1307, USA.
As a special exception, if other files instantiate templates or As a special exception, if other files instantiate templates or
use macros or inline functions from this file, or you compile use macros or inline functions from this file, or you compile
this file and link it with other works to produce a work based this file and link it with other works to produce a work based
on this file, this file does not by itself cause the resulting on this file, this file does not by itself cause the resulting
work to be covered by the GNU General Public License. However work to be covered by the GNU General Public License. However
the source code for this file must still be made available in the source code for this file must still be made available in
accordance with section (3) of the GNU General Public License. accordance with section (3) of the GNU General Public License.
This exception does not invalidate any other reasons why a work This exception does not invalidate any other reasons why a work
based on this file might be covered by the GNU General Public based on this file might be covered by the GNU General Public
License. License.
------------------------------------------- -------------------------------------------
####COPYRIGHTEND####*/ ####COPYRIGHTEND####*/
#ifndef LSO_H #ifndef LSO_H
#define LSO_H #define LSO_H
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "bacenum.h" #include "bacenum.h"
#include "bacdef.h" #include "bacdef.h"
#include "bacstr.h" #include "bacstr.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
/* Life Safety Operation Service */ /* Life Safety Operation Service */
typedef struct typedef struct
{ {
uint32_t processId; uint32_t processId;
BACNET_CHARACTER_STRING requestingSrc; BACNET_CHARACTER_STRING requestingSrc;
BACNET_LIFE_SAFETY_OPERATION operation; BACNET_LIFE_SAFETY_OPERATION operation;
BACNET_OBJECT_ID targetObject; BACNET_OBJECT_ID targetObject;
} BACNET_LSO_DATA; } BACNET_LSO_DATA;
int lso_encode_adpu( int lso_encode_adpu(
uint8_t *apdu, uint8_t *apdu,
uint8_t invoke_id, uint8_t invoke_id,
BACNET_LSO_DATA *data); BACNET_LSO_DATA *data);
/* decode the service request only */ /* decode the service request only */
int lso_decode_service_request( int lso_decode_service_request(
uint8_t *apdu, uint8_t *apdu,
unsigned apdu_len, unsigned apdu_len,
BACNET_LSO_DATA *data); BACNET_LSO_DATA *data);
#ifdef TEST #ifdef TEST
#include "ctest.h" #include "ctest.h"
void testLSO( void testLSO(
Test * pTest); Test * pTest);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif #endif
bacnet-stack/src/lso.c
+196 -196
View File
@@ -1,196 +1,196 @@
/*####COPYRIGHTBEGIN#### /*####COPYRIGHTBEGIN####
------------------------------------------- -------------------------------------------
Copyright (C) 2008 John Minack Copyright (C) 2008 John Minack
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2 as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version. of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to: along with this program; if not, write to:
The Free Software Foundation, Inc. The Free Software Foundation, Inc.
59 Temple Place - Suite 330 59 Temple Place - Suite 330
Boston, MA 02111-1307, USA. Boston, MA 02111-1307, USA.
As a special exception, if other files instantiate templates or As a special exception, if other files instantiate templates or
use macros or inline functions from this file, or you compile use macros or inline functions from this file, or you compile
this file and link it with other works to produce a work based this file and link it with other works to produce a work based
on this file, this file does not by itself cause the resulting on this file, this file does not by itself cause the resulting
work to be covered by the GNU General Public License. However work to be covered by the GNU General Public License. However
the source code for this file must still be made available in the source code for this file must still be made available in
accordance with section (3) of the GNU General Public License. accordance with section (3) of the GNU General Public License.
This exception does not invalidate any other reasons why a work This exception does not invalidate any other reasons why a work
based on this file might be covered by the GNU General Public based on this file might be covered by the GNU General Public
License. License.
------------------------------------------- -------------------------------------------
####COPYRIGHTEND####*/ ####COPYRIGHTEND####*/
#include "lso.h" #include "lso.h"
#include "bacdcode.h" #include "bacdcode.h"
#include "apdu.h" #include "apdu.h"
/* BACnet Life Safety Operation */ /* BACnet Life Safety Operation */
int lso_encode_adpu( int lso_encode_adpu(
uint8_t * apdu, uint8_t * apdu,
uint8_t invoke_id, uint8_t invoke_id,
BACNET_LSO_DATA * data) BACNET_LSO_DATA * data)
{ {
int len = 0; /* length of each encoding */ int len = 0; /* length of each encoding */
int apdu_len = 0; /* total length of the apdu, return value */ int apdu_len = 0; /* total length of the apdu, return value */
if (apdu && data) { if (apdu && data) {
apdu[0] = PDU_TYPE_CONFIRMED_SERVICE_REQUEST; apdu[0] = PDU_TYPE_CONFIRMED_SERVICE_REQUEST;
apdu[1] = encode_max_segs_max_apdu(0, MAX_APDU); apdu[1] = encode_max_segs_max_apdu(0, MAX_APDU);
apdu[2] = invoke_id; apdu[2] = invoke_id;
apdu[3] = SERVICE_CONFIRMED_LIFE_SAFETY_OPERATION; apdu[3] = SERVICE_CONFIRMED_LIFE_SAFETY_OPERATION;
apdu_len = 4; apdu_len = 4;
/* tag 0 - requestingProcessId */ /* tag 0 - requestingProcessId */
len = len =
encode_context_unsigned(&apdu[apdu_len], 0, encode_context_unsigned(&apdu[apdu_len], 0,
data->processId); data->processId);
apdu_len += len; apdu_len += len;
/* tag 1 - requestingSource */ /* tag 1 - requestingSource */
len = len =
encode_context_character_string(&apdu[apdu_len], 1, encode_context_character_string(&apdu[apdu_len], 1,
&data->requestingSrc); &data->requestingSrc);
apdu_len += len; apdu_len += len;
/* /*
Operation Operation
*/ */
len = encode_context_enumerated(&apdu[apdu_len], 2, data->operation); len = encode_context_enumerated(&apdu[apdu_len], 2, data->operation);
apdu_len += len; apdu_len += len;
/* /*
Object ID Object ID
*/ */
len = encode_context_object_id(&apdu[apdu_len], 3, len = encode_context_object_id(&apdu[apdu_len], 3,
(int)data->targetObject.type, (int)data->targetObject.type,
data->targetObject.instance); data->targetObject.instance);
apdu_len += len; apdu_len += len;
} }
return apdu_len; return apdu_len;
} }
int lso_decode_service_request( int lso_decode_service_request(
uint8_t *apdu, uint8_t *apdu,
unsigned apdu_len, unsigned apdu_len,
BACNET_LSO_DATA *data) BACNET_LSO_DATA *data)
{ {
int len = 0; /* return value */ int len = 0; /* return value */
int section_length = 0; /* length returned from decoding */ int section_length = 0; /* length returned from decoding */
uint32_t operation = 0; /* handles decoded value */ uint32_t operation = 0; /* handles decoded value */
/* check for value pointers */ /* check for value pointers */
if (apdu_len && data) { if (apdu_len && data) {
/* Tag 0: Object ID */ /* Tag 0: Object ID */
if ( (section_length = decode_context_unsigned(&apdu[len], 0, &data->processId)) == -1) if ( (section_length = decode_context_unsigned(&apdu[len], 0, &data->processId)) == -1)
{ {
return -1; return -1;
} }
len += section_length; len += section_length;
if ( (section_length = decode_context_character_string(&apdu[len], 1, &data->requestingSrc)) == -1) if ( (section_length = decode_context_character_string(&apdu[len], 1, &data->requestingSrc)) == -1)
{ {
return -1; return -1;
} }
len += section_length; len += section_length;
if ( (section_length = decode_context_enumerated(&apdu[len], 2, &operation)) == -1) if ( (section_length = decode_context_enumerated(&apdu[len], 2, &operation)) == -1)
{ {
return -1; return -1;
} }
data->operation = operation; data->operation = operation;
len += section_length; len += section_length;
/* /*
** This is an optional parameter, so dont fail if it doesnt exist ** This is an optional parameter, so dont fail if it doesnt exist
*/ */
if ( decode_is_context_tag(&apdu[len], 3) ) if ( decode_is_context_tag(&apdu[len], 3) )
{ {
if ( (section_length = decode_context_object_id(&apdu[len], 3, if ( (section_length = decode_context_object_id(&apdu[len], 3,
&data->targetObject.type, &data->targetObject.type,
&data->targetObject.instance)) == -1 ) &data->targetObject.instance)) == -1 )
{ {
return -1; return -1;
} }
len += section_length; len += section_length;
} }
else else
{ {
data->targetObject.type = 0; data->targetObject.type = 0;
data->targetObject.instance = 0; data->targetObject.instance = 0;
} }
return len; return len;
} }
return 0; return 0;
} }
#ifdef TEST #ifdef TEST
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
#include "bacapp.h" #include "bacapp.h"
void testLSO( void testLSO(
Test * pTest) Test * pTest)
{ {
uint8_t apdu[1000]; uint8_t apdu[1000];
int len; int len;
BACNET_LSO_DATA data; BACNET_LSO_DATA data;
BACNET_LSO_DATA rxdata; BACNET_LSO_DATA rxdata;
memset(&rxdata, 0, sizeof(rxdata)); memset(&rxdata, 0, sizeof(rxdata));
characterstring_init_ansi(&data.requestingSrc, "foobar"); characterstring_init_ansi(&data.requestingSrc, "foobar");
data.operation = LIFE_SAFETY_OP_RESET; data.operation = LIFE_SAFETY_OP_RESET;
data.processId = 0x1234; data.processId = 0x1234;
data.targetObject.instance = 0x1000; data.targetObject.instance = 0x1000;
data.targetObject.type = OBJECT_BINARY_INPUT; data.targetObject.type = OBJECT_BINARY_INPUT;
len = lso_encode_adpu(apdu, 100, &data); len = lso_encode_adpu(apdu, 100, &data);
lso_decode_service_request(&apdu[4], len, &rxdata); lso_decode_service_request(&apdu[4], len, &rxdata);
ct_test(pTest, data.operation == rxdata.operation); ct_test(pTest, data.operation == rxdata.operation);
ct_test(pTest, data.processId == rxdata.processId); ct_test(pTest, data.processId == rxdata.processId);
ct_test(pTest, data.targetObject.instance == rxdata.targetObject.instance); ct_test(pTest, data.targetObject.instance == rxdata.targetObject.instance);
ct_test(pTest, data.targetObject.type == rxdata.targetObject.type); ct_test(pTest, data.targetObject.type == rxdata.targetObject.type);
ct_test(pTest, memcmp(data.requestingSrc.value, rxdata.requestingSrc.value, rxdata.requestingSrc.length) == 0); ct_test(pTest, memcmp(data.requestingSrc.value, rxdata.requestingSrc.value, rxdata.requestingSrc.length) == 0);
} }
#ifdef TEST_LSO #ifdef TEST_LSO
int main( int main(
int argc, int argc,
char *argv[]) char *argv[])
{ {
Test *pTest; Test *pTest;
bool rc; bool rc;
pTest = ct_create("BACnet Life Safety Operation", NULL); pTest = ct_create("BACnet Life Safety Operation", NULL);
/* individual tests */ /* individual tests */
rc = ct_addTestFunction(pTest, testLSO); rc = ct_addTestFunction(pTest, testLSO);
assert(rc); assert(rc);
ct_setStream(pTest, stdout); ct_setStream(pTest, stdout);
ct_run(pTest); ct_run(pTest);
(void) ct_report(pTest); (void) ct_report(pTest);
ct_destroy(pTest); ct_destroy(pTest);
return 0; return 0;
} }
#endif /* TEST_COV */ #endif /* TEST_COV */
#endif /* TEST */ #endif /* TEST */