aboutsummaryrefslogtreecommitdiffstats
path: root/packet-q931.c
AgeCommit message (Collapse)AuthorFilesLines
2004-01-26Add a dissector table for LAPD SAPIs, and move the #defines for themGuy Harris1-1/+7
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-16From Tomas Kukosa: there are 3, not 4, bits of codeset in an IE.Guy Harris1-28/+3
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-15From Anders Broman: dissect access transport, user teleservice info,Guy Harris1-17/+26
user service infor prime, and echo control information parameters. svn path=/trunk/; revision=9668
2003-11-10The Q.931 dissector never checked whether the codeset variable was set to a ↵Ronnie Sahlberg1-2/+28
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-03Fro Anders Broman: fix the meaning of the extension bit, and add someGuy Harris1-79/+76
more bitfields. svn path=/trunk/; revision=8869
2003-10-30From Anders Broman:Guy Harris1-28/+45
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-09-21Remove a bunch of duplicate semicolons.Gerald Combs1-2/+2
svn path=/trunk/; revision=8509
2003-09-03Fix the bit mask for the parity level 1 information.Guy Harris1-2/+2
svn path=/trunk/; revision=8349
2003-08-05Fix up white space.Guy Harris1-13/+18
svn path=/trunk/; revision=8139
2003-08-05From Tomas Kukosa:Guy Harris1-63/+150
use the codeset value; allow subdissectors for user-specific IEs, and for codesets, to be registered. svn path=/trunk/; revision=8138
2003-07-08Put in stuff to dissect the body of a cause IE, just as the Q.2931Guy Harris1-92/+232
dissector does. svn path=/trunk/; revision=7985
2003-06-25As per the previous checkin, 0x08 bit means a *non*-locking shift, not aGuy Harris1-3/+3
locking shift; rename the #define for the bit. svn path=/trunk/; revision=7926
2003-06-24From Tomas Kukosa:Guy Harris1-58/+60
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-04-14From Anders Broman: dissect user-to-user IEs in ISUP messages as Q.931Guy Harris1-2/+2
UU IE's. svn path=/trunk/; revision=7456
2003-03-12From Anders Broman: fix the names of some fields.Guy Harris1-4/+3
svn path=/trunk/; revision=7346
2003-02-28"packet-isup.c" doesn't appear to need to include "packet-ip.h", soGuy Harris1-5/+6
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-28From Anders Broman: make the cause value, and various phone numbers,Guy Harris1-14/+55
filterable fields. svn path=/trunk/; revision=7224
2002-11-09Display the call reference flag, and don't include that bit in the callGuy Harris1-4/+18
reference value. svn path=/trunk/; revision=6593
2002-09-28From Tomas Kukosa:Gerald Combs1-1/+3
Offset shifting after Coding standard octet was missing. svn path=/trunk/; revision=6352
2002-09-17From Andreas Sikkema: add the connected number information element.Guy Harris1-1/+4
svn path=/trunk/; revision=6300
2002-08-28Removed trailing whitespaces from .h and .c files using theJörg Mayer1-16/+16
winapi_cleanup tool written by Patrik Stridvall for the wine project. svn path=/trunk/; revision=6117
2002-08-02Replace the types from sys/types.h and netinet/in.h by their glib.hJörg Mayer1-5/+1
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-05-14From Kan Sasaki: added some VSAs from the FreeRadius dictionary filesGuy Harris1-3/+3
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-13Have "is_tpkt()" take a minimum-payload-length argument and checkGuy Harris1-15/+13
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-03-25From Andreas Sikkema: put the H.225 stuff at the top level of theGuy Harris1-2/+2
protocol tree. svn path=/trunk/; revision=5017
2002-03-05There's just a single H.225 dissector, for both Call Signaling andGuy Harris1-9/+11
Registration, Admission, and Status, so just call it "h225", not "h225_cs". svn path=/trunk/; revision=4871
2002-02-23In the Q.931-over-TPKT-over-TCP dissector, if the TCP segment we'reGuy Harris1-2/+9
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"is_tpkt()" is always used to check a TCP segment to see if it mightGuy Harris1-7/+17
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-22Handle TPKT packets split across segment boundaries, and multiple TPKTGuy Harris1-24/+29
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-12Have a Q.931-over-TPKT TCP heuristic dissector.Guy Harris1-277/+274
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-02Clean up the heuristic code in the Q.931 dissector. If it's a heuristicGuy Harris1-70/+38
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-01-24Replace a bunch of "tvb_length()" and "tvb_length_remaining()" calls inGuy Harris1-3/+3
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-21Include files from the "epan" directory and subdirectories thereof withGuy Harris1-3/+3
"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
2001-12-10Move the pointer to the "column_info" structure in the "frame_data"Guy Harris1-5/+5
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-09-14Make the resolution for time values be nanoseconds rather thanGuy Harris1-4/+2
microseconds. Fix some "signed vs. unsigned" comparison warnings. svn path=/trunk/; revision=3934
2001-07-03Use the "pinfo" argument, rather than the global "pi", to refer to theGuy Harris1-3/+2
packet information in tvbuffified dissectors. svn path=/trunk/; revision=3645
2001-06-18From Joerg Mayer: explicitly fill in all members of aGuy Harris1-5/+5
"header_field_info" structure, including the ones that are later set by the routines to register fields. svn path=/trunk/; revision=3561
2001-05-27Call the Q.931 dissector through a handle.Guy Harris1-4/+4
Update Gerald's e-mail address. svn path=/trunk/; revision=3462
2001-03-30Q.931 protocol discriminators aren't, at least as I read Q.931, the sameGuy Harris1-32/+24
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-28Handle, in the Q.931 heuristic dissector, the case where TPKT isn'tGuy Harris1-1/+7
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-28Support for TPKT being used for its original purpose (TCP port > 102,Guy Harris1-12/+16
containing OSI transport layer PDUs). Enable the Q.931-inside-TPKT code (but not the H.225 stuff, as that requires Andreas Sikkema's H.225 dissector). Update it to match his current modified Q.931 dissector. svn path=/trunk/; revision=3199
2001-03-27Fix a comment.Guy Harris1-2/+2
svn path=/trunk/; revision=3197
2001-03-08Fixes to some typos, from Thomas Gimpel.Guy Harris1-10/+11
svn path=/trunk/; revision=3118
2001-02-11"Off-hoke"? What had I been smoking when I typed that?Guy Harris1-2/+2
svn path=/trunk/; revision=3021
2001-01-03Have "proto_register_protocol()" build a list of data structures forGuy Harris1-2/+2
protocols, in addition to adding structures to the list of filterable fields. Give it an extra argument that specifies a "short name" for the protocol, for use in such places as pinfo->current_proto; the dialog box for constructing filters; the preferences tab for the protocol; and so on (although we're not yet using it in all those places). Make the preference name that appears in the preferences file and the command line for the DIAMETER protocol "diameter", not "Diameter"; the convention is that the name in question be all-lower-case. Make some routines and variables that aren't exported static. Update a comment in the ICP dissector to make it clear that the dissector won't see fragments other than the first fragment of a fragmented datagram. svn path=/trunk/; revision=2810
2000-11-19For each column, have both a buffer into which strings for that columnGuy Harris1-2/+2
can be put, and a pointer to the string for the column, which might or might not point to that buffer. Add a routine "col_set_str()", which sets the string for the column to the string passed to it as an argument; it should only be handed a static string (a string constant would be ideal). It doesn't do any copying, so it's faster than "col_add_str()". Make the routines that append to columns check whether the pointer to the string for the column points to the buffer for the column and, if not, copy the string for the column to the buffer for the column so that you can append to it (so you can use "col_set_str()" and then use "col_append_str()" or "col_append_fstr()"). Convert a bunch of "col_add_str()" calls that take a string constant as an argument to "col_set_str()" calls. Convert some "col_add_fstr()" calls that take a string constant as the only argument - i.e., the format string doesn't have any "%" slots into which to put strings for subsequent arguments to "col_set_str()" calls (those calls are just like "col_add_str()" calls). Replace an END_OF_FRAME reference in a tvbuffified dissector with a "tvb_length(tvb)" call. svn path=/trunk/; revision=2670
2000-11-13Move "bytes_to_str()" to "strutil.c" from "packet.c" - it's just aGuy Harris1-11/+12
string formatter, like "format_text()", and, as "tvbuff.c" now calls it (*vide infra*), we don't want to have to make "tvbuff.c" drag "packet.h" in just to declare "bytes_to_str()". It's now declared in "strutil.h", so include it in modules that use "bytes_to_str()" and weren't already including it. Add a "tvb_bytes_to_str()" wrapper that calls "tvb_get_ptr()" to get a pointer to a chunk of N bytes at a given offset in a tvbuff and then hands that chunk to "bytes_to_str()". Convert the code that was doing that to use "tvb_bytes_to_str()" instead (which caught what I suspect is a bug in the Q.2931 dissector, where it was handing an offset of 0 to "tvb_get_ptr()" - a cut-and-pasteo, I think). Tvbuffify the ARP dissector. svn path=/trunk/; revision=2634
2000-10-19Note that we might not want the dissector for Q.931-inside-TPKT to beGuy Harris1-1/+10
heuristic - we may just want to make port 1720 be Q.931-inside-TPKT. svn path=/trunk/; revision=2512
2000-10-19Andreas Sikkema's new H.261 and TPKT dissectors, replacement RTCP andGuy Harris1-60/+309
RTP dissectors, and changes to the Q.931 dissector for use with H.323. svn path=/trunk/; revision=2511
2000-08-13Add the "Edit:Protocols..." feature which currently only implementsLaurent Deniel1-1/+3
the following: It is now possible to enable/disable a particular protocol decoding (i.e. the protocol dissector is void or not). When a protocol is disabled, it is displayed as Data and of course, all linked sub-protocols are disabled as well. Disabling a protocol could be interesting: - in case of buggy dissectors - in case of wrong heuristics - for performance reasons - to decode the data as another protocol (TODO) Currently (if I am not wrong), all dissectors but NFS can be disabled (and dissectors that do not register protocols :-) I do not like the way the RPC sub-dissectors are disabled (in the sub-dissectors) since this could be done in the RPC dissector itself, knowing the sub-protocol hfinfo entry (this is why, I've not modified the NFS one yet). Two functions are added in proto.c : gboolean proto_is_protocol_enabled(int n); void proto_set_decoding(int n, gboolean enabled); and two MACROs which can be used in dissectors: OLD_CHECK_DISPLAY_AS_DATA(index, pd, offset, fd, tree) CHECK_DISPLAY_AS_DATA(index, tvb, pinfo, tree) See also the XXX in proto_dlg.c and proto.c around the new functions. svn path=/trunk/; revision=2267
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 12:13:48 +0000