Commit Graph

46210 Commits

Author SHA1 Message Date
Jörg Mayer 7e51c9713b dumpabi: This would create the directories in the sourcedir instead
of the binary dir. Fixed that.
  NOTE: It fails with and without this patch for out of tree builds:

jmayer@egg:~/work/wireshark/svn/build/qt-gtk3> make dumpabi
[  1%] Built target wsutil
[  1%] Generating libwsutil.abi.tar.gz
ERROR: can't find modules
cp: cannot stat `abi_dumps/libwsutil/libwsutil_*': No such file or directory
make[3]: *** [wsutil/libwsutil.abi.tar.gz] Error 1
make[2]: *** [wsutil/CMakeFiles/dumpabi-libwsutil.dir/all] Error 2
make[1]: *** [CMakeFiles/dumpabi.dir/rule] Error 2
make: *** [dumpabi] Error 2
jmayer@egg:~/work/wireshark/svn/build/qt-gtk3>


svn path=/trunk/; revision=49014
2013-04-24 12:57:56 +00:00
Jörg Mayer 9db6d700cd The porting guide for Qt5 requires that Q_OS_ be used instead
of Q_WS_ in Qt4 projects
See:
http://qt-project.org/doc/qt-5.0/qtdoc/portingguide.html

svn path=/trunk/; revision=49013
2013-04-24 11:07:25 +00:00
Evan Huus 2616e09140 Add truncate function to wmem strbuf.
svn path=/trunk/; revision=49010
2013-04-24 00:11:57 +00:00
Evan Huus 1b13606b6f Now that the test suite is done and most of the common functions are
implemented, start replacing emem with wmem in dissectors.

Also remove emem.h include from a few files that didn't actually need it.

More to come once in hopefully large batches once I figure out the
appropriate regexes.

svn path=/trunk/; revision=49009
2013-04-24 00:01:45 +00:00
Jörg Mayer 28adc0dee1 Revert commits
------------------------------------------------------------------------
r47064 | cmaynard | 2013-01-14 16:39:38 +0100 (Mo, 14 Jan 2013) | 2 lines

packet-ncp2222.c -> dissectors/packet-ncp2222.c

------------------------------------------------------------------------
r47078 | gerald | 2013-01-14 21:05:24 +0100 (Mo, 14 Jan 2013) | 2 lines

Put packet-ncp2222.c in epan/dissectors. This matches Makefile.am's behavior.

------------------------------------------------------------------------

The first commit tried to make cmake behavior mimic autofoo behavior while
it should be the other way round: out of tree builds fail with packet-ncp2222.c
generation with autofoo.

The second commit just fixed the first one.


svn path=/trunk/; revision=49008
2013-04-23 23:09:34 +00:00
Jörg Mayer 8faa262e90 Stub cmake support for generating the asn1 dissectors.
It doesn't do anything yet, it is just to make svn status
readable again.

svn path=/trunk/; revision=49007
2013-04-23 23:05:33 +00:00
Martin Mathieson 4ef8ba6324 Add a quick check for a first printable character to avoid a more expensive
check of the whole first line. This gets called a lot as a heuristic
dissector.

svn path=/trunk/; revision=49006
2013-04-23 22:44:23 +00:00
Martin Mathieson 94d2036ad0 Turn some preferences on by default. Won't affect info column.
svn path=/trunk/; revision=49005
2013-04-23 22:33:53 +00:00
Gerald Combs 8ea3f82021 Add two tools useful for package maintainers:
backport-rev attempts to merge a revision from the trunk in the current
directory (presumably one of the release branches).

gen-bugnote fetches a bug title from bugs.wireshark.org and formats it
for inclusion in the release notes.

svn path=/trunk/; revision=49004
2013-04-23 19:21:18 +00:00
Martin Kaiser b9ec495a10 oops, missed a linebreak
svn path=/trunk/; revision=49003
2013-04-23 18:53:07 +00:00
Martin Kaiser 4324eeb254 From Mathias Guettler
dissector for ISO 10747 Inter Domain Routing Protocol
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8562

from me:
check for negative return value of tvb_reported_length_remaining()
remove unused hf entries
add modelines
don't initialise variables unless it's necessary
make idrp a new-style dissector


svn path=/trunk/; revision=49002
2013-04-23 18:46:08 +00:00
Gerald Combs d18230de70 Install QtShark by default.
svn path=/trunk/; revision=49001
2013-04-23 18:32:11 +00:00
Gerald Combs c0a41bb182 Add a link to the latest CRT redistributables.
svn path=/trunk/; revision=49000
2013-04-23 17:40:27 +00:00
Martin Kaiser 23856212d5 reformat, add editor modelines
svn path=/trunk/; revision=48998
2013-04-23 17:19:51 +00:00
Anders Broman 319bf24566 Add curr_layer_num which can be used to keep track of multiple occurances of the same protocol in a frame.
svn path=/trunk/; revision=48997
2013-04-23 17:17:56 +00:00
Martin Kaiser c9ac7ec169 nlpid.h requires value_string.h
svn path=/trunk/; revision=48996
2013-04-23 16:59:09 +00:00
Anders Broman 5d52a9c80f Restore a lost hf def.
svn path=/trunk/; revision=48995
2013-04-23 16:59:07 +00:00
Martin Mathieson f78d7ed4d7 When calling IP and Ipv6 dissectors, they may reduce the new tvb we pass in.
MPLS needs to similarly shrink its own tvb so its caller can tell that
there were bytes left over (e.g. ethernet trailer).

svn path=/trunk/; revision=48994
2013-04-23 02:55:44 +00:00
Jörg Mayer 048b751c21 tiny whitespace change
svn path=/trunk/; revision=48993
2013-04-22 23:04:22 +00:00
Jörg Mayer 4f8cb5fdc3 Mimic autoconf behavior and enable -Wc++-compat by default.
svn path=/trunk/; revision=48992
2013-04-22 22:32:03 +00:00
Evan Huus 2a50c31800 Add a section to the wmem README about testing.
svn path=/trunk/; revision=48990
2013-04-22 21:29:57 +00:00
Alexis La Goutte 63f51ce4e6 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48989
2013-04-22 21:26:24 +00:00
Alexis La Goutte 3f5c5aad62 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48988
2013-04-22 21:26:09 +00:00
Alexis La Goutte 76ef1e0acc Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48987
2013-04-22 21:25:59 +00:00
Alexis La Goutte 13d677e8be Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48986
2013-04-22 21:25:50 +00:00
Alexis La Goutte 9d6a6d7bbd Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48985
2013-04-22 21:25:39 +00:00
Alexis La Goutte 9b4a914c8f Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48984
2013-04-22 21:25:23 +00:00
Alexis La Goutte ea63ba2c8f Fix some Dead Store (Dead initialization) Warning found by Clang Fix also indent (Use tabs)
svn path=/trunk/; revision=48983
2013-04-22 21:25:12 +00:00
Alexis La Goutte 3797ae72c5 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48982
2013-04-22 21:24:57 +00:00
Pascal Quantin 7783ca3d2c Update guides
svn path=/trunk/; revision=48981
2013-04-22 21:24:40 +00:00
Evan Huus 43e07d6d0d Add tests for wmem stack, and misc. tweaks to other tests.
The wmem test suite now covers all of the existing allocators, data
structures and utility functions in at least basic cases.

svn path=/trunk/; revision=48980
2013-04-22 21:23:16 +00:00
Anders Broman fdf00ccc4e Dissect new element in GTPv2 MM Context.
svn path=/trunk/; revision=48977
2013-04-22 19:03:12 +00:00
Jörg Mayer 8c11433414 Revert
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=46575

User: gerald                                                                           Date: 2012/12/17 01:24 PM

Log:
 Add libui_dirty.

This is the autofoo way of solving the problem.

Implement the cmake solution (which is used in wiretap/ and other places)
which does not require building a separate lib.

svn path=/trunk/; revision=48976
2013-04-22 19:00:29 +00:00
Alexis La Goutte 679decdac6 Fix warning: 'attr_mask_offset' may be used uninitialized in this function in Mac OS X
svn path=/trunk/; revision=48975
2013-04-22 18:29:34 +00:00
Gerald Combs 5f442f78f2 Update the sample bug.
svn path=/trunk/; revision=48973
2013-04-22 18:01:16 +00:00
Gerald Combs ea19c7f952 1.9.3 → 1.11.0.
svn path=/trunk/; revision=48972
2013-04-22 17:59:38 +00:00
Gerald Combs a5037603ce Tell the user tha gui.update.channel probably shouldn't be changed.
svn path=/trunk/; revision=48970
2013-04-22 17:58:28 +00:00
Gerald Combs 4f9a9cd3d3 Convert another instance of g_assert_cmpuint to g_assert.
svn path=/trunk/; revision=48967
2013-04-22 17:34:50 +00:00
Alexis La Goutte 8a12090715 From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8601 NFSv4 attribute and READDIR modifications
*  "dissect_nfs4_attribute()" was eliminated because the values dissection
   portion of that routine was identical to the "dissect_nfs_attributes()"
   routine.  The code in "dissect_nfs4_bitmap4()" and
   "dissect_nfs4_attrlist4()" was also similar so those routines
   were also eliminated and their code incorporated in dissect_nfs_fattr4s().
   These measures have reduced the size of 'packet-nfs.c' by almost 400 lines.

*  Attributes were relabeled according to RFC 5661 (NFS4v1).
    o “mand_attr” (REQUIRED attribute) header was changed to "reqd_attr”.
    o “recc_attr” (RECOMMENDED attributes) header was changed to “reco_attr”
      because "recommended" only has one ‘c’. =)

*  In order to be able to list the attribute names horizontally in the
   "Attr mask[x]" header (e.g., "Attr mask[0]: 0x0010111a (TYPE, CHANGE, SIZE,
   FSID, ACL, FILEID)", “FATTR4_” was removed from the attribute names
   (e.g., “FATTR4_TYPE (1)” is now “TYPE (1)”.  Note that RFC 5661 does not
   define them with a “FATTR4” prefix.

*  In GETATTR responses, the “resok4” and “obj_attributes” subtrees were
   eliminated because they are neither actual fields nor serve any practical
   purpose.

*  The READDIR "Directory Listing" subtree was reformatted. "Filename" was
   changed to "Entry" because entries can also be directories.
   "Value Follows", "cookie", and "Attr mask[n]" were moved within each entry.
   If an Entry header is left-clicked all the fields of that entry are
   highlighted in the Hex pane. If it is right-clicked the 'nfs.name'
   field (filter) can be obtained. Finally, the "attr_vals:<DATA>" (text)
   subtree was eliminated because it appears to serve no useful purpose and
   clutters the tree.

svn path=/trunk/; revision=48966
2013-04-22 17:31:15 +00:00
Alexis La Goutte 12517d1309 Fix encoding args (via fix-encodings-args tools) Add Modelines info
svn path=/trunk/; revision=48965
2013-04-22 17:28:16 +00:00
Evan Huus 4983d99475 Improve wmem strbuf tests, add tests for string util. functions
svn path=/trunk/; revision=48964
2013-04-22 15:40:48 +00:00
Alexis La Goutte 049399b2fa Add dissection of Aruba Networks Vendor Specific stuff. With ArubaOS 6.2, there is a option to add AP Name in Beacon frame.
svn path=/trunk/; revision=48963
2013-04-22 12:31:04 +00:00
Martin Mathieson b18ab24f49 Don't report duplicate use of IP address twice when dissecting a
gratuitous ARP request.

svn path=/trunk/; revision=48962
2013-04-22 12:08:42 +00:00
Michael Mann f3689204a9 Improve AUTH handling (NTLM and elementary PLAIN mechanism)
from Uli Heilmeier, bug 8600 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8600)

svn path=/trunk/; revision=48961
2013-04-22 02:43:52 +00:00
Michael Mann 4a1bd75b60 Add a "hidden" array of UAT entry data to allow separation between UAT file syntax errors and "syntactically correct, but invalid field". Now UAT files load all entries into the "hidden" array (raw_data), but only adds valid ones to the user_data, which is used by the dissectors.
This is a start to fixing bug 7471 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7471) and is being committed to get the new ABI/API in before the 1.10 release.
What remains is the "GUI portion" (GTK+qt) to indicate to users which UAT entries are invalid.

svn path=/trunk/; revision=48960
2013-04-22 02:10:49 +00:00
Evan Huus 6ea50c8d2e Don't use g_assert_cmpuint, its definition breaks the Windows
buildbot for some reason; g_assert works just as well except
for providing less useful output on failures.

svn path=/trunk/; revision=48959
2013-04-22 01:29:13 +00:00
Michael Mann 8591b0b374 General cleanup.
Converted to proto_tree_add_text to proto_tree_add_item/expert_info

Allow columns/tree/(sub)dissectors/expert_info to be called at all of the proper times.  COL_INFO data still seems a bit verbose when errors occur, but I left it alone, just cleaning up the sequence of events.

Removed some structure definitions where the variables that used them were effectively "useless" once proto_tree_add_item was added (although they weren't that useful before that)

svn path=/trunk/; revision=48958
2013-04-21 23:20:10 +00:00
Evan Huus 2b9db8a7d4 Add wmem string-buffer tests and fix associated bugs.
svn path=/trunk/; revision=48957
2013-04-21 23:19:37 +00:00
Pascal Quantin ca72de3ffe Dissect more TLV objects
svn path=/trunk/; revision=48956
2013-04-21 21:12:24 +00:00
Guy Harris b391fb9c7f In tcp_dissect_pdus(), don't put the PDU length into the protocol tree
unless we're going to hand a packet to the PDU subdissector.

svn path=/trunk/; revision=48955
2013-04-21 19:47:45 +00:00