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

48939 Commits

Author SHA1 Message Date
Guy Harris 170a70aafd Copyright notice (GPL, why not). 
svn path=/trunk/; revision=52025
 2013-09-13 21:40:19 +00:00
Jeff Morriss a4882cdcfe Add WIRESHARK_APPDATA description to the rawshark and tshark man pages. 
svn path=/trunk/; revision=52024
 2013-09-13 21:15:29 +00:00
Jeff Morriss d179a1b788 Move debian-setup.sh into tools/ 
svn path=/trunk/; revision=52023
 2013-09-13 21:06:08 +00:00
Chris Maynard 02cec4d51b Allow an alternate application data location as specified by the new environment variable, WIRESHARK_APPDATA (chosen instead of my originally proposed WS_APPDATA name since most other Wireshark-specific environment variables were already named with the WIRESHARK_ prefix). 
See also: http://www.wireshark.org/lists/wireshark-users/201309/msg00013.html

svn path=/trunk/; revision=52022
 2013-09-13 20:15:46 +00:00
Pascal Quantin e078770856 From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9047 : 
EPL: Dissection for WriteMultipleParameter, Node Alias, SDO/ASND structuring

svn path=/trunk/; revision=52021
 2013-09-13 19:27:53 +00:00
Evan Huus 863e056a9c cmake/TestFileOffsetBits also copied from an upstream with the appropriate 
license

svn path=/trunk/; revision=52020
 2013-09-13 18:40:15 +00:00
Evan Huus b33c061cc5 Permit a bunch of 'combo' licenses (meaning GPL + something else we accept in 
the same file).

svn path=/trunk/; revision=52019
 2013-09-13 18:36:11 +00:00
Evan Huus d0d4118263 Add license header (attributing to Jakub) for a few of the npl files. 
svn path=/trunk/; revision=52018
 2013-09-13 18:29:08 +00:00
Evan Huus b5c48b4a41 Ignore svnversion.h, it's auto-generated. Ignore lemon and except.[ch], they're 
imported from upstreams with correct licensing but without a useful header (and
there's no particular reason to carry that delta).

svn path=/trunk/; revision=52017
 2013-09-13 18:24:22 +00:00
Chris Maynard 50bcbef658 OK, all the Makefiles use -build since r41943, so add that option back for now. 
svn path=/trunk/; revision=52016
 2013-09-13 18:11:29 +00:00
Chris Maynard 051c082a8c Update the comments to match the current usage. 
svn path=/trunk/; revision=52015
 2013-09-13 18:00:32 +00:00
Jörg Mayer 0d1411f854 Add comment where the vendor ids come from 
svn path=/trunk/; revision=52014
 2013-09-13 17:40:32 +00:00
Pascal Quantin 7623232f25 Convert a few more dissectors to wmem 
svn path=/trunk/; revision=52013
 2013-09-13 17:25:54 +00:00
Jörg Mayer fbef795dc3 Move common.c to dirty files 
svn path=/trunk/; revision=52012
 2013-09-13 17:23:29 +00:00
Jörg Mayer b0ef116a4c Fix 
/home/jmayer/work/wireshark/svn/trunk/echld/parent.c: In function ‘echld_terminate’:
/home/jmayer/work/wireshark/svn/trunk/echld/parent.c:305:5: error: suggest braces around empty body in ‘do’ statement [-Werror=empty-body]
  do ; while(sleep(1)); /* wait a full sec without signals */
     ^
cc1: all warnings being treated as errors


svn path=/trunk/; revision=52011
 2013-09-13 17:23:00 +00:00
Evan Huus 4fb4b2f1a2 Fix a bug (caught by Pascal) where a tree was being explicitly cast to emem_tree 
for some reason, and thus the compiler hadn't flagged a type mismatch when the
tree was converted to wmem.

svn path=/trunk/; revision=52010
 2013-09-13 17:21:12 +00:00
Jörg Mayer 79cd883f02 Fix might be used uninitialized warning 
svn path=/trunk/; revision=52009
 2013-09-13 17:20:39 +00:00
Evan Huus d6d4c069d9 Replace some emem with wmem. 
The windows-common dissector seems to make excessive use of strbufs - I
converted them and simplified a bit, but it could probably be simplified more.

svn path=/trunk/; revision=52008
 2013-09-13 17:14:55 +00:00
Jörg Mayer f24067ec9d Fix warnings shown by gcc-4.8.1 
/home/jmayer/work/wireshark/svn/trunk/echld/common.c:134:2: error: enum conversion in initialization is invalid in C++ [-Werror=c++-compat]
  {0,NULL}
  ^
/home/jmayer/work/wireshark/svn/trunk/echld/common.c:134:2: error: (near initialization for ‘t_map[34].type’) [-Werror=c++-compat]
/home/jmayer/work/wireshark/svn/trunk/echld/common.c:269:3: note: expected ‘echld_msg_type_t’ but argument is of type ‘guint32’
/home/jmayer/work/wireshark/svn/trunk/echld/common.c:253:8: error: variable ‘off’ set but not used [-Werror=unused-but-set-variable]
   long off;
        ^
cc1: all warnings being treated as errors

Still todo:

/home/jmayer/work/wireshark/svn/trunk/echld/common.c: In function ‘echld_read_frame’:
/home/jmayer/work/wireshark/svn/trunk/echld/common.c:269:3: error: enum conversion when passing argument 4 of ‘cb’ is invalid in C++ [-Werror=c++-compat]
   cb( &(r->rp[sizeof(hdr_t)]), HDR_LEN(h), h->h.chld_id, HDR_TYPE(h), h->h.reqh_id, cb_data);
   ^
/home/jmayer/work/wireshark/svn/trunk/echld/common.c:269:3: note: expected ‘echld_msg_type_t’ but argument is of type ‘guint32’

Whitespace fixes


svn path=/trunk/; revision=52007
 2013-09-13 17:08:00 +00:00
Chris Maynard 9c7e47fb2e Rename --build to --check-addtext/--nocheck-addtext for clarity. 
Add --check-addtext/--nocheck-addtext, --check-hf/--nocheck-hf and --debug to the usage output and format the usage output a little better.

svn path=/trunk/; revision=52006
 2013-09-13 16:52:08 +00:00
Evan Huus cabf974059 Remove useless-use-of-emem, add modelines. 
svn path=/trunk/; revision=52005
 2013-09-13 16:48:07 +00:00
Anders Broman b3ce4ecc14 Try to make the heuristic a bit more efficient. 
svn path=/trunk/; revision=52004
 2013-09-13 16:33:28 +00:00
Jörg Mayer 35a56ca756 Dario Lombardo via 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9147

More emem -> wmem conversion: Addresses se_malloc() calls.

svn path=/trunk/; revision=52003
 2013-09-13 14:14:23 +00:00
Jörg Mayer 23d3e3d665 Dario Lombardo <lomato@gmail.com> via 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9147

Migration from emem to wmem for trivial cases (ep_alloc only).


svn path=/trunk/; revision=52002
 2013-09-13 10:13:19 +00:00
Jörg Mayer 1e762e315d Remove epan.h from ftypes.h, address.h and tpg.h, 
add it to proto.h as it contains macros that require emem.h

svn path=/trunk/; revision=52001
 2013-09-13 09:13:09 +00:00
Jörg Mayer f348cd5678 Explicit inclusion of emem.h 
svn path=/trunk/; revision=52000
 2013-09-13 08:49:38 +00:00
Jörg Mayer e0d70f2ecc Include emem.h 
svn path=/trunk/; revision=51999
 2013-09-13 08:40:51 +00:00
Jörg Mayer 083ef50f3e Two more places with now explicit emem.h include 
svn path=/trunk/; revision=51998
 2013-09-13 08:26:15 +00:00
Jörg Mayer 029e258225 Explicitly include emem.h where it is needed 
svn path=/trunk/; revision=51997
 2013-09-13 08:16:50 +00:00
Gerald Combs 1ad683594d Add a context menu to the TCP stream graph which includes all of our 
keyboard shortcuts.

svn path=/trunk/; revision=51996
 2013-09-12 23:46:56 +00:00
Jörg Mayer e3ef5ac9fb emem -> wmem 
This was the last dissector in packet-[t-z]*.c that I consider
trivial enough to work on it. The remaining ones a left to people
who intend to think while doing the conversion ;-) 

svn path=/trunk/; revision=51995
 2013-09-12 22:53:40 +00:00
Jörg Mayer 1810de72b6 In some cases add include emem.h 
In other cases emem -> wmem

svn path=/trunk/; revision=51994
 2013-09-12 22:44:08 +00:00
Jörg Mayer 2614ec5ea0 emem -> wmem 
svn path=/trunk/; revision=51993
 2013-09-12 22:26:43 +00:00
Gerald Combs c1e9555ad3 Try different arrow glyphs. 
svn path=/trunk/; revision=51992
 2013-09-12 22:04:37 +00:00
Pascal Quantin 6cedc2c336 Convert a few more dissectors to wmem 
svn path=/trunk/; revision=51991
 2013-09-12 22:03:31 +00:00
Jörg Mayer 2e9cd19c9c == has higher precedence than & 
http://en.wikipedia.org/wiki/Operators_in_C_and_C++

svn path=/trunk/; revision=51990
 2013-09-12 21:53:53 +00:00
Gerald Combs 07c3d057b8 Add previous/next stream navigation to the TCP stream graph dialog. 
Add get_tcp_stream_count() to the TCP dissector and modify
graph_segment_list_get() to allow matching based solely on a stream.

Use text instead of icons for the mouse click behavior buttons. Remove
their PNG resources since we aren't using them any more. Fix setting the
cursor in the graph widget.

svn path=/trunk/; revision=51989
 2013-09-12 21:37:47 +00:00
Jörg Mayer 467f128306 emem -> wmem 
"tshark -v" tested

svn path=/trunk/; revision=51988
 2013-09-12 21:34:58 +00:00
Martin Kaiser fd50ee16e8 dissect OCSP nonce extension 
some minor reformatting of the ASN.1 imports

svn path=/trunk/; revision=51987
 2013-09-12 21:29:50 +00:00
Martin Kaiser c7f22db4d2 mark unused parameters 
svn path=/trunk/; revision=51986
 2013-09-12 21:17:21 +00:00
Anders Broman 71b93947de Try to make the STUN heuristic sligtly more efficient. 
svn path=/trunk/; revision=51985
 2013-09-12 20:53:51 +00:00
Jörg Mayer 884b61f987 Add missing includes 
Remove not needed include
emem -> wmem

svn path=/trunk/; revision=51984
 2013-09-12 20:38:07 +00:00
Pascal Quantin efe18f199c Convert a few dissectors from emem to wmem API 
svn path=/trunk/; revision=51983
 2013-09-12 20:37:30 +00:00
Chris Maynard ac7ecb10d2 More dissector table name related changes (a continuation of r51904). 
svn path=/trunk/; revision=51982
 2013-09-12 20:34:19 +00:00
Guy Harris aa8fbf09d2 The secs field of an nstime_t is a time_t, so cast to that. 
svn path=/trunk/; revision=51981
 2013-09-12 20:31:31 +00:00
Guy Harris 8d8c56d3e4 Note what the various ENC_TIME_ encodings are. 
svn path=/trunk/; revision=51980
 2013-09-12 20:30:55 +00:00
Jörg Mayer 1965ab5d3e emem -> wmem ("tshark -v" tested) 
svn path=/trunk/; revision=51979
 2013-09-12 20:25:51 +00:00
Jörg Mayer 934cc4526d Make proto.c compile on my system (linux, 32 bit) 
[-Werror,-Wshorten-64-to-32]
                                time_stamp.secs = (todsecs  / 1000000) - TOD_BASETIME;
                                                ~ ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~
/home/jmayer/work/wireshark/svn/trunk/epan/proto.c:1613:44: error: implicit conversion
      loses integer precision: 'unsigned long long' to 'time_t' (aka 'long')
      [-Werror,-Wshorten-64-to-32]
                                time_stamp.secs = (todsecs  / 1000000) - TOD_BASETIME;
                                                ~ ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~

svn path=/trunk/; revision=51978
 2013-09-12 20:07:48 +00:00
Anders Broman 753afe5fa4 Fix UDP port range. 
svn path=/trunk/; revision=51977
 2013-09-12 18:17:41 +00:00
Evan Huus 1f3adeae8c Revert the TPNCP changes in r51972 until we can figure out a better way to fix 
it.

svn path=/trunk/; revision=51976
 2013-09-12 17:32:49 +00:00