diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-06-07 20:28:51 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-06-07 20:28:51 +0000 |
| commit | c16562407da1b05e51e8890ec0bbdbecab60e71b (patch) | |
| tree | 6207f6f86bfe5e9ae189b7cd8f8ec258c150ad59 /wiretap | |
| parent | 17e512b059e95a864ac02a03df6e826fd45ac897 (diff) | |
Add an encapsulation type for BACnet MS/TP, and map the newly-assigned
libpcap DLT_ value for BACnet MS/TP to it.
svn path=/trunk/; revision=11126
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/libpcap.c | 4 | ||||
| -rw-r--r-- | wiretap/wtap.c | 5 | ||||
| -rw-r--r-- | wiretap/wtap.h | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index e7cd0c278e..c8d2b93289 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -1,6 +1,6 @@ /* libpcap.c * - * $Id: libpcap.c,v 1.119 2004/03/23 01:02:41 guy Exp $ + * $Id: libpcap.c,v 1.120 2004/06/07 20:28:50 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -333,6 +333,8 @@ static const struct { * meta-information such as QoS profiles, etc.. */ + { 165, WTAP_ENCAP_BACNET_MS_TP }, + /* * To repeat: * diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 3fd92285a1..3ec9d2d773 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -1,6 +1,6 @@ /* wtap.c * - * $Id: wtap.c,v 1.93 2004/03/30 19:37:31 guy Exp $ + * $Id: wtap.c,v 1.94 2004/06/07 20:28:51 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -248,6 +248,9 @@ static const struct encap_type_info { /* WTAP_ENCAP_APPLE_IP_OVER_IEEE1394 */ { "Apple IP-over-IEEE 1394", "ap1394" }, + + /* WTAP_ENCAP_BACNET_MS_TP */ + { "BACnet MS/TP", "bacnet-ms-tp" }, }; /* Name that should be somewhat descriptive. */ diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 3398a9c698..8963045c2d 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -1,6 +1,6 @@ /* wtap.h * - * $Id: wtap.h,v 1.154 2004/03/23 01:02:41 guy Exp $ + * $Id: wtap.h,v 1.155 2004/06/07 20:28:51 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -152,9 +152,10 @@ #define WTAP_ENCAP_USER15 60 #define WTAP_ENCAP_SYMANTEC 61 #define WTAP_ENCAP_APPLE_IP_OVER_IEEE1394 62 +#define WTAP_ENCAP_BACNET_MS_TP 63 /* last WTAP_ENCAP_ value + 1 */ -#define WTAP_NUM_ENCAP_TYPES 63 +#define WTAP_NUM_ENCAP_TYPES 64 /* File types that can be read by wiretap. We support writing some many of these file types, too, so we |