Commit Graph

51235 Commits

Author SHA1 Message Date
Jörg Mayer 2f76706a54 HAVE_PLUGINS was defined twice
svn path=/trunk/; revision=54627
2014-01-07 18:36:37 +00:00
Anders Broman 8da8e47ab1 Try to get rid of some warnings.
svn path=/trunk/; revision=54626
2014-01-07 18:08:02 +00:00
Anders Broman 43252e322e From Zoltán Lajos Kis:
OpenFlow 1.4 dissector: add missing features

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

svn path=/trunk/; revision=54625
2014-01-07 17:41:06 +00:00
Anders Broman 3dbebff4f2 Fix
warning: redundant redeclaration of 'zbee_get_bit_field' 
 warning: redundant redeclaration of 'zbee_aps_cid_names'

svn path=/trunk/; revision=54624
2014-01-07 17:25:20 +00:00
Stig Bjørlykke 74394f2cf7 Added expired handling to FieldInfo.
This avoids using free'd pointers (which leads to crash) when
assigning FieldInfos to global variables.

svn path=/trunk/; revision=54623
2014-01-07 14:46:17 +00:00
Guy Harris fd4faf6619 Expand a comment.
svn path=/trunk/; revision=54622
2014-01-06 23:07:48 +00:00
Guy Harris 81b21459c3 In col_fill_in() and col_fill_in_error(), use col_based_on_frame_data()
to determine whether to fill in the column from frame data or not.

svn path=/trunk/; revision=54621
2014-01-06 23:02:32 +00:00
Martin Mathieson f026d8a807 Call deciphering and integrity checking appropriately for
SecurityModeCommand and SecurityModeResponse.

Also show when integrity has been checked and found to be correct.

svn path=/trunk/; revision=54620
2014-01-06 18:18:04 +00:00
Anders Broman 7bf44dcd97 Try to fix warning: cast discards '__attribute__((const))' qualifier from pointer target type .
svn path=/trunk/; revision=54619
2014-01-06 17:28:49 +00:00
Anders Broman 52033d39d9 Try to fix warning: initializer element is not computable at load time.
svn path=/trunk/; revision=54618
2014-01-06 17:25:03 +00:00
Anders Broman 9c05ac141d Fix a typo.
svn path=/trunk/; revision=54617
2014-01-06 17:12:54 +00:00
Anders Broman ef399fb652 Try to fix warning: initializer element is not computable at load time.
svn path=/trunk/; revision=54616
2014-01-06 15:30:01 +00:00
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