Commit Graph

20736 Commits

Author SHA1 Message Date
Bill Meier 8dbe825b77 Restore hf[] entry commented out by mistake in SVN #47389.
svn path=/trunk/; revision=47448
2013-02-02 17:40:52 +00:00
Bill Meier 8ef31f222e Hack: disguise '/*' in text strings to prevent checkAPIs & etc seeing 'start of comment' within a text string.
svn path=/trunk/; revision=47446
2013-02-02 14:20:15 +00:00
Pascal Quantin 3ff81e9332 Fix error: declaration of 'j' shadows a previous local
svn path=/trunk/; revision=47445
2013-02-02 13:31:46 +00:00
Pascal Quantin eac8585dc9 Increase the maximum number of OPTIONAL / DEFAULT components per SEQUENCE to 128 and make it configurable through a define
svn path=/trunk/; revision=47444
2013-02-02 13:13:19 +00:00
Pascal Quantin f78791d7d2 Revert changes committed by error in r47433
svn path=/trunk/; revision=47442
2013-02-02 09:02:11 +00:00
Gerald Combs 7187abf120 Add $(AM_V_GEN) in a few more places.
svn path=/trunk/; revision=47434
2013-02-01 22:57:41 +00:00
Pascal Quantin f26b250595 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8290 :
Allow up to 64 OPTIONAL / DEFAULT components per SEQUENCE

svn path=/trunk/; revision=47433
2013-02-01 22:44:14 +00:00
Gerald Combs 8984a38512 Enable more build silence.
svn path=/trunk/; revision=47432
2013-02-01 22:13:43 +00:00
Gerald Combs c97b7912fa Go far enough down a rabbit hole and you will encounter libtool. See
if changing .o to .lo works.

svn path=/trunk/; revision=47430
2013-02-01 20:16:31 +00:00
Gerald Combs 34df2dbe54 Change some "<x>.c : <y>.h" rules to "<x>.o : <y>.h" in order to fix
distcheck. Add some rules recommended by the Automake manual in order
to avoid duplicate actions.

svn path=/trunk/; revision=47429
2013-02-01 18:20:17 +00:00
Michael Mann cfa53be211 From Gaurav Patwardhan, RFC 6720 - Generalized TTL Security Mechanism (GTSM) for the Label Distribution Protocol (LDP)
Bug 7856 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7856)

svn path=/trunk/; revision=47428
2013-02-01 18:13:50 +00:00
Alexis La Goutte f70b7bb15b Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47427
2013-02-01 16:37:04 +00:00
Alexis La Goutte 8524df12c3 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47426
2013-02-01 16:36:55 +00:00
Alexis La Goutte 1951eff160 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47425
2013-02-01 16:36:46 +00:00
Alexis La Goutte c6ff7f75ea Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47424
2013-02-01 16:36:37 +00:00
Alexis La Goutte a3e901f508 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47423
2013-02-01 16:36:29 +00:00
Alexis La Goutte d5557b458e Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47422
2013-02-01 16:36:15 +00:00
Michael Mann a71824a38b Replace THROW(ReportedBoundsError) with expert infos
Follow up to rev 47408

svn path=/trunk/; revision=47421
2013-02-01 16:32:15 +00:00
Chris Maynard eee4f31ab6 Evan Huus pointed out a duplicate block of code, so delete it. Also, move the other block before the "next_tvb=..." statement. Other changes:
-> Delete some unused header fields found with checkhf.pl
-> Fix a couple of typos.
-> Minor whitespace changes.
-> Add a TODO about replacing strstr with either g_strrstr or g_str_has_suffix


svn path=/trunk/; revision=47420
2013-02-01 16:23:16 +00:00
Michael Mann 158574f1d6 follow/clean up to rev 47389. The causes of some of the unused hf_ was typos and refactoring. hf_cip_reserved16 was a "placeholder", so it can remain commented out.
svn path=/trunk/; revision=47419
2013-02-01 16:16:05 +00:00
Jeff Morriss 981c598367 From Hendrik Uhlmann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8289 :
Negative integer values are displayed positive in hmi: -1 = 65535

(Change the variable to signed and add some casts to avoid this problem.)

svn path=/trunk/; revision=47418
2013-02-01 14:36:13 +00:00
Alexis La Goutte 2d776c5c29 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47417
2013-02-01 09:22:57 +00:00
Alexis La Goutte 7ef4c2f29c Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47416
2013-02-01 09:22:49 +00:00
Alexis La Goutte 03e97ee7d3 * Fix indent (Tab => 2 Spaces) and add Modelines info
svn path=/trunk/; revision=47414
2013-02-01 09:22:31 +00:00
Alexis La Goutte db66187a16 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Add also a missing break;

svn path=/trunk/; revision=47413
2013-02-01 09:22:22 +00:00
Alexis La Goutte 794daaa882 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47412
2013-02-01 09:22:07 +00:00
Alexis La Goutte da2a2f39bd Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47411
2013-02-01 09:21:57 +00:00
Alexis La Goutte 5bff584648 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47410
2013-02-01 09:21:48 +00:00
Jeff Morriss be111f2192 Fix the fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8284 :
Throw an exception if we don't find the guint8 we're looking for.  (This could
also be done as expert infos; throwing an exception is a bit brute force but
anyway the -1 return case has to be dealth with.)

Maybe there should be a version of tvb_find_guint8() which throws an
exception...

svn path=/trunk/; revision=47408
2013-02-01 03:55:49 +00:00
Jeff Morriss 21b1b0c5da Add heuristic MTP3 standard detection to M3UA (not for the draft M3UA versions).
The SCCP heuristics actually don't work all that well here but checking the PCs
(in M3UA) seems to do a decent job at least of differentiating ANSI from ITU.

svn path=/trunk/; revision=47407
2013-02-01 02:42:01 +00:00
Evan Huus 5754564be8 Fix format string error.
svn path=/trunk/; revision=47406
2013-02-01 02:19:17 +00:00
Michael Mann 73d339a5a4 Add Port Control Protocol dissector and convert NAT-PMP dissector to "new" style.
The Port Control Protocol overtakes the NAT-PMP IANA UDP ports, but is backwards compatible enough to trigger off of the version number (NAT-PMP is version 0).  NAT-PMP can still use Decode As.

Left the two dissectors with their own unique display filters despite a few overlapping fields.  Didn't want it to turn into a BOOTP/DHCP situation.

svn path=/trunk/; revision=47405
2013-02-01 01:29:58 +00:00
Jeff Morriss 7fb4d231c3 Eliminate a bunch of basically useless/duplicate hf's for affected PCs: they
all have the same name and abbreviation so there's not much point in having
multiple variables for them.  (Arguably the ansi_apc and chinese_apc variables
should be merged too but we may as well preserve the user interface: they have
different abbreviations.)

(Prompted by Bill's discovery of a cut-n-paste problem which rendered a couple
of these hf's unused.)

svn path=/trunk/; revision=47402
2013-01-31 22:43:04 +00:00
Pascal Quantin baa9dd683f Fix dissection of SI6 when carried in a SACCH Info Modify message
Issue reported by damker: http://www.wireshark.org/lists/wireshark-users/201301/msg00067.html

svn path=/trunk/; revision=47401
2013-01-31 22:34:12 +00:00
Bill Meier e169262c57 Remove some trailing whitespace from 3 field labels (aka names)
which was used to align the display of a few field values.

It certainly is desirable to align value fields;
However, the current convention is to not pad field labels
(which is enforced by checkAPIs).

As Evan Huus notes:
 "If we want fields to align (which would be nice, I admit) it should be
  done in some dissector-agnostic way."

Also: do a little whitespace cleanup.


svn path=/trunk/; revision=47400
2013-01-31 22:32:07 +00:00
Bill Meier 414b0c09e6 col...() and expert...() fcns should not be under 'if (tree0'.
svn path=/trunk/; revision=47398
2013-01-31 22:12:13 +00:00
Martin Kaiser 3d143dc3ff gerald@ethereal.com -> gerald@wireshark.org
svn path=/trunk/; revision=47397
2013-01-31 21:02:23 +00:00
Martin Kaiser aa297f4ed3 replaced TABs+spaces mixture with spaces
added editor modelines
removed one more if(tree)
other minor reformatting

svn path=/trunk/; revision=47396
2013-01-31 20:58:48 +00:00
Martin Kaiser a50877b1e5 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
http://www.wireshark.org/download/automated/analysis/scan-build-2013-01-31-1/report-vSXKx6.html#EndPath
use NULL instead of 0 for pointers
remove some unnecessary if (tree) checks

svn path=/trunk/; revision=47395
2013-01-31 20:51:15 +00:00
Pascal Quantin 98c1748e12 Add SIB type to info column
svn path=/trunk/; revision=47394
2013-01-31 20:08:38 +00:00
Gerald Combs d1f6e2e3ec Use a not-quite-black background for marked packets.
http://ianstormtaylor.com/design-tip-never-use-black/

svn path=/trunk/; revision=47392
2013-01-31 18:46:40 +00:00
Bill Meier 959ae3d687 Use '#if 0 ... #endif' rather than /** ... **/ to comment out
unused hf[] entries (which I should have done in the first place).


svn path=/trunk/; revision=47391
2013-01-31 18:35:06 +00:00
Bill Meier d3a7f4b817 Use '#if 0 ... #endif' rather than /** ... **/ to comment out
unused hf[] entries (which I should have done in the first place).

svn path=/trunk/; revision=47390
2013-01-31 18:31:28 +00:00
Bill Meier c439b805e2 Comment out unused hf[] entries & etc.
(found by checkhf)

svn path=/trunk/; revision=47389
2013-01-31 17:55:31 +00:00
Chris Maynard eb5fcc8d01 Fix Coverity CID 971261: Unused pointer value. Additionally, #if 0 two unused value_string's (should they be deleted altogether?), minor whitespace cleanup, delete a continuation character, try to use a consistent bracketing style throughout. [Is "Movment" a typo?]
svn path=/trunk/; revision=47387
2013-01-31 17:07:19 +00:00
Anders Broman 4a8f124c43 Add an OID translation.
svn path=/trunk/; revision=47386
2013-01-31 16:59:39 +00:00
Guy Harris a4902853a5 Constify a variable to which C string pointers will be assigned.
svn path=/trunk/; revision=47385
2013-01-31 06:50:24 +00:00
Guy Harris 094e30f9db Fix RCS ID.
svn path=/trunk/; revision=47384
2013-01-31 06:49:34 +00:00
Guy Harris 7999b06d76 Get rid of CR's, and set the appropriate properties.
svn path=/trunk/; revision=47383
2013-01-31 06:49:05 +00:00
Michael Mann 9ee8360e4a Add Parrot AR Drone dissector.
Bug 7493 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7493)

svn path=/trunk/; revision=47382
2013-01-31 03:52:06 +00:00
Guy Harris 9b23449384 Clean up white space.
svn path=/trunk/; revision=47379
2013-01-30 22:56:05 +00:00
Guy Harris e9479b543f A "DAAP request" is just an HTTP request of a certain type, possibly on
port 3689.  They don't have the media type application/x-dmap-tagged, so
they're not handed to us any more.  (This means that the Info column now
shows the HTTP URI rather than just "DAAP Request", so that's arguably a
feature; if you want to see all the traffic in the session, use "Follow
TCP Stream" or look for port 3689.)

svn path=/trunk/; revision=47377
2013-01-30 21:56:54 +00:00
Guy Harris a4714f643a Add a routine to allow dissectors to specify ports that carry HTTP
traffic *without* claiming all that traffic for themselves; they might
want, instead, to register for a particular media type.

Not all traffic to or from port 3689 is DAAP - not even traffic between
two Apple machines doing media stuff (e.g., some FairPlay traffic
isn't).  Register for the media type application/x-dmap-tagged, and just
say port 3689 is HTTP.  This means we can get rid of the FPLY hack, as
that traffic is application/octet-stream.  Update some comments.

Leave it up to the DAAP dissector to tag traffic as DAAP in the protocol
column.

svn path=/trunk/; revision=47376
2013-01-30 21:49:33 +00:00
Guy Harris b1e6d2730e Some FairPlay stuff in DAAP starts out with a 4-character FPLY tag, but
what follows the tag isn't a length, it's some unknown form of data.

svn path=/trunk/; revision=47370
2013-01-30 20:08:50 +00:00
Gerald Combs f0d670afb3 Fix a couple of dependencies.
svn path=/trunk/; revision=47369
2013-01-30 19:58:12 +00:00
Michael Mann d6901da1d1 Wiretap: Add support for files contain GIF, PNG images
From Michal Labedzki, bug 8278 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8278)

svn path=/trunk/; revision=47368
2013-01-30 19:26:05 +00:00
Evan Huus 942ac68bdc Add a cast to hopefully quiet the mac buildbot.
svn path=/trunk/; revision=47367
2013-01-30 01:14:13 +00:00
Evan Huus b8a74f33b6 Add SVN properties, modelines.
svn path=/trunk/; revision=47366
2013-01-30 01:09:31 +00:00
Michael Mann e5ba6f9b1e Add Gearman dissector. Bug 4992 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4992)
svn path=/trunk/; revision=47365
2013-01-30 00:59:27 +00:00
Martin Kaiser b48fb53c7e Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
http://www.wireshark.org/download/automated/analysis/scan-build-2013-01-28-1/report-AQojcV.html#EndPath

svn path=/trunk/; revision=47363
2013-01-29 23:35:30 +00:00
Martin Kaiser a32b153890 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
http://www.wireshark.org/download/automated/analysis/scan-build-2013-01-28-1/report-eehjto.html#EndPath

svn path=/trunk/; revision=47362
2013-01-29 22:33:37 +00:00
Martin Kaiser 4a64d51119 simplify dissect_gds() a bit
svn path=/trunk/; revision=47360
2013-01-29 22:15:06 +00:00
Martin Kaiser b3f2e26a7a Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
http://www.wireshark.org/download/automated/analysis/scan-build-2013-01-28-1/report-tWikJH.html#EndPath

svn path=/trunk/; revision=47359
2013-01-29 22:04:32 +00:00
Michael Mann 5d026123c4 Make eDonkey dissector a "new style" and only dissect if first byte matches a valid eDonkey protocol. This addresses the problem of Bug 3033 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3033), but I'm still not sure eDonkey should have explicitly registered TCP and UDP ports.
svn path=/trunk/; revision=47349
2013-01-29 18:16:23 +00:00
Michael Mann 23168c9677 Get Server Info should not have any data unless "challenged", per eMule source code. Addresses bug 3509 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3509).
Also updated documentation links.

svn path=/trunk/; revision=47345
2013-01-29 15:43:33 +00:00
Bill Meier c268f2c153 Add missing '&hf_gtpv2_bss_con_xid' entry to hf[].
(Found by checkhf)

Fix apparent issues with two hf[] entries.

Also: Do minor whitespace cleanup.

##Baclport 1.8

svn path=/trunk/; revision=47344
2013-01-29 14:31:21 +00:00
Bill Meier 39886c79cb Add missing '&hf_fw1_trailer' hf[] entry;
Found by checkhf.

## Backport 1.8

svn path=/trunk/; revision=47343
2013-01-29 14:18:04 +00:00
Bill Meier ef242060b8 Add an XXX comment about some code which will never be executed;
Also: mention that there's a missing hf[] entry.

svn path=/trunk/; revision=47342
2013-01-29 13:59:17 +00:00
Bill Meier 3520ab3889 Add missing 'hf_scsi_persresv_control_unreg' hf[] entry.
(Found by checkhf)

Do some minor whitespace cleanup.

svn path=/trunk/; revision=47341
2013-01-29 13:53:16 +00:00
Bill Meier f10906369a Remove some unneeded parens in hf[] entries;
svn path=/trunk/; revision=47340
2013-01-29 13:33:04 +00:00
Gerald Combs ec880b7db3 Use readlink instead of ls.
svn path=/trunk/; revision=47338
2013-01-29 01:06:24 +00:00
Balint Reczey c6f9d4c131 make dumpabi target build with multiple digits in library version numbers
svn path=/trunk/; revision=47329
2013-01-28 21:45:44 +00:00
Michael Mann 8ad4ccb850 Allow SNMP user table entry to be re-editted even if engineID/Username remains the same.
Bug 2426 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2426)

svn path=/trunk/; revision=47328
2013-01-28 21:08:14 +00:00
Evan Huus 29f02b2bb2 Update the MSRP link, it's an actual RFC now.
svn path=/trunk/; revision=47323
2013-01-28 13:27:28 +00:00
Jaap Keuter 335b2bdc96 From Gyanesh:
Add SPBV MAC address sub-TLV support (802.1aq).

svn path=/trunk/; revision=47321
2013-01-28 06:46:21 +00:00
Martin Kaiser fd85b72d51 the fragment id must depend on the transport connection
fragments from different transport connections can be interleaved

svn path=/trunk/; revision=47320
2013-01-27 22:08:29 +00:00
Pascal Quantin f857265011 Fix some dead increment warnings found by Clang
svn path=/trunk/; revision=47319
2013-01-27 18:58:52 +00:00
Pascal Quantin 2e05d7256c Fix typo error
svn path=/trunk/; revision=47318
2013-01-27 18:57:08 +00:00
Evan Huus 5eb312b04b From Hadar Shoham via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8262
Bootp updates, fixes and additional options.

svn path=/trunk/; revision=47317
2013-01-27 16:07:02 +00:00
Michael Mann b76078d210 Bugfix crash caused by AirPDcap decryption. Bug 8177 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8177)
svn path=/trunk/; revision=47314
2013-01-27 15:28:55 +00:00
Gerald Combs 10d1f1cd8b [Automatic manuf, services and enterprise-numbers update for 2013-01-27]
svn path=/trunk/; revision=47313
2013-01-27 15:03:25 +00:00
Bill Meier c929e42eb4 Fix various instances of unused hf[] entries found
by checkhf.

svn path=/trunk/; revision=47312
2013-01-26 22:43:34 +00:00
Jaap Keuter 38dbf79f14 Fix for CID 718640:
Make sure the AVPs length are right before we go into hash calculation.

svn path=/trunk/; revision=47311
2013-01-26 22:36:54 +00:00
Bill Meier 329f6e8cc0 Initialize some hf_... vars to -1;
(Reduces the number of checkhf false positives)

svn path=/trunk/; revision=47310
2013-01-26 21:42:36 +00:00
Evan Huus 50efee619e Make airpcap's print_debug_line take const arguments so that it compiles
on newer GCC's when _DEBUG is #defined.

Found while investigating
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8177

svn path=/trunk/; revision=47309
2013-01-26 21:21:25 +00:00
Bill Meier 6fe0b4cf12 Init several hf... vars to -1.
(found by checkhf)

svn path=/trunk/; revision=47308
2013-01-26 20:41:55 +00:00
Bill Meier 1cb988eb4c Add two missing hf[] entries (which should have been part of SVN #42819).
(Found by checkhf)

##Backport 1.8

svn path=/trunk/; revision=47304
2013-01-26 19:59:41 +00:00
Bill Meier 0c2e7dbe06 Use "4 space" indentation.
svn path=/trunk/; revision=47303
2013-01-26 19:09:15 +00:00
Bill Meier 0960e508e4 Comment out cases of unused hf array entries found by checkhf.
svn path=/trunk/; revision=47302
2013-01-26 18:54:53 +00:00
Bill Meier 33df8647d5 Reformat hf array entries slightly (to help checkdf)
svn path=/trunk/; revision=47301
2013-01-26 16:31:24 +00:00
Evan Huus fbf1970b06 Always call sub-dissectors with the top-level tree.
svn path=/trunk/; revision=47299
2013-01-26 15:41:35 +00:00
Evan Huus a18bdb19df From Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8246
Support for dissection of FeliCa payloads in PN532 InCommunicateThru packets.

svn path=/trunk/; revision=47297
2013-01-26 15:38:12 +00:00
Evan Huus 8444e23988 USB-CCID header is always 10 bytes and may contain payloads, so setting
it to run to the end of the packet was confusing and/or wrong.

svn path=/trunk/; revision=47296
2013-01-26 15:34:48 +00:00
Michael Mann c3651f0409 dcp-etsi dissector: new formula for rx_min
Bug 8231 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8231)

svn path=/trunk/; revision=47295
2013-01-26 15:07:25 +00:00
Evan Huus 0f5ea5487f Whitespace cleanup.
svn path=/trunk/; revision=47286
2013-01-25 22:04:59 +00:00
Evan Huus e55b8a1d38 From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8259
Improve the dissection of the "Get Software Version" confirmation frame as well
as the "Read configuration Block" confirmation frame by properly dissecting the
fields previously marked as reserved in the Homeplug-AV dissector.

svn path=/trunk/; revision=47285
2013-01-25 21:54:18 +00:00
Bill Meier 520230116f Clean up:
- Remove hf & ett decls not used externally from .h
- For hf & ett vars not used externally:
   remove from .c if not used internally otherwise
   declare as static.

svn path=/trunk/; revision=47284
2013-01-25 21:48:38 +00:00
Pascal Quantin df466c5940 Remove duplicate include file
svn path=/trunk/; revision=47275
2013-01-25 18:37:00 +00:00
Pascal Quantin fd659d2b4a Fix dissection of ETWS/CMAS messages
svn path=/trunk/; revision=47274
2013-01-25 18:33:07 +00:00
Pascal Quantin eaf731ccad Remove non ASCII character
svn path=/trunk/; revision=47273
2013-01-25 16:50:05 +00:00
Anders Broman ce6025b059 Dissect Broadcast-Message-Content correctly.
svn path=/trunk/; revision=47272
2013-01-25 15:29:19 +00:00
Pascal Quantin 738dae7c3d From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8258 :
HomePlugAV dissector: improve device ID decoding

svn path=/trunk/; revision=47271
2013-01-25 14:10:09 +00:00
Anders Broman 750c5a8401 Fix dissection of path ["/" session-id] is optional.
svn path=/trunk/; revision=47270
2013-01-25 09:08:24 +00:00
Michael Mann 4b3d76d426 Add new query types, options and message types for DHCPv6 Bulk Leasequery protocol. Also enforce message rules in RFC 5460 section 4 through expert_info
Part of bug 8172 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8172)

svn path=/trunk/; revision=47267
2013-01-25 03:40:53 +00:00
Evan Huus 471dde4a21 Use pinfo-scoped memory for mtp3 addresses.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8247

svn path=/trunk/; revision=47266
2013-01-25 00:28:48 +00:00
Evan Huus d334115b4d From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8166
properly dissect the 0x6048 and 0x6038 frames with HomePlug AV 1.1 

svn path=/trunk/; revision=47265
2013-01-25 00:18:10 +00:00
Gilbert Ramirez 10dd94fa0b Add support for HFI and infiniband interfaces in AIX iptrace files.
svn path=/trunk/; revision=47258
2013-01-24 18:08:25 +00:00
Evan Huus 9037ec60ed From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8166
Fixes for decoding HPAV-1.1 Network Info Request/Confirmation

From me: minor whitespace cleanup.

svn path=/trunk/; revision=47257
2013-01-24 16:23:15 +00:00
Tomas Kukosa 5d3ff466da Fix H.460.9 numbers of parameters
svn path=/trunk/; revision=47256
2013-01-24 11:54:18 +00:00
Pascal Quantin 40efff2019 Fix warning: cast to pointer from integer of different size
While we are at it, restore the private data if no private extension dissector is not found (seems to be the right thing to do)

svn path=/trunk/; revision=47255
2013-01-24 10:36:51 +00:00
Pascal Quantin 1bf78b2ba6 Add missing newline at end of file
svn path=/trunk/; revision=47254
2013-01-24 10:14:37 +00:00
Tomas Kukosa d19cde439e Fix H.460.x calling from H.225 - content decoding
svn path=/trunk/; revision=47253
2013-01-24 10:11:02 +00:00
Anders Broman e2d3294617 From Katrina Zhang sligtly modified.
- Add dissection of Selected PLMN ID.
- Put enterpice id in the tree
- Filter for UTRAN Transparent Field.

svn path=/trunk/; revision=47252
2013-01-24 09:59:06 +00:00
Anders Broman 7140161402 From Katrina Zhang sligtly modified.
- Correct dissection of 8.50 Selected PLMN ID.
- Pass Instance to private extension dissectors.

svn path=/trunk/; revision=47251
2013-01-24 09:56:28 +00:00
Anders Broman 5bd9f6aa9d Add sGSNPLMNIDChange
svn path=/trunk/; revision=47250
2013-01-24 09:53:57 +00:00
Balint Reczey 335d6ca7e2 Prevent copying longer than expected NTLM SSP key
svn path=/trunk/; revision=47248
2013-01-24 09:34:54 +00:00
Bill Meier 42de9da8e3 From Manuel Hofer: Dissector for the OpenVPN Protocol
As part of a semster project in our 3rd semester of
 "secure information systems" at the university of
 applied sciences upper austria, we built a wireshark
 dissector for the OpenVPN protocol.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8240

From me:
 Rework reassembly code and tree display of
  message fragments and reassembled messages.
 Fix various bugs and do some cleanup.

Also: Do minor whitespace changes in AUTHORS.

svn path=/trunk/; revision=47247
2013-01-24 04:26:46 +00:00
Jeff Morriss ce5adea80a Try making dataCodingScheme a guint32 to quiet the MacOS buildbots.
svn path=/trunk/; revision=47244
2013-01-24 02:28:12 +00:00
Chris Maynard 83fffcf258 Delete duplicated word, "you".
svn path=/trunk/; revision=47241
2013-01-24 01:39:59 +00:00
Gerald Combs 2dff8d7605 Add font and color preferences. Unfortunately Qt doesn't have a color
picker widget so we're back to popping up dialogs. Move the contents of
monospace_font.{cpp,h} to wireshark_application.{cpp,h}.

Pango and Qt use completely different string representations for fonts.
Add a separate gui.qt.font_name preference so that they don't clobber
each other.

svn path=/trunk/; revision=47240
2013-01-24 01:10:12 +00:00
Pascal Quantin 9cf7642d19 Allow dissection of several segmented warning messages in parallel
svn path=/trunk/; revision=47236
2013-01-23 21:55:07 +00:00
Pascal Quantin 59e4794390 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8216 :
Add basic dissection of UTF8String type in ASN.1 PER dissector

svn path=/trunk/; revision=47233
2013-01-23 20:50:18 +00:00
Anders Broman d59e9cf574 mm_context_used_cipher is 3 bits.
svn path=/trunk/; revision=47230
2013-01-23 15:56:29 +00:00
Anders Broman c94d02cf85 svn path=/trunk/; revision=47229 2013-01-23 15:40:32 +00:00
Jaap Keuter 260cafb04c Fix for CID 280286:
Take negative value into account, avoid all casting in the process.

svn path=/trunk/; revision=47223
2013-01-23 06:11:18 +00:00
Evan Huus 0cb2a257de Convert the strict allocator to use a hash table similarly to the simple
allocator, allowing it to implement realloc and free.

svn path=/trunk/; revision=47222
2013-01-23 02:31:04 +00:00
Evan Huus 681a3ad5a2 Handle NULL-pointers and 0-lengths in a much simpler allocator-agnostic way,
and document the fact that allocator authors don't have to care.

svn path=/trunk/; revision=47220
2013-01-23 01:11:36 +00:00
Evan Huus c25c5915c5 Add wrapper functions for realloc, free and gc, but don't expose them in the
header yet as not all allocators implement them.

svn path=/trunk/; revision=47219
2013-01-23 00:59:38 +00:00
Pascal Quantin ae61fe0158 Try to fix dissection of GSM protocol family broken by r47209.
Using val_to_str seemed to be a good idea, but most value_string arrays were not properly filled or were using hacks.
(I hope I got everything right...)


svn path=/trunk/; revision=47218
2013-01-22 23:25:44 +00:00
Jaap Keuter 6e1c54c8fd Fix for CID 761911-761984 and CID 761985-761994.
Try to convince Coverity that the passed in item pointer is appreciated,
but not used.
This time see if it pleases the Windows compiler too.

svn path=/trunk/; revision=47217
2013-01-22 22:07:44 +00:00
Bill Meier 1c7c18b725 Fix a typo in a comment;
Do some minor whitespace & etc cleanup.

svn path=/trunk/; revision=47216
2013-01-22 20:55:54 +00:00
Evan Huus 7ad70545cc More fixes for handling of NULL-pointers and 0-lengths in calls to
malloc/realloc/free.

svn path=/trunk/; revision=47215
2013-01-22 18:46:35 +00:00
Gerald Combs 6ef1fc5002 GTK+:
Get rid of user-hostile behavior. In the layout preferences pane 2 & 3
radio buttons overrode the user's selection if a duplicate item was
selected. Now we assume that the user knows what he or she is doing and
steal duplicate selections from the other panes.

Qt:

Match the new GTK+ behavior in the layout preferences. Add padding
around the layout images. Add toolbar style preferences to the
Appearance pane (instead of the layout pane).

All:

Remove the selection mode and scrollbar placement prefs and mark them
obsolete as recently discussed on -dev.

Adjust the layout images yet again after more Awful Monitor Testing.

svn path=/trunk/; revision=47214
2013-01-22 18:27:18 +00:00
Bill Meier df41b2aefa #include <epan/reassemble.h> not needed.
svn path=/trunk/; revision=47212
2013-01-22 15:55:59 +00:00
Bill Meier 9a636739ba Create/use extended value-string;
Add editor modelines;
Do minor whitespace, long lines, and etc cleanup.

svn path=/trunk/; revision=47211
2013-01-22 15:38:55 +00:00
Jaap Keuter 6a6aaf7409 Fix for CID 717414-717435.
Never ever access a string in a value string by its array index.
Use the proper access functions (val_to_str[_ext] and friends).

Also: make clean compile, so move out of dirty dissectors.

svn path=/trunk/; revision=47209
2013-01-22 07:18:20 +00:00
Anders Broman 332012288b Revert 47201 it does not compile on Windows.
svn path=/trunk/; revision=47208
2013-01-22 07:05:39 +00:00
Michael Mann 52b63d96a4 Update the FeliCa dissector to identify FeliCa Standard commands
From Tyson Key, bug 8243 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8243)

svn path=/trunk/; revision=47205
2013-01-22 04:29:37 +00:00
Chris Maynard 604fd1f1c5 Try to eliminate VS Code Analysis warning: warning C6385: Invalid data: accessing 'hf_packetbb_addr_value', the readable size is '16' bytes, but '4004' bytes might be read
svn path=/trunk/; revision=47204
2013-01-22 02:48:55 +00:00
Chris Maynard 0e34036761 Fix bug found by VS Code Analysis: warning C6336: Arithmetic operator has precedence over question operator, use parentheses to clarify intent
svn path=/trunk/; revision=47202
2013-01-22 01:56:07 +00:00
Jaap Keuter 86dd0abcd3 Fix for CID 761911-761984 and CID 761985-761994.
Try to convince Coverity that the passed in item pointer is appreciated,
but not used.

svn path=/trunk/; revision=47201
2013-01-21 22:38:11 +00:00
Alexis La Goutte 23b5828115 From Subramanian via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8109 Add support for Bidirectional Forwarding Detection (BFD) for MPLS Label Switched Paths (LSPs) [ RFC 5884]
svn path=/trunk/; revision=47193
2013-01-21 08:38:40 +00:00
Anders Broman b7548f11bd Update to 3GPP TS 25.419 V11.0.0 (2012-09) no change in asn1.
svn path=/trunk/; revision=47192
2013-01-21 07:09:13 +00:00
Jaap Keuter 5fe15dfd37 Fix CID 966637 and CID 966638
Check pointers before using them.

svn path=/trunk/; revision=47186
2013-01-20 21:14:12 +00:00
Alexis La Goutte 31b969a4b5 Replace tvb_get_ipv4 / ip_to_str ... by tvb_ip_to_str
svn path=/trunk/; revision=47181
2013-01-20 18:32:56 +00:00
Alexis La Goutte 26df7b88e5 Fix indent (Replace tabs by space) and add Modelines info
svn path=/trunk/; revision=47180
2013-01-20 18:32:47 +00:00
Alexis La Goutte 56bddf989b Use proto_tree_add_item for stun_att_reserved and use FT_BYTES type.
svn path=/trunk/; revision=47179
2013-01-20 18:32:37 +00:00
Alexis La Goutte 48cef7c61a Enhance FIX generator
* Remove whitespace and tab
* Add information how to generate packet-fix.h (in top of packet-fix.h)

Regenerate packet-fix.h

svn path=/trunk/; revision=47178
2013-01-20 18:32:23 +00:00
Pascal Quantin 1a182e2a79 Dissect ETWS and CMAS notifications
svn path=/trunk/; revision=47177
2013-01-20 17:14:24 +00:00
Gerald Combs 4cd9fb3084 [Automatic manuf, services and enterprise-numbers update for 2013-01-20]
svn path=/trunk/; revision=47174
2013-01-20 15:03:39 +00:00
Graham Bloice cf4fcaa8b6 snmp dissector did not correctly set length of pdu's of more than 127 bytes. The dissector assumed the ber identifier and length fields were always 2 bytes long, so a pdu length of more than 127 bytes, which requires more than 1 length octet, was incorrectly dissected.
svn path=/trunk/; revision=47173
2013-01-20 10:01:34 +00:00
Evan Huus f3ba854bec NULL is also a valid return for g_malloc if the requested size is 0.
svn path=/trunk/; revision=47172
2013-01-20 02:47:58 +00:00
Evan Huus 8df0020ac6 Don't add the new block to the hash table if it is NULL, which is a
valid non-error return from realloc if the new requested size is 0.

svn path=/trunk/; revision=47171
2013-01-20 02:44:32 +00:00
Evan Huus 518eee193b Use epan-scoped memory to clean up another 1Kb+ of valgrind
sorta-false-positive leaks.

svn path=/trunk/; revision=47170
2013-01-19 20:14:42 +00:00
Evan Huus 669b98bb5f Rewrite wmem_allocator_simple to track allocations using a GHashTable instead of
a GSList. This permits it to implement the new realloc and free functions. Also
fill in an empty gc function, since there isn't much it can do as far as
garbage-collection goes.

svn path=/trunk/; revision=47169
2013-01-19 19:56:20 +00:00
Evan Huus 1390569a99 Use wmem epan-scoped memory when initializing dcerpc so that it gets freed when
we shut down. Cleans up 5Kb worth of valgrind sorta-false-positive leaks.

svn path=/trunk/; revision=47168
2013-01-19 19:36:20 +00:00
Evan Huus 21453d5db6 Add three more slots to the wmem allocater definition (not yet implemented
by any particular allocator) and better document the entire structure.

svn path=/trunk/; revision=47163
2013-01-19 16:15:32 +00:00
Jaap Keuter f177deead0 Fix for CID 280252.
We can be sure we've at least 0 bytes remaining in the TVB.

svn path=/trunk/; revision=47162
2013-01-19 13:06:26 +00:00
Jaap Keuter a43975ca82 Following r47157, this tries to suppress similar Coverity issues.
svn path=/trunk/; revision=47160
2013-01-19 10:54:09 +00:00
Gerald Combs 2c5ce01f33 Add an "Appearance" (aka "User Interface") preference pane. Having an
"Advanced" pane gives us the luxury of omitting some items in favor of
simplicity so do that.

svn path=/trunk/; revision=47158
2013-01-19 00:57:57 +00:00
Jaap Keuter 69489bc85a Try and see if we can suppress about half of the Coverity issues.
svn path=/trunk/; revision=47157
2013-01-18 23:25:22 +00:00
Evan Huus 2a1e61d582 From Kaushal Shah via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8021
Experimental and Reserved sub-TLVs from [RFC 3630]

From me: use consistent whitespace

svn path=/trunk/; revision=47155
2013-01-18 22:04:15 +00:00
Evan Huus 21b5dc0107 Make the buffer argument to FvalueToStringRepr functions volatile
and use that to fix a -Wclobbered error that bleeding-edge GCC throws
on tvbuff types.

Also remove a variable that looked like it was being used to hide the error
before GCC got clever.

svn path=/trunk/; revision=47153
2013-01-18 19:27:31 +00:00
Alexis La Goutte 02bc1028b5 Replace tvb_get_ipv4 / ip_to_str ... by tvb_ip_to_str
svn path=/trunk/; revision=47150
2013-01-18 15:52:15 +00:00
Alexis La Goutte 46452171c9 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47149
2013-01-18 15:52:05 +00:00
Alexis La Goutte b4cdfdc5f1 Enhance MRCPv2 dissector * Fix indent (Tab => 4 Spaces) and add Modelines info * Replace by string_string * Replace if else if... by switch()
svn path=/trunk/; revision=47146
2013-01-18 15:51:33 +00:00
Anders Broman 39b51c7c07 Dissect 3GPP PCO option.
svn path=/trunk/; revision=47145
2013-01-18 09:49:22 +00:00
Gerald Combs ae7ee61e84 Rename the "saved_val" preference element to "stashed_val" in order to
more clearly indicate that it's a copy of a preference value rather than
something we've saved in the preferences file. Update
prefs_pref_to_str() to handle default, stashed, and current prefs.

Create ui/preference_utils.[ch] and move some common routines there. Use
prefs_pref_type_name() in the GTK+ preferences dialog.

Make the "OK" button in the Qt preferences dialog work. We simply write
the prefs and redissect on "OK" and do nothing on "Cancel". This is
intentionally different from the Apply/OK/Cancel behavior in the GTK+
version.

Add a general "emitAppSignal" method to wsApp and use it for packet
dissection and preference changes.

Suggest that we might want to create a WsString class to make conversion
between QStrings, gchar *s, and GStrings easier.

svn path=/trunk/; revision=47139
2013-01-18 00:50:14 +00:00
Jaap Keuter d97b358e64 Fix for bug 8212.
Disable speed optimization which otherwise cause dissector asserts due to 
appending text and setting lengths.

svn path=/trunk/; revision=47136
2013-01-17 22:06:22 +00:00
Anders Broman c6f702432e Register in the UDP heuristic table rather than the internal one.
svn path=/trunk/; revision=47133
2013-01-17 16:10:22 +00:00
Pascal Quantin 71dd7c2fe4 From Hendrik Uhlmann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8227 :
Electromagnetic Emission Parser parses field Event Id as Entity Id

svn path=/trunk/; revision=47132
2013-01-17 13:20:45 +00:00
Evan Huus bff31de434 Add modelines
svn path=/trunk/; revision=47130
2013-01-17 03:37:41 +00:00
Pascal Quantin 4bceaa501a Remove forbidden C++ style comments
svn path=/trunk/; revision=47127
2013-01-16 22:38:42 +00:00
Martin Kaiser 530de5ae97 no need for if (tree)
svn path=/trunk/; revision=47125
2013-01-16 21:57:34 +00:00
Martin Kaiser 6ba6ea6533 don't attempt reassembly if more than 1000 consecutive fragments are
missing

this fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8222

svn path=/trunk/; revision=47123
2013-01-16 21:51:16 +00:00
Pascal Quantin e7d64a962f From Stephen Donnelly via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8215 :
Several ERF types are incorrectly calling downstream dissectors under the erf_tree instead of under the top level tree

svn path=/trunk/; revision=47122
2013-01-16 21:47:28 +00:00
Evan Huus 72a00dc259 Add a cast to shut up MSVC.
svn path=/trunk/; revision=47120
2013-01-16 18:33:34 +00:00
Evan Huus 3a64f93a00 From Hendrik Uhlmann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8185
Support for Underwater Acoustic PDUs in packet-dis.c

svn path=/trunk/; revision=47119
2013-01-16 17:27:03 +00:00
Evan Huus e49285b9e4 Null the finfo pointer after we free it. Reduces (but does not completely fix)
the errors from bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8197

svn path=/trunk/; revision=47114
2013-01-16 14:14:05 +00:00
Michael Mann 52699bd342 Bugfix version number in EtherIP dissector + general cleanup. Bug 8211 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8211)
#BACKPORT

svn path=/trunk/; revision=47112
2013-01-16 13:27:23 +00:00
Jeff Morriss 99ce4232cb As suggested in comments in sl_alloc() and sl_free(): add a new environment
variable (WIRESHARK_DEBUG_USE_SLICES) which turns off the slab allocator and uses
g_slices instead (which can themselves be turned off by setting
G_SLICE=always-malloc).

This makes debugging problems in slab-allocated memory easier to find
(hopefully including https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8197 ).


Set WIRESHARK_DEBUG_USE_SLICES when running Valgrind on *shark.


Remove unused structure member: emem_chunk_t.org.

svn path=/trunk/; revision=47110
2013-01-16 03:34:29 +00:00
Evan Huus b1ac6585bc Don't run past the end of a fragment array, either in the loop or by putting a
useless sentinel in.

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8213

svn path=/trunk/; revision=47098
2013-01-15 16:51:55 +00:00
Jeff Morriss 1a93ee3345 Based on http://ask.wireshark.org/questions/17661/tcap-decoding-bug :
Register the Camel dissector for SSN 146 instead of (GSM MAP's) SSN 6-9.
Looks like the 6-9 list was a carryover from when this dissector was created
based on the GSM MAP dissector.

svn path=/trunk/; revision=47097
2013-01-15 16:44:02 +00:00
Martin Kaiser e00af44a36 extend the iso7816 dissector
link request apdus to response apdus
dissect parameters p1 and p2 for some messages

svn path=/trunk/; revision=47096
2013-01-15 16:41:03 +00:00
Evan Huus 5a74d61822 Add modelines.
svn path=/trunk/; revision=47095
2013-01-15 16:37:29 +00:00
Evan Huus e963cec25c Add missing header #include as the slab is part of the API even if nobody
outside wmem itself uses it yet.

svn path=/trunk/; revision=47094
2013-01-15 16:27:17 +00:00
Evan Huus b0a0372cff Use the block allocator for wmem's file-scope by default.
svn path=/trunk/; revision=47093
2013-01-15 16:25:24 +00:00
Gerald Combs b0ef1a67ed strcmp → g_strcmp0. Fixes a crash on Windows.
svn path=/trunk/; revision=47085
2013-01-14 23:23:50 +00:00
Evan Huus e4f46ce55f Take a wild guess at what might be causing
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8197

It can't hurt, in any case.

svn path=/trunk/; revision=47084
2013-01-14 22:29:23 +00:00
Gerald Combs b82f42d8cf When the user is editing text or selecting from a combo box, don't
immediately close the dialog if he or she presses the escape or enter
keys. Revert the value if the user presses escape. Properly handle the
base for uint preferences. Fix a NULL pointer dereference.

Add a gchar_free_to_qstring utility routine which creates a QString from
a g_malloced string and frees it.

svn path=/trunk/; revision=47083
2013-01-14 22:21:11 +00:00
Gerald Combs 6be760c512 Put packet-ncp2222.c in epan/dissectors. This matches Makefile.am's behavior.
svn path=/trunk/; revision=47078
2013-01-14 20:05:24 +00:00
Chris Maynard ad78db491a Fix Coverity CID 732304: Missing break in switch.
svn path=/trunk/; revision=47077
2013-01-14 19:23:26 +00:00
Chris Maynard f2dd9bc0d2 Avoid any possibility of an infinte loop. Fixes Coverity CID 739883: Infinite loop. (Minor whitespace cleanup also.)
svn path=/trunk/; revision=47076
2013-01-14 19:14:51 +00:00
Chris Maynard b3bc6cf28f Fix Coverity CID 741992: Unused pointer value.
svn path=/trunk/; revision=47073
2013-01-14 18:31:04 +00:00
Pascal Quantin 1891adc28e Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8208 :
Display ECI and LAC in decimal and fix highlighting of CGI, SAI, RAI, TAI, ECGI and LAI fields

svn path=/trunk/; revision=47071
2013-01-14 18:29:27 +00:00
Chris Maynard 110509a77f Fixed Coverity CID 762008: Structurally dead code.
svn path=/trunk/; revision=47066
2013-01-14 15:49:30 +00:00
Chris Maynard 9dedcbdb82 packet-ncp2222.c -> dissectors/packet-ncp2222.c
svn path=/trunk/; revision=47064
2013-01-14 15:39:38 +00:00
Chris Maynard b89380dd74 Fix CID 966603: Unused pointer value.
svn path=/trunk/; revision=47062
2013-01-14 15:13:21 +00:00
Chris Maynard c56910aa70 Fix CID 967205: Unused pointer value.
svn path=/trunk/; revision=47061
2013-01-14 15:09:12 +00:00
Jaap Keuter 23d2320dd0 Fixing CID 280433 and 280357.
Also strengthening the checking and debug presentation.

svn path=/trunk/; revision=47060
2013-01-14 07:43:14 +00:00
Gerald Combs a0df458eb8 [Automatic manuf, services and enterprise-numbers update for 2013-01-13]
svn path=/trunk/; revision=47048
2013-01-13 15:03:34 +00:00
Pascal Quantin ccbff26e80 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8196 :
Add dissection of IPv4v6 type to End User Address IE

svn path=/trunk/; revision=47047
2013-01-13 11:04:46 +00:00
Michael Mann a9fb54c677 bugfix nested loop that wasn't breaking out of the main loop when subloop really wanted it to. Bug 8198 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8198)
svn path=/trunk/; revision=47046
2013-01-13 02:58:42 +00:00
Pascal Quantin d3e4d6c972 Upgrade RRC dissector to v11.4.0
svn path=/trunk/; revision=47041
2013-01-11 23:25:30 +00:00
Guy Harris b8af5b44d1 #if 0 out some variables that are used only in now-#if 0'ed code.
svn path=/trunk/; revision=47040
2013-01-11 21:20:57 +00:00
Pascal Quantin 9f387eddbb Try to deduce NAS EPS Detach Request direction from message size
svn path=/trunk/; revision=47039
2013-01-11 20:54:04 +00:00
Guy Harris ef9384ff60 Fix uninitialized variable.
svn path=/trunk/; revision=47037
2013-01-11 20:25:05 +00:00
Pascal Quantin d4cf9ce69a Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8193 :
Add dissection of Dual Address Bearer Flag bit in Common Flags IE

svn path=/trunk/; revision=47036
2013-01-11 20:18:32 +00:00
Guy Harris ebdc5f8d55 Get rid of unused variable.
svn path=/trunk/; revision=47035
2013-01-11 20:08:43 +00:00
Pascal Quantin 1ca9d5c2b3 Upgrade LPP dissector to v11.1.0 and modify extract_asn1_from_spec.pl to automatically get ASN.1 from spec
svn path=/trunk/; revision=47034
2013-01-11 19:31:15 +00:00
Michael Mann 660e028212 Add support for expanded Gigamon Trailer format
from Sandeep Dahiya, bug 8191 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8191)

svn path=/trunk/; revision=47033
2013-01-11 19:20:39 +00:00
Michael Mann 2d2198962a replace g_warning with expert_add_info_format()
See bug 8155 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8155)

svn path=/trunk/; revision=47031
2013-01-11 15:57:11 +00:00
Michael Mann 8326a92942 Add RFC 5460 - DHCPv6 Bulk Leasequery
Bug 8172 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8172)

svn path=/trunk/; revision=47028
2013-01-11 14:41:17 +00:00
Anders Broman 614441f9e5 #if 0 out unused code
svn path=/trunk/; revision=47017
2013-01-10 12:42:07 +00:00
Anders Broman 84a8c1d83a From an.huang:
(1) support for optional attribute in Sample Value:
    datSet    (0x81), 
    refrTm    (0x84), 
    smpRate   (0x86),
    smpMod    (0x88). New attribute in 9-2 Ed2
(2) Data (0x87) decoded as PhsMeas in 9-2 LE(Lite Edition) recommemdation is removed, now the data is decoded as simply OctString, just as 9-2, further details should refer to the data set definition and Table 14 in Ed1 / Table 15 in Ed2  Encoding for the basic data types;

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5696

svn path=/trunk/; revision=47016
2013-01-10 12:13:16 +00:00
Anders Broman 2d44d2e05c From Alton MacDonald:
A TLV can be larger that the MIH payload. In this case the packet should be fragmented and controlled with the help of two fields in the MIH header. The attached patch checks these fields and dissects the TLVs if the MIH payload is not fragmented.

Additionally, if a TLV is detected larger than the payload size it is marked as a fragmented TLV and not dissected. This would be the case if the previously mentioned fields were not set correctly as their use under this scenario is not explicitly defined in the 802.21 standard.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5881

svn path=/trunk/; revision=47014
2013-01-10 07:36:32 +00:00
Anders Broman 68160dac5c From "temp4746":
wslua TvbRange:le_ustring/ustring buffer overflow's.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8175

svn path=/trunk/; revision=47012
2013-01-10 06:55:16 +00:00
Anders Broman 84a94842a8 From "schlephorst":
BACnet dissect new tags in NotificationParameters.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8181

svn path=/trunk/; revision=47011
2013-01-10 06:48:10 +00:00
Anders Broman c553ca5c5e From "schlephorst":
BACnet dissect new tags in EventParameters.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8181

svn path=/trunk/; revision=47010
2013-01-10 06:42:15 +00:00
Martin Kaiser 4e9a407c6f remove unnecessary NULL checks
svn path=/trunk/; revision=47006
2013-01-09 21:57:08 +00:00
Anders Broman 9cdf3803a9 From David Bergeron:Added unknown attributes for STUN from RFC3489 that are now deprecated but does'nt appear with classicstun. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8179
svn path=/trunk/; revision=47002
2013-01-09 05:13:20 +00:00
Pascal Quantin c872b1258c Dissect CDMA2000 system time
svn path=/trunk/; revision=47001
2013-01-08 22:29:38 +00:00
Martin Kaiser 30fdbd6da6 revert r46739
call fragment_add() before fragment_set_tot_len()
(the latter has no effect if no fragments are present, so we don't set
 the total length correctly when it's in the first fragment)

svn path=/trunk/; revision=47000
2013-01-08 22:24:42 +00:00
Martin Kaiser d3b504f331 From Evan:
sanity checks before setting a packet's total length in
fragment_set_tot_len()

(from me: check if fragments exist for the given id)

hopefully, this fixes #8111 and #8163 without causing troubles for other
protocols that use fragmentation and reassembly

svn path=/trunk/; revision=46999
2013-01-08 22:18:52 +00:00
Martin Kaiser 697514cd35 2012->2013
svn path=/trunk/; revision=46998
2013-01-08 21:51:01 +00:00
Martin Kaiser 898dfde383 bring up a warning if an APDU's length field does not match the number
of payload bytes

svn path=/trunk/; revision=46997
2013-01-08 21:44:12 +00:00
Anders Broman 433d9c198d Only the private extension IE value part should go in the tvb.
svn path=/trunk/; revision=46996
2013-01-08 09:57:10 +00:00
Evan Huus ab9129add9 Small updates to the SEL Fast Message dissector.
From Chris Bontje via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8170

svn path=/trunk/; revision=46995
2013-01-07 23:53:56 +00:00
Pascal Quantin 794183609d Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8164 :
Clarify content of StructureSize field

svn path=/trunk/; revision=46994
2013-01-07 23:08:25 +00:00
Evan Huus 74e5c710cb Re-fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8169 in a way that
is also (hopefully) valid for 32-bit platforms.

svn path=/trunk/; revision=46993
2013-01-07 22:12:38 +00:00
Pascal Quantin 952ccb4b83 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8168 :
Detect properly the EMM Service Request message

svn path=/trunk/; revision=46991
2013-01-07 21:37:55 +00:00
Evan Huus aa6929d0cd Fix potential (but very unlikely) overflow and infinite loop.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8169

svn path=/trunk/; revision=46989
2013-01-07 20:24:19 +00:00
Evan Huus 28808df71b Add mode-lines.
svn path=/trunk/; revision=46988
2013-01-07 20:00:38 +00:00
Gerald Combs 0fa6a4c421 Allow editing via the advanced preferences tree. Double-clicking an
item's name, status, or type resets it to its default value.
Double-clicking the item's value lets you edit it. Implement the
advanced search field. (Clicking OK and Cancel still doesn't yet do
anything.)

Note that we could probably use a
prefs_register_{uint16|port}_preference routine for 16-bit values. Make
reset_pref public. Update some names and descriptions.

svn path=/trunk/; revision=46986
2013-01-07 19:13:03 +00:00
Alexis La Goutte 86e16b4f61 Fix some Dead Store (Dead initialization) Warning found by Clang
svn path=/trunk/; revision=46978
2013-01-06 19:13:33 +00:00
Gerald Combs 6f100ff6e1 [Automatic manuf, services and enterprise-numbers update for 2013-01-06]
svn path=/trunk/; revision=46971
2013-01-06 15:03:32 +00:00
Alexis La Goutte ab7f4395d7 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=46967
2013-01-06 14:50:52 +00:00
Alexis La Goutte b3db35e7a6 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=46966
2013-01-06 14:50:44 +00:00
Alexis La Goutte 1cd2e3cd1b Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=46965
2013-01-06 14:50:35 +00:00
Alexis La Goutte 4d353242e8 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=46964
2013-01-06 14:50:27 +00:00
Alexis La Goutte 0c22e572c6 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=46963
2013-01-06 14:50:18 +00:00
Alexis La Goutte 3bf44b5a27 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=46962
2013-01-06 14:50:06 +00:00
Alexis La Goutte 2e3564d69e Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=46961
2013-01-06 14:49:58 +00:00
Alexis La Goutte bfa7d1a3f1 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=46960
2013-01-06 14:49:48 +00:00
Pascal Quantin ca189246fe Upgrade LTE RRC dissector to v11.2.0
svn path=/trunk/; revision=46959
2013-01-06 09:56:24 +00:00
Pascal Quantin ac972a58b2 From Nickolai via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8167 :
Fix an incorrect logical check for no_of_bits!=0 in proto_tree_add_split_bits_item_ret_val()

svn path=/trunk/; revision=46958
2013-01-05 23:49:24 +00:00
Evan Huus 33981700b5 From Guus Gerrits via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8148
Add some additional formatting to the mmhdr subtree (e.g. selecting 5
mmheaderbytes with mmver!=0, Added a subtree for the Fragmentation Info)

svn path=/trunk/; revision=46956
2013-01-05 23:14:50 +00:00
Evan Huus d131bc1077 From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8089
Dissector for the SEL (Schweitzer Engineering Labs) Fast Message protocol.

From me:
- use wmem instead of glib to not leak memory
- simplify port preference
- remove unneeded initializers
- modelines
- Id tag

svn path=/trunk/; revision=46949
2013-01-05 14:19:15 +00:00
Pascal Quantin b1143f60b3 Regenerate ANSI MAP dissector
svn path=/trunk/; revision=46948
2013-01-05 13:53:27 +00:00
Alexis La Goutte 5d6a6b4652 Fix regression from upgrade FIX 5.0 (Revision 46944)
../../../epan/dissectors/packet-fix.h:1450:10: error: multi-character character constant [-Werror=multichar]
../../../epan/dissectors/packet-fix.h:1451:10: error: multi-character character constant [-Werror=multichar]
[...]

When FIX field type is MULTIPLESTRINGVALUE use string_string (not value_string)

And regenerated packet-fix.h

svn path=/trunk/; revision=46947
2013-01-05 10:12:44 +00:00
Michael Mann bf8fce3a00 Upgrade to FIX 5.0 fields
Bug 7853 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7853)

FIX.xml is now based on FIX50SP2.xml with some fill in from 4x xml files (as determined by diff between "old" and "new" packet-fix.h)

Included all FIX 5.0 field files from http://sourceforge.net/projects/quickfix/files/ 

svn path=/trunk/; revision=46944
2013-01-05 04:06:31 +00:00
Gerald Combs b99199fcf8 Constify a couple of variables and export a couple of functions.
svn path=/trunk/; revision=46943
2013-01-05 03:42:28 +00:00
Gerald Combs 4a3342e4ba Break out preference type names, type descriptions, string
representations, and default status out of write_prefs and into their
own routines. Split the corresponding custom preference write callbacks.
Fix an apparent memory leak in the hidden column callback.

Add an initial preferences dialog to the Qt port. Use the new preference
routines to implement an "Adavanced" page similar to the "about:config"
page available in many web browsers. Standard pages will hopefully follow
soon.

Remove some QDebug includes and make sure our QTreeWidgets have uniform
row heights set.

svn path=/trunk/; revision=46942
2013-01-05 02:30:58 +00:00
Evan Huus bab105d094 Add convenience macros wmem_new and wmem_new0
svn path=/trunk/; revision=46941
2013-01-04 22:11:13 +00:00
Pascal Quantin 7d8ab07431 Fix some errors found by fix-encoding-args.pl script
svn path=/trunk/; revision=46933
2013-01-04 17:35:46 +00:00
Pascal Quantin deb4f08cb2 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8105 :
Allow use of huges values for localtime / ctime / gmtime with MSVC 2008 or later

svn path=/trunk/; revision=46930
2013-01-04 14:56:27 +00:00
Michael Mann 86d690880f replace "unsigned" datatype with "guint". Some mpeg files needed "unsigned int" instead.
bugs 7825-7827 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7825)

svn path=/trunk/; revision=46928
2013-01-04 05:22:43 +00:00
Jeff Morriss d36b4c8525 Fix a (false) could-be-used-uninitialized warning.
Fix up indentation (looks like "4 space tabs").

svn path=/trunk/; revision=46927
2013-01-04 02:28:46 +00:00
Anders Broman 6ea36c51c3 Add casts to make it build on win64
svn path=/trunk/; revision=46925
2013-01-03 23:24:47 +00:00
Pascal Quantin 70d2438851 Add packet-mrcpv2.c to CMakeLists.txt
svn path=/trunk/; revision=46923
2013-01-03 22:03:47 +00:00
Jaap Keuter 6fd81d4994 From Zeljko Ancimer:
New dissector for Media Resource Control Protocol Version 2 (MRCPv2).

svn path=/trunk/; revision=46922
2013-01-03 21:42:59 +00:00
Michael Mann 46935dbab4 USBHUB: Add useful details to INFO column, bug 8161 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8161)
From Steve Magnani

svn path=/trunk/; revision=46919
2013-01-03 18:08:50 +00:00
Alexis La Goutte 69b38c579f From Steve Magnani via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8157 USBHUB: Add dissection of GetPortStatus responses
Most USBHUB responses are not dissected. Add support for GetPortStatus.

svn path=/trunk/; revision=46913
2013-01-03 11:37:05 +00:00
Evan Huus 17a05dfae0 Remove unused file handle that appears to have been left over by
accident after a refactor.

svn path=/trunk/; revision=46907
2013-01-02 23:16:03 +00:00
Michael Mann 0292371cf4 bitmask patch for MIH dissector that makes 64-bit bitmasks only use 32-bits since proto_tree_add_bitmask only supports 32 bits and there are no definitions in the MIH standard that require more than 32 bits. This addresses part of bug 8155 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8155)
**
ERROR:proto.c:7240:proto_item_add_bitmask_tree: code should not be reached



svn path=/trunk/; revision=46895
2013-01-02 16:14:30 +00:00
Michael Mann 37d19a1202 Add heuristic for USB MassStorage dissector to be dissected by USB. Bug 8131 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8131)
svn path=/trunk/; revision=46877
2012-12-31 20:12:45 +00:00
Pascal Quantin 58575f394f From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8148 :
Fix dissection of HomePlug AV 1.1 frames with fragmentation information

From me: indentation fixes

svn path=/trunk/; revision=46871
2012-12-31 13:39:04 +00:00
Gerald Combs af2b925604 [Automatic manuf, services and enterprise-numbers update for 2012-12-30]
svn path=/trunk/; revision=46860
2012-12-30 15:03:22 +00:00
Anders Broman 54cb9e70ab Use tvb_bcd_dig_to_ep_str
svn path=/trunk/; revision=46858
2012-12-30 11:10:35 +00:00
Anders Broman be1ff84f48 From Katrina Zhang:Pretify dissection if a dissector exists for the private extension
svn path=/trunk/; revision=46857
2012-12-30 09:35:27 +00:00
Bill Meier 8b7f8d4c08 Move 3 ASN1 dissectors to 'clean' group; move 1 PIDL dissector to 'dirty' group.
svn path=/trunk/; revision=46855
2012-12-30 00:53:47 +00:00
Evan Huus 8331c0e495 Add a cast to pacify MSVC.
svn path=/trunk/; revision=46850
2012-12-29 21:34:57 +00:00
Evan Huus 563d64862a Implement wmem_strbuf_append_printf.
svn path=/trunk/; revision=46846
2012-12-29 20:37:53 +00:00
Evan Huus 45a77360ea Rename tcp.data -> tcp.segment_data and add a description field.
Should clear up the confusion from
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8084

svn path=/trunk/; revision=46843
2012-12-29 18:08:11 +00:00
Pascal Quantin 0b20f855f0 Upgrade NAS disssectors to v11.5.0
svn path=/trunk/; revision=46842
2012-12-29 17:10:04 +00:00
Gerald Combs 5bd252c44f Remove some duplicate code from ui/profile.c and move in more code from
ui/gtk/profile_dialog.c. Use the correct profile list in
profile_dialog.c so that deletion works.

Add a profile dialog to the Qt port. For some reason it crashes when
changing configuration profiles, which might be related to bug 7722.
Move the Qt configuration profile initialization from main.cpp to
wireshark_application.cpp. Make sure QMenuBar doesn't grab the
configuration profiles action on OS X. Add more role color names to
tango_colors.h.

svn path=/trunk/; revision=46834
2012-12-29 01:39:02 +00:00
Bill Meier c7dd6480e4 Minor fix when building with VS2012 (VC11):
Prevents warning:
cl : Command line warning D9002 : ignoring unknown option '/Zd'

svn path=/trunk/; revision=46832
2012-12-28 22:13:05 +00:00
Evan Huus 0c66691b92 Add a strict allocator that does canaries and various other things, for
platforms which don't have Valgrind.

Valgrind is still the better choice on platforms which support it.

svn path=/trunk/; revision=46828
2012-12-28 17:04:23 +00:00
Alexis La Goutte 5588d07faa Add missing new dissectors to CMake
* Media Independent handover (MIH) (Add in Revison 46802)
* RTCWeb Data Channel Protocol (Add in Revision 46809)

svn path=/trunk/; revision=46827
2012-12-28 14:38:27 +00:00
Alexis La Goutte fee2b8b2b9 Tab => Spaces
svn path=/trunk/; revision=46826
2012-12-28 14:38:19 +00:00
Evan Huus 97ec82d02e Make the alignment amount for the wmem block allocator into a #define
and use what appears to be the sanest calculation for it that I can find.

svn path=/trunk/; revision=46820
2012-12-27 23:11:47 +00:00
Evan Huus bb3b34d7bf Pre-declare just the enum, and not the typedef to avoid redefinition warnings.
svn path=/trunk/; revision=46818
2012-12-27 22:59:29 +00:00
Evan Huus 442b61d0a4 Change the format of the environment variable slightly to allow overriding
allocator choice to use any specific allocator, not just simple.

svn path=/trunk/; revision=46816
2012-12-27 22:51:33 +00:00
Evan Huus dc98756ca4 Store the type of each wmem allocator.
svn path=/trunk/; revision=46814
2012-12-27 22:31:42 +00:00
Evan Huus 347a8a2115 Add full modelines and minor whitespace fixes.
svn path=/trunk/; revision=46812
2012-12-27 18:58:08 +00:00
Michael Tüxen c541aa4ab5 Add initial support for
http://tools.ietf.org/html/draft-jesup-rtcweb-data-protocol-03
I'll improve the dissector as the ID evolves...


svn path=/trunk/; revision=46809
2012-12-27 17:11:24 +00:00
Anders Broman 93218a7c76 From Pawel Dziepak:dissect_rpc_array causes assertion fault when array is empty. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8145
svn path=/trunk/; revision=46805
2012-12-27 12:55:05 +00:00
Anders Broman 12317316ae From Ankith: Media Independent handover (MIH) protocol dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5881
svn path=/trunk/; revision=46802
2012-12-27 11:26:40 +00:00
Anders Broman 01432aaf5c Add Media Independent Handover Protocol ethertype
svn path=/trunk/; revision=46801
2012-12-27 11:19:46 +00:00
Guy Harris f79410f0cd Tabs -> spaces.
svn path=/trunk/; revision=46800
2012-12-26 22:34:39 +00:00
Guy Harris 7df01d368e Update a comment.
svn path=/trunk/; revision=46799
2012-12-26 22:34:09 +00:00
Guy Harris ab638bb6fc geoip_db_get_paths() is exported from libwireshark, so it has to exist
regardless of whether we have GeoIP or not.  However, regardless of
whether it's exported from GeoIP or not, it should return a g_mallocated
string.

svn path=/trunk/; revision=46798
2012-12-26 22:24:15 +00:00
Guy Harris 5c2a86ebc8 Update a comment.
svn path=/trunk/; revision=46795
2012-12-26 22:13:34 +00:00
Guy Harris 46e9f63fb2 Do array bounds checking.
svn path=/trunk/; revision=46793
2012-12-26 22:05:41 +00:00
Guy Harris d4b622de36 Don't define geoip_db_get_paths() unless we have GeoIP - we don't use it
unless it's defined.

svn path=/trunk/; revision=46791
2012-12-26 20:37:50 +00:00
Anders Broman 07c92db36b From Michal Labedzki: To ensure that names are correct copy NULL too This fixes unknown characters sometimes show in src/dst columns, etc. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7639
svn path=/trunk/; revision=46789
2012-12-26 15:28:28 +00:00
Guy Harris 29acae89d9 OK, see if not using an enum gets rid of "implicit conversion shortens
64-bit value to 32 bits" warnings on 32-bit compilers.  According to
6.1.3.3 "Enumeration constants" of C90, "An identifier declared as an
enumeration constant has type int", so there may be signed vs. unsigned
issues.

svn path=/trunk/; revision=46772
2012-12-26 11:46:48 +00:00
Guy Harris 1cd57ad3c5 bytestring_to_str() now returns a const char *; assign its result to a
const char *, not a char *.

svn path=/trunk/; revision=46769
2012-12-26 10:54:03 +00:00
Guy Harris 544efd26a6 And another 64-bit-to-32-bit conversion on 32-bit platforms.
svn path=/trunk/; revision=46768
2012-12-26 10:49:05 +00:00
Guy Harris 852ee34955 Another 64-bit-to-32-bit warning that shows up in 32-bit environments.
svn path=/trunk/; revision=46766
2012-12-26 10:30:34 +00:00
Guy Harris c1245c6b32 Change wireshark_gen.py to make the operation argument to routines a
"const char *", as it is now expected to be.  Regenerate the dissectors.

Update the URL for OmniOrb.

In README.parlay, use idl2wrs in the sample command.

svn path=/trunk/; revision=46765
2012-12-26 10:28:03 +00:00
Guy Harris 688b567111 And more 64-bit-to-32-bit time issues on 32-bit platforms.
svn path=/trunk/; revision=46763
2012-12-26 09:56:18 +00:00
Guy Harris dd1505428c Another ILP32 Y2.038K warning.
svn path=/trunk/; revision=46758
2012-12-26 07:05:42 +00:00
Guy Harris 7f40879104 Squelch a (Y2.038K) warning.
svn path=/trunk/; revision=46756
2012-12-26 06:41:49 +00:00
Guy Harris 229ec8c545 OK, *this* isn't a possibly-infinite loop.
svn path=/trunk/; revision=46755
2012-12-26 06:39:53 +00:00
Guy Harris 34633f5fe3 Widen some loop variables, in the hopes that it'll squelch some loop
warnings.

svn path=/trunk/; revision=46754
2012-12-26 06:20:59 +00:00
Guy Harris 50102335a7 Eliminate multiple "const"s.
svn path=/trunk/; revision=46753
2012-12-26 06:16:39 +00:00
Guy Harris b0d6fbcdeb OK, fine, maybe sometimes it's used; flag it with _U_ while we're at it.
svn path=/trunk/; revision=46750
2012-12-26 06:07:04 +00:00
Guy Harris a9635c3b9c If a parameter might be unused, mark it with _U_; don't stick in a fake
usage.

svn path=/trunk/; revision=46749
2012-12-26 06:04:05 +00:00
Guy Harris 8ed7a73e22 Fix a bunch of warnings.
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
sizeof.

Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
strtol() and strtoul().

Change some data types to avoid those implicit conversion warnings.

When assigning a constant to a float, make sure the constant isn't a
double, by appending "f" to the constant.

Constify a bunch of variables, parameters, and return values to
eliminate warnings due to strings being given const qualifiers.  Cast
away those warnings in some cases where an API we don't control forces
us to do so.

Enable a bunch of additional warnings by default.  Note why at least
some of the other warnings aren't enabled.

randpkt.c and text2pcap.c are used to build programs, so they don't need
to be in EXTRA_DIST.

If the user specifies --enable-warnings-as-errors, add -Werror *even if
the user specified --enable-extra-gcc-flags; assume they know what
they're doing and are willing to have the compile fail due to the extra
GCC warnings being treated as errors.

svn path=/trunk/; revision=46748
2012-12-26 05:57:06 +00:00
Guy Harris 8ede6b7dc0 bssmap_msg_fcn[] is a dense array, not a sparse array, so *every* entry
must be filled in - even if we don't happen to have dissectors for
particular message types.  Just put NULL in there, so we don't index
past the end of the array, grab a random location in memory's contents
as a function pointer, and crash when we call through that pointer.

svn path=/trunk/; revision=46747
2012-12-25 23:14:05 +00:00
Guy Harris 8432edcc72 More checks to make sure pinfo->private_data is not null.
svn path=/trunk/; revision=46746
2012-12-25 22:48:01 +00:00
Guy Harris ce5039c522 Add some additional sanity checks.
svn path=/trunk/; revision=46745
2012-12-25 22:39:11 +00:00
Guy Harris c8f3c1d9a3 In dissect_bthci_evt_command_complete():
Make a loop counter a full-width integer, just to be sure.

Do *NOT* assume that pinfo->private_data is non-null; I have at least
one capture where it is null when dissect_bthci_evt_command_complete()
is captured.

svn path=/trunk/; revision=46743
2012-12-25 22:35:54 +00:00
Martin Kaiser 13a5f0b5da set the dtls record length for reassembly _before_ adding a fragment
this is a workaround for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8111
it does not fully fix the underlying issue

svn path=/trunk/; revision=46739
2012-12-25 18:44:14 +00:00
Guy Harris b98d44d71f If there's no packet data, there's nothing to check to see whether this
is an MPEG-2 transport packet, so don't treat it as one.

svn path=/trunk/; revision=46733
2012-12-25 12:00:32 +00:00
Guy Harris ceb69f1413 Show the Vines Fragmentation Protocol control flags field as bitflags,
rather than as a single field.  If bits other than the two defined bits
are set in the first byte of the packet, don't dissect UDP packets as
Vines FRP, so that other dissectors get a chance to look at the packet.

svn path=/trunk/; revision=46732
2012-12-25 11:57:03 +00:00
Alexis La Goutte 87c1df5ead From report of Elavarasan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8099 Named field for each item in Selected Registrar Config methods is not available
The structure of both the Config Methods and Selected Registrar Config Methods are  the same.

Display filters such as "wps.config_methods.pushbutton", "wps.config_methods.display", etc are available for the different methods in the Config methods whereas the display filters for the elements in the Selected Registrar Config methods are found to be the same as the Config method Display filters.

From me :
add new filter for selected_registrar config method bitmask (and also permitted config method)

svn path=/trunk/; revision=46725
2012-12-23 19:17:54 +00:00
Alexis La Goutte 267e5baf55 From Francesco Fondelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8128 Add TCP Fast Open
This patch provides
i) support for Shared Use of Experimental TCP Options (draft-ietf-tcpm-experimental-options-03)
ii) support for TCP Fast Open (draft-ietf-tcpm-fastopen-02).

A new 'TFO=R' string is appended at the column info in case a client sends a SYN packet with a Fast Open Cookie Request. Moreover, if the server responds with a SYN-ACK containing a Fast Open Cookie option a 'TFO=C' is shown (as well as in any subsequent client attempt to send SYN + DATA).

tcp.options.tfo display filter can be used in order to easily select the complete TFO three-way handshake.

Chrome (and I think also Firefox) has support for client-side TFO. Linux 3.7 got both client and server-side support.

svn path=/trunk/; revision=46723
2012-12-23 18:40:55 +00:00
Gerald Combs 18e1080b28 [Automatic manuf, services and enterprise-numbers update for 2012-12-23]
svn path=/trunk/; revision=46719
2012-12-23 15:03:29 +00:00
Guy Harris 04a5398ab7 In nlsp_dissect_clvs(), count len down at the same time we increment the
offset, and do the bounds checking on the length before we count len
down.

svn path=/trunk/; revision=46718
2012-12-23 10:51:34 +00:00
Martin Kaiser 594b0bb11f revert r46678
now that tvb_get_ephemeral_unicode_string() throws an exception for
invalid length parameters, there's no point in doing an explicit check
beforehand

(when I added the check, there were many places that I missed)

svn path=/trunk/; revision=46707
2012-12-22 23:56:50 +00:00
Martin Kaiser 3eb2a8644f trivial: clean up epan/strutil.c
replace TABs with spaces
   add editor modelines

svn path=/trunk/; revision=46706
2012-12-22 23:27:40 +00:00
Martin Kaiser 50945da41c check the length parameter for tvb_get_unicode_string() and
tvb_get_ephemeral_unicode_string(), throw an exception for invalid
lengths (including -1, but length==-1 does not work for other tvb string
functions either)

I believe this is the proper fix for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8112

svn path=/trunk/; revision=46705
2012-12-22 22:35:07 +00:00
Michael Tüxen d9cca759e5 Fox copy-and-paste error.
svn path=/trunk/; revision=46701
2012-12-22 20:56:58 +00:00
Michael Tüxen 1f2b8a904c Add support for displaying the Packet Block Flags Word of pcapng.
svn path=/trunk/; revision=46698
2012-12-22 19:48:17 +00:00
Jaap Keuter cd376e0ca8 From G.Gerrits:
Minor patch just adding the newer AR7400/INT7400 with dev_id==4 for decoding 
in the Homeplug AV "Get Device/SW Version Confirm (A001)" response.

svn path=/trunk/; revision=46695
2012-12-22 14:28:52 +00:00
Guy Harris e773e4ff08 Get rid of unnecessary initialization that causes "discards qualifiers"
warnings.

svn path=/trunk/; revision=46688
2012-12-21 22:00:40 +00:00
Pascal Quantin d66d8c44d2 Fix GSM 7-bit default alphabet decoding in ANSI IS-637-A
svn path=/trunk/; revision=46687
2012-12-21 21:03:31 +00:00
Pascal Quantin aae3c27307 Include packet-gsm_sms.h and remove extern declarations
svn path=/trunk/; revision=46686
2012-12-21 21:01:45 +00:00
Jeff Morriss 6406acc768 Use TVB_SET_ADDRESS_HF() and COPY_ADDRESS_SHALLOW() instead of tvb_get_ptr()
and a couple of SET_ADDRESS()s.

Use proto_tree_add_item() instead of proto_tree_add_ether() called with a
pointer into the TVB.

Leave a comment for a place where a bunch of code in several case statements
could probably be collapsed into much less code.

svn path=/trunk/; revision=46682
2012-12-21 17:43:46 +00:00
Jeff Morriss 693a4d6483 Use TVB_SET_ADDRESS() and COPY_ADDRESS_SHALLOW() instead of tvb_get_ptr()
and a couple of SET_ADDRESS()s.

svn path=/trunk/; revision=46681
2012-12-21 17:43:44 +00:00
Martin Kaiser 6a6bd89c54 fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8112
by adding a range to the length that is passed to
tvb_get_ephemeral_unicode_string()

svn path=/trunk/; revision=46678
2012-12-21 15:52:42 +00:00
Guy Harris d7763299ae The KRB_RM_ #defines fit in 32 bits, so just make them unsigned, not
long.

dissect_krb5_Checksum() is declared in
epan/dissectors/packet-kerberos.h; don't declare it again here.

svn path=/trunk/; revision=46666
2012-12-21 11:37:54 +00:00
Guy Harris 8dbe2af621 Check whether something's too big before subtracting it from another
variable.

Adjust offset and len in parallel.

svn path=/trunk/; revision=46665
2012-12-21 11:12:23 +00:00
Guy Harris 954b90418a Squelch a qualifier-discard warning.
svn path=/trunk/; revision=46664
2012-12-21 11:04:10 +00:00
Guy Harris b1d5b64da6 Well, at least on my machine, packet-pres.c now compiles cleanly, with
the recent changes to pres.cnf to keep from generating some code.

svn path=/trunk/; revision=46663
2012-12-21 10:55:43 +00:00
Guy Harris 69270d1bea Get rid of unused routines for UDC-type.
svn path=/trunk/; revision=46662
2012-12-21 10:52:29 +00:00
Guy Harris 594e855738 Don't assume a pointer fits inside an unsigned long - it doesn't, in
LLP64 environments such as Windows.

Cast the result of a modulus op that causes the result to fit into an
int to int, to suppress implicit 64-bit-to-32-bit conversion warnings.

svn path=/trunk/; revision=46661
2012-12-21 10:26:52 +00:00
Guy Harris 81b8fd389e Get rid of duplicate declarations (so that -Wredundant-decls doesn't
complain).

svn path=/trunk/; revision=46660
2012-12-21 09:29:46 +00:00
Guy Harris 808c79a6b4 Everything else in the floating-point calculations is single-precision,
so make the constants single-precision, so we don't end up with warnings
about double-precision values being assigned to single-precision
variables.

svn path=/trunk/; revision=46658
2012-12-21 08:18:47 +00:00
Guy Harris be77dce42a Make some loop counters unsigned, so that we handle very large loop
counts by trying to iterate all over the items (and, presumably, failing
when we go past the end of the packet).

When assigning to the loop count, cast the value down, to avoid implicit
64-bit-to-32-bit conversion warnings.

Write those loops as for loops - it makes it a bit clearer what's going
on.

svn path=/trunk/; revision=46657
2012-12-21 08:16:12 +00:00
Guy Harris e2b61c828f Constify some character pointer variables to avoid warnings about
strings being assigned to them.

svn path=/trunk/; revision=46653
2012-12-21 05:34:38 +00:00
Guy Harris a9f4da4549 Clean up white space.
Add a return where I presume it was intended to be - a 4-octet address
is completely handled in that if clause, so there's no reason to fall
through.

Fix a comment.

svn path=/trunk/; revision=46646
2012-12-21 00:43:00 +00:00
Evan Huus e43dba76e0 Fix some valgrind warnings from the capture attached to
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8110

I can't reproduce the actual reported crash on trunk.

svn path=/trunk/; revision=46645
2012-12-21 00:19:16 +00:00
Pascal Quantin 79bde3d86a Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8095 :
Fix dissection of GPRS-NS over Frame Relay over MPLS

svn path=/trunk/; revision=46644
2012-12-20 21:18:26 +00:00
Pascal Quantin d6f2abcbfd Revert r46595
svn path=/trunk/; revision=46643
2012-12-20 21:17:23 +00:00
Anders Broman 8a508ee3d9 Try to determine wether it is MEAS REP, EXT MEAS REP or ENH MEAS REP.
svn path=/trunk/; revision=46630
2012-12-20 12:53:38 +00:00
Evan Huus b0ca152217 Only include wmem_core.h in packet_info.h. It's not technically a
public header, but since packet_info.h is included in most of the tree it saves
a great deal of recompilation when something in one of the wmem data structures
changes.

svn path=/trunk/; revision=46624
2012-12-19 23:11:22 +00:00
Guy Harris 292b386089 See if *this* squelches the MSVC errors.
svn path=/trunk/; revision=46611
2012-12-19 04:30:02 +00:00