Commit Graph

36816 Commits

Author SHA1 Message Date
Guy Harris c6eb12cc5f Do more checking of the TLV length. Yes, the length can be zero or
negative in a malformed packet.  Should fix bug 6238.

svn path=/trunk/; revision=38521
2011-08-13 22:33:14 +00:00
Michael Tüxen b3862dec4d Don't print "none" if no addresses are available to save space.
Patch provided by Stig.

svn path=/trunk/; revision=38520
2011-08-13 20:47:48 +00:00
Michael Tüxen fddc6c386a Fix warnings reported by Bill.
svn path=/trunk/; revision=38519
2011-08-13 20:21:25 +00:00
Michael Tüxen 19c6de7ade Some cleanup.
svn path=/trunk/; revision=38518
2011-08-13 20:12:27 +00:00
Guy Harris 854aef62eb Make the description of -I match the description in dumpcap and TShark.
svn path=/trunk/; revision=38517
2011-08-13 19:46:40 +00:00
Michael Tüxen 9778785d61 Honor command line options in the capture options dialog.
svn path=/trunk/; revision=38516
2011-08-13 19:33:23 +00:00
Guy Harris 2511e53ace Say "none" rather than "unknown" if there are no IP addresses; in most
if not all cases, it's not that we don't know the IP addresses, it's
that there are no IP addresses to know.

svn path=/trunk/; revision=38515
2011-08-13 19:21:02 +00:00
Guy Harris 0bf9fe65da Call the column giving the link-layer header type "Link-layer header",
to describe it a bit more completely.  (Note that it indicates what type
of link -layer headers you'll get, which isn't necessarily what type of
interface you have - an 802.11 interface might have a link-layer header
type of "Ethernet", for example.)

svn path=/trunk/; revision=38514
2011-08-13 19:09:18 +00:00
Michael Tüxen 9af31e0dce Minor cleanup.
svn path=/trunk/; revision=38513
2011-08-13 18:26:19 +00:00
Stig Bjørlykke 5a5e2263da Set correct svn properties.
svn path=/trunk/; revision=38512
2011-08-13 17:55:44 +00:00
Stig Bjørlykke 7225c8ec04 Fixed an email address.
svn path=/trunk/; revision=38511
2011-08-13 17:54:43 +00:00
Stig Bjørlykke 0eefc553b2 From Edwin Groothuis via bug 6179:
Added Time Shift functionality.

From me:
Renamed to use "Time Shift" everywhere + some other minor cleanups.

svn path=/trunk/; revision=38510
2011-08-13 17:39:38 +00:00
Stig Bjørlykke 154b9b9ee9 From Edwin Groothuis via bug 6179:
Add nstime_copy.

svn path=/trunk/; revision=38509
2011-08-13 17:39:25 +00:00
Michael Tüxen 64a6efe5d6 Improve handling of snaplen in capture options window.
svn path=/trunk/; revision=38508
2011-08-13 17:13:50 +00:00
Michael Tüxen 5dd17d9c98 Fix Windows builds (hopefully).
svn path=/trunk/; revision=38507
2011-08-13 16:57:46 +00:00
Michael Tüxen bc90e7bf93 Make the monitor mode selectable only when supported by the interface.
This fixes a bug reported by Stig.

svn path=/trunk/; revision=38506
2011-08-13 15:49:24 +00:00
Michael Tüxen 4431957840 Add description of -I option in -h output.
svn path=/trunk/; revision=38505
2011-08-13 12:25:05 +00:00
Jörg Mayer 00873ace29 Revert 38500 - compiling with gtk2.12 and gtk2.22 and gtk3.0 obviously
wasn't enough.

svn path=/trunk/; revision=38504
2011-08-12 20:51:53 +00:00
Jörg Mayer 223c248f07 Replace 2.x only gtk_statusbar_set_has_resize_grip by 3.x only
gtk_window_set_has_resize_grip

svn path=/trunk/; revision=38503
2011-08-12 20:02:19 +00:00
Jörg Mayer 0b00c1ccb6 In gtk3, gtk_set_locale is gone without replacement or
even deprecation. As it basically just did a setlocale
put that call in directly.

svn path=/trunk/; revision=38502
2011-08-12 19:33:09 +00:00
Jörg Mayer 4149300207 OK, that search and replace took in a wrong object.
Unfortunately gcc 4.5.1 on linux didn't complain.

svn path=/trunk/; revision=38501
2011-08-12 18:04:36 +00:00
Jörg Mayer f143f8d5c7 Replace GDK_IS_DRAWABLE by gtk_widget_is_drawable(). All occurrences
seem to be in the GTK < 2.22 path, so it didn't really matter.

svn path=/trunk/; revision=38500
2011-08-12 17:52:48 +00:00
Jörg Mayer 3a19feec7b Replace almost all occurances of GTK_OBJECT by G_OBJECT.
The remaining uses are inside calls to functions that are deprecated
in gtk3.

svn path=/trunk/; revision=38499
2011-08-12 17:26:20 +00:00
Anders Broman 1e2e3edcc0 Fix a typo
svn path=/trunk/; revision=38498
2011-08-12 13:48:32 +00:00
Anders Broman 91861a302e - Use cairo_surface_t
- rename variables refering to the surface.

svn path=/trunk/; revision=38497
2011-08-12 13:30:10 +00:00
Anders Broman bfc2da178b - Use cairo_surface_t
- rename variables refering to the surface.

svn path=/trunk/; revision=38496
2011-08-12 13:04:47 +00:00
Anders Broman dc681c67a0 - Use cairo_surface_t
- rename variables refering to the surface.

svn path=/trunk/; revision=38495
2011-08-12 12:32:18 +00:00
Jörg Mayer 47977a8039 Update status again, the result for GDK_DISABLE_DEPRECATE is
close, thanks to Anders' work.

svn path=/trunk/; revision=38494
2011-08-12 10:48:04 +00:00
Anders Broman 60495e3e64 SCTP graphs:
- Use cairo_surface_t
- rename variables refering to the surface.
IOgraph
- rename variables refering to the surface.

svn path=/trunk/; revision=38493
2011-08-12 09:11:16 +00:00
Jeff Morriss f8034556e5 From Anish Bhatt via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6113 :
The standard iscsi dissector only recognizes iscsi traffic to and from port
3260 as specified. However, it doesn't understand traffic in MPIO/MCS
connections where the iscsi target runs on a range of ports (3260-3270 for
eg.); or rather it will ignore all iscsi traffic not on the specified port.

Attached patch adds ability to recognize iscsi traffic over a range of ports.
Default range is set to 3260-3260, so it behaves exactly like the current
dissector.


From me:

Don't surround a bunch of code in proto_register_iscsi() with braces just to
allow a new variable to be declared (without incurring the wrath of
non-C99-compliant compilers): just declare the variable at the top of the
function.

svn path=/trunk/; revision=38492
2011-08-11 21:59:02 +00:00
Jeff Morriss 613ddfa1cc From Hanspeter via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6229 :
If an EnhancedPacketBlock in a pcapng file contains a comment option the
content isn't displayed. Instead "Malformed packet" is displayed with the
reason Exception occurred.

The reason for the problem is a bug in the pcapng.c, where for enhanced packet
blocks, interface description blocks and interface statistics blocks the wrong
union members are used to set the comment. This way required fields in the
structures are overwritten.

The attached patch solves the problem.

svn path=/trunk/; revision=38491
2011-08-11 21:42:37 +00:00
Anders Broman 5c49820e7c Remove remaining GDK deprecated functons.
(Use cairo_surface_t).

svn path=/trunk/; revision=38490
2011-08-11 20:49:07 +00:00
Guy Harris bda2c7d6cf Leading white space in the field descriptive name is not allowed.
svn path=/trunk/; revision=38489
2011-08-11 17:46:02 +00:00
Michael Tüxen 7ea85134c2 Whitespace changes.
svn path=/trunk/; revision=38488
2011-08-11 17:10:30 +00:00
Gerald Combs 5e67ca6f69 From Dirk Jagdmann: Protect the RTS info column.
svn path=/trunk/; revision=38487
2011-08-11 16:38:45 +00:00
Anders Broman 8b1263c618 Check if the embedded text is xml, if it is call the xml dissector.
svn path=/trunk/; revision=38486
2011-08-11 15:51:41 +00:00
Jeff Morriss 23c5165169 Clarify that Tvb_reported_length_remaining may return -1
svn path=/trunk/; revision=38485
2011-08-11 13:45:42 +00:00
Michael Tüxen 93ebb2d936 Fix some warnings reported by Bill.
svn path=/trunk/; revision=38484
2011-08-11 12:58:37 +00:00
Michael Tüxen 06e88de947 Fix another issues related to the activity of the start button
in the capture options dialog.

svn path=/trunk/; revision=38483
2011-08-11 12:30:03 +00:00
Michael Tüxen 291fa19fbf Fix a bug where the Start button of the capture options dialog
box was not activated when it should an vice versa.
Reported by Stig.

svn path=/trunk/; revision=38482
2011-08-11 12:06:35 +00:00
Anders Broman 69330127fd Remove unused variables.
svn path=/trunk/; revision=38481
2011-08-11 11:35:37 +00:00
Michael Tüxen 2e48084fa6 Fix a bug which show up when enabling the snaplen.
svn path=/trunk/; revision=38480
2011-08-11 10:55:30 +00:00
Anders Broman 49d6e3e4ce Get rid of no longer neded GdkGC:s
svn path=/trunk/; revision=38479
2011-08-11 10:00:52 +00:00
Anders Broman 41a4ccb657 from Joe McEachern:
patch for DHCPv6 DS-Lite AFTR Option RFC 6334

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

svn path=/trunk/; revision=38478
2011-08-11 09:25:37 +00:00
Anders Broman b189d5bfa2 Use Cairo in more places.
The #if 0 code in draw_element_arc() currently crashes
and the arc coordinates should be fixed to work with Cairo, any help apreciated :-)

svn path=/trunk/; revision=38477
2011-08-11 08:59:43 +00:00
Ronnie Sahlberg 64d9e6a044 Regenerate a new updated FRSRPC dissector.
This dissectors now dissects a whole lot more of the FRS protocol.



svn path=/trunk/; revision=38476
2011-08-11 08:17:21 +00:00
Ronnie Sahlberg b86507fa3f Generate the MISC definitions for dcerpc and include the header file in the build
svn path=/trunk/; revision=38475
2011-08-11 08:14:23 +00:00
Ronnie Sahlberg 427624780e From Matthieu Patou <mat@matws.net>
Add a new misc.idl interface to host some definiteions to share across 
multiple interfaces


svn path=/trunk/; revision=38474
2011-08-11 07:59:12 +00:00
Ronnie Sahlberg db69883151 From Matthieu Patou <mat@matws.net>
Add significantly improved FRSRPC definition and CNF file
Do not compile/regenerate the dissector just yet. More patches needed first


svn path=/trunk/; revision=38473
2011-08-11 07:57:00 +00:00
Ronnie Sahlberg 788dc6230a From Matthieu Patou <mat@matws.net>
Add new helper function for DCE/RPC NDR data blobs


svn path=/trunk/; revision=38472
2011-08-11 07:48:02 +00:00