Commit Graph

24858 Commits

Author SHA1 Message Date
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
Guy Harris 11848b9efe 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).

svn path=/trunk/; revision=25551
2008-06-23 21:06:42 +00:00
Guy Harris 3235c5b4f4 Temporarily make -Wshadow not a default.
svn path=/trunk/; revision=25550
2008-06-23 20:51:31 +00:00
Guy Harris 2a6564dea9 Rename a variable to avoid collisions with a global variable, as noted
by John Smith.

svn path=/trunk/; revision=25549
2008-06-23 20:34:18 +00:00
Guy Harris 6b762c78a5 Rename a variable to avoid collisions with a global variable, as noted
by John Smith.

svn path=/trunk/; revision=25548
2008-06-23 20:32:50 +00:00
Guy Harris 256552f6a3 Rename an argument to avoid collisions with a global variable name, as
noted by John Smith.

Fix indentation.

svn path=/trunk/; revision=25547
2008-06-23 20:31:21 +00:00
Guy Harris 0b1a0718ce Get rid of the static capture_opts pointer - it collides with parameter
names, as noted by John Smith.

svn path=/trunk/; revision=25546
2008-06-23 20:29:13 +00:00
Guy Harris 7b20f77bea 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.

svn path=/trunk/; revision=25545
2008-06-23 20:25:17 +00:00
Stig Bjørlykke 0766be81b4 Rename some variables to avoid shadowing warnings.
svn path=/trunk/; revision=25544
2008-06-23 20:24:52 +00:00
Stig Bjørlykke dd6c6af3e4 Rename some variables to avoid shadowing warnings.
svn path=/trunk/; revision=25543
2008-06-23 20:23:29 +00:00
Guy Harris ee78dbb925 Get rid of the static capture_opts pointer - it collides with parameter
names, as noted by John Smith.

svn path=/trunk/; revision=25542
2008-06-23 20:21:46 +00:00
Guy Harris 4d879cd0b8 Rename arguments not to collide with function names, to avoid warnings
from -Wshadow, as noted by John Smith.

svn path=/trunk/; revision=25541
2008-06-23 20:17:08 +00:00
Guy Harris 094911ef4f Rename arguments not to collide with function names, to avoid warnings
from -Wshadow, as noted by John Smith.

svn path=/trunk/; revision=25540
2008-06-23 20:15:30 +00:00
Stig Bjørlykke cb91244d0b Fixed some "shadowed variables", as pointed out by John Smith.
svn path=/trunk/; revision=25539
2008-06-23 20:06:20 +00:00
Stig Bjørlykke 926e31da26 Don't call an argument "time", as this is a function.
svn path=/trunk/; revision=25538
2008-06-23 20:04:31 +00:00
Guy Harris 98a15b7e80 Add -Wshadow, so we catch cases where somebody might not be using the
variable they think they are.

svn path=/trunk/; revision=25537
2008-06-23 19:56:47 +00:00
Guy Harris bbccb9cbfb 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.

svn path=/trunk/; revision=25533
2008-06-23 18:46:29 +00:00
Martin Mathieson 629c06eadb Save timestamp when updating entry for new request frames in existing call.
svn path=/trunk/; revision=25532
2008-06-23 17:04:52 +00:00
Martin Mathieson d25c57e884 Show short version of Content-Length header.
Fixes but 2635.














svn path=/trunk/; revision=25531
2008-06-23 14:58:17 +00:00
Martin Mathieson 4aa522855d Make sure info column is set correctly when tree == NULL.
Fixes but 2561.













svn path=/trunk/; revision=25530
2008-06-23 13:02:50 +00:00
Martin Mathieson d2036aca8a Try again to get labels matching function names.
svn path=/trunk/; revision=25529
2008-06-23 10:08:13 +00:00
Martin Mathieson 8d053ee86d Fix wimax UL-MAP ext IE decode error.
From Frank Wang (bug 2548).











svn path=/trunk/; revision=25528
2008-06-23 09:24:32 +00:00
Stig Bjørlykke 1c1da758bf Updated the Configuration Profiles chapter in the User Guide.
svn path=/trunk/; revision=25527
2008-06-22 22:50:27 +00:00
Stig Bjørlykke 1689ec6a8d Make the ACTRACE dissector give away the package if it knows its not a ACTRACE.
svn path=/trunk/; revision=25526
2008-06-22 18:42:37 +00:00
Stig Bjørlykke 03468a7b19 Make the MGCP dissector give away the package if it knows its not a MGCP.
svn path=/trunk/; revision=25525
2008-06-22 18:36:33 +00:00
Bill Meier 46386986fa Use editcap_SOURCES and capinfos_SOURCES in Windows Makefile
svn path=/trunk/; revision=25524
2008-06-22 15:13:08 +00:00
Stig Bjørlykke 55b2064946 Updated some chapters in the User Guide.
svn path=/trunk/; revision=25523
2008-06-22 13:25:57 +00:00
Stig Bjørlykke 50e372dd66 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

svn path=/trunk/; revision=25522
2008-06-22 10:59:08 +00:00
Stig Bjørlykke b17d12b64d Removed an unused static entry.
svn path=/trunk/; revision=25521
2008-06-22 00:50:29 +00:00
Stig Bjørlykke af6fa2004c From Sven Eckelmann (bug 2632):
Added B.A.T.M.A.N. dissector

svn path=/trunk/; revision=25520
2008-06-22 00:14:33 +00:00