obnox/wireshark/wip.git
13 years agoFix markup.
gerald [Wed, 23 Mar 2011 22:31:59 +0000 (22:31 +0000)]
Fix markup.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36302 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoremove a conditional that can never be true
sahlberg [Wed, 23 Mar 2011 21:17:29 +0000 (21:17 +0000)]
remove a conditional that can never be true

coverity 247

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36301 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoClean up information about older Windows versions.
gerald [Wed, 23 Mar 2011 21:03:18 +0000 (21:03 +0000)]
Clean up information about older Windows versions.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36300 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdded an entry about the new tshark "-z <proto>,srt" syntax.
cmaynard [Wed, 23 Mar 2011 20:38:16 +0000 (20:38 +0000)]
Added an entry about the new tshark "-z <proto>,srt" syntax.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36299 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd ICMP echo request/reply conversation tracking. Closes bug 5770.
cmaynard [Wed, 23 Mar 2011 20:20:40 +0000 (20:20 +0000)]
Add ICMP echo request/reply conversation tracking.  Closes bug 5770.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36298 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom: http://www.wireshark.org/lists/wireshark-dev/201103/msg00157.html
cmaynard [Wed, 23 Mar 2011 20:00:13 +0000 (20:00 +0000)]
From: 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)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36297 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5768 :
morriss [Wed, 23 Mar 2011 19:12:24 +0000 (19:12 +0000)]
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()

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36296 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemove unneeded NULL Test...
wmeier [Wed, 23 Mar 2011 18:55:02 +0000 (18:55 +0000)]
Remove unneeded NULL Test...

Addresses Coverity 598

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36295 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRecode a loop slightly ....
wmeier [Wed, 23 Mar 2011 18:10:34 +0000 (18:10 +0000)]
Recode a loop slightly ....

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36294 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix bug: 'if ((octet & 0x80) == 80)' ==> 'if ((octet & 0x80) == 0x80)'
wmeier [Wed, 23 Mar 2011 15:21:18 +0000 (15:21 +0000)]
Fix bug: 'if ((octet & 0x80) == 80)' ==> 'if ((octet & 0x80) == 0x80)'

Coverity 345

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36293 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix bugs: 'if ((flags & 0x2) == 1)' ==> 'if ((flags & 0x2) != 0)'
wmeier [Wed, 23 Mar 2011 15:15:02 +0000 (15:15 +0000)]
Fix bugs: 'if ((flags & 0x2) == 1)' ==> 'if ((flags & 0x2) != 0)'
Coverity 346 & 347

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36292 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFixed second parameter to create_persconffile_profile.
stig [Wed, 23 Mar 2011 14:58:34 +0000 (14:58 +0000)]
Fixed second parameter to create_persconffile_profile.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36291 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoEnsure we create the "Default" personal configuration files directory before
stig [Wed, 23 Mar 2011 14:52:39 +0000 (14:52 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36290 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix bug: 'guint8 |=0x8000'.
wmeier [Wed, 23 Mar 2011 14:51:40 +0000 (14:51 +0000)]
Fix bug: 'guint8 |=0x8000'.
Coverity 350

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36289 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDon't use C++/C99-style comments.
morriss [Wed, 23 Mar 2011 13:18:38 +0000 (13:18 +0000)]
Don't use C++/C99-style comments.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36288 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemove some unncessary assignments to proto_item pointers.
martinm [Wed, 23 Mar 2011 11:35:03 +0000 (11:35 +0000)]
Remove some unncessary assignments to proto_item pointers.

Coverity 904 & 905.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36287 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDon't assign proto_item pointers that are not used.
martinm [Wed, 23 Mar 2011 10:58:24 +0000 (10:58 +0000)]
Don't assign proto_item pointers that are not used.

Coverity CIDs 1021 & 1022.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36286 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemove static that was added to appease Coverity 753. 2016 bytes isn't too much to...
martinm [Wed, 23 Mar 2011 10:12:35 +0000 (10:12 +0000)]
Remove static that was added to appease Coverity 753. 2016 bytes isn't too much to put on the stack.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36285 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Vincent Helfre:
etxrab [Wed, 23 Mar 2011 09:14:50 +0000 (09:14 +0000)]
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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36284 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemoved unused parameter to parseServiceNodeId.
stig [Wed, 23 Mar 2011 08:03:02 +0000 (08:03 +0000)]
Removed unused parameter to parseServiceNodeId.

Coverity 596.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36283 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRewrote check for szStr in dissect_ICBAPhysicalDevice_get_LogicalDevice_rqst.
stig [Wed, 23 Mar 2011 07:34:00 +0000 (07:34 +0000)]
Rewrote check for szStr in dissect_ICBAPhysicalDevice_get_LogicalDevice_rqst.

Coverity 535.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36282 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemoved "comparing an array to null", with no effect.
stig [Wed, 23 Mar 2011 07:31:17 +0000 (07:31 +0000)]
Removed "comparing an array to null", with no effect.

Coverity 534.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36281 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemoved "comparing an array to null", with no effect.
stig [Wed, 23 Mar 2011 07:29:19 +0000 (07:29 +0000)]
Removed "comparing an array to null", with no effect.

Coverity 533.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36280 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemoved "comparing an array to null", with no effect.
stig [Wed, 23 Mar 2011 07:25:08 +0000 (07:25 +0000)]
Removed "comparing an array to null", with no effect.

Coverity 532.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36279 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agovalue&0x03 does not need to be shifted to the right by two.
sahlberg [Wed, 23 Mar 2011 06:50:09 +0000 (06:50 +0000)]
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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36278 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoCID 453,454
etxrab [Wed, 23 Mar 2011 05:48:58 +0000 (05:48 +0000)]
CID 453,454
Missing break

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36277 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agodont assign to a proto_item* unless we are going to use the value
sahlberg [Wed, 23 Mar 2011 05:18:26 +0000 (05:18 +0000)]
dont assign to a proto_item* unless we are going to use the value

coverity 1157

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36276 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoPrint the time units in the CSV output for io_stat using correct extension, i.e....
sahlberg [Wed, 23 Mar 2011 05:11:06 +0000 (05:11 +0000)]
Print the time units in the CSV output for io_stat using correct extension, i.e. always in seconds.

coverity 419

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36275 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoShift the correct number of steps when masking the UAAERP bit to 0/1
sahlberg [Wed, 23 Mar 2011 04:55:22 +0000 (04:55 +0000)]
Shift the correct number of steps when masking the UAAERP bit to 0/1

coverity 348

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36274 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoThe NSG bits in the login pdu are 0x0c not 0xc0
sahlberg [Wed, 23 Mar 2011 04:50:17 +0000 (04:50 +0000)]
The NSG bits in the login pdu are 0x0c   not 0xc0

coverity 344

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36273 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDon't compute each checksum twice when adding dummy headers (-u, -T, -s, -S options)
wmeier [Wed, 23 Mar 2011 00:43:55 +0000 (00:43 +0000)]
Don't compute each checksum twice when adding dummy headers (-u, -T, -s, -S options)

g_ntohs() & friends may be (are ?) macros and may (will ?) eval args more than once ...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36272 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDon't compile expert_dlg.c (that dialog is being removed)
morriss [Tue, 22 Mar 2011 21:15:36 +0000 (21:15 +0000)]
Don't compile expert_dlg.c (that dialog is being removed)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36271 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoClarify a comment.
gerald [Tue, 22 Mar 2011 21:07:00 +0000 (21:07 +0000)]
Clarify a comment.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36270 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoCoverity 989
sahlberg [Tue, 22 Mar 2011 20:48:36 +0000 (20:48 +0000)]
Coverity 989

Remove some item=  assignments we dont need since we never use the value
of the created item.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36269 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdded a sanity check for finfo->hfinfo.
stig [Tue, 22 Mar 2011 19:48:55 +0000 (19:48 +0000)]
Added a sanity check for finfo->hfinfo.

Coverity 425.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36268 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemove two tests for fail return from g_malloc(); Fixes Coverity #424 "FORWARD_NULL"
wmeier [Tue, 22 Mar 2011 19:27:48 +0000 (19:27 +0000)]
Remove two tests for fail return from g_malloc();  Fixes Coverity #424 "FORWARD_NULL"

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36267 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAllocate correct size of fdata col_text and col_text_len.
stig [Tue, 22 Mar 2011 19:24:08 +0000 (19:24 +0000)]
Allocate correct size of fdata col_text and col_text_len.

Coverity 711 & 716.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36266 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAllocate correct size of nwk_keyring.
stig [Tue, 22 Mar 2011 19:16:19 +0000 (19:16 +0000)]
Allocate correct size of nwk_keyring.

Coverity 715.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36265 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAllocate correct size of hash_key.
stig [Tue, 22 Mar 2011 19:13:48 +0000 (19:13 +0000)]
Allocate correct size of hash_key.

Coverity 713.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36264 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAllocate correct size of reload_frame.
stig [Tue, 22 Mar 2011 19:13:05 +0000 (19:13 +0000)]
Allocate correct size of reload_frame.

Coverity 714.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36263 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAllocate correct size of range.
stig [Tue, 22 Mar 2011 18:58:32 +0000 (18:58 +0000)]
Allocate correct size of range.

Coverity 718.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36262 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAllocate correct size of int, not size of a pointer to int.
stig [Tue, 22 Mar 2011 18:53:37 +0000 (18:53 +0000)]
Allocate correct size of int, not size of a pointer to int.

Coverity 717.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36261 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoInitialize al_cto before usage.
stig [Tue, 22 Mar 2011 18:42:02 +0000 (18:42 +0000)]
Initialize al_cto before usage.

Coverity 808.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36260 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoInitialize geom in window_get_geometry.
stig [Tue, 22 Mar 2011 18:28:08 +0000 (18:28 +0000)]
Initialize geom in window_get_geometry.

Coverity 804.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36259 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix potential array overrun: Coverity CID #565.
wmeier [Tue, 22 Mar 2011 18:26:36 +0000 (18:26 +0000)]
Fix potential array overrun: Coverity CID #565.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36258 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix mask when extracting FACH Indicator.
martinm [Tue, 22 Mar 2011 18:24:38 +0000 (18:24 +0000)]
Fix mask when extracting FACH Indicator.
Coverity CID 349.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36257 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemove redundant comparison.
martinm [Tue, 22 Mar 2011 18:06:58 +0000 (18:06 +0000)]
Remove redundant comparison.
Coverity CID 361.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36256 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoMake a struct static to avoid growing the stack too much.
martinm [Tue, 22 Mar 2011 17:46:59 +0000 (17:46 +0000)]
Make a struct static to avoid growing the stack too much.
Coverity CID 753.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36255 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDon't assign top_ti - delete it for now.
martinm [Tue, 22 Mar 2011 17:37:47 +0000 (17:37 +0000)]
Don't assign top_ti - delete it for now.
Coverity CID 862

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36254 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Dirk via bug #5771: Add heuristic dissector for images and HTTP
sfisher [Tue, 22 Mar 2011 16:43:16 +0000 (16:43 +0000)]
From Dirk via bug #5771: Add heuristic dissector for images and HTTP

Also add to AUTHORS file.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36253 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoWe have to initialize the elements of the fdata->col_text array to null
guy [Tue, 22 Mar 2011 16:33:39 +0000 (16:33 +0000)]
We have to initialize the elements of the fdata->col_text array to null
pointers, as there's code that assumes that if they're not set to null
pointers, they're set correctly, and doesn't bother setting them to the
right value.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36252 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoCopy expert_tapdata_t here so that expert_dlg.h is no longer needed.
morriss [Tue, 22 Mar 2011 16:05:12 +0000 (16:05 +0000)]
Copy expert_tapdata_t here so that expert_dlg.h is no longer needed.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36251 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoThere can be up to 15 DL HARQ processes (depending upon TDD config index).
martinm [Tue, 22 Mar 2011 14:39:02 +0000 (14:39 +0000)]
There can be up to 15 DL HARQ processes (depending upon TDD config index).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36250 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix a typo
morriss [Tue, 22 Mar 2011 13:49:07 +0000 (13:49 +0000)]
Fix a typo

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36249 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoPass pointers to structs instead of struct values to create_ntlmssp_v2_key.
stig [Tue, 22 Mar 2011 12:12:04 +0000 (12:12 +0000)]
Pass pointers to structs instead of struct values to create_ntlmssp_v2_key.

Coverity 567.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36248 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAllocate space for null termination in make_basename.
stig [Tue, 22 Mar 2011 11:46:19 +0000 (11:46 +0000)]
Allocate space for null termination in make_basename.

Coverity 710.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36247 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoClose fp in error case in ssl_parse_key_list to avoid leakage.
stig [Tue, 22 Mar 2011 11:40:15 +0000 (11:40 +0000)]
Close fp in error case in ssl_parse_key_list to avoid leakage.

Coverity 597.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36246 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRewrote error reporting to avoid using a 2048 bytes stack buffer.
stig [Tue, 22 Mar 2011 11:25:12 +0000 (11:25 +0000)]
Rewrote error reporting to avoid using a 2048 bytes stack buffer.

Coverity 726.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36245 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoCorrected hack for TAPA by checking for "not IPv4".
stig [Tue, 22 Mar 2011 10:12:07 +0000 (10:12 +0000)]
Corrected hack for TAPA by checking for "not IPv4".

Coverity 343.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36244 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoCoverity 1167
sahlberg [Tue, 22 Mar 2011 09:55:33 +0000 (09:55 +0000)]
Coverity 1167

Dont assign tlv_item unless we need to dereference it.
Also push the variable deeper into the scope where it is used isntead of function wide scope.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36243 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoCoverity 1168
sahlberg [Tue, 22 Mar 2011 09:47:34 +0000 (09:47 +0000)]
Coverity 1168

Create the items for 33_ARS under the subtree we create for this type and not under the parent node in the tree.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36242 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoCoverity 512
sahlberg [Tue, 22 Mar 2011 09:35:26 +0000 (09:35 +0000)]
Coverity 512

Check if we ran out of bytes in the tvb and return NULL
instead of trying to pass it to the decryption routines.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36241 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoCoverity 323
sahlberg [Tue, 22 Mar 2011 09:12:57 +0000 (09:12 +0000)]
Coverity 323

Use strdup to copy a string literal we will free() later on.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36240 f5534014-38df-0310-8fa8-9805f1628bb7

13 years ago- Add 9.4.5 IMEISV IE dissection
etxrab [Tue, 22 Mar 2011 09:06:42 +0000 (09:06 +0000)]
- Add 9.4.5 IMEISV IE dissection
- UE Time Zone is TLV
- Cell Global Identity  PDU type is SGSAP_PDU_TYPE

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36239 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoCoverity 420
sahlberg [Tue, 22 Mar 2011 09:05:26 +0000 (09:05 +0000)]
Coverity 420

Remove dead code and add a g_assert_not_reached() at a spot we can definitely never reach.

change a if(x)g_free(x) to a g_free(x)
since g_free(NULL) is just a nop.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36238 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoUse the same style in netscreen_seek_read() that we use in
guy [Tue, 22 Mar 2011 07:42:45 +0000 (07:42 +0000)]
Use the same style in netscreen_seek_read() that we use in
netscreen_read(), checking the return value of
parse_netscreen_hex_dump() against -1 and explicitly returning FALSE if
it's -1, otherwise driving on.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36237 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoMake expert_tapdata_t opaque to its clients; define the structure only
guy [Tue, 22 Mar 2011 07:24:14 +0000 (07:24 +0000)]
Make expert_tapdata_t opaque to its clients; define the structure only
in gtk/expert_comp_dlg.c.

Don't declare now-static functions in gtk/expert_dlg.h.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36236 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRemove the Exper info dialogue.
etxrab [Tue, 22 Mar 2011 06:17:20 +0000 (06:17 +0000)]
Remove the Exper info dialogue.
(Leave the fies for a while).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36235 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoWhen we allocate the col_text array, initialize it to a bunch of
guy [Tue, 22 Mar 2011 03:56:39 +0000 (03:56 +0000)]
When we allocate the col_text array, initialize it to a bunch of
pointers to null strings, rather than a bunch of null pointers, so that
if an exception is thrown before we set any of the columns, or some
other problem occurs, we don't end up with null pointers that could
later cause a crash.

Fix indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36234 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRe-arrange code so Coverity Prevent doesn't falsely report several INFINITE_LOOPs...
wmeier [Tue, 22 Mar 2011 00:38:55 +0000 (00:38 +0000)]
Re-arrange code so Coverity Prevent doesn't falsely report several INFINITE_LOOPs: Coverity 427-429 (run 617)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36233 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix for bug 5762, wireshark asserts on reading juniper snoop output when no hex data...
sake [Mon, 21 Mar 2011 22:04:22 +0000 (22:04 +0000)]
Fix for bug 5762, wireshark asserts on reading juniper snoop output when no hex data is present (snoop detail off).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36232 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix an "infinite loop" defect reported by Coverity Prevent (Coverity 430 (run 616)).
wmeier [Mon, 21 Mar 2011 19:33:19 +0000 (19:33 +0000)]
Fix an "infinite loop" defect reported by Coverity Prevent (Coverity 430 (run 616)).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36231 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoCorrected decoding of oid values with length 5.
stig [Mon, 21 Mar 2011 18:58:48 +0000 (18:58 +0000)]
Corrected decoding of oid values with length 5.
This fixes coverity 340.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36230 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRe-arrange code slightly to remove a false positive Coverity Prevent "Forward Null...
wmeier [Mon, 21 Mar 2011 18:54:10 +0000 (18:54 +0000)]
Re-arrange code slightly to remove a false positive Coverity Prevent "Forward Null" defect report.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36229 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdded some casts to fix coverity 325.
stig [Mon, 21 Mar 2011 18:33:18 +0000 (18:33 +0000)]
Added some casts to fix coverity 325.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36228 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd a comment re a "suspicious" sizeof() reported by Coverity Prevent.
wmeier [Mon, 21 Mar 2011 17:34:58 +0000 (17:34 +0000)]
Add a comment re a "suspicious" sizeof() reported by Coverity Prevent.
(The report seems correct but I'm not altogether sure).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36227 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDon't close file handle if a file write error; (caller does the close)
wmeier [Mon, 21 Mar 2011 17:07:18 +0000 (17:07 +0000)]
Don't close file handle if a file write error; (caller does the close)

Fixes "USE_AFTER_FREE" defect reported by Coverity Prevent.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36226 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFix a comment; Use consistent indentatation & formatting.
wmeier [Mon, 21 Mar 2011 16:57:11 +0000 (16:57 +0000)]
Fix a comment; Use consistent indentatation & formatting.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36225 f5534014-38df-0310-8fa8-9805f1628bb7

13 years ago#if out another unused routine.
morriss [Mon, 21 Mar 2011 14:52:54 +0000 (14:52 +0000)]
#if out another unused routine.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36224 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Jakub Zawadzki via wireshark-dev: Fix comment.
cmaynard [Mon, 21 Mar 2011 13:28:20 +0000 (13:28 +0000)]
From Jakub Zawadzki via wireshark-dev: Fix comment.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36223 f5534014-38df-0310-8fa8-9805f1628bb7

13 years ago#if 0-out an unused routine.
guy [Mon, 21 Mar 2011 08:21:51 +0000 (08:21 +0000)]
#if 0-out an unused routine.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36222 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd Python 3 support via 2to3.
gerald [Sun, 20 Mar 2011 23:09:36 +0000 (23:09 +0000)]
Add Python 3 support via 2to3.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36221 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoexpert_dlg.c:603: warning: 'expert_dlg_cb' defined but not used
etxrab [Sun, 20 Mar 2011 22:36:57 +0000 (22:36 +0000)]
expert_dlg.c:603: warning: 'expert_dlg_cb' defined but not used

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36220 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDon't register the Exper info dialogue as a first step of removal.
etxrab [Sun, 20 Mar 2011 19:33:07 +0000 (19:33 +0000)]
Don't register the Exper info dialogue as a first step of removal.

Should the common routines be moved into expet_comp_dlg.[ch]?

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36219 f5534014-38df-0310-8fa8-9805f1628bb7

13 years ago[Automatic manuf, services and enterprise-numbers update for 2011-03-20]
gerald [Sun, 20 Mar 2011 15:03:47 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-03-20]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36216 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdded a configure message when having c-ares instead of adns.
stig [Sun, 20 Mar 2011 12:38:31 +0000 (12:38 +0000)]
Added a configure message when having c-ares instead of adns.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36215 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Roland Knall <rknall [AT] gmail.com>: allow heuristic subdissectors
guy [Sun, 20 Mar 2011 00:47:18 +0000 (00:47 +0000)]
From Roland Knall <rknall [AT] gmail.com>: allow heuristic subdissectors
for SERCOS III packets.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36214 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoClean up indentation.
guy [Sun, 20 Mar 2011 00:05:39 +0000 (00:05 +0000)]
Clean up indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36213 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom James Deucker via bug 5766:
stig [Sat, 19 Mar 2011 11:09:03 +0000 (11:09 +0000)]
From James Deucker via bug 5766:
Mark some unused arguments.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36212 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Alexis La Goutte submitted in bug 5759: Use ENC_NA where appropriate.
cmaynard [Fri, 18 Mar 2011 20:02:45 +0000 (20:02 +0000)]
From Alexis La Goutte submitted in bug 5759: Use  ENC_NA where appropriate.
From me:  Remove unused header fields found by checkhf.pl.  One more ENC_NA.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36211 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAll fields are little-endian. Fixes bug 5759 reported by Tang Fulin.
cmaynard [Thu, 17 Mar 2011 20:17:09 +0000 (20:17 +0000)]
All fields are little-endian.  Fixes bug 5759 reported by Tang Fulin.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36210 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDon't clobber the capinfos data if we have a valid capture file. This
gerald [Thu, 17 Mar 2011 19:53:28 +0000 (19:53 +0000)]
Don't clobber the capinfos data if we have a valid capture file. This
should let the original file information show up in bug reports.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36209 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoRespond to most of the clang warnings for this dissector.
martinm [Thu, 17 Mar 2011 16:00:13 +0000 (16:00 +0000)]
Respond to most of the clang warnings for this dissector.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36208 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoFrom Jakub Zawadzki: Simpler patch to resolve bug 5755 to properly display all
cmaynard [Thu, 17 Mar 2011 15:37:28 +0000 (15:37 +0000)]
From Jakub Zawadzki: Simpler patch to resolve bug 5755 to properly display all
strings in dissect_octet_string() without having to allocate extra memory.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36207 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAs per bug 5751, these header files are no longer needed/used.
morriss [Thu, 17 Mar 2011 13:27:23 +0000 (13:27 +0000)]
As per bug 5751, these header files are no longer needed/used.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36206 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAdd README.heuristic to the source distribution
morriss [Thu, 17 Mar 2011 13:18:27 +0000 (13:18 +0000)]
Add README.heuristic to the source distribution

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36205 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAvoid some unnecessary assignments (as reported by clang).
martinm [Wed, 16 Mar 2011 23:18:59 +0000 (23:18 +0000)]
Avoid some unnecessary assignments (as reported by clang).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36204 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoDon't increment after reading last outheader value (as reported by clang).
martinm [Wed, 16 Mar 2011 23:01:33 +0000 (23:01 +0000)]
Don't increment after reading last outheader value (as reported by clang).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36203 f5534014-38df-0310-8fa8-9805f1628bb7

13 years agoAvoid having large buffers on the stack (as noted in VS Code Analyzer warnings).
martinm [Wed, 16 Mar 2011 22:53:41 +0000 (22:53 +0000)]
Avoid having large buffers on the stack (as noted in VS Code Analyzer warnings).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36202 f5534014-38df-0310-8fa8-9805f1628bb7

13 years ago2 VS Code Analyzer warnings were bogus. Avoid one and add a comment about the second...
martinm [Wed, 16 Mar 2011 22:51:45 +0000 (22:51 +0000)]
2 VS Code Analyzer warnings were bogus. Avoid one and add a comment about the second one.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36201 f5534014-38df-0310-8fa8-9805f1628bb7