Commit Graph

50323 Commits

Author SHA1 Message Date
Michael Mann 60d6b05e23 Stats_tree enhancements for sorting, averages and burst rate. Bug 9452 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9452)
From Deon van der Westhuysen

- Bug fix: object leak in stats_tree after a tap reset (for example apply statistics preferences with a stats_tree window open)
- Bug fix: correct sample code in README.stats_tree
- Add: slash in plug-in name now creates submenu as docs describe (was a bug?)
- Add: menu separator before the stat_tree registered plug-ins
- Add: stats_tree can now calculate averages for nodes; automatically calculated for range nodes. Add section in README.stats_tree describing averages.
- Add: stats_tree can now calculate burst rate of each node (like rate but with a shorter, sliding time window)
- Add: sorting for stats_tree plug-ins. Can sort on node name, count, average, min, max values and burst rate.
- Add: preferences for stats_tree system (default sort column, burst calc params)
- Add: stats_tree window copy to clipboard and export and plain text, csv and XML.
- Added sample of new functionality in $srcdir/plugins/stats_tree/pinfo_stats_tree.c
- Moved all stats_tree sample plug-ins to "IP Statistics" submenu.

svn path=/trunk/; revision=53657
2013-11-29 22:47:59 +00:00
Jörg Mayer eaaf4437ab Graham Bloice
Ensure we use the correct value for MSC_VER_REQUIRED (similar to
nmake build)

svn path=/trunk/; revision=53656
2013-11-29 21:07:23 +00:00
Jakub Zawadzki 82e2675f45 Avoid including <wiretap/wtap.h> in dissectors.
svn path=/trunk/; revision=53655
2013-11-29 20:53:00 +00:00
Jörg Mayer fb22ecce8d Graham Bloice
I've now got tshark to build from a VS solution file, had to do some hacks
to get there though, patch files attached for others to peruse, as I'm not
sure if they are the optimal solutions:

   3. As mentioned in my previous message, the VS solution chops out every
   8192nd byte from the command line passed to make-dissector-reg.py.  My
   patch (make-reg.patch) gets CMake to write out the required source file
   list to a file and modifies the python script to read in the file.  The
   python changes *should* be backwards compatible.

Me: Small fix to UseMakeDissectorReg.cmake (elseif() -> else())

svn path=/trunk/; revision=53654
2013-11-29 19:57:00 +00:00
Jakub Zawadzki d99fdfda63 Replace macros: BSWAP16, BSWAP32, BSWAP64 with glib-version.
XXX, people are not aware that expression of this macros might be evaluated multiple times, like:
 -  BSWAP16(tvb_get_letohs(tvb, off)) : \
 +  GUINT16_SWAP_LE_BE(tvb_get_letohs(tvb, off)) : \

Should be tvb_get_ntohs() called?


svn path=/trunk/; revision=53653
2013-11-29 19:21:20 +00:00
Jakub Zawadzki 5ac6474c94 Rename some of pint.h macros to match common style (bits number on the end).
pntohs  -> pntoh16
   pntohl  -> pntoh32
   pletohs -> pletoh16
   pletohl -> pletoh32
   phtons  -> phton16
   phtonl  -> phton32


svn path=/trunk/; revision=53652
2013-11-29 18:59:06 +00:00
Jakub Zawadzki 288efa5128 Expand macros: htoles(), htolel(), htolell()
svn path=/trunk/; revision=53651
2013-11-29 18:44:00 +00:00
Michael Mann 9c9a038428 General "Prosody" placeholder parameter ("prosody-") is broken down to a 6 new "Prosody" specific parameters. Bug 9425 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9425)
From zeljko

svn path=/trunk/; revision=53650
2013-11-29 17:51:56 +00:00
Martin Mathieson 73f042aa35 Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_
svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
Gerald Combs 27089d62a9 Clean up whitespace.
svn path=/trunk/; revision=53648
2013-11-29 15:46:50 +00:00
Jörg Mayer 718568b4ff Graham Bloice:
Always include the "true" zlib includes first. This works around a
bug in the Windows setup of GTK[23] which has a faulty zconf.h.


svn path=/trunk/; revision=53647
2013-11-29 15:40:04 +00:00
Michael Mann bf9fdc8e8f Bugfix timestamp formatting of Gigamon trailer. Bug 9433 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9433)
From Sandeep Dahiya

svn path=/trunk/; revision=53646
2013-11-29 14:55:49 +00:00
Michael Mann 8821cb7e2d Bugfixes of r53636, part of bug 9423 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9423)
From DSR Corporation

svn path=/trunk/; revision=53645
2013-11-29 13:42:09 +00:00
Pascal Quantin 9a48c7e8da Improve request / response tracking in case you have several open / close commands in the capture
svn path=/trunk/; revision=53644
2013-11-29 10:38:00 +00:00
Jörg Mayer 09770dbff4 At least winpcap checks for WIN32 and not for _WIN32, so
define it. This copies the behaviour of Makefile.nmake.

svn path=/trunk/; revision=53643
2013-11-29 09:45:44 +00:00
Alexis La Goutte 5cb8483d82 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=53642
2013-11-29 08:33:51 +00:00
Alexis La Goutte 09e1e860d4 Enable by default UDP conversation (Needed by udp.stream)
svn path=/trunk/; revision=53641
2013-11-29 08:02:39 +00:00
Alexis La Goutte 7e0645563a Add udp.stream display filter
The result is the same filter used by Follow UDP (may be reuse the new filter in Follow)

svn path=/trunk/; revision=53640
2013-11-29 08:02:30 +00:00
Alexis La Goutte e2f4b545d7 When clean remove also *.moc.cpp / *.rrc.ccp and ui_*.h ...
svn path=/trunk/; revision=53639
2013-11-29 08:02:19 +00:00
Alexis La Goutte 110795132b Add HTTP2 heuristic when it is encapsulated in SSL
the heuristic may be leak (only check if type > 10...)

svn path=/trunk/; revision=53638
2013-11-29 08:02:09 +00:00
Anders Broman f60aba38a4 Add an application id.
svn path=/trunk/; revision=53637
2013-11-29 07:14:13 +00:00
Michael Mann 563cf65155 Improved ZCL dissectors. Bug 9423 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9423)
From DSR Corporation

svn path=/trunk/; revision=53636
2013-11-29 03:40:16 +00:00
Gerald Combs 5acdfae070 Restore disabled "decode as" settings.
svn path=/trunk/; revision=53635
2013-11-29 03:14:24 +00:00
Jakub Zawadzki 9e0cd5d1d8 Fix typo (r53633) in one more place, fix typo in filename, make hex numbers capital.
svn path=/trunk/; revision=53634
2013-11-28 23:09:55 +00:00
Guy Harris 26446f8882 Fix (presumed) tpyo.
svn path=/trunk/; revision=53633
2013-11-28 22:36:10 +00:00
Jakub Zawadzki 3bbfb68ffa Move MPEG section table id defines to packet-mpeg-sect.h
svn path=/trunk/; revision=53632
2013-11-28 22:31:55 +00:00
Pascal Quantin 37660f413b Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9478 :
GSM SMS User Data header fill bits are wrong when using a 7 bits ASCII / IA5 encoding

svn path=/trunk/; revision=53631
2013-11-28 21:59:02 +00:00
Guy Harris 710feed2e0 GUINT_TO_POINTER() does just enough casting to suppress complaints about
32-bit integers and 64-bit pointers, so it needs to be handed a guint
(or equivalent type); it doesn't suppress warnings about 8-bit or 16-bit
integers, so those have to be cast up to guint first.

svn path=/trunk/; revision=53630
2013-11-28 20:40:46 +00:00
Michael Mann a31d10208b Bluetooth: HSP: Add support for HSP. Bug 9446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446)
HSP is modest version of HFP.

From Michal Labedzki.

svn path=/trunk/; revision=53629
2013-11-28 18:33:26 +00:00
Michael Mann 8dab82556c Bluetooth improvements. Bug 9446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446)
From Michal Labedzki.

1. Bluetooth: HFP: Fix recognizing roles. There is need to check which side SDP record is, then it is possible to recognize roles.
2. Bluetooth: RFCOMM/HFP: Fix recognizing services and roles. Direction bit means only that device is initiator of connection or not. But need information who is owner of connection (remote device or localhost), so use this information from L2CAP.
3. Bluetooth: HFP: Fix unexpected expert info
4. Bluetooth: HCI: Set addresses to host/controller. Also optimize a little handing of dissectors handles.

svn path=/trunk/; revision=53628
2013-11-28 18:11:02 +00:00
Balint Reczey 30ae01c73b Support long Domain Names in NTLMSSP v2
... instead of crashing on them. :-)

Discovered by Garming Sam <garming@catalyst.net.nz>

svn path=/trunk/; revision=53626
2013-11-28 16:39:04 +00:00
Michael Mann 71d05170dc USB: Enable Decode As. Bug 9445 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9445)
From Michal Labedzki

From me: 
Have #defines in packet-usb.c because they are only used in the module.

Break out the value computation so that it can be properly wrapped in GUINT_TO_POINTER without adding more complexity.

svn path=/trunk/; revision=53625
2013-11-28 16:33:54 +00:00
Balint Reczey 2ec033d15e Fix potential signed int overflow in Lemon
This chrashed Solaris buildbot when -ftrapv was enabled.
Triaged by Guy Harris, see detail at:
http://www.wireshark.org/lists/wireshark-dev/201311/msg00185.html

svn path=/trunk/; revision=53624
2013-11-28 16:04:33 +00:00
Michael Mann ea7bcf0783 Add count() function to display filter. Bug 9480 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9480)
From Martin Kaiser

svn path=/trunk/; revision=53623
2013-11-28 15:56:53 +00:00
Michael Mann 3d9e55b8be RTPproxy dissector: Add expert info about timeouts. Bug 9484 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9484)
From Peter Lemenkov

svn path=/trunk/; revision=53622
2013-11-28 14:11:48 +00:00
Michael Mann f74c645499 Adjust fc_stat.c to use newer fc_exchange_t structure for its stats.
svn path=/trunk/; revision=53621
2013-11-28 14:00:23 +00:00
Michael Mann e450b9baae Bugfix Negative Fibre Channel scsi_time value. Bug 3209 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3209)
The solution was to move the itlq_nexus_t structure handling from the FC dissector to the FCS dissector since it's actually the one with the LUN field.  OXID+LUN makes a unique exchange at FC layer so track that separately.  Also needed some additional OXID->LUN mapping at the FC layer to keep LUN correctly persistent.

Not backporting because this was partially made possible by r53569, which won't be backported.

svn path=/trunk/; revision=53620
2013-11-28 01:49:29 +00:00
Jörg Mayer b5fd2fd59d Having a generated file in the source tree is not fun.
svn path=/trunk/; revision=53619
2013-11-27 23:09:19 +00:00
Jörg Mayer d2fc0179cc - Avoid copying of the graphics, specify the graphics source
dir instead.
- (Finally!) fix the problem of missing admon graphics in out of
  tree builds - specify the admin directory as an absolute path
  This may need porting to Makefile.am

svn path=/trunk/; revision=53618
2013-11-27 23:07:25 +00:00
Martin Kaiser be4e248a07 try to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9485
fc dissector rejects the packet if data parameter is empty


svn path=/trunk/; revision=53617
2013-11-27 21:52:44 +00:00
Bill Meier c3a8eca1c8 Try fixing Sun compiler error: "warning: this decimal constant is unsigned only in ISO C90"
svn path=/trunk/; revision=53616
2013-11-27 17:23:00 +00:00
Bill Meier 914605a31f Fix a badly formed comment;
svn path=/trunk/; revision=53615
2013-11-27 16:48:00 +00:00
Bill Meier 04cdccdb83 - Create/use several extended value_strings
(sort associated value_string arrays as needed);

- Use new VALUE_STRING_LIST mechanism/macros to
  create enums and value_string arrays for:
    WERR_errors, DOS_errors, SRV_errors, and HRD_errors;

- Declare certain global value_string arrays as static (local)
  and use global extended value_strings to reference same;
    (e.g., ms_coiuntry_codes value_string_array)

- Rename SMBE_... defs used in several different value_string arrays
  to prevent potential name collisions:
   ( e.g., for SRV_errors: SMBE_... ==> SMBE_SRV_...)
   Done for value_string arrays: DOS_errors, SRV_errors, HRD_errors;

- WERR_errors value_string array:
    Note that WERR associated defs no longer exist in the latest samba doserr.h.
    (The WERR_errors defs were originally generated from the samba doserr.h).
    For now: WERR_errors kept as is.

- ToDo: Fix PIDL-generated dcerpc dissectors to use NT_errors_ext
        and WERR_errors_ext extended value_strings.

- Add editor modelines to a few files.

- Make whitespace changes.


svn path=/trunk/; revision=53614
2013-11-27 16:30:20 +00:00
Bill Meier d1daa67cab Create/use several extended value_strings;
Add editor modelines.

svn path=/trunk/; revision=53613
2013-11-27 14:37:33 +00:00
Pascal Quantin ca8b7b1ad0 Reinitialize counter between loops to avoid an out of bound access found with fuzz testing.
svn path=/trunk/; revision=53612
2013-11-27 08:09:55 +00:00
Chris Maynard 5d44edf894 While r53608 fixed the "Use promiscuous mode on all interfaces" toggle button behavior, it wasn't enough, so use the technique from r53609 for the "Capture on all interfaces" toggle button to fix it completely.
#BACKPORT(1.10)

svn path=/trunk/; revision=53611
2013-11-27 05:31:10 +00:00
Chris Maynard eabd5d8534 OK, capture_all is only ever set to TRUE or FALSE, so just use it directly.
svn path=/trunk/; revision=53610
2013-11-27 05:13:22 +00:00
Chris Maynard 136030657b Make "Capture on all interfaces" toggle button behave properly, particularly when all interfaces had been selected but one of them is deselected.
#BACKPORT(1.10)

svn path=/trunk/; revision=53609
2013-11-27 05:03:31 +00:00
Chris Maynard a01b501445 Make "Use promiscuous mode on all interfaces" toggle button work properly again.
#BACKPORT(1.10)

svn path=/trunk/; revision=53608
2013-11-27 03:02:51 +00:00
Jeff Morriss 69017ac3bd Overhaul rpm-building options a bit: as suggested by Anders, have the RPM follow
./configure's options for gtk2 vs gtk3 vs qt.

Make it possible to not build the GNOME package (now both UIs' packages are
optional).  I think Chris requested this a while ago.

If this works out it may make sense to control the rest of the options via
./configure .

svn path=/trunk/; revision=53607
2013-11-26 23:43:18 +00:00