Commit Graph

24887 Commits

Author SHA1 Message Date
Guy Harris 1f08653d0e Make the preference settings for the dissector to use for various ERF
link-layer types static.

If the preference is set to "raw data" for any of those types, display
the raw data with an indication that the preference in question has been
set to "raw data", so people don't just wonder why ERF files aren't
working right any more.  (See bug 2641; I had the same surprise when I
tried it on some ERF captures I have.)

Pull the dissect_erf_header() code into dissect_erf() - it's dissecting
the *payload*, not the *header*.

Fill in the Info column with the record type.

When using tvb_new_subset() to chop a header off of a tvbuff, just
specify lengths of -1, so we go all the way to the end.

Clean up the Infiniband dissector call.

svn path=/trunk/; revision=25608
2008-06-26 01:38:38 +00:00
Bill Meier ceebccced4 Fix some warnings reported by gcc -Wshadow ...
svn path=/trunk/; revision=25607
2008-06-26 00:16:58 +00:00
Gerald Combs e783130961 We last supported NT 4.0 with version 0.99.4 (according to
wireshark.nsi, at least). Drop it from the "supported" list and add a
note about NT 4.0 and older Windows versions.

svn path=/trunk/; revision=25606
2008-06-25 23:07:40 +00:00
Guy Harris ae9f16c37b We apper to spell it "TShark" rather than "Tshark", the fact that it's
"Wireshark" rather than "WireShark" nonwithstanding.

Say we run on NT 4.0 rather than "NT" - I don't know whether we run on
NT 3.x (and 2000/2003/XP are really NT 5.x and Vista/2008 are really NT
6.x - that's why Microsoft are talking about "Windows 7" as the next big
release).

In the capture-privileges paragraph, note that it's dumpcap that needs
to run as root, and suggest not only that Wireshark shouldn't be set-UID
root, but that it shouldn't even be run as root, and that the same
applies to TShark.

Update "How to Report a Bug" to reflect that we're telling people to
report bugs on Bugzilla, and that "wireshark -v"/"tshark -v" give almost
all the version information we want.

svn path=/trunk/; revision=25605
2008-06-25 22:52:08 +00:00
Jaap Keuter 0740f305fb Update the document to the current state of affairs.
svn path=/trunk/; revision=25604
2008-06-25 21:21:33 +00:00
Martin Mathieson dbfbb872ee Make sip.msg_hdr a string field instead of FT_NONE.
svn path=/trunk/; revision=25602
2008-06-25 12:40:15 +00:00
Guy Harris 83fc9d5e09 Constify a bunch of stuff, to squelch -Wwrite-strings warnings.
epan/dissectors/packet-ncp2222.inc is a bit hard to fix, so we're not
ready to enable that warning by default yet.

Throw in some casts to handle GLib routines that take arbitrary
non-const pointers (they can later return the pointers, and some
callers might want to modify or free up those pointers in cases where
they're known to be writable or allocated).

Use ep_tvb_memdup() rather than a combination of ep_alloc() and
tvb_memcpy().

Clean up some indentation.

svn path=/trunk/; revision=25601
2008-06-25 09:12:35 +00:00
Guy Harris 044e57c917 Clean up indentation.
Make build_expert_data() take the size of "buffer" as an argument, and
use that when doing g_snprintf() into the buffer, to ensure we don't
overflow the buffer.  Also, don't just assign to "buffer", as that
doesn't put anything *in* the buffer.

svn path=/trunk/; revision=25600
2008-06-25 09:10:50 +00:00
Martin Mathieson 7001a1564b For for compressed DLMAP decode error.
From Frank Wang (bug 2640).

svn path=/trunk/; revision=25599
2008-06-25 08:54:22 +00:00
Jaap Keuter 4838e5d7f2 From Max Ivanov:
The destination unreachable indication for external IP routes is at offset 24, not 4 as in internal IP routes.

svn path=/trunk/; revision=25598
2008-06-25 06:18:23 +00:00
Guy Harris 360e555826 Update a comment.
svn path=/trunk/; revision=25597
2008-06-25 03:05:53 +00:00
Guy Harris 9e6329860a Fix some warnings - declare some arguments, variables, and structure
members to be const pointers when that's possible, and throw in some
casts when the GLib API fails to have properly consted arguments.

Use ep_strdup_printf() in some cases.

svn path=/trunk/; revision=25596
2008-06-25 03:05:19 +00:00
Gerald Combs 495ddc2830 Make it obvious that this is a development version. Fix a makefile
dependency on the splash images.

svn path=/trunk/; revision=25594
2008-06-24 22:53:52 +00:00
Gerald Combs 48c21706f2 Add TurboCap-related changes from /trunk-1.0:
From Dustin Johnson: Add support for TurboCap.
  - packet-ppi.c: Add aggregation and 802.3 extended information.
  - capture-wpcap.c: Add support for pcap_list_datalinks and pcap_set_datalink.

Make pcap_list_datalinks and pcap_set_datalink mandatory on Windows.

svn path=/trunk/; revision=25593
2008-06-24 21:16:22 +00:00
Gerald Combs 38d6dc43a4 Fix a logic problem.
svn path=/trunk/; revision=25592
2008-06-24 20:54:38 +00:00
Jeff Morriss b47985d13e Make inet_ntop fix work for out-of-tree builds
svn path=/trunk/; revision=25590
2008-06-24 20:09:43 +00:00
Guy Harris da027b4668 Make -Wwrite-strings non-default for now.
Note what files are blocking some -W flags.

svn path=/trunk/; revision=25589
2008-06-24 19:58:29 +00:00
Guy Harris 22dbfc8181 Get rid of another unused variable.
svn path=/trunk/; revision=25588
2008-06-24 19:38:40 +00:00
Guy Harris 7445488cf2 Get rid of some code that fills in a string that's never used. Get rid
of the string, while we're at it.

svn path=/trunk/; revision=25587
2008-06-24 19:27:46 +00:00
Gerald Combs 015025b06f Highlight the whole hostname, even if we've truncated it in the display.
svn path=/trunk/; revision=25586
2008-06-24 19:18:21 +00:00
Guy Harris a33614e485 We're not ready for -Wshadow by default yet.
svn path=/trunk/; revision=25585
2008-06-24 19:13:15 +00:00
Gerald Combs 358abd9b50 Noam Rathus discovered that the RMI dissector was using g_strlcpy
incorrectly, which could lead to information disclosure or worse. Use
tvb_format_text instead. This lets us get rid of a character array and
avoids feeding raw packet data to the GUI.

svn path=/trunk/; revision=25584
2008-06-24 19:08:54 +00:00
Guy Harris 884a635762 Assign pointers to strings to a const pointer.
svn path=/trunk/; revision=25582
2008-06-24 18:22:26 +00:00
Guy Harris dc7ae72983 Fix another variable named "index".
svn path=/trunk/; revision=25581
2008-06-24 18:10:57 +00:00
Guy Harris c6ac1c31fd We don't check structure sizes elsewhere; don't check them here. (In
any case, the detailed error string is supposed to be g_malloced....)

Fix some "snoop" to be "btsnoop", and note that this is Symbian btsnoop,
not regular snoop.

svn path=/trunk/; revision=25580
2008-06-24 18:00:14 +00:00
Jeff Morriss 7eca9942fd Fix *NIX builds where we need our own inet_pton.c or inet_ntop.c . This should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2607
svn path=/trunk/; revision=25579
2008-06-24 17:57:44 +00:00
Guy Harris 6588c21e67 Temporarily turn on some -W options, to provoke the buildbots to build
with them to check whether we've cleaned those warnings up or not.

svn path=/trunk/; revision=25578
2008-06-24 17:45:09 +00:00
Guy Harris f3b0035e0f One -Wcast-align suffices.
svn path=/trunk/; revision=25577
2008-06-24 17:43:48 +00:00
Guy Harris c4932893e3 Have separate callback mechanisms in file.c and capture.c; pass the
capture callbacks the capture_options * as its second argument in all
cases.  This makes it a bit clearer what arguments callbacks take, and
means we can get rid of all global_capture_opts references in
gtk/main_statusbar.c.

Put the interface between gtk/main.c and gtk/main_statusbar.c into a
private header.

svn path=/trunk/; revision=25576
2008-06-24 08:05:45 +00:00
Guy Harris a9ffacc1b3 Only include gtk/capture_globals.h if we're building with capture
support.

svn path=/trunk/; revision=25575
2008-06-24 04:04:47 +00:00
Guy Harris f441b8941e Add gtk/capture_globals.h, to declare global_capture_opts, so files that
don't need global_capture_opts don't need to have it declared and thus
don't need capture_options defined.

Include gtk/capture_globals in the files in question.

Change some more capture_opts references to refer to
global_capture_opts.

Change some global_capture_opts references in routines with a
capture_opts argument to refer to capture_opts.

The structure type is capture_options, not capture_opts; fix some
references.

Include <sys/types.h>, if it's present, in capture_opts.h, so we get
gid_t defined.

Clean up indentation.

svn path=/trunk/; revision=25574
2008-06-24 03:38:15 +00:00
Guy Harris f8b7863753 Fix some references to the global loop_data structure that weren't
changed in the previous checkin.

svn path=/trunk/; revision=25573
2008-06-24 03:33:51 +00:00
Guy Harris 881a38f96e For now, just refer to global_capture_opts, replacing references to the
now-defult global capture_opts pointer; we eventually should try to
minimize the use of global variables.

svn path=/trunk/; revision=25572
2008-06-24 02:24:17 +00:00
Guy Harris e53bf053f9 For now, just refer to global_capture_opts, replacing references to the
now-defult global capture_opts pointer; we eventually should try to
minimize the use of global variables.

Export global_capture_opts from gtk/main.h.

Clean up indentation.

svn path=/trunk/; revision=25571
2008-06-24 02:22:36 +00:00
Guy Harris 2a691a0aec Have capture_info_ui_create() and capture_info_open() take a pointer to
the capture_opts structure as an argument, rather than just a pointer to
the interface name.

Don't declare a global "capture_opts" pointer, as we don't define it any
more.

svn path=/trunk/; revision=25570
2008-06-24 01:23:33 +00:00
Stig Bjørlykke 2eb5983b47 Do not only update the argument name, but also where it's used.
svn path=/trunk/; revision=25566
2008-06-23 21:58:16 +00:00
Stig Bjørlykke 7f3ee01d41 Renamed some local variables to avoid name collisions.
svn path=/trunk/; revision=25565
2008-06-23 21:53:24 +00:00
Stig Bjørlykke a0bb456edd Renamed a local variable to avoid name collisions.
svn path=/trunk/; revision=25564
2008-06-23 21:43:00 +00:00
Stig Bjørlykke 7036a616a5 Renamed a local variable to avoid name collisions.
svn path=/trunk/; revision=25563
2008-06-23 21:40:40 +00:00
Stig Bjørlykke f00cd871fe Renamed a local variable to avoid name collisions.
svn path=/trunk/; revision=25562
2008-06-23 21:36:22 +00:00
Stig Bjørlykke cb43c90778 Renamed a local variable to avoid name collisions.
svn path=/trunk/; revision=25561
2008-06-23 21:34:40 +00:00
Stig Bjørlykke e2e09deeda Renamed index and ipv4_addr to avoid name collisions.
svn path=/trunk/; revision=25560
2008-06-23 21:31:47 +00:00
Guy Harris bb3ac49c2d Rename an argument to avoid colliding with a global variable.
svn path=/trunk/; revision=25559
2008-06-23 21:31:10 +00:00
Stig Bjørlykke 29adf5399a Removed argument names in function pointers to avoid shadowing warnings.
svn path=/trunk/; revision=25558
2008-06-23 21:28:44 +00:00
Stig Bjørlykke d881f0213b Renamed the global bit_mask to avoid collisions with the bit_mask used
in various functions.

svn path=/trunk/; revision=25557
2008-06-23 21:27:52 +00:00
Guy Harris 3d2c418ba7 Rename an argument to avoid colliding with pipe().
svn path=/trunk/; revision=25556
2008-06-23 21:27:37 +00:00
Guy Harris ddb5a7a13f Rename an argument to avoid colliding with pipe().
svn path=/trunk/; revision=25555
2008-06-23 21:24:48 +00:00
Guy Harris 802d9abf4f Rename the global "ld" structure to "global_ld", to avoid collisions
with the "ld" pointer argument (and to point out that it's a global
variable).

svn path=/trunk/; revision=25554
2008-06-23 21:22:11 +00:00
Guy Harris 710ccf240c Rename a local variable in a macro to avoid collisions with regular
variables.

svn path=/trunk/; revision=25553
2008-06-23 21:08:58 +00:00
Gerald Combs d5de78acd1 Copy over r25535 from /trunk-1.0: When we're run with -p, set
VERSION_BUILD no matter what.

svn path=/trunk/; revision=25552
2008-06-23 21:07:37 +00:00