diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-07-21 06:20:47 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-07-21 06:20:47 +0000 |
| commit | 3e1365cc151d1848beab7574110ab8df3a9bbe88 (patch) | |
| tree | 909349ed031d0715aa481d3b1ee5cddd44bf380f /epan/dissectors/packet-bacapp.h | |
| parent | 617077e94a3c463c82703cd345ac21d97f8363fa (diff) | |
From Herbert Lischka:
Added some new features to BACnet dissection:
- ListOfObjectPropertyReferences in scheduler
- RestartReason
- Properties for loop-object
- LogDeviceObjectProperty in trend-log object
- log-buffer entries in trend-log object
- reassemby of fragmented messages
- fallback changed if iconv-library is not here
Me: Moved includes from .h to .c as thats how we normaly do it.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3736
svn path=/trunk/; revision=29151
Diffstat (limited to 'epan/dissectors/packet-bacapp.h')
| -rw-r--r-- | epan/dissectors/packet-bacapp.h | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/epan/dissectors/packet-bacapp.h b/epan/dissectors/packet-bacapp.h index 4b1d19734b..f745478836 100644 --- a/epan/dissectors/packet-bacapp.h +++ b/epan/dissectors/packet-bacapp.h @@ -28,17 +28,6 @@ #ifndef __BACAPP_H__ #define __BACAPP_H__ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#include <glib.h> - -#include <epan/packet.h> #ifndef min #define min(a,b) (((a)<(b))?(a):(b)) @@ -1463,7 +1452,7 @@ static guint fDestination (tvbuff_t *tvb, proto_tree *tree, guint offset); #endif -#if 0 + /** * BACnetDeviceObjectPropertyReference ::= SEQUENCE { * objectIdentifier [0] BACnetObjectIdentifier, @@ -1478,7 +1467,6 @@ fDestination (tvbuff_t *tvb, proto_tree *tree, guint offset); */ static guint fDeviceObjectPropertyReference (tvbuff_t *tvb, proto_tree *tree, guint offset); -#endif /** * BACnetDeviceObjectReference ::= SEQUENCE { @@ -1550,7 +1538,7 @@ fEventParameter (tvbuff_t *tvb, proto_tree *tree, guint offset); #endif -#if 0 + /** * BACnetLogRecord ::= SEQUENCE { * timestamp [0] BACnetDateTime, @@ -1576,7 +1564,7 @@ fEventParameter (tvbuff_t *tvb, proto_tree *tree, guint offset); */ static guint fLogRecord (tvbuff_t *tvb, proto_tree *tree, guint offset); -#endif + /** * BACnetNotificationParameters ::= CHOICE { @@ -1696,6 +1684,12 @@ fBACnetPropertyReference (tvbuff_t *tvb, proto_tree *tree, guint offset, guint8 static guint fBACnetObjectPropertyReference (tvbuff_t *tvb, proto_tree *tree, guint offset); +static guint +fLOPR (tvbuff_t *tvb, proto_tree *tree, guint offset); + +static guint +fRestartReason (tvbuff_t *tvb, proto_tree *tree, guint offset); + /** * BACnetPropertyValue ::= SEQUENCE { * PropertyIdentifier [0] BACnetPropertyIdentifier, @@ -2083,6 +2077,9 @@ proto_reg_handoff_bacapp(void); guint32 fConvertXXXtoUTF8(gchar *in, size_t *inbytesleft, gchar *out, size_t *outbytesleft, const gchar *fromcoding); +static void +uni_to_string(char * data, guint32 str_length, char *dest_buf); + #endif /* __BACAPP_H__ */ |