Commit Graph

51323 Commits

Author SHA1 Message Date
Martin Mathieson f6bf6285ef Do EEA2 deciphering in-place, from Pascal
svn path=/trunk/; revision=54615
2014-01-06 11:28:20 +00:00
Anders Broman 5a3ba6c19b Omit assignment for not used types.
svn path=/trunk/; revision=54614
2014-01-06 08:30:53 +00:00
Michael Mann df3d47aebc Base dissector for fileshark functionality. Intended as the equivalent of packet-frame for capture files. This is meant as a placeholder for now, so don't take any of the fields/data as being written in stone.
svn path=/trunk/; revision=54613
2014-01-06 00:44:41 +00:00
Alexis La Goutte bcacd60c1c Fix indent (use 4 spaces)
svn path=/trunk/; revision=54612
2014-01-05 18:40:07 +00:00
Alexis La Goutte 6c66f368df Fix indent (use 4 spaces) and add modelines and remove trailing whitespace
svn path=/trunk/; revision=54611
2014-01-05 18:39:58 +00:00
Alexis La Goutte 2108ccad09 Fix indent (Use tabs) and add modelines
svn path=/trunk/; revision=54610
2014-01-05 18:39:50 +00:00
Alexis La Goutte f27990cfbb Fix indent (use 4 spaces)
svn path=/trunk/; revision=54609
2014-01-05 18:39:43 +00:00
Alexis La Goutte bf76292805 Fix indent (4 spaces) and add modelines
svn path=/trunk/; revision=54608
2014-01-05 18:39:35 +00:00
Alexis La Goutte 9e49bf897d Fix build when use PortablesAPPS
svn path=/trunk/; revision=54607
2014-01-05 18:16:29 +00:00
Alexis La Goutte a051efea06 Fix indent (use 4 spaces)
svn path=/trunk/; revision=54606
2014-01-05 18:16:22 +00:00
Alexis La Goutte 88dcc80aad Enhance NSIS Windows installer (Wireshark Qt support)
* Add Radiobox to choose File Association (Wireshark GTK or Qt)
* Add Checkbox to choose Wireshark Qt icon will be installed (Startup, Desktop...)
* Fix unistaller (don't remove all icons...)
* ...

svn path=/trunk/; revision=54605
2014-01-05 18:16:14 +00:00
Alexis La Goutte 76c9fc03bb Enhance NSIS Windows installer (Wireshark Qt support)
* Add Radiobox to choose File Association (Wireshark GTK or Qt)
* Add Checkbox to choose Wireshark Qt icon will be installed (Startup, Desktop...)
* Fix unistaller (don't remove all icons...)
* ...

svn path=/trunk/; revision=54604
2014-01-05 17:16:03 +00:00
Gerald Combs 9aad2eebc9 [Automatic manuf, services and enterprise-numbers update for 2014-01-05]
svn path=/trunk/; revision=54601
2014-01-05 15:03:44 +00:00
Evan Huus 5fdb822101 Dissect the remainder of IEC104 integrated totals, including the binary counter
reading and the various flags.

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9596

svn path=/trunk/; revision=54600
2014-01-05 14:58:07 +00:00
Martin Kaiser 2ddfebb63c use a DVB string for the event text in the short evt descriptor
svn path=/trunk/; revision=54599
2014-01-05 12:17:52 +00:00
Evan Huus 36e68f7b36 From Jim Young via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9613
Don't use "rand" as a variable name, it shadows a global in recent MacOSX
stdlib.h

svn path=/trunk/; revision=54598
2014-01-05 00:47:24 +00:00
Anders Broman 21cc278905 Fix a typo.
svn path=/trunk/; revision=54597
2014-01-04 23:41:22 +00:00
Anders Broman 0c3f422b30 Omit assignment for not used types.
svn path=/trunk/; revision=54596
2014-01-04 17:48:15 +00:00
Bill Meier 65ac347e0c Minor: update 'Conversation' intro to include find_or_create_conversation
svn path=/trunk/; revision=54595
2014-01-04 17:45:12 +00:00
Bill Meier b26f50cbb1 (Trivial) explicitely --> explicitly
svn path=/trunk/; revision=54594
2014-01-04 17:29:20 +00:00
Anders Broman 3a533ccc32 Omit assignment for not used types.
svn path=/trunk/; revision=54593
2014-01-04 12:03:02 +00:00
Anders Broman c7c5e4f54e Omit assignment for not used types.
svn path=/trunk/; revision=54592
2014-01-04 11:54:27 +00:00
Anders Broman 6b58ef91d4 Omit assignment for not used types.
svn path=/trunk/; revision=54591
2014-01-04 11:48:40 +00:00
Anders Broman 42e0144f08 Remove unused function and variable.
svn path=/trunk/; revision=54590
2014-01-04 11:40:43 +00:00
Anders Broman 2334acec2c Omit assignment for not used types.
svn path=/trunk/; revision=54589
2014-01-04 11:34:46 +00:00
Anders Broman 4763f36a75 Omit assignment for not used types.
svn path=/trunk/; revision=54588
2014-01-04 11:26:30 +00:00
Anders Broman 2b32fed0ef Omit assignment for not used types.
svn path=/trunk/; revision=54587
2014-01-04 11:24:33 +00:00
Anders Broman 72970675bd Add the rest of the NOKIA extensions.
svn path=/trunk/; revision=54586
2014-01-04 10:06:04 +00:00
Gerald Combs d0f7a4fadf Add tooltips for the total number of streams.
svn path=/trunk/; revision=54585
2014-01-04 01:13:01 +00:00
Gerald Combs 2fa2f632ec Add a note and commented-out definitions for Win flex-bison.
Alex Zhondin was kind enough to create a Chocolatey package for Win
flex-bison.  Unfortunately a bug in Chocolatey's shell wrapper generator
keeps us from using it for the time being.

svn path=/trunk/; revision=54584
2014-01-04 01:00:19 +00:00
Evan Huus 7af0e2a446 Add partial dissection of IEC104 M_IT_TB_1.
For https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9596

Also add modelines.

svn path=/trunk/; revision=54583
2014-01-03 15:09:24 +00:00
Bill Meier c62db3cdc0 For -h option: output to stdout and exit(0) as per convention;
Do some whitespace changes;
Change editor-modelines tab-width & etc to 8.

svn path=/trunk/; revision=54582
2014-01-03 14:44:16 +00:00
Bill Meier 58a92b1f14 For '-h' option: exit(0) as per convention;
No need to build a constant string on the stack at runtime;
Fix a typo;
Do some whitespace changes;
Change tab-width & etc to 8 in editor modelines.

svn path=/trunk/; revision=54581
2014-01-03 14:30:09 +00:00
Anders Broman 4f62f2cfa3 Add a few more of the NOKIA extensions.
svn path=/trunk/; revision=54580
2014-01-03 13:29:48 +00:00
Pascal Quantin 3fb89feca6 EIA2 is now functional
svn path=/trunk/; revision=54579
2014-01-03 12:21:26 +00:00
Alexis La Goutte 8299c8deeb Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=54578
2014-01-03 10:22:10 +00:00
Alexis La Goutte ff19d5726d Update NEWS and Release note
Revert part of last commit about AUTHORS-SHORT in Windows....

svn path=/trunk/; revision=54577
2014-01-03 10:21:56 +00:00
Anders Broman dd03231870 Update with the removal of the ASN1 plugin and the GNM dissector.
svn path=/trunk/; revision=54576
2014-01-03 09:48:53 +00:00
Evan Huus 396c028eb7 Make sure we have a dissector table before calling dissector_try_uint_new. Fixes
a null-ptr deref found while fuzzing.

svn path=/trunk/; revision=54574
2014-01-03 06:03:28 +00:00
Jörg Mayer 75dbaf5830 Check flags that might be supported by both C and C++ still
separately.

svn path=/trunk/; revision=54573
2014-01-03 00:40:21 +00:00
Jörg Mayer 0752f22af1 As discussed on wireshark-dev: follow autotools to use
-Wshorten-64-to-32 for c only

svn path=/trunk/; revision=54572
2014-01-03 00:14:46 +00:00
Jeff Morriss ef5e9fd6b4 Don't try to build asn1/asn1/Makefile either (see r54561).
svn path=/trunk/; revision=54571
2014-01-02 20:48:33 +00:00
Guy Harris 9d41c658fe No seek-read routines use the length argument, so eliminate it from
wtap_seek_read().

svn path=/trunk/; revision=54570
2014-01-02 20:47:21 +00:00
Alexis La Goutte 5acabc99b0 It is AUTHORS-SHORT.txt in Windows
Kept comment about dev release (and change logo)
Use the some order like Wireshark GTK (Authors before Folders)

svn path=/trunk/; revision=54569
2014-01-02 20:21:09 +00:00
Guy Harris 11e4e670a4 Don't use the length argument to the seek-read routine; no other
seek-read routine does that.

Pass the length we just filled in to buffer_assure_space() in the
seek-read routine, and use that in the memcpy() as well.

svn path=/trunk/; revision=54568
2014-01-02 20:17:24 +00:00
Jeff Morriss d91261a53b Don't try to build asn1/gnm/Makefile (see r54561).
svn path=/trunk/; revision=54567
2014-01-02 19:48:26 +00:00
Jeff Morriss 24b377b51f Don't try to distribute asn1.dll since we no longer build it.
svn path=/trunk/; revision=54566
2014-01-02 19:47:03 +00:00
Guy Harris ac0f903dfa Don't pass the wtap * to a routine if it's not needed.
svn path=/trunk/; revision=54565
2014-01-02 19:39:20 +00:00
Guy Harris e9730c89af Fill in the struct wtap_pkthdr in the seek-read routine.
svn path=/trunk/; revision=54564
2014-01-02 19:33:47 +00:00
Jeff Morriss a56494a526 Fix wireshark-qt startup coredump under autofoo and Windows: make cmake's
VERSION_* macros integers instead of numbers (and treat them as such in
ui/qt/about_dialog.cpp).

svn path=/trunk/; revision=54563
2014-01-02 19:11:06 +00:00