obnox/wireshark/wip.git
15 years agoHave checkAPIs.pl print to stderr, so that its output is colored red in
gerald [Fri, 27 Jun 2008 22:48:25 +0000 (22:48 +0000)]
Have checkAPIs.pl print to stderr, so that its output is colored red in
Buildbot. Make capitalization more consistent. Look for abort functions in
wsutil.

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

15 years agoFix some warnings reported by gcc -Wshadow ...
wmeier [Fri, 27 Jun 2008 16:15:30 +0000 (16:15 +0000)]
Fix some warnings reported by gcc -Wshadow ...
Fix some spacing in packet-dcom.c

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

15 years agoFix some checkAPIs warnings.
gerald [Fri, 27 Jun 2008 16:07:21 +0000 (16:07 +0000)]
Fix some checkAPIs warnings.

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

15 years agoFix some warnings reported by gcc -Wshadow ...
wmeier [Fri, 27 Jun 2008 04:52:56 +0000 (04:52 +0000)]
Fix some warnings reported by gcc -Wshadow ...

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

15 years agoWiretap code probably shouldn't abort the application either.
gerald [Thu, 26 Jun 2008 23:43:15 +0000 (23:43 +0000)]
Wiretap code probably shouldn't abort the application either.

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

15 years agoAdd support for "API groups" in checkAPIs.pl. Make the "prohibited"
gerald [Thu, 26 Jun 2008 22:20:05 +0000 (22:20 +0000)]
Add support for "API groups" in checkAPIs.pl. Make the "prohibited"
and "deprecated" groups the default. Add an "abort" group for code that
shouldn't exit the program. Update the makefiles to call "checkAPIs.pl
-g abort" for dissectors. Remove a dependency on "cat" in checkAPIs.pl.

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

15 years agoFix a comment: the subdissector won't /assert/ out it will /except/ out if the MSU...
morriss [Thu, 26 Jun 2008 20:42:58 +0000 (20:42 +0000)]
Fix a comment: the subdissector won't /assert/ out it will /except/ out if the MSU is truncated.

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

15 years agoFrom Abhik Sarkar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2647 :
morriss [Thu, 26 Jun 2008 20:40:30 +0000 (20:40 +0000)]
From Abhik Sarkar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2647 :
The syslog dissector could crash if the "packlog" MSU is truncated such that
the hex string ends in with a nibble.

From me: Check if that will happen and chop off the nibble before giving it to
convert_string_to_hex() so we'll dissect as much of the MSU as possible.

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

15 years agoRemove a lot of vestigal GTK-Wimp stuff. It's been included with
gerald [Thu, 26 Jun 2008 16:42:07 +0000 (16:42 +0000)]
Remove a lot of vestigal GTK-Wimp stuff. It's been included with
GTK+ since version 2.8, when its name was changed to the "GTK MS
Windows-Engine."

Simplify the Windows installer by removing the GTK-Wimp option (which
means the "Wireshark" item can be an entry instead of a group). Move
Rawshark to the "Tools" group.

(If anyone wants to disable the MS Windows Engine they can still do so
after installation by disabling or removing libwimp.dll.)

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

15 years agoFix a missed "item" -> "item_local" in the previous checkin.
guy [Thu, 26 Jun 2008 02:29:13 +0000 (02:29 +0000)]
Fix a missed "item" -> "item_local" in the previous checkin.

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

15 years agoMake the default for HDLC traffic "Raw data", just as it is for other
guy [Thu, 26 Jun 2008 01:47:59 +0000 (01:47 +0000)]
Make the default for HDLC traffic "Raw data", just as it is for other
record types, so that people know they have to set the preference.

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

15 years agoMake the preference settings for the dissector to use for various ERF
guy [Thu, 26 Jun 2008 01:38:38 +0000 (01:38 +0000)]
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.

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

15 years agoFix some warnings reported by gcc -Wshadow ...
wmeier [Thu, 26 Jun 2008 00:16:58 +0000 (00:16 +0000)]
Fix some warnings reported by gcc -Wshadow ...

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

15 years agoWe last supported NT 4.0 with version 0.99.4 (according to
gerald [Wed, 25 Jun 2008 23:07:40 +0000 (23:07 +0000)]
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.

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

15 years agoWe apper to spell it "TShark" rather than "Tshark", the fact that it's
guy [Wed, 25 Jun 2008 22:52:08 +0000 (22:52 +0000)]
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.

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

15 years agoUpdate the document to the current state of affairs.
jake [Wed, 25 Jun 2008 21:21:33 +0000 (21:21 +0000)]
Update the document to the current state of affairs.

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

15 years agoMake sip.msg_hdr a string field instead of FT_NONE.
martinm [Wed, 25 Jun 2008 12:40:15 +0000 (12:40 +0000)]
Make sip.msg_hdr a string field instead of FT_NONE.

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

15 years agoConstify a bunch of stuff, to squelch -Wwrite-strings warnings.
guy [Wed, 25 Jun 2008 09:12:35 +0000 (09:12 +0000)]
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.

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

15 years agoClean up indentation.
guy [Wed, 25 Jun 2008 09:10:50 +0000 (09:10 +0000)]
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.

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

15 years agoFor for compressed DLMAP decode error.
martinm [Wed, 25 Jun 2008 08:54:22 +0000 (08:54 +0000)]
For for compressed DLMAP decode error.

From Frank Wang (bug 2640).

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

15 years agoFrom Max Ivanov:
jake [Wed, 25 Jun 2008 06:18:23 +0000 (06:18 +0000)]
From Max Ivanov:
The destination unreachable indication for external IP routes is at offset 24, not 4 as in internal IP routes.

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

15 years agoUpdate a comment.
guy [Wed, 25 Jun 2008 03:05:53 +0000 (03:05 +0000)]
Update a comment.

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

15 years agoFix some warnings - declare some arguments, variables, and structure
guy [Wed, 25 Jun 2008 03:05:19 +0000 (03:05 +0000)]
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.

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

15 years agoMake it obvious that this is a development version. Fix a makefile
gerald [Tue, 24 Jun 2008 22:53:52 +0000 (22:53 +0000)]
Make it obvious that this is a development version. Fix a makefile
dependency on the splash images.

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

15 years agoAdd TurboCap-related changes from /trunk-1.0:
gerald [Tue, 24 Jun 2008 21:16:22 +0000 (21:16 +0000)]
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.

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

15 years agoFix a logic problem.
gerald [Tue, 24 Jun 2008 20:54:38 +0000 (20:54 +0000)]
Fix a logic problem.

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

15 years agoMake inet_ntop fix work for out-of-tree builds
morriss [Tue, 24 Jun 2008 20:09:43 +0000 (20:09 +0000)]
Make inet_ntop fix work for out-of-tree builds

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

15 years agoMake -Wwrite-strings non-default for now.
guy [Tue, 24 Jun 2008 19:58:29 +0000 (19:58 +0000)]
Make -Wwrite-strings non-default for now.

Note what files are blocking some -W flags.

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

15 years agoGet rid of another unused variable.
guy [Tue, 24 Jun 2008 19:38:40 +0000 (19:38 +0000)]
Get rid of another unused variable.

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

15 years agoGet rid of some code that fills in a string that's never used. Get rid
guy [Tue, 24 Jun 2008 19:27:46 +0000 (19:27 +0000)]
Get rid of some code that fills in a string that's never used.  Get rid
of the string, while we're at it.

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

15 years agoHighlight the whole hostname, even if we've truncated it in the display.
gerald [Tue, 24 Jun 2008 19:18:21 +0000 (19:18 +0000)]
Highlight the whole hostname, even if we've truncated it in the display.

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

15 years agoWe're not ready for -Wshadow by default yet.
guy [Tue, 24 Jun 2008 19:13:15 +0000 (19:13 +0000)]
We're not ready for -Wshadow by default yet.

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

15 years agoNoam Rathus discovered that the RMI dissector was using g_strlcpy
gerald [Tue, 24 Jun 2008 19:08:54 +0000 (19:08 +0000)]
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.

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

15 years agoAssign pointers to strings to a const pointer.
guy [Tue, 24 Jun 2008 18:22:26 +0000 (18:22 +0000)]
Assign pointers to strings to a const pointer.

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

15 years agoFix another variable named "index".
guy [Tue, 24 Jun 2008 18:10:57 +0000 (18:10 +0000)]
Fix another variable named "index".

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

15 years agoWe don't check structure sizes elsewhere; don't check them here. (In
guy [Tue, 24 Jun 2008 18:00:14 +0000 (18:00 +0000)]
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.

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

15 years agoFix *NIX builds where we need our own inet_pton.c or inet_ntop.c . This should fix...
morriss [Tue, 24 Jun 2008 17:57:44 +0000 (17:57 +0000)]
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

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

15 years agoTemporarily turn on some -W options, to provoke the buildbots to build
guy [Tue, 24 Jun 2008 17:45:09 +0000 (17:45 +0000)]
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.

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

15 years agoOne -Wcast-align suffices.
guy [Tue, 24 Jun 2008 17:43:48 +0000 (17:43 +0000)]
One -Wcast-align suffices.

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

15 years agoHave separate callback mechanisms in file.c and capture.c; pass the
guy [Tue, 24 Jun 2008 08:05:45 +0000 (08:05 +0000)]
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.

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

15 years agoOnly include gtk/capture_globals.h if we're building with capture
guy [Tue, 24 Jun 2008 04:04:47 +0000 (04:04 +0000)]
Only include gtk/capture_globals.h if we're building with capture
support.

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

15 years agoAdd gtk/capture_globals.h, to declare global_capture_opts, so files that
guy [Tue, 24 Jun 2008 03:38:15 +0000 (03:38 +0000)]
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.

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

15 years agoFix some references to the global loop_data structure that weren't
guy [Tue, 24 Jun 2008 03:33:51 +0000 (03:33 +0000)]
Fix some references to the global loop_data structure that weren't
changed in the previous checkin.

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

15 years agoFor now, just refer to global_capture_opts, replacing references to the
guy [Tue, 24 Jun 2008 02:24:17 +0000 (02:24 +0000)]
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.

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

15 years agoFor now, just refer to global_capture_opts, replacing references to the
guy [Tue, 24 Jun 2008 02:22:36 +0000 (02:22 +0000)]
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.

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

15 years agoHave capture_info_ui_create() and capture_info_open() take a pointer to
guy [Tue, 24 Jun 2008 01:23:33 +0000 (01:23 +0000)]
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.

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

15 years agoDo not only update the argument name, but also where it's used.
stig [Mon, 23 Jun 2008 21:58:16 +0000 (21:58 +0000)]
Do not only update the argument name, but also where it's used.

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

15 years agoRenamed some local variables to avoid name collisions.
stig [Mon, 23 Jun 2008 21:53:24 +0000 (21:53 +0000)]
Renamed some local variables to avoid name collisions.

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

15 years agoRenamed a local variable to avoid name collisions.
stig [Mon, 23 Jun 2008 21:43:00 +0000 (21:43 +0000)]
Renamed a local variable to avoid name collisions.

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

15 years agoRenamed a local variable to avoid name collisions.
stig [Mon, 23 Jun 2008 21:40:40 +0000 (21:40 +0000)]
Renamed a local variable to avoid name collisions.

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

15 years agoRenamed a local variable to avoid name collisions.
stig [Mon, 23 Jun 2008 21:36:22 +0000 (21:36 +0000)]
Renamed a local variable to avoid name collisions.

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

15 years agoRenamed a local variable to avoid name collisions.
stig [Mon, 23 Jun 2008 21:34:40 +0000 (21:34 +0000)]
Renamed a local variable to avoid name collisions.

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

15 years agoRenamed index and ipv4_addr to avoid name collisions.
stig [Mon, 23 Jun 2008 21:31:47 +0000 (21:31 +0000)]
Renamed index and ipv4_addr to avoid name collisions.

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

15 years agoRename an argument to avoid colliding with a global variable.
guy [Mon, 23 Jun 2008 21:31:10 +0000 (21:31 +0000)]
Rename an argument to avoid colliding with a global variable.

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

15 years agoRemoved argument names in function pointers to avoid shadowing warnings.
stig [Mon, 23 Jun 2008 21:28:44 +0000 (21:28 +0000)]
Removed argument names in function pointers to avoid shadowing warnings.

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

15 years agoRenamed the global bit_mask to avoid collisions with the bit_mask used
stig [Mon, 23 Jun 2008 21:27:52 +0000 (21:27 +0000)]
Renamed the global bit_mask to avoid collisions with the bit_mask used
in various functions.

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

15 years agoRename an argument to avoid colliding with pipe().
guy [Mon, 23 Jun 2008 21:27:37 +0000 (21:27 +0000)]
Rename an argument to avoid colliding with pipe().

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

15 years agoRename an argument to avoid colliding with pipe().
guy [Mon, 23 Jun 2008 21:24:48 +0000 (21:24 +0000)]
Rename an argument to avoid colliding with pipe().

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

15 years agoRename the global "ld" structure to "global_ld", to avoid collisions
guy [Mon, 23 Jun 2008 21:22:11 +0000 (21:22 +0000)]
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).

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

15 years agoRename a local variable in a macro to avoid collisions with regular
guy [Mon, 23 Jun 2008 21:08:58 +0000 (21:08 +0000)]
Rename a local variable in a macro to avoid collisions with regular
variables.

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

15 years agoCopy over r25535 from /trunk-1.0: When we're run with -p, set
gerald [Mon, 23 Jun 2008 21:07:37 +0000 (21:07 +0000)]
Copy over r25535 from /trunk-1.0: When we're run with -p, set
VERSION_BUILD no matter what.

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

15 years agoRename a variable to avoid collisions with the old V7 index() function,
guy [Mon, 23 Jun 2008 21:06:42 +0000 (21:06 +0000)]
Rename a variable to avoid collisions with the old V7 index() function,
still declared by <string.h> on some platforms (at least the way we
compile, with all sorts of non-ANSI C/non-POSIX stuff added).

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

15 years agoTemporarily make -Wshadow not a default.
guy [Mon, 23 Jun 2008 20:51:31 +0000 (20:51 +0000)]
Temporarily make -Wshadow not a default.

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

15 years agoRename a variable to avoid collisions with a global variable, as noted
guy [Mon, 23 Jun 2008 20:34:18 +0000 (20:34 +0000)]
Rename a variable to avoid collisions with a global variable, as noted
by John Smith.

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

15 years agoRename a variable to avoid collisions with a global variable, as noted
guy [Mon, 23 Jun 2008 20:32:50 +0000 (20:32 +0000)]
Rename a variable to avoid collisions with a global variable, as noted
by John Smith.

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

15 years agoRename an argument to avoid collisions with a global variable name, as
guy [Mon, 23 Jun 2008 20:31:21 +0000 (20:31 +0000)]
Rename an argument to avoid collisions with a global variable name, as
noted by John Smith.

Fix indentation.

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

15 years agoGet rid of the static capture_opts pointer - it collides with parameter
guy [Mon, 23 Jun 2008 20:29:13 +0000 (20:29 +0000)]
Get rid of the static capture_opts pointer - it collides with parameter
names, as noted by John Smith.

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

15 years agoRename capture_opts to global_capture_opts - that's what it's called in
guy [Mon, 23 Jun 2008 20:25:17 +0000 (20:25 +0000)]
Rename capture_opts to global_capture_opts - that's what it's called in
dumpcap, and calling it capture_opts collides with parameter names, as
noted by John Smith.

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

15 years agoRename some variables to avoid shadowing warnings.
stig [Mon, 23 Jun 2008 20:24:52 +0000 (20:24 +0000)]
Rename some variables to avoid shadowing warnings.

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

15 years agoRename some variables to avoid shadowing warnings.
stig [Mon, 23 Jun 2008 20:23:29 +0000 (20:23 +0000)]
Rename some variables to avoid shadowing warnings.

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

15 years agoGet rid of the static capture_opts pointer - it collides with parameter
guy [Mon, 23 Jun 2008 20:21:46 +0000 (20:21 +0000)]
Get rid of the static capture_opts pointer - it collides with parameter
names, as noted by John Smith.

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

15 years agoRename arguments not to collide with function names, to avoid warnings
guy [Mon, 23 Jun 2008 20:17:08 +0000 (20:17 +0000)]
Rename arguments not to collide with function names, to avoid warnings
from -Wshadow, as noted by John Smith.

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

15 years agoRename arguments not to collide with function names, to avoid warnings
guy [Mon, 23 Jun 2008 20:15:30 +0000 (20:15 +0000)]
Rename arguments not to collide with function names, to avoid warnings
from -Wshadow, as noted by John Smith.

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

15 years agoFixed some "shadowed variables", as pointed out by John Smith.
stig [Mon, 23 Jun 2008 20:06:20 +0000 (20:06 +0000)]
Fixed some "shadowed variables", as pointed out by John Smith.

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

15 years agoDon't call an argument "time", as this is a function.
stig [Mon, 23 Jun 2008 20:04:31 +0000 (20:04 +0000)]
Don't call an argument "time", as this is a function.

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

15 years agoAdd -Wshadow, so we catch cases where somebody might not be using the
guy [Mon, 23 Jun 2008 19:56:47 +0000 (19:56 +0000)]
Add -Wshadow, so we catch cases where somebody might not be using the
variable they think they are.

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

15 years agoGive more details on the stuff Beast does, and suggest a possible scheme
guy [Mon, 23 Jun 2008 18:46:29 +0000 (18:46 +0000)]
Give more details on the stuff Beast does, and suggest a possible scheme
for getting things as right as possible.

gnome_url_show() is run by gnome-open, so just running gnome-open - or
xdg-open, which runs gnome-open on GNOME - will suffice.

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

15 years agoSave timestamp when updating entry for new request frames in existing call.
martinm [Mon, 23 Jun 2008 17:04:52 +0000 (17:04 +0000)]
Save timestamp when updating entry for new request frames in existing call.

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

15 years agoShow short version of Content-Length header.
martinm [Mon, 23 Jun 2008 14:58:17 +0000 (14:58 +0000)]
Show short version of Content-Length header.
Fixes but 2635.

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

15 years agoMake sure info column is set correctly when tree == NULL.
martinm [Mon, 23 Jun 2008 13:02:50 +0000 (13:02 +0000)]
Make sure info column is set correctly when tree == NULL.

Fixes but 2561.

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

15 years agoTry again to get labels matching function names.
martinm [Mon, 23 Jun 2008 10:08:13 +0000 (10:08 +0000)]
Try again to get labels matching function names.

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

15 years agoFix wimax UL-MAP ext IE decode error.
martinm [Mon, 23 Jun 2008 09:24:32 +0000 (09:24 +0000)]
Fix wimax UL-MAP ext IE decode error.

From Frank Wang (bug 2548).

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

15 years agoUpdated the Configuration Profiles chapter in the User Guide.
stig [Sun, 22 Jun 2008 22:50:27 +0000 (22:50 +0000)]
Updated the Configuration Profiles chapter in the User Guide.

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

15 years agoMake the ACTRACE dissector give away the package if it knows its not a ACTRACE.
stig [Sun, 22 Jun 2008 18:42:37 +0000 (18:42 +0000)]
Make the ACTRACE dissector give away the package if it knows its not a ACTRACE.

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

15 years agoMake the MGCP dissector give away the package if it knows its not a MGCP.
stig [Sun, 22 Jun 2008 18:36:33 +0000 (18:36 +0000)]
Make the MGCP dissector give away the package if it knows its not a MGCP.

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

15 years agoUse editcap_SOURCES and capinfos_SOURCES in Windows Makefile
wmeier [Sun, 22 Jun 2008 15:13:08 +0000 (15:13 +0000)]
Use editcap_SOURCES and capinfos_SOURCES in Windows Makefile

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

15 years agoUpdated some chapters in the User Guide.
stig [Sun, 22 Jun 2008 13:25:57 +0000 (13:25 +0000)]
Updated some chapters in the User Guide.

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

15 years agoChanges in B.A.T.M.A.N. dissector:
stig [Sun, 22 Jun 2008 10:59:08 +0000 (10:59 +0000)]
Changes in B.A.T.M.A.N. dissector:
- Fixed last element in value_string arrays
- Fixed a possible bug in a loop making a currently unused string
- Changed preferences prefix to "batman"
- Added udp port preference in batman to be uniform
- Fixed some indents
- Added break in some switches
- Make it compile on win32

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

15 years agoRemoved an unused static entry.
stig [Sun, 22 Jun 2008 00:50:29 +0000 (00:50 +0000)]
Removed an unused static entry.

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

15 years agoFrom Sven Eckelmann (bug 2632):
stig [Sun, 22 Jun 2008 00:14:33 +0000 (00:14 +0000)]
From Sven Eckelmann (bug 2632):
Added B.A.T.M.A.N. dissector

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

15 years agoAdd stuff to a comment, and move stuff to that comment from elsewhere,
guy [Sat, 21 Jun 2008 23:53:15 +0000 (23:53 +0000)]
Add stuff to a comment, and move stuff to that comment from elsewhere,
discussing the fun of launching on UNIX+X11.

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

15 years agoFrom Peter Hertting (bug 2633):
stig [Sat, 21 Jun 2008 23:40:17 +0000 (23:40 +0000)]
From Peter Hertting (bug 2633):
Added support for IUA carrying X.25.

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

15 years agoUpdate manuf
stig [Sat, 21 Jun 2008 23:07:33 +0000 (23:07 +0000)]
Update manuf

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

15 years agoUpdate the services file from IANA's port-numbers.
stig [Sat, 21 Jun 2008 23:02:01 +0000 (23:02 +0000)]
Update the services file from IANA's port-numbers.

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

15 years agoWe have to define HTML_VIEWER for the prefs.c code that sets the default
guy [Sat, 21 Jun 2008 18:50:52 +0000 (18:50 +0000)]
We have to define HTML_VIEWER for the prefs.c code that sets the default
value of the Web browser preference, even though that preference won't
be offered.

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

15 years agoIf we have xdg-open, always run that to launch a Web browser, and ignore
guy [Sat, 21 Jun 2008 18:09:17 +0000 (18:09 +0000)]
If we have xdg-open, always run that to launch a Web browser, and ignore
the Web browser setting; that should honor the user's *real* preferred
Web browser setting (i.e., the one they've selected in their desktop
environment).

Don't bother defining HTML_VIEWER as "xdg-open" if we have xdg-open - we
don't need it.

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

15 years agoUpdated the statusbar documentation:
stig [Sat, 21 Jun 2008 17:30:44 +0000 (17:30 +0000)]
Updated the statusbar documentation:
- Added description of the expert info bullet
- Added description of the configuration profile with menu
- Show the correct Packets/Displayed/Marked(/Dropped) names
- Describe the display filter message when using the != operator

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

15 years agoFrom Alex Turbov :
etxrab [Sat, 21 Jun 2008 15:39:01 +0000 (15:39 +0000)]
From   Alex Turbov :
Decode buddy name and reason message from 'Grant Future Authorization'
SNAC(13,14) and 'Future Authorization Granted' SNAC(13,15) packets.

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

15 years agoFrom Thomas Dreibholz:
etxrab [Sat, 21 Jun 2008 15:29:41 +0000 (15:29 +0000)]
From   Thomas Dreibholz:
- Made parameter naming consistent. Example: A Pool Handle Parameter is now
also named "Pool Handle Parameter" instead of "Pool handle" only, because it
contains a field "Pool Handle" which actually contains the PH byte vector. All
parameters are now named "<name> Parameter".
- Made other strings consistent, as in the Internet Drafts. Example: "Pool
element identifier" -> "Pool Element Identifier". Each word begins with
capitalized letter now.

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

15 years agoFrom Thomas Dreibholz:
etxrab [Sat, 21 Jun 2008 15:26:57 +0000 (15:26 +0000)]
From   Thomas Dreibholz:
Improvements for the ASAP dissector:
- Support for the "Handle Resolution Option" defined in
draft-dreibholz-rserpool-asap-hropt-01.txt has been added. This option is used
in all ASAP Handle Resolution messages of the RSPLIB Open Source RSerPool
implementation (http://tdrwww.exp-math.uni-essen.de/dreibholz/rserpool/).
- Made parameter naming consistent. Example: A Pool Handle Parameter is now
also named "Pool Handle Parameter" instead of "Pool handle" only, because it
contains a field "Pool Handle" which actually contains the PH byte vector. All
parameters are now named "<name> Parameter".
- Made other strings consistent, as in the Internet Drafts. Example: "Pool
element identifier" -> "Pool Element Identifier". Each word begins with
capitalized letter now.

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