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
Gerald Combs
085d21ec1c
Remove what appears to be an errant vi/vim command and add a newline.
...
svn path=/trunk/; revision=43371
2012-06-19 15:44:10 +00:00
Jeff Morriss
e54831aef1
Don't install idl2wrs except in Debian's special wireshark-dev package.
...
(Normal Wireshark installations can't be used to develop dissectors so there's
no need to install it or its man page.)
http://www.wireshark.org/lists/wireshark-dev/201206/msg00073.html
(The Debian changes are untested.)
svn path=/trunk/; revision=43370
2012-06-19 15:39:52 +00:00
Jeff Morriss
afa07ed684
gui.airpcap_toolbar_show is the old name for the wireless toolbar, not the old name of the filter toolbar.
...
svn path=/trunk/; revision=43369
2012-06-19 15:01:25 +00:00
Anders Broman
2592e50101
Don't install main-menubar-ui.xml
...
svn path=/trunk/; revision=43368
2012-06-19 14:54:11 +00:00
Anders Broman
5b64a10d18
Get rid of the remnats of NEW_MENU_CODE.
...
It's probably not a good idea to read the menu bar code from file as it causes problems with permissions when Wireshark is run fom build dir.
svn path=/trunk/; revision=43367
2012-06-19 14:49:12 +00:00
Jörg Mayer
2602372010
Add a comment to prevent acidentally bumping lua version to 5.2 again.
...
svn path=/trunk/; revision=43366
2012-06-19 14:48:36 +00:00
Anders Broman
7364abf0bc
Typo
...
svn path=/trunk/; revision=43365
2012-06-19 14:46:21 +00:00
Anders Broman
1992295e16
Revert:
...
airpcap_tb -> wireless_tb
Second try.
svn path=/trunk/; revision=43364
2012-06-19 14:37:46 +00:00
Jakub Zawadzki
85aad38347
Add proto_tree_add_unicode_string() to add UTF-8 string to tree.
...
Convert some proto_tree_add_string_format_value(..., val, "%s", val); to use new function.
svn path=/trunk/; revision=43363
2012-06-19 14:32:24 +00:00
Jakub Zawadzki
7c59ac0280
Fix bug #7378 : Wireshark 1.8.0rc1: gsm_a_dtap SMS 7-bit default alphabet regression w.r.t. 1.6.8
...
proto_item_add_string() can be only used with ASCII strings.
svn path=/trunk/; revision=43362
2012-06-19 14:25:50 +00:00
Jörg Mayer
e64ba28e3b
Do the changes to configure from r43354 in cmake as well.
...
Log:
Start to have an generic wireless toolbar. Sligtly modified patch from
Pontus Fuchs.
svn path=/trunk/; revision=43361
2012-06-19 14:21:08 +00:00
Anders Broman
eeb63c1297
Revert:
...
airpcap_tb -> wireless_tb
svn path=/trunk/; revision=43360
2012-06-19 14:08:15 +00:00
Anders Broman
890a3f66ea
airpcap_tb -> wireless_tb
...
svn path=/trunk/; revision=43359
2012-06-19 13:36:35 +00:00
Jörg Mayer
2a58400811
Downgrade Lua from 5.2.1 to 5.1.5: Lua 5.2 is API incompatible
...
with Lua 5.1.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7373
svn path=/trunk/; revision=43358
2012-06-19 13:31:49 +00:00
Jeff Morriss
f39c0913ed
Mark some variables as volatile to avoid compiler warnings.
...
svn path=/trunk/; revision=43357
2012-06-19 13:24:43 +00:00
Anders Broman
d2b78d48f2
The option to activate the Wireless toolbar should always be available, even if the toolbar is useless.
...
(As it was before as we compiled with HAVE_AIRPCAP 1 ).
svn path=/trunk/; revision=43356
2012-06-19 13:14:25 +00:00
Anders Broman
f0f3e36bda
Try to fix unused variable warnings and "clobbered by 'longjmp' or 'vfork' "
...
svn path=/trunk/; revision=43355
2012-06-19 12:44:13 +00:00
Anders Broman
227eb36c83
Start to have an generic wireless toolbar. Sligtly modified patch from
...
Pontus Fuchs.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6973
svn path=/trunk/; revision=43354
2012-06-19 12:42:06 +00:00
Jakub Zawadzki
addf9236dc
Support multiple relation test without logic and (python-like)
...
Like:
a == b == c
or
a < b <= c <= d < e
Real life example:
6660 <= tcp.port <= 6669
Just syntactic sugar, this is *NOT* optimized.
svn path=/trunk/; revision=43353
2012-06-19 12:12:41 +00:00
Anders Broman
9ee8562c32
From Richard Sharpe:
...
Wireshark is unable to dissect Security Descriptors that span TCP segments where some are not captured or reassembled
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7363
svn path=/trunk/; revision=43352
2012-06-19 10:30:51 +00:00
Guy Harris
9ff274758a
capture_get_if_icon() no longer determines the interface type itself, it
...
relies on get_interface_type() having done so. Thus, we no longer need
to include <sys/types.h> or <sys/stat.h> on Linux, as we aren't doing,
and haven't been doing, ws_stat64()s on Linux.
svn path=/trunk/; revision=43351
2012-06-19 09:59:45 +00:00
Guy Harris
86a888bc0d
Set save_fragmented at the beginning of the routine, so it can always be
...
used at the end to restore pinfo->fragmented.
svn path=/trunk/; revision=43350
2012-06-19 08:24:23 +00:00
Guy Harris
85e4574258
The file dialog run by file_selection_browse() is modal, so there will
...
only be one instance per "Browse" button up at a time - no need to check
for one already being open.
svn path=/trunk/; revision=43349
2012-06-19 08:11:30 +00:00
Guy Harris
98c0e827d0
In dissect_nt_transaction_request(), restore pinfo->fragmented before
...
returning.
svn path=/trunk/; revision=43348
2012-06-19 08:09:28 +00:00
Anders Broman
99e919bf8b
From Richard Sharpe:
...
packet-smb.c does not properly handle NT TRANSACT requests (and probably TRANSACT and TRANSACT2 requests)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7351
svn path=/trunk/; revision=43347
2012-06-19 06:24:30 +00:00
Anders Broman
24d2178eb7
From Sandeep Dahiya.
...
Add support for Gigamon timestamp trailer (different from existing Gigamon header format).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7365
svn path=/trunk/; revision=43346
2012-06-19 06:18:30 +00:00
Anders Broman
4f5bdb67b2
From Pontus Fuchs:
...
If there are many interfaces the button bar is not visible
unless you manually resize the dialog. On a normal Linux PC
you can easily reach 15-20 interfaces due to USB monitor.
Add a vbox so that you get a scrollbar for the interface table
instead of on the window. This way the button bar is always
visible.
Also increase the default height to handle 20 interfaces.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7379
svn path=/trunk/; revision=43345
2012-06-19 06:08:58 +00:00
Gerald Combs
0541cc3897
Switch to a working tag (r43278).
...
svn path=/trunk/; revision=43344
2012-06-18 23:42:09 +00:00
Michael Tüxen
1b0a5c58e2
Fix compilation on FreeBSD.
...
svn path=/trunk/; revision=43343
2012-06-18 21:50:59 +00:00
Jakub Zawadzki
39f1f0bcb7
Fix r43338 once again :(
...
svn path=/trunk/; revision=43342
2012-06-18 21:33:08 +00:00
Jakub Zawadzki
fc881f6f37
Fix r43338
...
svn path=/trunk/; revision=43339
2012-06-18 20:15:42 +00:00
Jakub Zawadzki
6d06c68247
Change record->col_text_len type to unsigned short.
...
Maximal length of column is defined as 256, for COL_INFO it's 4096,
so limiting it to 65535 bytes in GUI is OK.
XXX To save memory more, we could make col_text_len[] member of PacketList, not PacketListRecord.
svn path=/trunk/; revision=43338
2012-06-18 19:35:34 +00:00
Gerald Combs
0bf0ece483
Integrate r43221 and 43222 with 43211. (Revert back to having only
...
dscp_vals_ext.)
svn path=/trunk/; revision=43335
2012-06-18 17:23:10 +00:00
Gerald Combs
4945ce61ef
Fix a null pointer warning from Clang. Not sure if we'll run into this
...
in practice.
svn path=/trunk/; revision=43334
2012-06-18 17:09:54 +00:00
Pascal Quantin
697cc92c86
Use enums instead of hand written values
...
svn path=/trunk/; revision=43333
2012-06-18 16:53:24 +00:00
Pascal Quantin
7351065ccd
From Sven Eckelmann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7375 :
...
Add support for not_best_next_hop flag in B.A.T.M.A.N. Advanced v14
svn path=/trunk/; revision=43332
2012-06-18 09:17:58 +00:00
Guy Harris
7fbd6ca1f0
Add "simple dialog" routines to pop up modal message boxes.
...
svn path=/trunk/; revision=43330
2012-06-18 08:30:53 +00:00