aboutsummaryrefslogtreecommitdiffstats
path: root/packet-wtp.c
AgeCommit message (Collapse)AuthorFilesLines
2004-02-28Update URLs for various IANA documents.guy1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10262 f5534014-38df-0310-8fa8-9805f1628bb7
2004-01-27From Chris Wilson:obiot1-2/+2
Separate the GSM SMS User Data dissector from the SMPP dissector. Rename the protocol. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9872 f5534014-38df-0310-8fa8-9805f1628bb7
2004-01-07Get rid of a now unused variable.obiot1-3/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9593 f5534014-38df-0310-8fa8-9805f1628bb7
2004-01-04Add more information to the WTP protocol summary (PDU type and PDU specificobiot1-93/+173
important parameters). Document the computation of the length field in WTP concatenation after having looked at a capture with the length field encoded as a WSP uintvar-integer. Use "common code" for WTP reassembly, by calling process_reassembled_data(). Document the behavior of reassembly as the output of Ethereal differs between the first and the second pass. Question: shoud the common reassembly code provide a call-back mechanism to get access to previously-unreassembled packets that appear to be part of a reassembled whole, and to be able to update the state and information of those packets at the time of the reassembly? git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9547 f5534014-38df-0310-8fa8-9805f1628bb7
2003-12-30Clean up the handling of the code that handles the payload a bit; thisguy1-22/+31
also fixes a case where we'd put the same string into the Info column twice. Put the packet sequence number into the Info column for segmented invoke and result PDUs, even if we don't try to reassemble them. Don't put an entry into the protocol tree for the payload if there isn't any payload. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9493 f5534014-38df-0310-8fa8-9805f1628bb7
2003-12-23Move the GSM SMS dissection to a dedicated subdissector (currently still withinobiot1-2/+2
packet-smpp.c). Now the higher-level protocols show up without the need of unfolding the SMPP dissector tree. Add a new address type AT_STRINGZ, and use it for GSM SMS message reassembly. Get rid of the different UDH IE subtrees, and replace them with one subtree for all UDH IEs. Add debug logging to SMPP and SMPP GSM SMS dissectors. Move the Short Message reassembly from the SMPP dissector to the SMPP GSM SMS dissector. Fix duplicated "reassembled in" header fields. Rename header fields that are now part of SMPP GSM SMS (including the dissector table name, so it has also been updated in packet-wsp.c and packet-wtp.c). Add an explicit "if (!tree) return" in the WSP add_headers() method. NOTE: it would be great if we were able to merge the existing packet-gsm_sms.c and the SMPP GSM SMS dissector. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9431 f5534014-38df-0310-8fa8-9805f1628bb7
2003-12-22Speed up WTP dissection by performing TPI subdissection only once and settingobiot1-41/+58
the WTP length after processing the TPI. Update reassembly so dissection of reassembled data is only enabled in the last reassembled packet. This way, we alo see the WTP PDUs. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9410 f5534014-38df-0310-8fa8-9805f1628bb7
2003-12-21warning: static declaration for ... follows non-staticjmayer1-4/+4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9394 f5534014-38df-0310-8fa8-9805f1628bb7
2003-12-21warning: ISO C does not allow extra ; outside of a functionjmayer1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9387 f5534014-38df-0310-8fa8-9805f1628bb7
2003-12-15Remove unused dissector handles from the WAP dissectors.obiot1-4/+4
Rename the WAP protocols so that they reflect the protocol name and not the protocol stack name. Fix the WSP content-type header. Rename the WSP header fields from 'hdr' to 'header'. Rename the WSP Openwave header fields from header code page 'x-up-1': replace 'openwave' with 'x_up_1' (is more intuitive). Remove unused WSP header fields. Rename the WTLS header fields so they do not contain 'wsp' anymore. Correct the WBXML code page switches in the token parsers. Fix the code page support of multi-codepage content. Update the PROV WBXML content (and find bugs in the new OMA Prov spec :). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9291 f5534014-38df-0310-8fa8-9805f1628bb7
2003-11-05From Olivier Biot: have a separate subtree ett_ value for concatenatedguy1-2/+4
PDUs. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8884 f5534014-38df-0310-8fa8-9805f1628bb7
2003-08-07From Lo�c Minier: allow packets with no payload to participate inguy1-3/+7
reassembly, as the last packet of a fragmented WTP message can have a payload length of 0. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8147 f5534014-38df-0310-8fa8-9805f1628bb7
2003-07-29Put "WTP" into the Info column for segmented invoke/result PDUs on whichguy1-2/+2
we don't try to do reassembly, just as it's put in for other PDUs. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8101 f5534014-38df-0310-8fa8-9805f1628bb7
2003-07-29From Georg von Zezschwitz: don't pass segments other than the firstguy1-4/+26
segment of a segmented invoke or result to subdissectors. Show the payload of fragments other than the one that finishes reassembly. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8100 f5534014-38df-0310-8fa8-9805f1628bb7
2003-06-30From Olivier Biot:guy1-1/+2
UDH dissection in SMPP message WTP and WSP dissection over SMPP (no reassembly) WSP status code rendering in Info column git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7954 f5534014-38df-0310-8fa8-9805f1628bb7
2003-05-24Timo Sirainen discovered that snprintf() returning -1 wasn't being handledgerald1-10/+11
properly. Use a GString instead. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7730 f5534014-38df-0310-8fa8-9805f1628bb7
2003-05-19From Olivier Biot: fix incorrect tvbuff definition in the WTP PDUguy1-2/+2
concatenation situation. Now the WSP dissector wanting to display the entire PDU will stick to the sub-tvbuff boundaries in the data highlight pane. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7690 f5534014-38df-0310-8fa8-9805f1628bb7
2003-05-08From Olivier Biot: fix WTP sub-PDU size presentation in the protocolguy1-5/+5
tree (display size in decimal instead of the highlighted bytes). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7653 f5534014-38df-0310-8fa8-9805f1628bb7
2003-04-20Add a pointer to an hf_ value for a "reassembled_in" field (which can beguy1-1/+2
null) to the "fragment_items" structure, and don't pass that value into "process_reassembled_data()", just have it use the value in the "fragment_items" structure passed to it. Make "process_reassembled_data()" capable of handling reassembly done by "fragment_add_seq_check()", and use it in the ATP and 802.11 dissectors; give them "reassembled_in" fields. Make "process_reassembled_data()" handle only the case of a completed reassembly (fd_head != NULL) so that we can use it in those dissectors without gunking the code up too much. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7513 f5534014-38df-0310-8fa8-9805f1628bb7
2003-04-09From Tom Uijldert: properly decode the packet sequence number in WTPguy1-2/+2
Negative Ack packets. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7429 f5534014-38df-0310-8fa8-9805f1628bb7
2003-03-05Use the reported length, not the captured length, as the fragment lengthguy1-7/+12
when doing reassembly. In some additional places, use "tvb_bytes_exist()" to check whether we have enough data to do reassembly, rather than checking to see if the frame is short (it might be short but we might still have enough data to do reassembly). In DCE RPC, use the fragment length from the header as the number of bytes of fragment data. There's no need to check "pinfo->fragmented" before doing reassembly in the DCERPC-over-SMB-pipes code - either we have all the data or we don't. In SNA and WTP reassembly, add a check to make sure we have all the data to be reassembled. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7282 f5534014-38df-0310-8fa8-9805f1628bb7
2002-12-19Update reassemble.c/show_item and all callers to use FT_FRAMENUM for the ↵sahlberg1-3/+3
list of packets corresponding to a reassembled pdu git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6807 f5534014-38df-0310-8fa8-9805f1628bb7
2002-12-02From Olivier Biot: show the packet sequence number and the "Missingguy1-3/+3
Packets" value in the WTP header in decimal, not hex. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6722 f5534014-38df-0310-8fa8-9805f1628bb7
2002-10-24Add a "fragment_add_seq_next()" to reassemble fragments that don't haveguy1-2/+2
sequence numbers or offsets and are thus assumed to be received in order with no duplicates or dropped fragments (e.g., for NetBIOS Frame, where 802.2 LLC guarantees in-order delivery to NetBIOS with no duplicates or dropped fragments). "show_fragment_tree()' and "show_fragment_seq_tree()" don't modify the "fragment_items" to which the "fit" argument points, so make that argument a "const fragment_items *". Make all the "fragment_items" tables "static" (as they're not used outside the modules defining them) and "const" (as they're not modified). Add support for reassembly of NetBIOS fragmented requests and responses. Get rid of an unnecessary include of "packet-tr.c" in the NetBIOS dissector, and make its table of dissection function pointers static. Fix some typos in the AppleTalk and NetBIOS dissectors. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6491 f5534014-38df-0310-8fa8-9805f1628bb7
2002-08-28Removed trailing whitespaces from .h and .c files using thejmayer1-50/+50
winapi_cleanup tool written by Patrik Stridvall for the wine project. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6117 f5534014-38df-0310-8fa8-9805f1628bb7
2002-08-09From Tom Uijldert: WTP TPI dissection, and reindentation.guy1-643/+761
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@5973 f5534014-38df-0310-8fa8-9805f1628bb7
2002-08-02Replace the types from sys/types.h and netinet/in.h by their glib.hjmayer1-9/+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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@5932 f5534014-38df-0310-8fa8-9805f1628bb7
2002-07-17From Joerg Mayer:guy1-6/+1
dftest.c: Remove #if-0-ed includes packet-ieee80211.c, packet-wtls.c, packet-afp.c, packet-wsp.c, packet-wtp.c, ethereal_gen.py: Remove redundant include varargs (already in snprintf.h, and required only for snprintf.h) Remove unused include of snprintf.h from files not using "snprintf()". git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@5889 f5534014-38df-0310-8fa8-9805f1628bb7
2002-06-07Add "show_fragment_seq_tree()", which is like "show_fragment_tree()",guy1-69/+16
but for stuff reassembled with "fragment_add_seq()" or "fragment_add_seq_check()". Add a "fragment tag" string to the "fragment_items", so that packets with fragmentation errors can be properly flagged as having "Illegal fragments" or "Illegal segments" depending on the term used with the protocol in question. Make all the dissectors that can use "show_fragment_tree()" or "show_fragment_seq_tree()", and don't already use them, do so. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@5644 f5534014-38df-0310-8fa8-9805f1628bb7
2002-06-04Get rid of the "data_src" member of the "frame_data" structure; put itguy1-2/+2
in the "packet_info" structure instead, as we don't need a pointer for every single frame in the capture file, just for each frame for which we currently have an open "epan_dissect_t". git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@5614 f5534014-38df-0310-8fa8-9805f1628bb7
2002-05-27From Kari Heikkila: fix for WTP PDUs not containing user data.guy1-5/+7
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@5574 f5534014-38df-0310-8fa8-9805f1628bb7
2002-04-17Fix up the offsets in the list of segments.guy1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@5178 f5534014-38df-0310-8fa8-9805f1628bb7
2002-04-09Get rid of the extra "Header" entry, putting the tree back the way itguy1-58/+41
was. Get rid of variables unused as a result. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@5133 f5534014-38df-0310-8fa8-9805f1628bb7
2002-04-05Give the top-level tree for concatenated PDUs an ett_ value of ett_wtp.guy1-43/+46
Create a protocol tree item for the fixed part of the WTP header. Don't assign the value of "proto_tree_add_XXX" routines to a variable if you're not going to use the value. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@5103 f5534014-38df-0310-8fa8-9805f1628bb7
2002-03-27Put a tree with information about the WTP fragments into the tree ifguy1-1/+136
we've reassembled a message. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@5027 f5534014-38df-0310-8fa8-9805f1628bb7
2002-02-27Label the data source for various forms of reassembled data with theguy1-2/+2
protocol that fragmented them, rather than just calling them "Reassembled". Do the same with uncompressed WCP data. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4822 f5534014-38df-0310-8fa8-9805f1628bb7
2002-02-18Don't give tvbuffs names; instead, give data sources names, where aguy1-4/+4
"data source" has a name and a top-level tvbuff, and frames can have a list of data sources associated with them. Use the tvbuff pointer to determine which data source is the data source for a given field; this means we don't have to worry about multiple data sources with the same name - the only thing the name does is label the notebook tab for the display of the data source, and label the hex dump of the data source in print/Tethereal output. Clean up a bunch of things discovered in the process of doing the above. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4749 f5534014-38df-0310-8fa8-9805f1628bb7
2002-01-21Include files from the "epan" directory and subdirectories thereof withguy1-2/+2
"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/"). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4586 f5534014-38df-0310-8fa8-9805f1628bb7
2002-01-17Use the "fragmented" field of the "packet_info" structure inguy1-1/+4
"dissect_frame()" to indicate whether a ReportedBoundsError was due to the packet being malformed (i.e., the packet was shorter than it's supposed to be, so the dissector went past the end trying to extract fields that were supposed to be there) or due to it not being reassembled (i.e., the packet was fragmented, and we didn't reassemble it, but just treated the first fragment as the entire packet, so the dissector went past the end trying to extract fields that were partially or completely in fragments after that). Mark the latter as being unreasembled rather than malformed. Properly initialize, save, and restore that field, and properly set it, so that works. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4555 f5534014-38df-0310-8fa8-9805f1628bb7
2002-01-04WTP reassembly, from Tom Uijldert.guy1-83/+131
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4480 f5534014-38df-0310-8fa8-9805f1628bb7
2001-12-10Move the pointer to the "column_info" structure in the "frame_data"guy1-23/+13
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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4370 f5534014-38df-0310-8fa8-9805f1628bb7
2001-12-03Make "dissector_add()", "dissector_delete()", and "dissector_change()"guy1-3/+5
take a dissector handle as an argument, rather than a pointer to a dissector function and a protocol ID. Associate dissector handles with dissector table entries. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4308 f5534014-38df-0310-8fa8-9805f1628bb7
2001-12-03As you set a conversation dissector by supplying a dissector handleguy1-4/+5
rather than a function pointer, "dissect_wtp_fromudp()" no longer needs to be global; make it static, register it by name, and have the WSP dissector get the handle by calling "find_dissector()" rather than by constructing its own handle for it. Fix up some attributions. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4306 f5534014-38df-0310-8fa8-9805f1628bb7
2001-10-07From Georg von Zezschwitz:guy1-8/+50
- A bug related to "WSP header pages" is fixed, that resulted into "malformed WSP frame" alerts - "Concatenated PDUs" (Multiple PDUs within one UDP packet) are now supported (used e.g. by Nokia 8310) - The URL of WSP GET/POST requests is display in the info column, same like HTTP GET requests git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4004 f5534014-38df-0310-8fa8-9805f1628bb7
2001-09-11Fix from Tom Uijldert: scan TPI's to get proper WTP packet length andguy1-8/+23
correct start of WSP-data. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3920 f5534014-38df-0310-8fa8-9805f1628bb7
2001-09-10Some WAP WTP naming fixes plus textual Transaction Class value decoding,guy1-7/+14
from Olivier Biot. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3914 f5534014-38df-0310-8fa8-9805f1628bb7
2001-07-20Don't base the WSP dissector's idea of whether it's running inguy1-3/+4
connectionless or connection-oriented mode on the server port; that won't work with redirects. Instead, base it on the protocol atop which WSP is running - atop UDP, or directly atop WTLS, it's connectionless; atop WTP, it's connection-oriented. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3750 f5534014-38df-0310-8fa8-9805f1628bb7
2001-07-20Dissect WSP redirects, and set up a conversation and conversationguy1-2/+2
dissector so that the redirected traffic is dissected as WAP traffic. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3743 f5534014-38df-0310-8fa8-9805f1628bb7
2001-07-03Don't base the protocol column setting in the WSP and WTP dissectors onguy1-21/+38
the port - instead, base it on whether the dissector was called directly from UDP or called from another WAP dissector. That way, if you explicitly say "decode this as WTP" because there was a redirection (or if, in the future, the WSP dissector handles redirections for you, although that won't handle the case of a capture where the redirection wasn't captured), the column doesn't say "UDP", it says the right thing. Don't register the WTLS dissector by name - nobody calls it through a handle. Register the WTP dissector by name, as the WTLS dissector tries to get a handle for it - although it doesn't actually call it, or the WSP dissector, through a handle. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3647 f5534014-38df-0310-8fa8-9805f1628bb7
2001-06-18From Joerg Mayer: explicitly fill in all members of aguy1-22/+22
"header_field_info" structure, including the ones that are later set by the routines to register fields. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3561 f5534014-38df-0310-8fa8-9805f1628bb7
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 04:09:49 +0000