Commit Graph

34706 Commits

Author SHA1 Message Date
Jeff Morriss cc6fc23812 From Didier via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3055 :
Apply rev 25869 to most of the rest of the TCP-desegmenting dissectors.
(The SSL dissector was already updated in one of two spots with bug 4535/rev
32456.)

A couple of the patches had to be manually applied.

From me: Fix the comments to match the change (including in the TCP and SSL
dissectors.)

svn path=/trunk/; revision=36332
2011-03-25 19:02:18 +00:00
Chris Maynard 28ef67fb39 Change urb_type from FT_STRING to FT_UINT8. This fixes the display filtering
for this field.  This change was prompted because of the following query:
    http://ask.wireshark.org/questions/3113/usburb_type-values

Also, remove 2 unused fields found by running tools/checkhf.pl.

svn path=/trunk/; revision=36331
2011-03-25 18:51:12 +00:00
Jeff Morriss 2c8e2564f6 Fix the problem reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3785#c14 :
If we thought we finished reassembly (and called the subdissector) only to find
out that the subdissector asked for more data, handle the case where the
subdissector asked for DESEGMENT_UNTIL_FIN.  Previously we only handled the
possibility that the subdissector would ask for a specific number of bytes or
DESEGMENT_ONE_MORE_SEGMENT.

svn path=/trunk/; revision=36330
2011-03-25 15:45:37 +00:00
Ronnie Sahlberg f4a8e83704 remove two unused assignments
coverity 1050


svn path=/trunk/; revision=36329
2011-03-25 07:26:17 +00:00
Ronnie Sahlberg 79e0b02dcd use the newly created tree to store the new items instead of the parent tree
coverity 842


svn path=/trunk/; revision=36328
2011-03-25 07:22:23 +00:00
Ronnie Sahlberg b48b51293d remove unused variable
coverity 229


svn path=/trunk/; revision=36327
2011-03-25 07:19:15 +00:00
Ronnie Sahlberg 8d93bec973 remove an unused variable
coverity 1044


svn path=/trunk/; revision=36326
2011-03-25 07:15:48 +00:00
Anders Broman f14e039375 Make it build on Windows 7
(pcapng.c(1817) : warning C4267: '=' : conversion from 'size_t' to 'gint', possible loss of data)

svn path=/trunk/; revision=36325
2011-03-25 06:42:59 +00:00
Ronnie Sahlberg d8f7b6f1ae remove assignment of an unused value
coverity 1178

svn path=/trunk/; revision=36324
2011-03-25 03:07:05 +00:00
Gerald Combs 2ea9b63ee7 If a segment looks like a retransmission, don't mark it out-of-order.
svn path=/trunk/; revision=36323
2011-03-25 00:28:47 +00:00
Bill Meier e402e91dd1 Don't assign to a proto_item* if the value won't be used:
Also: Fix a bug wherein PPP_RTP_CUD8 was being registered
 to "ppp.protocol" with the cudp16 handle rather than the cudp8 handle.

Coverity 1004-1013

svn path=/trunk/; revision=36322
2011-03-24 23:34:13 +00:00
Gerald Combs 1cc613c32d Add a missing include.
svn path=/trunk/; revision=36321
2011-03-24 23:33:38 +00:00
Bill Meier 845612e450 Fix a compile warning: unused variable
svn path=/trunk/; revision=36320
2011-03-24 23:05:36 +00:00
Gerald Combs ded5b39a98 Add an item about pcapng name resolution.
svn path=/trunk/; revision=36319
2011-03-24 22:58:45 +00:00
Gerald Combs fcf51fc73b Add initial pcapng name resolution record support. Wireshark has read
support; TShark has read+write support. Additionally TShark can read a
"hosts" file and write those records to a capture file.

This uses "struct addrinfo" in many places and probably won't compile on
some platforms.

svn path=/trunk/; revision=36318
2011-03-24 22:47:57 +00:00
Bill Meier 57833dc778 Don't assign to a proto_item* if the value won't be used: Coverity 942-951
Also: minor Code & Whitespace cleanup.

svn path=/trunk/; revision=36317
2011-03-24 22:27:20 +00:00
Stephen Fisher df50d409fb Only display the 3 digits of precision after the decimal that we have
from the ICMP conversation response time tracking. 


svn path=/trunk/; revision=36316
2011-03-24 21:22:07 +00:00
Bill Meier 78c5c20d08 Don't assign to a proto_item* if the value won't be used: Coverity 1155-1156;
Also:
  - Fix a few cases of SET_HIDDEN on the wrong item. (The SET_HIDDEN was being
    done on an already hidden item).
  - Minor indentation cleanup;

svn path=/trunk/; revision=36315
2011-03-24 21:19:39 +00:00
Bill Meier 78dda7cc7e Don't assign to a proto_item* if the value won't be used: Coverity 1124-1128;
Also: minorwhitespace cleanup.


svn path=/trunk/; revision=36314
2011-03-24 20:17:22 +00:00
Chris Maynard 9493ebe8e9 Display the value of the ICMP echo request/reply response time in milliseconds.
svn path=/trunk/; revision=36313
2011-03-24 18:05:10 +00:00
Bill Meier b9331456e9 Don't assign to a proto_item* if the value won't be used: Coverity 1151-1154;
svn path=/trunk/; revision=36312
2011-03-24 17:37:07 +00:00
Tomas Kukosa 7755178447 Export next_tvb_... functions
svn path=/trunk/; revision=36311
2011-03-24 16:21:31 +00:00
Bill Meier 24b8d23fb4 Don't assign to a proto_item* if the value isn't to be used: Coverity 1173;
Also:
  - Fix 2 cases of an item attached to the wrong subtree;
  - "localize" & rename some variable definitions;
  - Minor indentation cleanup.


svn path=/trunk/; revision=36310
2011-03-24 16:03:12 +00:00
Jeff Morriss 01ec42762f From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5768 :
Patch 3 :
Enhance MySQL : Request/Response sub-dissector/function 
(white space changes, use ENC_NA when appropriate, use
proto_tree_add_item()...)

Patch 4 :
Enhance MySQL : packet_ok, server, capa sub-dissector/function (white space
changes, use ENC_NA when appropriate, use proto_tree_add_item()...)

Split mysql_dissect_caps in mysql_dissect_caps_client and
mysql_dissect_caps_server

Rename mysql_dissect_ext_caps to mysql_dissect_ext_caps_client

svn path=/trunk/; revision=36309
2011-03-24 15:31:52 +00:00
Anders Broman db3a34973a Beutify IMEISV IE output.
svn path=/trunk/; revision=36308
2011-03-24 10:36:39 +00:00
Anders Broman d11e6439cd Fix Checkapi errors
Error: the name for field " N32" ("gsm_rlcmac_dl.n32") has leading space in packet-gsm_rlcmac.c
Error: the name for field " N51" ("gsm_rlcmac_dl.n51") has leading space in packet-gsm_rlcmac.c
Error: the name for field " N26" ("gsm_rlcmac_dl.n26") has leading space in packet-gsm_rlcmac.c

svn path=/trunk/; revision=36307
2011-03-24 10:35:29 +00:00
Anders Broman 4cd37afb6c From Vincent Helfre:
I updated again the csn1 dissector to associate hf_field to each element.

svn path=/trunk/; revision=36306
2011-03-24 09:20:14 +00:00
Jeff Morriss bb61772be7 From Dirk: fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2930 :
Make the image (png, gif, jfif) dissectors "new style" so that they don't
dissect data that does not belong to them.

Modify the HTTP dissector to call heuristic dissectors on the body if the
registered subdissector does not accept/dissect the data.

From me: don't use assert() and don't add a preference to the HTTP dissector
for this behavior: it makes sense to behave like that by default.

svn path=/trunk/; revision=36305
2011-03-24 02:49:05 +00:00
Jeff Morriss 8c73d0c6f4 If we've already seen a segment which starts a multi-segment pdu (i.e., it's
a retransmission), don't add it to the list (tree) of multi-segment pdus.

Otherwise, if we'd already seen the rest of the pdu and the other segments
were not retransmitted, the retransmission would break dissection of the pdu
because lookups for the segment would find the retransmission (to which the
other segments were not attached).

Since we know this segment is a retransmission, don't bother handing it off
to the subdissector either.

Use PINFO_FD_VISITED().
Add some white space in the desegmentation routine to improve readability.

Apply the same changes to the SSL dissector.

svn path=/trunk/; revision=36304
2011-03-24 02:10:04 +00:00
Gerald Combs a365760a6d More markup updates.
svn path=/trunk/; revision=36303
2011-03-23 23:36:39 +00:00
Gerald Combs 8589dbd3a2 Fix markup.
svn path=/trunk/; revision=36302
2011-03-23 22:31:59 +00:00
Ronnie Sahlberg 5f502a5bfb remove a conditional that can never be true
coverity 247


svn path=/trunk/; revision=36301
2011-03-23 21:17:29 +00:00
Gerald Combs bf305c1476 Clean up information about older Windows versions.
svn path=/trunk/; revision=36300
2011-03-23 21:03:18 +00:00
Chris Maynard 0a4e8a4d52 Added an entry about the new tshark "-z <proto>,srt" syntax.
svn path=/trunk/; revision=36299
2011-03-23 20:38:16 +00:00
Chris Maynard 276e9cced3 Add ICMP echo request/reply conversation tracking. Closes bug 5770.
svn path=/trunk/; revision=36298
2011-03-23 20:20:40 +00:00
Chris Maynard feb1d468d8 From: http://www.wireshark.org/lists/wireshark-dev/201103/msg00157.html
Change RTT references to SRT.
(tshark.pod could use a description for -z afp,srt and -z camel,srt)

svn path=/trunk/; revision=36297
2011-03-23 20:00:13 +00:00
Jeff Morriss e7a6230eca From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5768 :
Patch 1 :
Enhance MySQL : Reorder hf and Proto_reg

Patch 2 :
Enhance MySQL : white space changes, use ENC_NA when appropriate, use
proto_tree_add_item()

svn path=/trunk/; revision=36296
2011-03-23 19:12:24 +00:00
Bill Meier 52d5cc586a Remove unneeded NULL Test...
Addresses Coverity 598

svn path=/trunk/; revision=36295
2011-03-23 18:55:02 +00:00
Bill Meier 6817d03a66 Recode a loop slightly ....
svn path=/trunk/; revision=36294
2011-03-23 18:10:34 +00:00
Bill Meier 95402cf9de Fix bug: 'if ((octet & 0x80) == 80)' ==> 'if ((octet & 0x80) == 0x80)'
Coverity 345

svn path=/trunk/; revision=36293
2011-03-23 15:21:18 +00:00
Bill Meier ae465d5d39 Fix bugs: 'if ((flags & 0x2) == 1)' ==> 'if ((flags & 0x2) != 0)'
Coverity 346 & 347

svn path=/trunk/; revision=36292
2011-03-23 15:15:02 +00:00
Stig Bjørlykke 03941b54ed Fixed second parameter to create_persconffile_profile.
svn path=/trunk/; revision=36291
2011-03-23 14:58:34 +00:00
Stig Bjørlykke 714c8c52b9 Ensure we create the "Default" personal configuration files directory before
creating a new profile.  This fixes a bug when trying to create a new profile
from a newly installed wireshark with no saved preferences.

svn path=/trunk/; revision=36290
2011-03-23 14:52:39 +00:00
Bill Meier fc11b62891 Fix bug: 'guint8 |=0x8000'.
Coverity 350

svn path=/trunk/; revision=36289
2011-03-23 14:51:40 +00:00
Jeff Morriss 50c8f0f80a Don't use C++/C99-style comments.
svn path=/trunk/; revision=36288
2011-03-23 13:18:38 +00:00
Martin Mathieson d620640a70 Remove some unncessary assignments to proto_item pointers.
Coverity 904 & 905.

svn path=/trunk/; revision=36287
2011-03-23 11:35:03 +00:00
Martin Mathieson b47c36a4bd Don't assign proto_item pointers that are not used.
Coverity CIDs 1021 & 1022.

svn path=/trunk/; revision=36286
2011-03-23 10:58:24 +00:00
Martin Mathieson 473b578880 Remove static that was added to appease Coverity 753. 2016 bytes isn't too much to put on the stack.
svn path=/trunk/; revision=36285
2011-03-23 10:12:35 +00:00
Anders Broman fd782e736c From Vincent Helfre:
- added documentation in packet-csn1.h
- fixed a bug in packet-csn1.c
- fixed a BSIC description in packet-gsm_a_rr.c
- removed the "_v" suffix in packet-gsm_rlcmac element description

svn path=/trunk/; revision=36284
2011-03-23 09:14:50 +00:00
Stig Bjørlykke cb56e84556 Removed unused parameter to parseServiceNodeId.
Coverity 596.

svn path=/trunk/; revision=36283
2011-03-23 08:03:02 +00:00