Commit Graph

3558 Commits

Author SHA1 Message Date
Jaap Keuter e86825b8f8 From Francesco Fondelli:
Attached is a patch for:
- PW Associated Channel Header dissection as per RFC 4385
- PW MPLS Control Word dissection as per RFC 4385
- mpls subdissector table indexed by label value
- enhanced "what's past last mpls label?" heuristic
- Ethernet PW (w/o CW) support as per RFC 4448

svn path=/trunk/; revision=25730
2008-07-13 17:19:33 +00:00
Stig Bjørlykke b1e0d8edc5 Correct help topic for firewall dialog.
svn path=/trunk/; revision=25725
2008-07-12 19:28:08 +00:00
Jeff Morriss c50b4aec09 More (mostly stats tree) unsigned->signed char cleanup
svn path=/trunk/; revision=25717
2008-07-12 01:48:24 +00:00
Guy Harris 08b4f712c8 Note bug 2699, which reports a bug in xdg-open.
svn path=/trunk/; revision=25700
2008-07-10 18:36:19 +00:00
Gerald Combs 98f5096bbd Replace r25638 with a better fix. On Windows, don't open a console window if
we've been passed "-i -", since it clobbers stdio.

svn path=/trunk/; revision=25695
2008-07-09 23:28:18 +00:00
Bill Meier c18d922045 Fix compile error
svn path=/trunk/; revision=25674
2008-07-08 03:21:54 +00:00
Bill Meier d3fc3b6c3e Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API
gtk_button_box_set_spacing()  ==> gtk_box_set_spacing()

svn path=/trunk/; revision=25673
2008-07-08 02:43:40 +00:00
Bill Meier 44efa0ed2e Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API
gtk_timeout_add()     ==> g_timeout_add
   gtk_timeout_remove()  ==> g_source_remove()

Also: timer callback should return gboolean (not void or gint)

svn path=/trunk/; revision=25672
2008-07-08 02:25:30 +00:00
Guy Harris a04774395f Add Makefile.common files for epan/dfilter and epan/ftypes.
Add checkapi rules to Makefile.am files.

svn path=/trunk/; revision=25656
2008-07-02 01:44:30 +00:00
Jeff Morriss 83f9ecf96f Move privileges.c and unicode-utils.c from epan to wsutil (so things like
capinfos and dumpcap don't need to depend on libwireshark nor directly pull
in those modules).  Because capinfos and editcap were only being linked with
privileges.c if we had plugins, this allows those programs to be linked when
someone is compiling --without-plugins.

svn path=/trunk/; revision=25640
2008-06-30 17:16:29 +00:00
Gerald Combs 6d4f9c1eda When we open a debug console on Windows, don't grab stdin. We never read
anything on this particular console, and if we open stdin here we can't
read a capture from an anonymous pipe.

svn path=/trunk/; revision=25638
2008-06-30 16:36:37 +00:00
Bill Meier 56206e0002 Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API
gtk_container_border_width()          ==> gtk_container_set_border_width()
  gtk_container_children()              ==> gtk_container_get_children()
  gtk_entry_new_with_max_length()       ==> gtk_entry_new(); gtk_entry_set_max_length()
  gtk_menu_append()                     ==> gtk_menu_shell_append()
  gtk_menu_prepend()                    ==> gtk_menu_shell_prepend()
  gtk_notebook_set_page()               ==> gtk_notebook_set_current_page()
  gtk_paned_gutter_size()               ==> gtk_paned_set_gutter_size()
  gtk_radio_button_group()              ==> gtk_radio_button_get_group()
  gtk_signal_connect()                  ==> g_signal_connect()
  gtk_signal_disconnect()               ==> g_signal_handler_disconnect()
  gtk_signal_emit_by_name()             ==> g_signal_emit_by_name()
  gtk_signal_handler_block_by_data()    ==> g_signal_handlers_block_matched()
  gtk_signal_handler_block_by_func()    ==> g_signal_handlers_block_by_func()
  gtk_signal_handler_unblock_by_data()  ==> g_signal-handlers_unblock_matched()
  gtk_signal_handler_unblock_by_func()  ==> g_signal-handlers_unblock_by_func()
  gtk_spin_button_get_value_as_float()  ==> gtk_spin_button_get_value()
  gtk_toggle_button_set_state()         ==> gtk_toggle_button_set_active()

svn path=/trunk/; revision=25634
2008-06-29 15:51:43 +00:00
Sake Blok cd7405c44d From Kovarththanan Rajaratnam (bug 2657):
Resolve accelerator ambiguity in filter toolbar


svn path=/trunk/; revision=25633
2008-06-29 14:59:23 +00:00
Sake Blok 50fa079b11 From Kovarththanan Rajaratnam (bug 2658):
Leading $ will now be propageted to display filter entry (on keyboards
where AltGr needs to be used to enter a '$').


svn path=/trunk/; revision=25632
2008-06-29 12:55:14 +00:00
Sake Blok be8956d104 Add accelerator keys for (un)mark all packets
svn path=/trunk/; revision=25630
2008-06-29 09:01:12 +00:00
Sake Blok 9fe2206771 From Kovarththanan Rajaratnam (bug 2652):
Add accelerator keys for Find Next/Previous Reference


svn path=/trunk/; revision=25629
2008-06-29 08:36:24 +00:00
Gerald Combs 72965329b0 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.)

svn path=/trunk/; revision=25611
2008-06-26 16:42:07 +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
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
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 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
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 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
Guy Harris 4745bbf0d5 Add stuff to a comment, and move stuff to that comment from elsewhere,
discussing the fun of launching on UNIX+X11.

svn path=/trunk/; revision=25519
2008-06-21 23:53:15 +00:00
Guy Harris 8f244766f3 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.

svn path=/trunk/; revision=25514
2008-06-21 18:09:17 +00:00
Stig Bjørlykke 45e0a74c15 And use correct help topic...
svn path=/trunk/; revision=25507
2008-06-21 14:06:08 +00:00
Stig Bjørlykke 7c29c08046 Added help topic item previous reused for another topic.
Todo: add documentation text.

svn path=/trunk/; revision=25506
2008-06-21 13:59:52 +00:00
Stig Bjørlykke 860028c634 Removed the usage of topic_available() as we now have all topics.
svn path=/trunk/; revision=25505
2008-06-21 13:36:31 +00:00
Stig Bjørlykke 960d9138af Added a help button in the Interface Options dialog.
Added the Interface Options docbook chapter.

svn path=/trunk/; revision=25502
2008-06-21 13:08:02 +00:00
Stig Bjørlykke 01de1202bc Update the statusbar expert info icon when changing profile.
svn path=/trunk/; revision=25491
2008-06-19 21:56:25 +00:00
Stig Bjørlykke 4889fc41e9 Make storage-based and time-based "Next file every" checkboxes behave equal
in "Use multiple files".  Also default to storage-based if not time-based.

This fixes the initial problem in bug #2599.

svn path=/trunk/; revision=25489
2008-06-19 17:25:34 +00:00
Guy Harris 19470978ef Encase another variable used only if we support capture in #ifdef
HAVE_LIBPCAP/#endif.

svn path=/trunk/; revision=25482
2008-06-18 21:23:52 +00:00
Stig Bjørlykke 4235740cad Put a variable inside a ifdef HAVE_LIBPCAP
svn path=/trunk/; revision=25481
2008-06-18 20:59:57 +00:00
Stig Bjørlykke 52bb83fd57 Reload the interface list on the welcome page when changing profile and
after editing the interface options.

svn path=/trunk/; revision=25479
2008-06-18 20:14:28 +00:00
Stig Bjørlykke 9e4cb36cba Draw menu items with radio buttons.
svn path=/trunk/; revision=25471
2008-06-18 15:57:12 +00:00
Stig Bjørlykke d69f8cd46c The recent.gui_time_precision fix introduced a worse bug when changing
profiles, so I revert this and will investigate some more...

svn path=/trunk/; revision=25469
2008-06-17 20:37:34 +00:00
Stig Bjørlykke 4cd3667832 Popup a menu with configuration profiles instead of the profile dlg
when clicking the profile in the statusbar.  Much easier to use.

svn path=/trunk/; revision=25468
2008-06-17 19:50:22 +00:00
Stig Bjørlykke b82eba3f42 Initialize recent.gui_time_precision when changing profile to avoid a crash
in some rare cases.

svn path=/trunk/; revision=25457
2008-06-15 20:53:06 +00:00
Stig Bjørlykke 2198a435da Cleanup return values from info_bar_new() and packets_bar_new().
svn path=/trunk/; revision=25456
2008-06-15 20:50:10 +00:00
Stig Bjørlykke 15963a143b Click on the profile in the statusbar will open Configuration Profiles dialog.
svn path=/trunk/; revision=25455
2008-06-15 20:47:06 +00:00
Stig Bjørlykke f9b3982cd2 Moved setting of E_MPACKET_LIST_KEY object data to the function creating
packet_list to ensure it's created before we set it.

Applying filter from the packet list still doesn't work correctly.

svn path=/trunk/; revision=25454
2008-06-15 18:29:22 +00:00
Stig Bjørlykke c64847fe16 Update all time columns when changing the time precision.
Not implemented for conversation relative and delta time yet, because this
will need a reload as they are set by the dissectors and does not exist in
the frame data.

svn path=/trunk/; revision=25452
2008-06-14 16:51:11 +00:00
Stig Bjørlykke 98325a69c9 Save the column width in the recent list on every change so we can
pick the correct width when changing the time precision.

svn path=/trunk/; revision=25451
2008-06-14 16:45:06 +00:00
Guy Harris aeda5cffa7 Sun C warns about an integer overflow for 1 << 31, presumably because 1
is signed; make the flags field in "struct magnify" unsigned, and make
the flags unsigned, so we shift 1U rather than 1.

svn path=/trunk/; revision=25421
2008-06-04 00:05:57 +00:00
Guy Harris 60e49f65bc GTK+ 1.2[.x] is no longer relevant - we require 2.x - so don't talk
about it in a comment.

svn path=/trunk/; revision=25419
2008-06-03 23:57:26 +00:00
Stig Bjørlykke 3fe084beb3 Rewrote ifopts_options_add() to make it readable and simpler.
Fixed a bug where a one character comment would skip the interface.
If syntax error in the comment just skip the comment instead of the interface.

svn path=/trunk/; revision=25413
2008-06-02 22:18:25 +00:00