osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
41,411 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

41411 Commits

Author SHA1 Message Date
Anders Broman 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
Anders Broman 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
Anders Broman 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
Anders Broman 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
Gerald Combs 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
Pascal Quantin fb0a2f3031 Do not use same name for filters with incompatible types 
svn path=/trunk/; revision=43451
 2012-06-23 15:45:01 +00:00
Pascal Quantin 4a6244d1fa Do not use same name for filters with incompatible types 
svn path=/trunk/; revision=43450
 2012-06-23 15:27:51 +00:00
Pascal Quantin 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
Pascal Quantin 472f036552 Do not use same name for filters with incompatible types 
svn path=/trunk/; revision=43448
 2012-06-23 14:36:21 +00:00
Pascal Quantin e68222ebfd Fix copy/paste errors 
svn path=/trunk/; revision=43447
 2012-06-23 14:11:06 +00:00
Pascal Quantin 8c91a5ab0b Do not use same name for filters with incompatible types 
svn path=/trunk/; revision=43446
 2012-06-23 14:10:19 +00:00
Guy Harris 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
Pascal Quantin 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
Balint Reczey 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
Jakub Zawadzki 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
Guy Harris 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
Guy Harris 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
Gerald Combs a0148735c1 Make Docbook happy. 
svn path=/trunk/; revision=43438
 2012-06-21 21:22:07 +00:00
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