e6e6d6217b
From Tony Trinh:
...
Update Lua from 5.1 to 5.2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7400
svn path=/trunk/; revision=43482
2012-06-25 20:42:07 +00:00
8eeebf73e0
Move get_args_as_string from ui/util.c into wsutil (maybe not to the best
...
module, but...).
This makes dftest no longer dependent on libui, so stop linking against it.
svn path=/trunk/; revision=43481
2012-06-25 20:38:45 +00:00
aeceb172a4
From Tony Trinh:
...
Update autoconf script to check for Lua 5.2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7400
svn path=/trunk/; revision=43480
2012-06-25 20:31:24 +00:00
6efe4ea27c
From Tony Trinh:
...
Update Lua from 5.1 to 5.2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7400
svn path=/trunk/; revision=43479
2012-06-25 20:28:14 +00:00
f272aaeb80
Only allow "Save" if
...
the file has unsaved changes, and we can save it in some format
through Wiretap
or
the file is a temporary file and has no unsaved changes (so that
"saving" it just means copying it).
Only allow "Save As" if
we can save it in some format through Wiretap
or
the file is a temporary file and has no unsaved changes (so that
"saving" it just means copying it).
This means that we don't support using "Save As" for just copying the
file unless we can do that with Wiretap; copying the file byte-for-byte
only works as "saving" if there are no unsaved changes *and* we're
saving it in the same format that it's in *and* we're saving it with the
same form of compression (if any) that it has.
Rename cf_can_save_as() to cf_can_write_with_wiretap() to better reflect
what it really does.
svn path=/trunk/; revision=43477
2012-06-25 18:37:52 +00:00
c96179ed1e
In the "Save As" dialog box, default to compressed if the file is
...
compressed and the default file format supports compression.
svn path=/trunk/; revision=43475
2012-06-25 17:56:29 +00:00
053707aef8
Fix dissection of NAS EPS Service Request message (broken in r42200)
...
svn path=/trunk/; revision=43474
2012-06-25 11:12:54 +00:00
2d5792d19b
Fix typo errors
...
svn path=/trunk/; revision=43473
2012-06-25 10:16:15 +00:00
7e1b2bcde2
From Rick Mortensen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4128 :
...
Add Ericsson-proprietary AVPs and Result-Codes for SCAP.
Add Huawei as a known vendor.
From me:
Reindent the Ericsson XML file; sort the new AVPs by number.
svn path=/trunk/; revision=43472
2012-06-25 04:41:36 +00:00
342812d0ee
From Yair:
...
1. OAM cells are not automatically detected if the AAL type passed is
AAL_UNKNOWN.
2. CRC10 calculation does not take into account the "crc_stripped" option, and
uses a hardcoded offset of 5 bytes into the cell.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7385
svn path=/trunk/; revision=43471
2012-06-24 23:56:27 +00:00
753d90e57e
From Martin Kaiser:
...
add oid for sha256.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7395
svn path=/trunk/; revision=43469
2012-06-24 23:52:24 +00:00
06e81d59b4
Fix up some white space (get rid of 4-space tabs.
...
svn path=/trunk/; revision=43468
2012-06-24 23:52:05 +00:00
a2a9d5757a
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7386 :
...
Fix dissection of Packet Receipt Times Report Block
svn path=/trunk/; revision=43467
2012-06-24 21:26:40 +00:00
2b6b0656c2
Pontus Fuchs via bug 6973:
...
Add last piece of the wireless toolbar: Use dumpcap to actually set
the channel.
svn path=/trunk/; revision=43466
2012-06-24 19:45:49 +00:00
5cab183cfb
Pontus Fuchs (via bug 6973):
...
Make the wireless toolbar actually appear.
svn path=/trunk/; revision=43465
2012-06-24 19:43:09 +00:00
3b34b557f8
Also add ws80211_utils.c for CMake builds.
...
Build with -g to make debugging easier. The debug info
will get removed on installation.
svn path=/trunk/; revision=43464
2012-06-24 19:41:13 +00:00
17a63f9ca8
Build Wireshark with ws80211_utils.c
...
svn path=/trunk/; revision=43463
2012-06-24 19:38:51 +00:00
2a2ddb7bcb
Pontus Fuchs (via bug 6973):
...
Add libnl version 1 support for wireless toolbar.
svn path=/trunk/; revision=43462
2012-06-24 19:36:20 +00:00
f7e438945f
Remove useless packet-spnego.h file
...
svn path=/trunk/; revision=43461
2012-06-24 19:32:32 +00:00
a0e2ba5eb0
FT_FLOAT and FT_DOUBLE share the same comparison functions -> use same filter name
...
svn path=/trunk/; revision=43460
2012-06-24 17:41:18 +00:00
9adf66b3fb
From Adam Langley:
...
Decrypt resumed, SSL sessions from keylog file-
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7396
svn path=/trunk/; revision=43458
2012-06-24 15:24:59 +00:00
464464d8b6
From Pontus Fuchs:
...
strncpy -> strlcpy
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6973
svn path=/trunk/; revision=43457
2012-06-24 15:19:24 +00:00
ef9180b030
From Evan Huus:
...
Simplify debugging ifdef in camel-persistantdata.c
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7398
svn path=/trunk/; revision=43456
2012-06-24 15:13:05 +00:00
cb801710ba
From Evan Huus:
...
Size wrong in "File Set List" for just-finished captures.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7370
svn path=/trunk/; revision=43455
2012-06-24 15:08:41 +00:00
ebd34c3b28
[Automatic manuf, services and enterprise-numbers update for 2012-06-24]
...
svn path=/trunk/; revision=43452
2012-06-24 14:03:31 +00:00
fb0a2f3031
Do not use same name for filters with incompatible types
...
svn path=/trunk/; revision=43451
2012-06-23 15:45:01 +00:00
4a6244d1fa
Do not use same name for filters with incompatible types
...
svn path=/trunk/; revision=43450
2012-06-23 15:27:51 +00:00
3ceda0e1c4
Rename two entries to avoid having same filter name for entries with incompatible types
...
svn path=/trunk/; revision=43449
2012-06-23 15:04:13 +00:00
472f036552
Do not use same name for filters with incompatible types
...
svn path=/trunk/; revision=43448
2012-06-23 14:36:21 +00:00
e68222ebfd
Fix copy/paste errors
...
svn path=/trunk/; revision=43447
2012-06-23 14:11:06 +00:00
8c91a5ab0b
Do not use same name for filters with incompatible types
...
svn path=/trunk/; revision=43446
2012-06-23 14:10:19 +00:00
16f582176b
In the Windows capture file "Save As" dialog code, do the same sort of
...
checks for the inability to save comments that we do for UN*X. This
should fix bug 7222, although the UI isn't currently as nice, as the
dialog boxes are Windows dialog boxes and we don't set the button labels
to reflect the actual choices being offered to the user. (We may be
able to do that by using template resources to construct the message
boxes.)
svn path=/trunk/; revision=43444
2012-06-23 08:18:14 +00:00
10f6bcc140
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7391 :
...
Do not use same name for filters with incompatible types
svn path=/trunk/; revision=43443
2012-06-22 20:44:52 +00:00
b90a1b7f63
Give hint to check http://wiki.wireshark.org/CaptureSetup/CapturePrivileges in Lua error messages related to running Wireshark as root
...
svn path=/trunk/; revision=43442
2012-06-22 15:18:03 +00:00
557ed446c9
Change #if USE_WIN32_FILE_DIALOGS to #ifdef
...
It should fix buldbot compilation error:
capture_file_dlg.c(2107) : fatal error C1017: invalid integer constant expression
svn path=/trunk/; revision=43441
2012-06-22 08:22:11 +00:00
a862178702
We now need <epan/filesystem.h> regardless of whether we're being built
...
on Win32 or not, as we need test_for_directory().
svn path=/trunk/; revision=43440
2012-06-21 22:49:22 +00:00
204ea39c5d
Move a bunch of common code in the file chooser dialog loops into a
...
routine to run a file chooser dialog.
On Windows, add to that code to resolve shell links ("shortcuts"),
adopted from the Sylpheed mail reader. (That code requires a pile of
OLE stuff, so link with the OLE library.)
Make it a bit easier to configure ui/gtk/capture_file_dlg.c to use GTK+
dialogs on Windows, but continue to default to using the Win32 dialogs,
at least for now.
svn path=/trunk/; revision=43439
2012-06-21 22:21:02 +00:00
a0148735c1
Make Docbook happy.
...
svn path=/trunk/; revision=43438
2012-06-21 21:22:07 +00:00
a66eee919e
Mark a couple more variables volatile.
...
svn path=/trunk/; revision=43437
2012-06-21 21:19:48 +00:00
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
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
4d00f428fd
Reset for the next major release.
...
svn path=/trunk/; revision=43433
2012-06-21 19:29:43 +00:00
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
1785ed1ee0
Try to fix tarball compilation on Windows.
...
svn path=/trunk/; revision=43428
2012-06-21 17:35:59 +00:00
3685b4db6f
Remove some trailing whitespace
...
svn path=/trunk/; revision=43425
2012-06-21 13:23:45 +00:00
536cc401ad
Try to use the gtk-compat macros correctly.
...
svn path=/trunk/; revision=43424
2012-06-21 00:37:42 +00:00
5a89cfdebf
It's FindNL.cmake not FindLIBNL.cmake
...
svn path=/trunk/; revision=43423
2012-06-21 00:15:11 +00:00
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
c0da019caa
Complete cmake support for netlink detection
...
svn path=/trunk/; revision=43421
2012-06-20 20:59:43 +00:00
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
Anders Broman