osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
51,796 Commits 26 Branches 0 Tags 795 MiB
Commit Graph

51796 Commits

Author SHA1 Message Date
Gerald Combs d1fb81722f Merge "We have a usable tag now. There's no need to fake a version number." 2014-01-29 19:56:48 +00:00
Hadriel Kaplan f97d6f397c Fix for Bug 9707 'Lua: init.lua has multiple 'MENU_STAT_TELEPHONY' values' 
Change-Id: If4ee1906aa60dd37366cf2ef9bc4168e0ea024b6
 2014-01-29 19:53:59 +00:00
Gerald Combs 82c5bfd6f1 We have a usable tag now. There's no need to fake a version number. 
Change-Id: Ic6a704013b38e9be130be40098e9293e9196bfec
 2014-01-29 11:53:04 -08:00
Stig Bjørlykke 60a1931beb Merge "Lua: Added a utility function file_exists()." 2014-01-29 18:29:59 +00:00
Alexis La Goutte 5982c6179b Merge "Apply layouts in Qt Creator. Fix a tooltip." 2014-01-29 17:44:54 +00:00
Stefan Metzmacher 6167a0f6ed packet-smb2: fix lease epoch fields 
Bug: 9703

Change-Id: I1955360adaee53846f084434c59180d715e19fcd
Signed-off-by: Stefan Metzmacher <metze@samba.org>
 2014-01-29 17:42:51 +00:00
Alexis La Goutte cac3024d70 Merge "smb2: Lease Epoch is only 16 bit" 2014-01-29 17:42:10 +00:00
Volker Lendecke fc216102e3 smb2: Lease Epoch is only 16 bit 
See [MS-SMB2] 2.2.14.2.12

Bug: 9703

Change-Id: Ia9c9c658bd5020e0dad84fc74617fed60ce7df06
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
 2014-01-29 17:41:31 +00:00
Alexis La Goutte a5b2a9c93c Merge "smb2: Fix a typo" 2014-01-29 17:39:22 +00:00
Stig Bjørlykke e4a140c7f0 Lua: Added a utility function file_exists(). 
This function can be used to check for files before calling dofile(),
which will fail for non-existing files.

Change-Id: Iae7b7ef6d8eb6e0e18f98fee7c740d2a5705eef3
 2014-01-29 16:05:48 +01:00
Gilbert Ramirez a20d788da3 Add newlines at end of files that are missing them. 
gcc 4.1.2 complained with:
    No newline at end of file

Change-Id: I813af88737e725a328713eea4a7096d28942f9b2
 2014-01-29 05:11:10 -08:00
Volker Lendecke 05a7306482 smb2: Fix a typo 
Bug: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9703

Change-Id: I8ebb20a48e1131fcf14ee55e5e1822a8dcd713d2
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
 2014-01-29 11:34:47 +01:00
Martin Kaiser 447c96304e tree variables don't have to be initialized 
Change-Id: Ic87133b143170d0146cd3a8fb23f8d0b33ec6502
 2014-01-28 20:31:01 +00:00
Gerald Combs 221878bc1b Merge "[Automatic manuf, services and enterprise-numbers update for 2014-01-26]" 2014-01-28 19:13:40 +00:00
Bill Meier 58bb4726a8 Comment out a lot more hf[] entries and related. 
(Found by checkhf).

Note: There's quite a large amount of hf[] entries which are
      commented out. I wonder if there are "top-level" entries
      missing from the "parse-tree" arrays ?


svn path=/trunk/; revision=54990
 2014-01-28 03:09:03 +00:00
Bill Meier 9d0207ed90 Comment out unused hf[] entries and related found by checkhf. 
svn path=/trunk/; revision=54989
 2014-01-28 03:06:03 +00:00
Bill Meier c1e53e7359 Re-arrange #if 0/#endif related to an hf[] entry so that checkhf doesn't complain. 
svn path=/trunk/; revision=54988
 2014-01-28 03:02:37 +00:00
Evan Huus 953d54b120 From Marko Hrastovec via 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9697

Architectural support for multiple version of the same Asterix categories.
Includes implementation of CAT064 v.0.17.

svn path=/trunk/; revision=54987
 2014-01-28 00:48:23 +00:00
Anders Broman a40f824e0e Make it easier to try GTK 3.6 
svn path=/trunk/; revision=54986
 2014-01-27 19:22:10 +00:00
Gerald Combs 257e301696 Convert the quick setup chapter to AsciiDoc and start converting its 
content to Git.

svn path=/trunk/; revision=54985
 2014-01-27 18:43:57 +00:00
Bill Meier 5c9c6cd8fb Fix hf[] entries with refs to range_string arrays 
to add missing BASE_RANGE_STRING and to use RVALS instead of VALS.

Fixes crashes in 'tshark -G values' and presumably also fixes
 crashes when used in a dissection.

Introduced in SVN #54449.

(I suspect that ' convert_proto_tree_add_text.pl' may need some work
 to handle range_strings).



svn path=/trunk/; revision=54984
 2014-01-27 18:22:39 +00:00
Bill Meier 80b5c57713 Fix: value string specified as a BASE_VAL64_STRING in 
an hf[] entry but defined as a 'value_string' intead of
 as a 'val64_string'.

Caused 'tshark -G values' to crash
 (and presumably would also cause a crash when the value-string
  is referenced in a dissection):

Introduced in svn #54728

(Note: There's still another 'tshark -G values' crash to to found & fixed)


svn path=/trunk/; revision=54983
 2014-01-27 17:20:44 +00:00
Bill Meier dfb3d167b3 (Trivial) Fix spellling in a comment. 
svn path=/trunk/; revision=54982
 2014-01-27 14:33:54 +00:00
Evan Huus dab27680cd From Pavel Moravec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9612 
Fix possibly-uninitialized variable caught by valgrind fuzzing in AMQP.

svn path=/trunk/; revision=54981
 2014-01-27 13:42:34 +00:00
Evan Huus 2338fdea0f Add missing cast. 
svn path=/trunk/; revision=54980
 2014-01-27 13:12:59 +00:00
Martin Mathieson 9416835735 Revert part of previous change 
svn path=/trunk/; revision=54979
 2014-01-27 12:54:34 +00:00
Martin Mathieson f903141d65 Send news of SecurityModeFailure to PDCP dissector, which will attempt to roll back to previous setting 
svn path=/trunk/; revision=54978
 2014-01-27 12:06:46 +00:00
Stig Bjørlykke 3abb51aa67 Do not handle BER bitstring as ASCII string, because this will fail 
when the first bit is set.

svn path=/trunk/; revision=54977
 2014-01-27 09:57:24 +00:00
Stig Bjørlykke fbaff1f081 Add back the fix from revision 54693. 
svn path=/trunk/; revision=54976
 2014-01-27 09:55:46 +00:00
Stig Bjørlykke face757db3 Added back x509af_get_last_algorithm_id() removed in revision 54647 to 
restore usage in cms and pkcs12.  They never got a valid value in 
actx->external.direct_reference because they use another actx in this case.

This will add back the global variable in x509af, but this is needed
until we manage to pass the value in another way.

See comments in bug 9573.

svn path=/trunk/; revision=54975
 2014-01-27 09:02:06 +00:00
Gerald Combs b48a2db7d1 Try to fix the path selector argument. 
svn path=/trunk/; revision=54974
 2014-01-27 05:26:38 +00:00
Gerald Combs 59990b7031 Fix a section name conflict. 
svn path=/trunk/; revision=54973
 2014-01-27 05:10:34 +00:00
Gerald Combs 5b17df040e Restore an inadvertently deleted file. 
svn path=/trunk/; revision=54972
 2014-01-27 04:34:25 +00:00
Gerald Combs 5344e2f2fc Migrate the build environment introduction to AsciiDoc. 
svn path=/trunk/; revision=54971
 2014-01-27 04:20:44 +00:00
Gerald Combs e61a6533e7 Convert the preface to AsciiDoc with minor edits. 
svn path=/trunk/; revision=54970
 2014-01-27 03:08:01 +00:00
Jörg Mayer bb21a09681 GPLv2 -> GPLv2+ 
svn path=/trunk/; revision=54969
 2014-01-26 22:21:28 +00:00
Alexis La Goutte bdcf5496b3 lupdate / lrelease ui/qt/Qtshark.pro 
svn path=/trunk/; revision=54968
 2014-01-26 18:24:56 +00:00
Alexis La Goutte ea227de9e2 Fix indent (Use 4spaces) and modelines info 
svn path=/trunk/; revision=54967
 2014-01-26 18:24:45 +00:00
Gerald Combs 2df4f47459 [Automatic manuf, services and enterprise-numbers update for 2014-01-26] 
Change-Id: Iaec909df5c97e92ee5d25b2ef1593b9dc00f0ad6
 2014-01-26 09:06:14 -08:00
Alexis La Goutte c6022b3b85 Drop support of Visual Studio 2005 
* Remove _MSC_VER < 1500 check
* Cleanup config.nmake

See http://www.wireshark.org/lists/wireshark-dev/201305/msg00159.html

svn path=/trunk/; revision=54965
 2014-01-26 12:56:32 +00:00
Alexis La Goutte 47f50d13ce Fix indent (Use 4 spaces) and add modelines 
svn path=/trunk/; revision=54964
 2014-01-26 12:56:16 +00:00
Alexis La Goutte c802536f67 Fix encoding arg for RSVP dissector (with fix-encodings-args tools 
svn path=/trunk/; revision=54963
 2014-01-26 12:55:59 +00:00
Bill Meier 64fd4c9c28 (Trivial) update a comment 
svn path=/trunk/; revision=54962
 2014-01-25 18:44:29 +00:00
Martin Kaiser b2c8429a2c TABs -> spaces 
add editor modelines

svn path=/trunk/; revision=54961
 2014-01-25 14:38:51 +00:00
Martin Kaiser 0d1f9021ff BASE_NONE -> STR_ASCII 
svn path=/trunk/; revision=54960
 2014-01-25 14:29:45 +00:00
Martin Kaiser 5a70a53e11 the sametime dissector stores the result of tvb_get_string() into hf 
variables that can handle only 7bit ascii strings
replace this with tvb_get_string_enc()

svn path=/trunk/; revision=54959
 2014-01-25 14:27:49 +00:00
Gerald Combs 4a32b10948 Comment out the "diff" section for now. We'll have to update it for "git 
diff" at some point.

svn path=/trunk/; revision=54958
 2014-01-25 03:27:22 +00:00
Gerald Combs b326fe61c7 Uncomment anchors. 
svn path=/trunk/; revision=54957
 2014-01-25 02:26:12 +00:00
Gerald Combs b87a2cb204 Fix Windows build. 
svn path=/trunk/; revision=54956
 2014-01-25 01:49:57 +00:00
Gerald Combs 927914a2cf Fix xpath selector. Clean up whitespace. 
svn path=/trunk/; revision=54955
 2014-01-25 01:09:28 +00:00