Commit Graph

41193 Commits

Author SHA1 Message Date
Jeff Morriss a66eee919e Mark a couple more variables volatile.
svn path=/trunk/; revision=43437
2012-06-21 21:19:48 +00:00
Guy Harris 07d3f84d28 The symbolic names for column indices are unused outside of
capture_dlg.c; move them there.  (There are no routines exported by
capture_dlg.c that use them.)

svn path=/trunk/; revision=43436
2012-06-21 20:45:22 +00:00
Jeff Morriss 7a18a5e7b9 From Richard Sharpe via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7387 :
Don't break/return out of a TRY/CATCH.

svn path=/trunk/; revision=43434
2012-06-21 19:32:56 +00:00
Gerald Combs 4d00f428fd Reset for the next major release.
svn path=/trunk/; revision=43433
2012-06-21 19:29:43 +00:00
Jeff Morriss 5cfd2561f8 ws80211_init() only returned ENOTSUP back when it could be a stub when we
did not HAVE_LIBNL.  Now that we only compile the modules when we HAVE_LIBNL
(and thus the stub no longer exists) there's no need to check for it.

svn path=/trunk/; revision=43430
2012-06-21 18:07:52 +00:00
Gerald Combs 1785ed1ee0 Try to fix tarball compilation on Windows.
svn path=/trunk/; revision=43428
2012-06-21 17:35:59 +00:00
Jörg Mayer 3685b4db6f Remove some trailing whitespace
svn path=/trunk/; revision=43425
2012-06-21 13:23:45 +00:00
Jeff Morriss 536cc401ad Try to use the gtk-compat macros correctly.
svn path=/trunk/; revision=43424
2012-06-21 00:37:42 +00:00
Jeff Morriss 5a89cfdebf It's FindNL.cmake not FindLIBNL.cmake
svn path=/trunk/; revision=43423
2012-06-21 00:15:11 +00:00
Jeff Morriss e5fc8b288c GtkComboBoxText is only available in 2.24 and later; use GtkComboBox instead.
svn path=/trunk/; revision=43422
2012-06-21 00:11:06 +00:00
Jörg Mayer c0da019caa Complete cmake support for netlink detection
svn path=/trunk/; revision=43421
2012-06-20 20:59:43 +00:00
Gerald Combs 49849233c3 If we're making two passes and we have a display filter applied, create
a protocol tree in process_packet_first_pass(). Otherwise we crash with

ERROR:dfvm.c:434:dfvm_apply: assertion failed: (tree)

svn path=/trunk/; revision=43420
2012-06-20 20:44:05 +00:00
Jörg Mayer 41232f172e Remove HAVE_WIRELESS_TOOLBAR from the other build systems.
svn path=/trunk/; revision=43419
2012-06-20 19:11:55 +00:00
Jörg Mayer d9f88ebdcc And another instance of HAVE_WIRELESS_TOOLBAR I missed
svn path=/trunk/; revision=43418
2012-06-20 19:09:35 +00:00
Jörg Mayer 46e1e8643e Forgot to copy one more change
svn path=/trunk/; revision=43417
2012-06-20 19:03:27 +00:00
Jörg Mayer b5c1bd803c Copy over Makefile.common changes to CMakeLists
svn path=/trunk/; revision=43416
2012-06-20 18:46:16 +00:00
Jörg Mayer 646212685c Makefile.common:
- ws80211_utils.c is only needed to build dumpcap, not to build wireshark.
  If it were different it would probably indicate a bad api design.
ui/gtk/Makefile.common:
- Sort in the toolbar in the right place (alphabetically)

svn path=/trunk/; revision=43415
2012-06-20 18:45:25 +00:00
Jörg Mayer d2b4825558 Comment back in the body of tb80211_do_set_channel to avoid warnings about
unused parameters. Add the missing functions by applying the skipped patches
to capture_sync.[hc]

svn path=/trunk/; revision=43414
2012-06-20 18:42:45 +00:00
Anders Broman 5f156576cb #if 0 out code to make it build in it's current state
svn path=/trunk/; revision=43413
2012-06-20 17:35:38 +00:00
Jeff Morriss 3fa645481f Followup to r43176, r43177, r43178, and r43179: prohibit FT_*INT*
with BASE_NONE (or other future display values).

Don't use BASE_NONE with FT_UINT32s in the expert info fields.

svn path=/trunk/; revision=43412
2012-06-20 17:25:53 +00:00
Anders Broman a2f2c49074 Add the toolbar of bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6973
sligtly modified to compile on Windows. See if it breaks any other platform.

svn path=/trunk/; revision=43411
2012-06-20 17:02:07 +00:00
Anders Broman 9ee113d384 Add ws80211_utils.[ch] of bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6973
sligtly modified to compile on Windows. See if it breaks any other platform.

svn path=/trunk/; revision=43410
2012-06-20 16:05:34 +00:00
Pascal Quantin fe3c093534 Fix compilation with gcc...
svn path=/trunk/; revision=43409
2012-06-20 13:42:17 +00:00
Pascal Quantin 29fb9f460b Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7383 :
Put back items into the correct dtap_tree tree and comment pd_tree that is unused for now

svn path=/trunk/; revision=43408
2012-06-20 13:37:22 +00:00
Jeff Morriss 96a3da3e05 Use separate filters for the RTT found on a SACK and the RTT found on a
DATA chunk: having them in both places is helpful when looking at the
messages but having them separate is helpful when graphing the RTTs.

svn path=/trunk/; revision=43406
2012-06-20 13:30:07 +00:00
Anders Broman 1f96f7105e Revert http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=43404.
(Needs rethinking).

svn path=/trunk/; revision=43405
2012-06-20 11:44:28 +00:00
Anders Broman 21e86b9d4d SDP data embeded in OCTET STRING.
svn path=/trunk/; revision=43404
2012-06-20 10:48:00 +00:00
Anders Broman 3cdd0278aa Add a link to IANA registry.
svn path=/trunk/; revision=43403
2012-06-20 10:47:18 +00:00
Anders Broman 3b24901e53 Upadte e-mail.
svn path=/trunk/; revision=43402
2012-06-20 10:46:38 +00:00
Anders Broman 4cc3cae627 - In INTERNAL HANDOVER COMMAND Circuit Identity Code is C(Coded optional in WS)
- be_speech_codec ( 3.2.2.104    Speech Codec) did not cover all codecs.

svn path=/trunk/; revision=43401
2012-06-20 07:59:20 +00:00
Guy Harris 3e7ea12e96 Clean up white space (no tabs).
svn path=/trunk/; revision=43397
2012-06-20 05:48:06 +00:00
Guy Harris 750d666e73 Handle the case where the user has added comments to a file that's not
in a format that supports comments and they do a "Save" by popping up a
similar question to the one we pop up in the "Save As" case and, if they
say "choose another format", pop up a "Save As" dialog box.

svn path=/trunk/; revision=43395
2012-06-20 04:44:14 +00:00
Anders Broman 4e5f1e9914 MAke it compile by adding discard_comments = FALSE
svn path=/trunk/; revision=43394
2012-06-20 04:42:55 +00:00
Guy Harris 06474b4330 If the file has an SHB comment or any packet comments, and the user
tries to do "Save As" in a format for which we don't support comments
(currently, we only support them for pcap-ng), ask whether they want to
discard the comments and save anyway or, *if* the file can be saved in a
format for which we *do* support comments, they want to save the file in
some other format.

Keep a count of packet comments so that we don't have to scan all the
frame_data structures to determine whether we have any comments.

svn path=/trunk/; revision=43392
2012-06-20 01:11:01 +00:00
Gerald Combs 75c8dbff83 Use the first matched color instead of the last one, which is what
Wireshark does.

svn path=/trunk/; revision=43391
2012-06-19 23:01:21 +00:00
Gerald Combs e466eb2a3f Add a list of release dates for major versions of GTK+ and GLib in case
we want to have another Purging Of Old Code.

svn path=/trunk/; revision=43390
2012-06-19 22:09:25 +00:00
Jeff Morriss 030a76319c Correct the IPv6 fragment offset shown in COL_INFO.
Make some Fragment header fields filterable (add_text() -> add_item()).
Display (and make filterable) the reserved octet and bits.

svn path=/trunk/; revision=43389
2012-06-19 20:20:18 +00:00
Gerald Combs ff0d1ec3fa ascend_scanner.c includes ascend.h. Add corresponding makefile
dependencies, otherwise we might have a race condition when doing
parallel makes. Hopefully this will fix intermitten buildbot failures
we've been getting lately.

svn path=/trunk/; revision=43387
2012-06-19 19:53:03 +00:00
Jakub Zawadzki 760559b957 Simplify proto_tree_add_string_format_value(..., val, "%s", val) with proto_tree_add_string.
hash is 16-bytes hex dump (ASCII!). No need to use proto_tree_add_string_format_value().

svn path=/trunk/; revision=43386
2012-06-19 19:50:43 +00:00
Pascal Quantin fe8280ce5e Use tvb_get_ephemeral_string_enc() in combination with proto_tree_add_unicode_string() (as recommended by Jakub on the mailing list)
svn path=/trunk/; revision=43385
2012-06-19 19:25:01 +00:00
Guy Harris d50353013b AAAAARGH. Making the UI libs platform-dependent breaks dependency
checking, so if a UI library changes Wireshark won't be relinked with
it.  Revert the change that made them platform-dependent; we may end up
having to have separate targets for GTK+ Wireshark and Qt Wireshark.

svn path=/trunk/; revision=43384
2012-06-19 19:24:50 +00:00
Guy Harris 475b8d9bcd The GTK+ file chooser already *includes* UI code to ask the user whether
they want to overwrite an existing file; just use that.  (The Win32 file
chooser also does that itself.)  Just do UI for "do you want to
overwrite this {user-immutable,unwritable} file?".

svn path=/trunk/; revision=43381
2012-06-19 19:20:47 +00:00
Guy Harris 6ba80adfed The "save as" dialog is modal, so we don't need to worry about keeping
track of multiple such "save as" windows.

Use modal dialog boxes to report errors, while we're at it.  That lets
us keep the dialog open if we get an error.

svn path=/trunk/; revision=43380
2012-06-19 18:47:22 +00:00
Pascal Quantin 6356f914c4 Use newly introduced proto_tree_add_unicode_string() to add UTF-8 strings
svn path=/trunk/; revision=43379
2012-06-19 18:21:53 +00:00
Jeff Morriss aab480d191 Followup to r43370: don't install idl2wrs or its man page.
svn path=/trunk/; revision=43377
2012-06-19 17:32:49 +00:00
Jeff Morriss adb2a47a58 Mark another variable as volatile to pacify the buildbot.
svn path=/trunk/; revision=43376
2012-06-19 17:29:56 +00:00
Jörg Mayer 9e495c9998 Pontus Fuchs
add libnl detection to configure
(not yet used until the missing part of bug 6973 has been committed)

svn path=/trunk/; revision=43375
2012-06-19 16:35:15 +00:00
Jörg Mayer ebc9046f2d Replace last instance of airpcap_tb by wireless_tb for
consistency.

svn path=/trunk/; revision=43374
2012-06-19 16:32:05 +00:00
Jörg Mayer bca451b663 capture_dlg.h:
- Replace airpcap_tb in comment
- Remove trailing whitespace
main.c:
- wireless_tb must always be defined now, even if compiling without
  HAVE_AIRPCAP

svn path=/trunk/; revision=43373
2012-06-19 16:13:11 +00:00
Jörg Mayer 1b1d6ff096 set_menu_visible needs to be protected to avoid defined but unused
warning turned error.

svn path=/trunk/; revision=43372
2012-06-19 15:53:22 +00:00