diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-02-18 07:14:36 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-02-18 07:14:36 +0000 |
| commit | 0d5df0a17249a0e0f2891b64a9e63ac19fe35d9d (patch) | |
| tree | b796d218a98add5b38b2a47581bd47c8e72f0aa7 | |
| parent | 58b13319d27fe9f4c35f58908c2dc85b5fcc05c4 (diff) | |
From Rolf Fiedler: German ISDN carriers don't supply the seconds in the
date/time IE, so support IE lengths of 5 (no seconds) or 6 (includes
seconds).
Merge the two AUTHORS and man page entries for him.
svn path=/trunk/; revision=10089
| -rw-r--r-- | AUTHORS | 5 | ||||
| -rw-r--r-- | doc/ethereal.pod | 1 | ||||
| -rw-r--r-- | packet-q931.c | 29 |
3 files changed, 18 insertions, 17 deletions
@@ -2006,6 +2006,7 @@ Chris Wilson <chris [AT] mxtelecom.com> { Rolf Fiedler <Rolf.Fiedler [AT] Innoventif.com> { ISDN TEI management frame support + Support for reading EyeSDN USB S0 trace files } Alastair Maw <ethereal [AT] almaw.com> { @@ -2021,10 +2022,6 @@ Martin Mathieson <martin [AT] arca-technologies.com> { SIP sipfrag support } -Rolf Fiedler <Rolf.Fiedler [AT] Innoventif.com> { - Support for reading EyeSDN USB S0 trace files -} - Christian Wagner <Christian.Wagner [AT] stud.uni-karlsruhe.de> { Soul Seek (slsk) protocol support } diff --git a/doc/ethereal.pod b/doc/ethereal.pod index cff9fee735..8d1cd55c7d 100644 --- a/doc/ethereal.pod +++ b/doc/ethereal.pod @@ -2085,7 +2085,6 @@ B<http://www.ethereal.com>. Alastair Maw <ethereal [AT] almaw.com> Sam Leffler <sam [AT] errno.com> Martin Mathieson <martin [AT] arca-technologies.com> - Rolf Fiedler <Rolf.Fiedler [AT] Innoventif.com> Christian Wagner <Christian.Wagner [AT] stud.uni-karlsruhe.de> Edwin Calo <calo [AT] fusemail.com> Pavel Roskin <proski [AT] gnu.org> diff --git a/packet-q931.c b/packet-q931.c index 66583f1d1e..bef11a4ffd 100644 --- a/packet-q931.c +++ b/packet-q931.c @@ -2,7 +2,7 @@ * Routines for Q.931 frame disassembly * Guy Harris <guy@alum.mit.edu> * - * $Id: packet-q931.c,v 1.66 2004/01/26 20:48:38 guy Exp $ + * $Id: packet-q931.c,v 1.67 2004/02/18 07:14:36 guy Exp $ * * Modified by Andreas Sikkema for possible use with H.323 * @@ -1612,19 +1612,24 @@ static void dissect_q931_date_time_ie(tvbuff_t *tvb, int offset, int len, proto_tree *tree) { - if (len != 6) { + if (len == 6) { + /* + * XXX - what is "year" relative to? Is "month" 0-origin or + * 1-origin? Q.931 doesn't say.... + */ + proto_tree_add_text(tree, tvb, offset, 6, + "Date/time: %02u-%02u-%02u %02u:%02u:%02u", + tvb_get_guint8(tvb, offset + 0), tvb_get_guint8(tvb, offset + 1), tvb_get_guint8(tvb, offset + 2), + tvb_get_guint8(tvb, offset + 3), tvb_get_guint8(tvb, offset + 4), tvb_get_guint8(tvb, offset + 5)); + } else if (len == 5) { + proto_tree_add_text(tree, tvb, offset, 5, + "Date/time: %02u-%02u-%02u %02u:%02u:00", + tvb_get_guint8(tvb, offset + 0), tvb_get_guint8(tvb, offset + 1), tvb_get_guint8(tvb, offset + 2), + tvb_get_guint8(tvb, offset + 3), tvb_get_guint8(tvb, offset + 4)); + } else { proto_tree_add_text(tree, tvb, offset, len, - "Date/time: length is %d, should be 6\n", len); - return; + "Date/time: length is %d, should be 5 or 6\n", len); } - /* - * XXX - what is "year" relative to? Is "month" 0-origin or - * 1-origin? Q.931 doesn't say.... - */ - proto_tree_add_text(tree, tvb, offset, 6, - "Date/time: %02u-%02u-%02u %02u:%02u:%02u", - tvb_get_guint8(tvb, offset + 0), tvb_get_guint8(tvb, offset + 1), tvb_get_guint8(tvb, offset + 2), - tvb_get_guint8(tvb, offset + 3), tvb_get_guint8(tvb, offset + 4), tvb_get_guint8(tvb, offset + 5)); } /* |