Added UCovNotification handler to demo server application.

This commit is contained in:
skarg
2008-11-20 16:27:40 +00:00
parent e6f683a43b
commit 6072b98f1f
5 changed files with 91 additions and 9 deletions
+71
View File
@@ -0,0 +1,71 @@
/**************************************************************************
*
* Copyright (C) 2008 Steve Karg <skarg@users.sourceforge.net>
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*********************************************************************/
#include <stddef.h>
#include <stdint.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include "config.h"
#include "txbuf.h"
#include "bacdef.h"
#include "bacdcode.h"
#include "apdu.h"
#include "npdu.h"
#include "abort.h"
/* special for this module */
#include "cov.h"
#include "bactext.h"
/* note: nothing is specified in BACnet about what to do with the
information received from Unconfirmed COV Notifications. */
void handler_ucov_notification(
uint8_t * service_request,
uint16_t service_len,
BACNET_ADDRESS * src)
{
BACNET_COV_DATA cov_data;
int len = 0;
#if PRINT_ENABLED
fprintf(stderr, "UCOV: Received Notification!\n");
#endif
/* decode the service request only */
len = cov_notify_decode_service_request(
service_request, service_len, &cov_data);
#if PRINT_ENABLED
if (len > 0) {
fprintf(stderr,
"UCOV: PID=%u instance=%u %s %u time remaining=%u seconds\n",
cov_data.subscriberProcessIdentifier,
cov_data.initiatingDeviceIdentifier,
bactext_object_type_name(
cov_data.monitoredObjectIdentifier.type),
cov_data.monitoredObjectIdentifier.instance,
cov_data.timeRemaining);
} else {
fprintf(stderr, "UCOV: Unable to decode service request!\n");
}
#endif
}
+4
View File
@@ -159,6 +159,10 @@ extern "C" {
uint8_t * apdu,
int max_apdu);
void handler_ucov_notification(
uint8_t * service_request,
uint16_t service_len,
BACNET_ADDRESS * src);
#ifdef __cplusplus
}
+5
View File
@@ -27,8 +27,12 @@ BACNET_INCLUDE = ../include
# compiler configuration
#STANDARDS = -std=c99
INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT_DIR) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER)
OPTIMIZATION = -Os
DEBUGGING =
ifeq (${BUILD},debug)
OPTIMIZATION = -O0
DEBUGGING = -g
endif
CFLAGS = -Wall $(DEBUGGING) $(OPTIMIZATION) $(STANDARDS) $(INCLUDES) $(DEFINES)
CORE_SRC = \
@@ -86,6 +90,7 @@ HANDLER_SRC = \
$(BACNET_HANDLER)/h_whohas.c \
$(BACNET_HANDLER)/h_ihave.c \
$(BACNET_HANDLER)/h_cov.c \
$(BACNET_HANDLER)/h_ucov.c \
$(BACNET_HANDLER)/s_arfs.c \
$(BACNET_HANDLER)/s_awfs.c \
$(BACNET_HANDLER)/s_dcc.c \
+10 -9
View File
@@ -67,6 +67,9 @@
<Unit filename="..\demo\handler\h_ihave.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\h_npdu.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\h_rd.c">
<Option compilerVar="CC" />
</Unit>
@@ -82,24 +85,21 @@
<Unit filename="..\demo\handler\h_ts.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\h_ucov.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\h_whohas.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\h_whois.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\h_npdu.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\h_wp.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\noserv.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\s_iam.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\s_arfs.c">
<Option compilerVar="CC" />
</Unit>
@@ -112,9 +112,9 @@
<Unit filename="..\demo\handler\s_iam.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\s_ihave.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\s_ihave.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\demo\handler\s_rd.c">
<Option compilerVar="CC" />
</Unit>
@@ -236,6 +236,7 @@
<Unit filename="..\include\whohas.h" />
<Unit filename="..\include\whois.h" />
<Unit filename="..\include\wp.h" />
<Unit filename="Makefile" />
<Unit filename="..\ports\win32\bip-init.c">
<Option compilerVar="CC" />
</Unit>
+1
View File
@@ -88,6 +88,7 @@ HANDLER_SRC = $(BACNET_HANDLER)\txbuf.c \
$(BACNET_HANDLER)\h_whohas.c \
$(BACNET_HANDLER)\h_ihave.c \
$(BACNET_HANDLER)\h_cov.c \
$(BACNET_HANDLER)\h_ucov.c \
$(BACNET_HANDLER)\s_arfs.c \
$(BACNET_HANDLER)\s_awfs.c \
$(BACNET_HANDLER)\s_dcc.c \