aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-gmhdr.c
diff options
context:
space:
mode:
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2010-09-14 14:43:56 +0000
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2010-09-14 14:43:56 +0000
commit351e055e23693ea99e1af70ad7f48b20a1ee9bf3 (patch)
treea52fc8f86c3d834fef39600e51b0ce6d9ecd8164 /epan/dissectors/packet-gmhdr.c
parentec407a07956ff366309aeef7d942e27e8a22a57b (diff)
From tieuthunhi:
Add new time source for Gigamon header. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5210 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34114 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-gmhdr.c')
-rw-r--r--epan/dissectors/packet-gmhdr.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/epan/dissectors/packet-gmhdr.c b/epan/dissectors/packet-gmhdr.c
index 12803e967f..73ef48403f 100644
--- a/epan/dissectors/packet-gmhdr.c
+++ b/epan/dissectors/packet-gmhdr.c
@@ -41,12 +41,14 @@
#define GMHDR_FTYPE_SRCPORT 2
#define GMHDR_FTYPE_TIMESTAMP_LOCAL 3
#define GMHDR_FTYPE_TIMESTAMP_NTP 4
-#define GMHDR_FTYPE_TIMESTAMP_EXT 5
+#define GMHDR_FTYPE_TIMESTAMP_GPS 5
+#define GMHDR_FTYPE_TIMESTAMP_1588 6
static const value_string gmhdr_ftype_timestamp[] = {
{ GMHDR_FTYPE_TIMESTAMP_LOCAL, "Local" },
{ GMHDR_FTYPE_TIMESTAMP_NTP, "NTP" },
- { GMHDR_FTYPE_TIMESTAMP_EXT, "External" },
+ { GMHDR_FTYPE_TIMESTAMP_GPS, "GPS" },
+ { GMHDR_FTYPE_TIMESTAMP_1588, "1588" },
{ 0, NULL }
};
@@ -129,7 +131,8 @@ dissect_gmtlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *gmhdr_tree, gui
break;
case GMHDR_FTYPE_TIMESTAMP_LOCAL:
case GMHDR_FTYPE_TIMESTAMP_NTP:
- case GMHDR_FTYPE_TIMESTAMP_EXT:
+ case GMHDR_FTYPE_TIMESTAMP_GPS:
+ case GMHDR_FTYPE_TIMESTAMP_1588:
if (fl != 8) {
expert_add_info_format(pinfo, gmhdr_tree, PI_MALFORMED, PI_ERROR, "Field length %u invalid", fl);
break;