Commit graph

14928 commits

Author SHA1 Message Date
Chris Maynard
1e71ccef15 From Andrew Feren via bug 5775: Correct types on several info elements.
svn path=/trunk/; revision=36415
2011-03-31 14:03:23 +00:00
Stig Bjørlykke
8d62b393a4 Register tcp by name.
To be used in User DLT's and Lua scripts.

svn path=/trunk/; revision=36414
2011-03-31 12:18:14 +00:00
Stig Bjørlykke
a54e28e2ec Use correct functions to fetch protocol name for a dissector registered
by register_dissector().

svn path=/trunk/; revision=36413
2011-03-31 12:16:41 +00:00
Stig Bjørlykke
a6476ba91b Added dissector_handle_get_long_name().
svn path=/trunk/; revision=36412
2011-03-31 12:14:59 +00:00
Stig Bjørlykke
0b8be02229 Use correct length for clientaddr4 callback address entry.
svn path=/trunk/; revision=36411
2011-03-31 11:01:06 +00:00
Ronnie Sahlberg
13f6b77d92 remove two pointless const in casts
coverity 580 and 581

svn path=/trunk/; revision=36407
2011-03-30 04:36:09 +00:00
Ronnie Sahlberg
f3512de0a9 remove some assignments we dont use
svn path=/trunk/; revision=36406
2011-03-30 03:39:58 +00:00
Chris Maynard
a4452f43fa Change TCP_PORT_MANGO to TCP_PORT_MONGO.
svn path=/trunk/; revision=36405
2011-03-29 21:40:54 +00:00
Jeff Morriss
5a2a122942 Don't put a 65536 byte variable on the stack: instead, malloc/free it.
Coverity 760-761.

svn path=/trunk/; revision=36404
2011-03-29 21:39:15 +00:00
Chris Maynard
83dc9446ec From Alexis La Goutte via bug 5790: Add partial bit flag in query.
svn path=/trunk/; revision=36399
2011-03-29 20:58:57 +00:00
Anders Broman
ba8a739f4c Remove check_col().
svn path=/trunk/; revision=36396
2011-03-29 14:23:21 +00:00
Stig Bjørlykke
9e5a9badda Guard against NULL return from find_protocol_by_id().
svn path=/trunk/; revision=36393
2011-03-29 11:09:59 +00:00
Stig Bjørlykke
f7c84ad094 From Pascal Quantin:
Added guard against proto_name's not resolved as protocols.

svn path=/trunk/; revision=36392
2011-03-29 11:08:15 +00:00
Tomas Kukosa
7c083c0966 RTP: display payload type name from dynamic payload type table
H.223: use just one protocol for bot dissectors for more clear protocol disabling 

svn path=/trunk/; revision=36391
2011-03-29 10:56:30 +00:00
Chris Maynard
d69a7dac79 Cast to guint to avoid a Windows compiler warning.
svn path=/trunk/; revision=36389
2011-03-28 22:22:05 +00:00
Stephen Fisher
d4649392d8 Fix for bug #4334 "VNC Hextile encoding is incomplete" from Yaniv Kaul.
svn path=/trunk/; revision=36386
2011-03-28 20:53:20 +00:00
Jeff Morriss
a2393ea239 Use g_ascii_strdown instead of g_strdown
svn path=/trunk/; revision=36385
2011-03-28 19:44:41 +00:00
Chris Maynard
15503bf4aa Don't use prohibited strncpy(). In this case, use g_strlcat() instead.
svn path=/trunk/; revision=36382
2011-03-28 16:42:25 +00:00
Jeff Morriss
c977007591 From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5522 :
Fix a Clang warning, add email address, and add some stuff to COL_INFO.

svn path=/trunk/; revision=36381
2011-03-28 15:28:03 +00:00
Jeff Morriss
c39c25ce9c From Stephane Bryant via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5787 :
Register the reload-framing dissector by name.  Needed when RELOAD is not used
over udp/tcp (but tls, for example)

svn path=/trunk/; revision=36380
2011-03-28 15:23:27 +00:00
Jeff Morriss
569c3d9014 From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5768 :
Patch 5

Enchance MySQL : 
* Add expert info of when undecoded data 
* Fix some white space

svn path=/trunk/; revision=36379
2011-03-28 15:20:16 +00:00
Chris Maynard
ba9dc9f45f Make ip.fragments an FT_BYTES field so a PDML Export will display the bytes in
the value="..." attribute.  Fixes bug 1520.

svn path=/trunk/; revision=36378
2011-03-28 14:53:35 +00:00
Stig Bjørlykke
b95c4cb6a2 Added payload, header and trailer information to the DLT tree entry.
svn path=/trunk/; revision=36377
2011-03-28 14:18:29 +00:00
Bill Meier
0da2042447 Fix Coverity 393: "DEADCODE"; Add an XXX comment
svn path=/trunk/; revision=36373
2011-03-27 16:15:19 +00:00
Gerald Combs
8cc32fd535 Add the IPv4 address, not the first 4 bytes of its name, to the
resolution table.

svn path=/trunk/; revision=36370
2011-03-27 15:58:52 +00:00
Bill Meier
7a77cdf0f1 1. Fix bug in dissection of a field; Add two missing lines of code.
2. #if 0 if test "which will never be true"; Add XXX comment

svn path=/trunk/; revision=36369
2011-03-27 15:39:06 +00:00
Gerald Combs
a4f03a1101 [Automatic manuf, services and enterprise-numbers update for 2011-03-27]
svn path=/trunk/; revision=36368
2011-03-27 15:03:43 +00:00
Stig Bjørlykke
e43c9a35e4 Added a FALLTHRU comment to avoid a "missing break" warning.
Coverity 472.

svn path=/trunk/; revision=36366
2011-03-27 14:11:40 +00:00
Anders Broman
129f07a949 Added FALLTHRU comment to avoid a "missing break" warning.
svn path=/trunk/; revision=36365
2011-03-27 14:02:42 +00:00
Stig Bjørlykke
3c533baf45 Added a missing break.
Coverity 452.

svn path=/trunk/; revision=36364
2011-03-27 13:56:53 +00:00
Stig Bjørlykke
71c369611a Added a missing break.
Coverity 461.

svn path=/trunk/; revision=36363
2011-03-27 13:54:53 +00:00
Stig Bjørlykke
473b25301e Added some missing breaks.
Coverity 462 & 463.

svn path=/trunk/; revision=36362
2011-03-27 13:51:47 +00:00
Stig Bjørlykke
c9468a80be Added some missing breaks.
Coverity 443 & 444.

svn path=/trunk/; revision=36361
2011-03-27 13:40:54 +00:00
Stig Bjørlykke
8ce65d5dee Added some missing breaks.
Coverity 447.

svn path=/trunk/; revision=36360
2011-03-27 13:35:30 +00:00
Stig Bjørlykke
31b37eec2d Added a FALLTHRU comment to avoid a "missing break" warning.
Coverity 458.

svn path=/trunk/; revision=36359
2011-03-27 13:33:28 +00:00
Stig Bjørlykke
d79ac3d6b8 Added some missing breaks.
Coverity 466.

svn path=/trunk/; revision=36358
2011-03-27 13:30:39 +00:00
Stig Bjørlykke
a39c0d9577 Added a missing break.
Coverity 492.

svn path=/trunk/; revision=36356
2011-03-27 13:15:14 +00:00
Bill Meier
21d34d05b9 Don't assign to a proto_item* if the value won't be used: Coverity 895-897
Also: Fix some indentation & whitespace.

svn path=/trunk/; revision=36355
2011-03-26 16:39:30 +00:00
Jaap Keuter
391b328a6b From Alexis La Goutte:
A patch to add ATM over TCP Dissector.
The dissector dissect only the ATMTCP header (VCI, VPI, Payload Length) 
The data are not yet dissect, it is necessary to add a "UAT" (As with the K12
dissector) to indicate the type (ILMI, AAL, ATM...) of data (based on VCI/VPI)

svn path=/trunk/; revision=36354
2011-03-26 16:07:30 +00:00
Stig Bjørlykke
ff40ab2174 Added a sanity check to remove a coverity warning.
Coverity 537.

svn path=/trunk/; revision=36353
2011-03-26 15:59:57 +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
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
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
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
Bill Meier
845612e450 Fix a compile warning: unused variable
svn path=/trunk/; revision=36320
2011-03-24 23:05:36 +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
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
Tomas Kukosa
7755178447 Export next_tvb_... functions
svn path=/trunk/; revision=36311
2011-03-24 16:21:31 +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
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
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
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
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
aca69d699a Removed "comparing an array to null", with no effect.
Coverity 532.

svn path=/trunk/; revision=36279
2011-03-23 07:25:08 +00:00
Ronnie Sahlberg
0832de6b8e value&0x03 does not need to be shifted to the right by two.
cut-n-paste bug from a few lines above where value&0x0c do need to be shifted by two
before printing as a value

coverity 342


svn path=/trunk/; revision=36278
2011-03-23 06:50:09 +00:00
Anders Broman
691c566900 CID 453,454
Missing break

svn path=/trunk/; revision=36277
2011-03-23 05:48:58 +00:00
Ronnie Sahlberg
89d3156883 Shift the correct number of steps when masking the UAAERP bit to 0/1
coverity 348

svn path=/trunk/; revision=36274
2011-03-23 04:55:22 +00:00
Ronnie Sahlberg
24eb2e7b6e The NSG bits in the login pdu are 0x0c not 0xc0
coverity 344


svn path=/trunk/; revision=36273
2011-03-23 04:50:17 +00:00
Ronnie Sahlberg
feaf55330e Coverity 989
Remove some item=  assignments we dont need since we never use the value
of the created item.


svn path=/trunk/; revision=36269
2011-03-22 20:48:36 +00:00
Bill Meier
1f5bfa75b1 Remove two tests for fail return from g_malloc(); Fixes Coverity #424 "FORWARD_NULL"
svn path=/trunk/; revision=36267
2011-03-22 19:27:48 +00:00
Stig Bjørlykke
fac93b08b2 Allocate correct size of nwk_keyring.
Coverity 715.

svn path=/trunk/; revision=36265
2011-03-22 19:16:19 +00:00
Stig Bjørlykke
41d5c9b750 Allocate correct size of hash_key.
Coverity 713.

svn path=/trunk/; revision=36264
2011-03-22 19:13:48 +00:00
Stig Bjørlykke
f51139e659 Allocate correct size of reload_frame.
Coverity 714.

svn path=/trunk/; revision=36263
2011-03-22 19:13:05 +00:00