Commit Graph

34776 Commits

Author SHA1 Message Date
Stig Bjørlykke cfd583a6be Added sanity checks for preferences.
Coverity 551 & 553.

svn path=/trunk/; revision=36352
2011-03-26 15:53:55 +00:00
Stig Bjørlykke 2e4ae4108f Added a sanity check in output_fields_set_option.
Coverity 552.

svn path=/trunk/; revision=36351
2011-03-26 15:39:35 +00:00
Stig Bjørlykke 33814e3b39 Added a FALLTHRU comment to avoid a coverity warning.
Coverity 480.

svn path=/trunk/; revision=36350
2011-03-26 15:24:36 +00:00
Stig Bjørlykke 4c7f1096db Added a missing break in graph_select_segment.
Coverity 482.

svn path=/trunk/; revision=36349
2011-03-26 15:20:37 +00:00
Stig Bjørlykke 43cba80324 Added a missing break in hostlist_get_filter_name.
Coverity 481.

svn path=/trunk/; revision=36348
2011-03-26 15:16:40 +00:00
Jaap Keuter ab3fbb4d31 From Hadar Shoham:
Add support to correlation ID under DHCPv6 according to 
"CL-SP-CANN-DHCP-Reg-I06-110210" 
DHCPv6 option 17 Vendor-specific Information, sub option 2172 (paragraph 5.4.3)

svn path=/trunk/; revision=36347
2011-03-26 11:23:46 +00:00
Ronnie Sahlberg aa01f6e0f6 remove a proto_item variable we never use
coverity 866

svn path=/trunk/; revision=36346
2011-03-26 05:39:45 +00:00
Ronnie Sahlberg f00cc53adb remove a proto_item variable we dont need
coverity 1046


svn path=/trunk/; revision=36345
2011-03-26 05:18:09 +00:00
Jeff Morriss 3161977bf8 Introduce ep_strconcat (copied from the glib version)
svn path=/trunk/; revision=36344
2011-03-26 02:39:04 +00:00
Jeff Morriss b838995e60 Remove some duplicated string manipulation code.
svn path=/trunk/; revision=36343
2011-03-26 02:11:42 +00:00
Jeff Morriss 28939cef5c Simplify the generation of the 'name' passed to tick_stat_node().
svn path=/trunk/; revision=36342
2011-03-26 01:22:31 +00:00
Jeff Morriss dd9f86c38d The 'name's passed to tick_stat_node() do not need to be static.
svn path=/trunk/; revision=36341
2011-03-26 01:21:43 +00:00
Gerald Combs 4ee10e769e Fix Coverity CIDs 810 & 811: uninitialized variables.
svn path=/trunk/; revision=36340
2011-03-25 23:45:48 +00:00
Stephen Fisher 321149bcd7 Fix Coverity 331, 332, 333: Wrap the three remaining
gtk_tree_selection_get_selected() calls with if(!..) return;
like the rest of them.  These functions shouldn't be called
unless a packet was selected, so this call should always return
TRUE for success.


svn path=/trunk/; revision=36339
2011-03-25 22:35:29 +00:00
Jeff Morriss 5e1b6cf408 Reword the comments from rev 36304.
Replace the tabs in the file (mostly added by me) with spaces (for consistency).

svn path=/trunk/; revision=36338
2011-03-25 22:20:27 +00:00
Stephen Fisher 3a8bd554fe Fix coverity 268, 269, 546, 547, 548, 549 by checking for null return
from p_get_proto_data() since it should have been set already by the
calling function.  Any other case would be a bug, so call
DISSECTOR_ASSERT in those cases.  Hopefully Coverity realizes that this
is a null return value check.


svn path=/trunk/; revision=36337
2011-03-25 22:16:23 +00:00
Bill Meier 23eaca915b Don't assign to a proto_item* if the value won't be used: Coverity 941
svn path=/trunk/; revision=36336
2011-03-25 22:13:33 +00:00
Bill Meier ea10c028b1 Don't assign to a proto_item* if the value won't be used: Coverity 958-961.
svn path=/trunk/; revision=36335
2011-03-25 21:52:56 +00:00
Bill Meier 7d8633af66 Don't assign to a proto_item* if the value won't be used: Coverity 852,854;
Add a hidden item to the correct subtree: Coverity 853.

svn path=/trunk/; revision=36334
2011-03-25 21:09:28 +00:00
Jeff Morriss 38b9f1cfbd As suggested by Didier in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3055 :
Apply rev 25869 to some more dissectors.

svn path=/trunk/; revision=36333
2011-03-25 20:04:54 +00:00
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