Commit Graph

43219 Commits

Author SHA1 Message Date
Pascal Quantin f69b25250b Simplify #ifdef blocks
svn path=/trunk/; revision=45694
2012-10-21 19:17:36 +00:00
Pascal Quantin b439ae0d6a Revert r45692 and try to fix link failure another way: console_win32.[ch] definitely belong to ui/win32
Add console_win32.[ch] to Makefile.am

svn path=/trunk/; revision=45693
2012-10-21 19:12:18 +00:00
Alexis La Goutte 5af3defc46 Try to fix LINK : fatal error LNK1181: cannot open input file 'win32/console_win32.obj'
move ui/win32/console_win32.[ch] to ui/console_win32.[ch]

svn path=/trunk/; revision=45692
2012-10-21 18:10:31 +00:00
Alexis La Goutte 1d4bd1cb33 Make Windows Buildbot happy
svn path=/trunk/; revision=45691
2012-10-21 16:37:45 +00:00
Alexis La Goutte 96f58b6f38 Make buildbot happy and add modelines info
svn path=/trunk/; revision=45690
2012-10-21 15:26:48 +00:00
Alexis La Goutte b700020a83 Add svn:keyworks and svn:eol-style to ui/win32/console_win32.[ch] (not found how to add with git-svn...)
svn path=/trunk/; revision=45689
2012-10-21 15:04:50 +00:00
Anders Broman 8d178187e3 AddressString can have a size of 1, fixes Bug 7882 -GSM_MAP show malformed Packets when two IMSI https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7882
svn path=/trunk/; revision=45687
2012-10-21 15:01:23 +00:00
Alexis La Goutte 1ae6c353e7 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45686
2012-10-21 14:54:11 +00:00
Alexis La Goutte 5d448950f8 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45685
2012-10-21 14:54:01 +00:00
Alexis La Goutte 55356782db Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45684
2012-10-21 14:53:51 +00:00
Alexis La Goutte 732a735429 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45683
2012-10-21 14:53:38 +00:00
Alexis La Goutte 0baa7413a9 Fix Passed-by-value struct argument contains uninitialized data Warning found by Clang
svn path=/trunk/; revision=45682
2012-10-21 14:53:29 +00:00
Alexis La Goutte 2ce9037866 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45681
2012-10-21 14:53:20 +00:00
Alexis La Goutte 523417a5ca Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45680
2012-10-21 14:53:10 +00:00
Alexis La Goutte 8e0fc436f9 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45679
2012-10-21 14:53:01 +00:00
Alexis La Goutte b88ff840a3 Add MSWindows console to QtShark
svn path=/trunk/; revision=45678
2012-10-21 14:45:40 +00:00
Alexis La Goutte 62ce10ced8 Move MSWindows console "windows" to ui/win32/console_win32.[ch]
svn path=/trunk/; revision=45677
2012-10-21 14:45:23 +00:00
Gerald Combs 6af91f9304 [Automatic manuf, services and enterprise-numbers update for 2012-10-21]
svn path=/trunk/; revision=45675
2012-10-21 14:03:28 +00:00
Jakub Zawadzki 829b2fc91f Make r45511 work also without HAVE_C_ARES.
svn path=/trunk/; revision=45674
2012-10-20 20:50:25 +00:00
Jakub Zawadzki 2fd81fdaf9 Move ep_free_all() *AFTER* packet dissection.
Use glib allocator for data_source.

Thread on wireshark-dev: http://www.wireshark.org/lists/wireshark-dev/201210/msg00116.html

svn path=/trunk/; revision=45673
2012-10-20 20:04:40 +00:00
Jakub Zawadzki b53dbea042 Make data_source opqaue, add getter for tvb.
svn path=/trunk/; revision=45672
2012-10-20 19:54:56 +00:00
Jakub Zawadzki 33b064cd81 I don't understand how this variable might be clobbered, but mark it volatile to silent gcc warning.
svn path=/trunk/; revision=45671
2012-10-20 19:52:23 +00:00
Jakub Zawadzki 77368c3668 Introduce epan_dissect_run_with_taps() which run dissection with taps.
unexport tap_queue_init, tap_push_tapped_queue

svn path=/trunk/; revision=45670
2012-10-20 19:27:24 +00:00
Jakub Zawadzki 6dc977b7d2 - Allow reseting edt with new function epan_dissect_reset(),
- initialize edt once in few places, and later reset it after dissecting
  (add_packet_to_packet_list),
- revert r45667, probably no longer needed.

svn path=/trunk/; revision=45669
2012-10-20 16:44:55 +00:00
Jakub Zawadzki ef72e0eed3 - Free root node and tree data outside proto_tree_free_node,
- remove #if 0 code.

svn path=/trunk/; revision=45668
2012-10-20 16:38:55 +00:00
Evan Huus eb4e26e1b7 Make a few variables volatile to fix longjmp warnings.
svn path=/trunk/; revision=45667
2012-10-20 13:16:10 +00:00
Jakub Zawadzki 88ac0dbea2 Pass create_proto_tree, cinfo directly to add_packet_to_packet_list
svn path=/trunk/; revision=45666
2012-10-20 12:51:34 +00:00
Jakub Zawadzki ea31ff66a0 Remove always TRUE refilter argument from rescan_packets, add_packet_to_packet_list
svn path=/trunk/; revision=45665
2012-10-20 12:51:05 +00:00
Evan Huus 99ddfe913c Remove unused variable.
svn path=/trunk/; revision=45664
2012-10-19 22:04:44 +00:00
Guy Harris 6bcb25c6cb Pass parse_vms_hex_dump() a pointer to a wtap_pkthdr structure and have
it always fill it in.  Have the seek-read routine pass its phdr argument
in.  Have it just return a success/failure indication; do the check for
the packet size in the seek-read routine by looking at the caplen field
of the wtap_pkthdr structure.

svn path=/trunk/; revision=45663
2012-10-19 21:05:03 +00:00
Gerald Combs d16be272c9 Fix columns.
svn path=/trunk/; revision=45662
2012-10-19 20:56:22 +00:00
Gerald Combs b369a09cd2 The file set and export object trees are lists. Make them act like
it. Show human-readable sizes in the file set dialog. Move the
format_size_flags_e operator to qt_ui_utils.cpp for lack of a better
place.

svn path=/trunk/; revision=45661
2012-10-19 19:04:21 +00:00
Chris Maynard ebaf451a4e Add back the "%!" removed in r33773; otherwise, for some unknown reason, only 1 page will be viewable. (Tested w/gsview 5.0 and ghostscript 9.06)
#BACKPORT(1.8, 1.6)

svn path=/trunk/; revision=45660
2012-10-19 18:05:02 +00:00
Gerald Combs b924cfed2b The U3 and PortableApps packaging processes depend on simple
defined/undefined checks. Create a bunch of them corresponding to the
various components that GTK2 and GTK3 need and plumb the packaging files
accordingly. Tested only with GTK2 but GTK3 *should* work.

svn path=/trunk/; revision=45659
2012-10-19 17:47:34 +00:00
Gerald Combs 17f959dc74 Revert the background color for TCP and lighten it for UDP. Change the
ARP background to differntiate it from UDP.

svn path=/trunk/; revision=45658
2012-10-19 15:25:06 +00:00
Chris Maynard 43ebecad9a 1) Use tvb_reported_length_remaining instead of tvb_reported_length_remaining.
2) Use proto_item_append_text instead of proto_item_set_text, since this is
   called within a loop.
3) Increment the offset correctly using blocklen-4 instead of
   tvb_length_remaining, which makes no sense.

svn path=/trunk/; revision=45657
2012-10-19 13:50:23 +00:00
Jakub Zawadzki 6f50f7bf50 Mark unused variable with _U_
svn path=/trunk/; revision=45656
2012-10-19 07:29:56 +00:00
Guy Harris fe22586b79 Hoist the code to set the wtap_pkthdr into a routine, and call it in
both the read and the seek-read routine, now that a pointer to the
wtap_pkthdr is passed to the seek-read routine.

svn path=/trunk/; revision=45655
2012-10-19 00:34:28 +00:00
Guy Harris 9f5431f1d9 Wrap lines a little differently.
svn path=/trunk/; revision=45654
2012-10-18 23:18:23 +00:00
Guy Harris e0e8d220b7 Get rid of unnecessary block braces, clean up white space.
svn path=/trunk/; revision=45653
2012-10-18 23:11:40 +00:00
Bill Meier 8f8775800b Minor Updates:
- #if 0 unused typedef (found by cppcheck);
- create/use extended value strings as appropriate;
- reformat hf[] entries;
- whitespace.

svn path=/trunk/; revision=45652
2012-10-18 23:01:47 +00:00
Bill Meier 8e9db03197 Minor cleanup:
- revert incorrect replacement of FALSE by ENC_BIG_ENDIAN
  done a while back;
  [The incorrect use of ENC_BIG_ENDIAN was benign since
   ENC_BIG_ENDIAN is currently defined as 0x0000000];

svn path=/trunk/; revision=45651
2012-10-18 22:22:25 +00:00
Evan Huus 97f5e101d9 Fix CMake build:
- add some new files to CMakeLists
- we do need _U_ for C++ now that we're sharing some headers between
  C and C++.

svn path=/trunk/; revision=45650
2012-10-18 22:20:36 +00:00
Guy Harris 11aa25f668 Move some arguments up a line.
svn path=/trunk/; revision=45649
2012-10-18 21:54:47 +00:00
Gerald Combs 97fa2f2a5f Show the object export dialog in accordance with the Qt
documentation. Remove our tap listener and clean up after ourselves.

svn path=/trunk/; revision=45648
2012-10-18 21:51:38 +00:00
Gerald Combs 576b24c96e Move ui-independent object export routines to the common ui directory.
Implement DICOM, HTTP, and SMB object exports. Rename the GTK+ export
files. C++-ize epan/tap.h. Fix an apparent memory leak in
eo_save_all_clicked_cb.

The Qt dialog has an indeterminate progress bar. I tried adding
something similar to the GTK+ dialog but event processing led down a
rabbit hole.

svn path=/trunk/; revision=45647
2012-10-18 21:14:43 +00:00
Martin Kaiser 05c1e47f68 (try to) fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7871
increment offset to point to the first byte after the options
(the code used to set an absolute position, if that was 0, we were stuck
 in an endless loop)

svn path=/trunk/; revision=45646
2012-10-18 20:57:02 +00:00
Martin Kaiser 8bf29e8efe minor cleanup of packet-wtp.c
- replace TABs with spaces
- add modelines
- reformat some parts
- use glib data types

svn path=/trunk/; revision=45645
2012-10-18 20:37:10 +00:00
Bill Meier 2c0019b9b5 (Trivial)
-  1 --> TRUE;
-  whitespace and formatting changes.

svn path=/trunk/; revision=45644
2012-10-18 20:27:53 +00:00
Martin Kaiser 93343248cb add CC datatype IDs for the SRM protocol
svn path=/trunk/; revision=45643
2012-10-18 20:12:46 +00:00