Commit Graph

76 Commits

Author SHA1 Message Date
Guy Harris b54a2d3f11 Neaten up the display of the top-level protocol tree item for a number
IE.

svn path=/trunk/; revision=10625
2004-04-17 04:43:58 +00:00
Guy Harris 847d46fa08 From Tomas Kukosa: put the number string for a number IE into the
top-level item for the IE tree.

svn path=/trunk/; revision=10489
2004-03-25 23:59:01 +00:00
Guy Harris 4afd41eede From Tomas Kukosa:
improve the Info column text for reassembled messages;

	register subdissectors for dissecting Q.931 IEs and make the
	ISUP dissector call the codeset 0 IE subdissector through a
	handle.

svn path=/trunk/; revision=10400
2004-03-18 09:00:37 +00:00
Guy Harris 45ec7cb5ff From Anders Broman:
use the packet-e164.c stuff to analyze E.164 numbers;

	add some more filterable fields.

svn path=/trunk/; revision=10330
2004-03-06 10:11:54 +00:00
Guy Harris b312ba697d Fix a typo.
svn path=/trunk/; revision=10156
2004-02-21 04:19:12 +00:00
Guy Harris 082091a7d5 Squelch some compiler warnings.
Format the definitions of the segment-reassembly fields the same way the
other field definitions are formatted.

svn path=/trunk/; revision=10142
2004-02-20 22:32:36 +00:00
Guy Harris cea8bc3801 From Tomas Kukosa: reassemble segmented Q.931 messages.
svn path=/trunk/; revision=10124
2004-02-20 10:34:42 +00:00
Guy Harris f121ee94d0 From Tomas Kukosa:
- display the type of segmented message in the info column
   - don't dissect the last IE in the 1st segment if it is incomplete
   - don't dissect IEs in following segments as segment boundaries
     usually don't IE boundaries

svn path=/trunk/; revision=10097
2004-02-18 20:43:37 +00:00
Guy Harris d3a22200f4 Newlines don't belong in format strings for the "proto_tree_add"
routines.

svn path=/trunk/; revision=10093
2004-02-18 09:58:17 +00:00
Guy Harris 0d5df0a172 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
2004-02-18 07:14:36 +00:00
Guy Harris 1f078d0fff Add a dissector table for LAPD SAPIs, and move the #defines for them
into "lapd_sapi.h".  Use that to register the Q.931 dissector atop LAPD.

From Rolf Fiedler: ISDN TEI management frame support.

svn path=/trunk/; revision=9864
2004-01-26 20:48:39 +00:00
Guy Harris 04ac43b255 From Tomas Kukosa: there are 3, not 4, bits of codeset in an IE.
That means that the codeset number cannot be bigger than the number of
elements in "q931_info_element_vals[]", so we can get rid of the checks
for the codeset value; we also make NUM_INFO_ELEMENT_VALS equal to
(Q931_IE_SHIFT_CODESET+1), to make this clearer.

svn path=/trunk/; revision=9676
2004-01-16 18:28:09 +00:00
Guy Harris 4495c27aa5 From Anders Broman: dissect access transport, user teleservice info,
user service infor prime, and echo control information parameters.

svn path=/trunk/; revision=9668
2004-01-15 02:23:18 +00:00
Ronnie Sahlberg 838f4f9b2e The Q.931 dissector never checked whether the codeset variable was set to a reasonable value or not.
This was problematic and caused crashes since this variable is used as an index into an array where we grab a
pointer (which is later dereferenced).

Dereferencing that pointer will have surprising effects. Usually crashes.

Update Q.931 to verify sanity of the codeset variable everytime it gets set.

svn path=/trunk/; revision=8927
2003-11-10 08:14:07 +00:00
Guy Harris 5cbc6cac02 Fro Anders Broman: fix the meaning of the extension bit, and add some
more bitfields.

svn path=/trunk/; revision=8869
2003-11-03 20:49:16 +00:00
Guy Harris b10a085434 From Anders Broman:
fix the offset when putting the cause code in a Cause IE into the
	protocol tree;

	in a Number IE, show the number type, numbering plan, and
	extension indicator as named-field bitfields.

svn path=/trunk/; revision=8828
2003-10-30 08:07:30 +00:00
Gerald Combs d47426ec58 Remove a bunch of duplicate semicolons.
svn path=/trunk/; revision=8509
2003-09-21 20:06:02 +00:00
Guy Harris 48e75dda62 Fix the bit mask for the parity level 1 information.
svn path=/trunk/; revision=8349
2003-09-03 05:28:16 +00:00
Guy Harris ea836cdc6a Fix up white space.
svn path=/trunk/; revision=8139
2003-08-05 17:45:52 +00:00
Guy Harris 1e59d59b62 From Tomas Kukosa:
use the codeset value;

	allow subdissectors for user-specific IEs, and for codesets, to
	be registered.

svn path=/trunk/; revision=8138
2003-08-05 17:39:23 +00:00
Guy Harris 3368b84541 Put in stuff to dissect the body of a cause IE, just as the Q.2931
dissector does.

svn path=/trunk/; revision=7985
2003-07-08 07:56:27 +00:00
Guy Harris 33b0b260ab As per the previous checkin, 0x08 bit means a *non*-locking shift, not a
locking shift; rename the #define for the bit.

svn path=/trunk/; revision=7926
2003-06-25 06:12:13 +00:00
Guy Harris 008dec8f04 From Tomas Kukosa:
1) Swap locking/non-locking shift IEs. It was used in wrong way. "0"
	   indicates locking  and "1" indicates non-locking shift.
	2) Return back to last locked codeset instead of codeset 0 after
	   non-locking shift.
	3) Handling of unknown single-octet IEs.

svn path=/trunk/; revision=7919
2003-06-24 05:58:32 +00:00
Guy Harris a551f4a0ab From Anders Broman: dissect user-to-user IEs in ISUP messages as Q.931
UU IE's.

svn path=/trunk/; revision=7456
2003-04-14 18:04:13 +00:00
Guy Harris 6239c6f014 From Anders Broman: fix the names of some fields.
svn path=/trunk/; revision=7346
2003-03-12 00:23:52 +00:00
Guy Harris 16db97a28c "packet-isup.c" doesn't appear to need to include "packet-ip.h", so
don't do so.

Pick up Anders Broman's table of Q.850 cause values, and his change to
use "dissect_q931_cause_ie()" for cause indicators - but do it by
modifying the Q.931 dissector's "dissect_q931_cause_ie()" to take, as an
argument, the header field to use for the cause value, and export that
routine and have the ISUP dissector call it, rather than by duplicating
the cause IE dissector.

svn path=/trunk/; revision=7225
2003-02-28 23:16:15 +00:00
Guy Harris 4f4c44407f From Anders Broman: make the cause value, and various phone numbers,
filterable fields.

svn path=/trunk/; revision=7224
2003-02-28 22:43:56 +00:00
Guy Harris c9e5b47d21 Display the call reference flag, and don't include that bit in the call
reference value.

svn path=/trunk/; revision=6593
2002-11-09 08:09:18 +00:00
Gerald Combs 5be7f32de9 From Tomas Kukosa:
Offset shifting after Coding standard octet was missing.

svn path=/trunk/; revision=6352
2002-09-28 23:31:39 +00:00
Guy Harris b59eef7ba5 From Andreas Sikkema: add the connected number information element.
svn path=/trunk/; revision=6300
2002-09-17 19:50:12 +00:00
Jörg Mayer 7c4176d868 Removed trailing whitespaces from .h and .c files using the
winapi_cleanup tool written by Patrik Stridvall for the wine
project.

svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Jörg Mayer 173fe5aef4 Replace the types from sys/types.h and netinet/in.h by their glib.h
equivalents for the toplevel directory. The removal of winsock2.h will
hopefully not cause any problems under MSVC++, as those files using
struct timeval still include wtap.h, which still includes winsock2.h.

svn path=/trunk/; revision=5932
2002-08-02 23:36:07 +00:00
Guy Harris abfac9ae93 From Kan Sasaki: added some VSAs from the FreeRadius dictionary files
and other changes to RADIUS.

Export the Q.931 cause location and code values, and use them in the
RADIUS dissector for ACC cause codes and values.

Make "CHAP" all caps, as it should be, and use InterCaps in AppleTalk
(Apple does).

The CHAP Challenge is an octet string, not a text string - the
FreeRadius dictionary has an error there.

In "rdconvertinttostr()", if there's no value_string table, just print
the value numerically, don't call "rd_match_strval()".

Don't pass a null value_string pointer to "rd_match_strval_attrib()" -
just report the value, without attempting to find a string for it.

svn path=/trunk/; revision=5460
2002-05-14 09:24:27 +00:00
Guy Harris c845015f06 Have "is_tpkt()" take a minimum-payload-length argument and check
whether the length value in the TPKT header is large enough to include
that much payload - if not, report the packet as not being a TPKT
packet.

Have the heuristic Q.931 dissector supply the appropriate value.

svn path=/trunk/; revision=5457
2002-05-13 21:18:26 +00:00
Guy Harris 6dcb948ca2 From Andreas Sikkema: put the H.225 stuff at the top level of the
protocol tree.

svn path=/trunk/; revision=5017
2002-03-25 20:23:17 +00:00
Guy Harris a7553a5586 There's just a single H.225 dissector, for both Call Signaling and
Registration, Admission, and Status, so just call it "h225", not
"h225_cs".

svn path=/trunk/; revision=4871
2002-03-05 03:10:52 +00:00
Guy Harris f4f3208a00 In the Q.931-over-TPKT-over-TCP dissector, if the TCP segment we're
handed looks as if it contains only a TPKT header (4 bytes long, and
those 4 bytes look like a TPKT header according to "is_tpkt()"), call
the "dissect TPKT over a TCP stream" routine.  If we're doing
reassembly, that routine will force a reassembly because the TPKT
payload isn't in that segment, and the various heuristic XXX-over-TPKT
dissectors will be called again, this time with enough data for them to
say whether the TPKT payload is for them or not; if we're not doing
reassembly, we'll dissect the TPKT header and then call the "dissect a
Q.931 PDU" routine, which will throw an exception because there isn't
any payload from which to fetch data (and that's what we want to
happen).

In the "dissect TPKT over a TCP stream" routine, if reassembly is
enabled, do the check to see if we need to do reassembly to get the
payload before dissecting the TPKT header, so that we don't dissect the
TPKT header and then decide "oops, we need some more data to get the
TPKT payload".

svn path=/trunk/; revision=4792
2002-02-23 21:07:48 +00:00
Guy Harris 7027650b5c "is_tpkt()" is always used to check a TCP segment to see if it might
have a TPKT header at the beginning, so there's not need for it to have
an offset as an argument; its callers don't have to know how big the
TPKT header is (or we can put a #define in "packet-tpkt.h" for it).  Get
rid of the second argument.

svn path=/trunk/; revision=4791
2002-02-23 02:30:16 +00:00
Guy Harris e9bc3da370 Handle TPKT packets split across segment boundaries, and multiple TPKT
packets per segment.

Instead of having a routine for dissectors such as the Q.931 dissector
to call to dissect the TPKT header, have a routine that does all the
reassembly and multiple-packets-per-segment work, and have the Q.931
dissector call it.  Export "is_tpkt()", and the new routine, to plugins.

Add preferences for TPKT and Q.931 reassembly.

svn path=/trunk/; revision=4778
2002-02-22 08:56:48 +00:00
Guy Harris 8bf31f9c18 Have a Q.931-over-TPKT TCP heuristic dissector.
Have the Q.931 PDU dissector, if it's Q.931-over-TPKT, check for
user-user IEs with a protocol discriminator of "X.208 and X.209 coded
user information" and, if it sees one, call an H.225.0 Call Setup
dissector if it could find the handle for it.

svn path=/trunk/; revision=4723
2002-02-12 10:21:05 +00:00
Guy Harris 02d0d90682 Clean up the heuristic code in the Q.931 dissector. If it's a heuristic
dissector, it's looking for Q.931 encapsulated inside TPKT, so it
shouldn't check whether the first byte is NLPID_Q_931 or not, as it
*won't* be NLPID_Q_931, it'll be 3, for the TPKT version.  It should
first check whether "is_tpkt()" thinks it's a TPKT packet, and then
check that the packet has at least 3 bytes past the TPKT header, then
check the first byte in the payload to see whether it's NLPID_Q_931.  If
that all succeeds, treat it as Q.931 inside TPKT.

Make "is_tpkt()" return the length from the TPKT header on success, and
-1 on failure, and return the offset past the TPKT header via a pointer
(so clients don't have to know that the TPKT header is 4 bytes long).

svn path=/trunk/; revision=4669
2002-02-02 02:51:20 +00:00
Guy Harris eb2d6593dc Replace a bunch of "tvb_length()" and "tvb_length_remaining()" calls in
arguments to "proto_tree_add_text()", and to "proto_tree_add_XXX()" calls
that add FT_NONE or FT_PROTO items to the protocol tree, with -1.

Replace some calls to "tvb_length()" or "tvb_length_remaining()" with
calls to "tvb_reported_length()" and "tvb_reported_length_remaining()",
as those give the actual length of the data in the packet, not just the
data that happened to be captured.

svn path=/trunk/; revision=4605
2002-01-24 09:20:54 +00:00
Guy Harris ee5ca25d31 Include files from the "epan" directory and subdirectories thereof with
"epan/..." pathnames, so as to avoid collisions with header files in any
of the directories in which we look (e.g., "proto.h", as some other
package has its own "proto.h" file which it installs in the top-level
include directory).

Don't add "-I" flags to search "epan", as that's no longer necessary
(and we want includes of "epan" headers to fail if the "epan/" is left
out, so that we don't re-introduce includes lacking "epan/").

svn path=/trunk/; revision=4586
2002-01-21 07:37:49 +00:00
Guy Harris 23319ff023 Move the pointer to the "column_info" structure in the "frame_data"
structure to the "packet_info" structure; only stuff that's permanently
stored with each frame should be in the "frame_data" structure, and the
"column_info" structure is not guaranteed to hold the column values for
that frame at all times - it was only in the "frame_data" structure so
that it could be passed to dissectors, and, as all dissectors are now
passed a pointer to a "packet_info" structure, it could just as well be
put in the "packet_info" structure.

That saves memory, by shrinking the "frame_data" structure (there's one
of those per frame), and also lets us clean up the code a bit.

svn path=/trunk/; revision=4370
2001-12-10 00:26:21 +00:00
Guy Harris 1d42c94b05 Make the resolution for time values be nanoseconds rather than
microseconds.

Fix some "signed vs. unsigned" comparison warnings.

svn path=/trunk/; revision=3934
2001-09-14 07:10:13 +00:00
Guy Harris 541af0c740 Use the "pinfo" argument, rather than the global "pi", to refer to the
packet information in tvbuffified dissectors.

svn path=/trunk/; revision=3645
2001-07-03 04:56:46 +00:00
Guy Harris 8412393197 From Joerg Mayer: explicitly fill in all members of a
"header_field_info" structure, including the ones that are later set by
the routines to register fields.

svn path=/trunk/; revision=3561
2001-06-18 02:18:27 +00:00
Guy Harris 9baeab5cab Call the Q.931 dissector through a handle.
Update Gerald's e-mail address.

svn path=/trunk/; revision=3462
2001-05-27 07:27:21 +00:00
Guy Harris 4f61e8c410 Q.931 protocol discriminators aren't, at least as I read Q.931, the same
as ISO/IEC TR 9577 protocol identifiers, even if they may, in some
cases, use the same value for the same protocol.

svn path=/trunk/; revision=3210
2001-03-30 07:57:38 +00:00
Guy Harris e8775b6c34 Handle, in the Q.931 heuristic dissector, the case where TPKT isn't
enabled.

Fix comments to explain that a return of -1 from "dissect_tpkt_header()"
means "TPKT wasn't enabled".

svn path=/trunk/; revision=3200
2001-03-28 08:06:07 +00:00