Commit Graph

19059 Commits

Author SHA1 Message Date
Michael Mann 7f3703de34 update GMR-1 protocols display filers
svn path=/trunk/; revision=44161
2012-07-31 17:19:32 +00:00
Alexis La Goutte e761d193c9 Update ICMPv6 to last IANA Parameters (2012-07-18)
Add draft-irtf-rrg-ilnp-icmpv6-06: ICMP Locator Update message for ILNPv6 ID (Conflit with draft-ietf-6lowpan-nd-18...)

svn path=/trunk/; revision=44160
2012-07-31 17:16:52 +00:00
Chris Maynard 6590deb37f Fix Coverity CID 712526: Missing break in switch. Bug introduced with r44134.
svn path=/trunk/; revision=44157
2012-07-31 14:32:10 +00:00
Anders Broman 796bbde5d3 - Put back not used constants to fill value_strings_ext.
- Don't dissect RRC container, it seems to only cause grief.

svn path=/trunk/; revision=44156
2012-07-31 13:49:39 +00:00
Anders Broman baabe8b191 Make it possible to configure TIPC over UDP ports.
svn path=/trunk/; revision=44155
2012-07-31 08:57:41 +00:00
Jakub Zawadzki b503d9d659 Restore includes from r44107 to fix abi check.
Reverted (by mistake?) in r44129

svn path=/trunk/; revision=44154
2012-07-31 08:40:22 +00:00
Anders Broman df0bef704a From Michael Mann:
Expand show version preference.
implementation of Steven's suggestion of a radio button (actually
dropdown) of the 4 possibilities. 

I changed  the default to  have the version on both in
the welcome screen and on the window as that's how it was and people tend not to change the preferences I think.

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

svn path=/trunk/; revision=44153
2012-07-31 07:27:39 +00:00
Anders Broman fc5a63c97f From Stephen Donnelly:
ERF dissector cleanup

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

svn path=/trunk/; revision=44152
2012-07-31 07:03:25 +00:00
Anders Broman ad95fa259b From Jacob Nordgren and Rishie Sharma:
NBAP: added preferences to change logical channel id to mac content type mapping.

svn path=/trunk/; revision=44151
2012-07-31 06:56:13 +00:00
Jörg Mayer 51b40ed150 Whitespace fixes:
- trailing whitespace
- mixing TAB and space for indentation

svn path=/trunk/; revision=44150
2012-07-31 05:37:57 +00:00
Chris Maynard 63592a1442 tvb_length_remaining() can return -1 if the offset is out of bounds, so return if it does. In this case, it won't since tvb_offset_exists() is previously called, but it's not a bad idea to do it anyway in case the call to tvb_offset_exists() is ever removed, which we might just want to do? Anyway, this is a simple enough change and fixes Coverity CID 280522: Improper use of negative value.
svn path=/trunk/; revision=44149
2012-07-31 00:35:38 +00:00
Chris Maynard d3a8e5614c tvb_length_remaining() can return -1 if the offset is out of bounds. Be sure to deal with it if it does. Fixes Coverity CID 280523: Improper use of negative value.
svn path=/trunk/; revision=44146
2012-07-30 23:43:17 +00:00
Stig Bjørlykke 29cdc9a4cf Added Custom.common as dependency for register.c
svn path=/trunk/; revision=44137
2012-07-30 13:54:02 +00:00
Chris Maynard 4efded1f50 Fix Coverity CID 712343: Wrong sizeof argument.
svn path=/trunk/; revision=44136
2012-07-30 13:38:51 +00:00
Anders Broman 5a4c037e87 Add Russian national variant.
svn path=/trunk/; revision=44134
2012-07-30 13:22:38 +00:00
Michael Tüxen 07e87691f6 Fix compilation issues.
svn path=/trunk/; revision=44133
2012-07-30 11:34:56 +00:00
Michael Mann 7dc7977c04 Add Mojito dissector (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2688)
properly alphabetize packet-mim.c in makefiles

svn path=/trunk/; revision=44132
2012-07-30 11:07:29 +00:00
Jakub Zawadzki c852982ebc wrappers for label filling (with information about string truncation)
svn path=/trunk/; revision=44131
2012-07-30 10:52:20 +00:00
Guy Harris 4ed63300d8 No // comments, please.
svn path=/trunk/; revision=44130
2012-07-30 09:19:07 +00:00
Anders Broman ee071c887a From Jacob Nordgren and Rishie Sharma:
-MAC-is update

svn path=/trunk/; revision=44129
2012-07-30 08:37:00 +00:00
Bill Meier 2479be037f Use consistent indentation.
svn path=/trunk/; revision=44122
2012-07-29 21:59:25 +00:00
Bill Meier 6326869cca Minor cleanup.
svn path=/trunk/; revision=44119
2012-07-29 21:05:08 +00:00
Bill Meier 3c71068c12 Several right-shifts should be left-shifts.
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6881#c12

svn path=/trunk/; revision=44118
2012-07-29 20:39:46 +00:00
Bill Meier c68e50e0e8 g_assert --> DISSECTOR_ASSERT
svn path=/trunk/; revision=44117
2012-07-29 20:19:38 +00:00
Bill Meier 72f8a17e92 Minor cleanup....
svn path=/trunk/; revision=44116
2012-07-29 20:11:33 +00:00
Pascal Quantin b94cd13e93 Fix usage of range string and use extended value strings in a few places
svn path=/trunk/; revision=44115
2012-07-29 19:48:22 +00:00
Bill Meier f0d8bf411e Don't do 'return 0' in mpls-y1722 dissector (so mpls dissector won't try to continue dissecting).
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6787
     Comments 14, 16, 17


svn path=/trunk/; revision=44114
2012-07-29 19:47:50 +00:00
Bill Meier 4e1bad0218 Fix a typo :(
svn path=/trunk/; revision=44113
2012-07-29 19:05:18 +00:00
Bill Meier 3933d7591b Cast away a compile warning: "conversion from '__int64' to 'gulong', possible loss of data"
svn path=/trunk/; revision=44112
2012-07-29 19:00:46 +00:00
Bill Meier 7a22f13aa0 Fix crash when "file_name_snooping" & "file_full_name_snooping" prefs enabled.
Crash due to a g_snprintf() incorrect (too large) "max number of bytes" parameter.

Note that g_snprintf() apparently writes to (initializes ?) bytes beyond the
 actual string written.

Fixes Bug #7948: (To be confirmed by the user)
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7498


svn path=/trunk/; revision=44111
2012-07-29 18:17:17 +00:00
Alexis La Goutte 2f328434f2 From Tobias Rutz via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7518
Add new dissector for DVB-S2 Baseband Frame and GSE dissection

There is a standard for satellite receiving equipment to output all the received
data over an ethernet interface. This dissector is able to show these packets
according to the ETSI standards.
By default the dissector is disabled, it can be enabled in the protocol
settings dialogue

With the dissector...

svn path=/trunk/; revision=44110
2012-07-29 16:57:54 +00:00
Alexis La Goutte c132f85385 From Tobias Rutz via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7518
Add new dissector for DVB-S2 Baseband Frame and GSE dissection

There is a standard for satellite receiving equipment to output all the received
data over an ethernet interface. This dissector is able to show these packets
according to the ETSI standards.
By default the dissector is disabled, it can be enabled in the protocol
settings dialogue

svn path=/trunk/; revision=44109
2012-07-29 16:43:03 +00:00
Alexis La Goutte 3e5cc78d46 From Weijun Wang via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7481
Description for Kerberos 5's ENC-TKT-IN-SKEY is wrong

http://tools.ietf.org/html/rfc4120#section-2.9.2

#Backport

svn path=/trunk/; revision=44108
2012-07-29 16:33:34 +00:00
Jakub Zawadzki e66f10b125 Try to fix ABI check.
svn path=/trunk/; revision=44107
2012-07-29 16:12:17 +00:00
Gerald Combs b9ff022476 [Automatic manuf, services and enterprise-numbers update for 2012-07-29]
svn path=/trunk/; revision=44101
2012-07-29 14:03:32 +00:00
Martin Mathieson 4f65e11ad9 Add a comment that VS Code Analyzer makes a very good point here -
masking the m.s.b. of the command code does mean that several of them
won't ever get detected.  I couldn't readily see from the spec what the
right think to do is.

svn path=/trunk/; revision=44098
2012-07-28 23:51:06 +00:00
Martin Mathieson e1389f1196 VS code analysis was right - 'x' & 0 *was* always going to return 0...
svn path=/trunk/; revision=44097
2012-07-28 23:30:40 +00:00
Martin Mathieson dfd2753b06 Use the _vs suffix for value_string variables consistently. There was a
clash between the value_string 'addr_fmt' and where the raw value was
parsed.

svn path=/trunk/; revision=44096
2012-07-28 22:55:27 +00:00
Martin Mathieson 923c530545 Avoid 2 redeclarations of 'len' in inner scopes - they can all use the
outer one.  They had 3 different types, so use guint, which is what
tvb_length() returns.

svn path=/trunk/; revision=44095
2012-07-28 22:46:11 +00:00
Martin Mathieson 84182d3451 Fix VC code analaysis warning about definition of variable in inner
scope.

svn path=/trunk/; revision=44094
2012-07-28 22:35:11 +00:00
Evan Huus 1457a01f49 Always memset the packet-header struct in Lua to avoid
crashes from garbage data.

Also, give Lua a copy of the packet comment if there is one.

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

svn path=/trunk/; revision=44093
2012-07-28 15:51:37 +00:00
Pascal Quantin f4e322cd56 Fix inverted dissection of Pre-emption Capability and Pre-emption Vulnerability
svn path=/trunk/; revision=44091
2012-07-28 13:40:11 +00:00
Pascal Quantin 857f19c622 Fix a 'dead increment' warning forgotten in r44084
svn path=/trunk/; revision=44090
2012-07-28 13:02:35 +00:00
Evan Huus 3ed453c4d5 Decode SSL streams in XMPP sessions. Fixes:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3177

The logic is rather conservative for now, but I imagine false negatives are
better than false positives for this sort of thing.

svn path=/trunk/; revision=44088
2012-07-28 03:09:46 +00:00
Pascal Quantin 9f8467f1bf Fix 'dead increment' and 'dereference of null pointer' Clang warnings
svn path=/trunk/; revision=44084
2012-07-27 22:45:46 +00:00
Pascal Quantin c299201935 Fix a few Clang warnings (dead increment, dead assignment)
svn path=/trunk/; revision=44082
2012-07-27 21:58:26 +00:00
Gerald Combs 5fc656ee46 Add a preview to the common file dialog. Adjust the win32 file dialog
preview logic slightly.

svn path=/trunk/; revision=44080
2012-07-27 21:43:02 +00:00
Pascal Quantin 1f6b7eb9c4 Fix dead assignment Clang warning and use consistent indentation
The two remaining Clang warnings (function call argument is an uninitialized value, result of operation is garbage or undefined) seem to be false positives

svn path=/trunk/; revision=44079
2012-07-27 21:09:11 +00:00
Bill Meier 26d1cbb989 Create/use extended value strings to access certain value string arrays;
Remove unneeded initializers;
Use consistent indentation.

svn path=/trunk/; revision=44073
2012-07-27 16:02:06 +00:00
Bill Meier 0a631d2543 Sort value-string array by value to allow extended-value-string binary search;
Add XXX comments as to possible missing entries in a value-string array.

svn path=/trunk/; revision=44071
2012-07-27 14:49:04 +00:00
Pascal Quantin 8c493695ad Fix a few Clang warnings (dead assignment, function call argument is an uninitialized value)
Remove misleading U-RNTI display: it is useless for RLC dissection and the variable is a placeholder used for re-assembly that can contain other identifiers than the real U-RNTI (see packet-umts_fp.c)

svn path=/trunk/; revision=44070
2012-07-27 14:07:20 +00:00
Bill Meier c4d66ac9a2 Fix some potential integer arithmetic overflow issues;
Create/use extended value strings to access certain value string arrays;
Remove some unneeded initializers;
Reformat hf[] entries.

svn path=/trunk/; revision=44069
2012-07-27 14:04:48 +00:00
Michael Mann c809fb3703 Address bug 4097 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4097) by improving heuristics by limiting when the heuristics can be evaluated.
TURN and STUN channel data is negotiated by STUN, so its heuristics should only be based on a STUN negotiation, not raw UDP/TCP packets.  "Decode As" is still available for TURN and STUN channel data if the STUN negotiation isn't captured.  

svn path=/trunk/; revision=44068
2012-07-27 13:41:42 +00:00
Jakub Zawadzki b6bc9e65be Fix memleak of list
Valgrind log:
  = 2,656 (640 direct, 2,016 indirect) bytes in 40 blocks are definitely lost in loss record 41,241 of 41,608
  =    at 0x4C26ABB: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
  =    by 0xC5B0574: g_malloc (in /usr/lib64/libglib-2.0.so.0.2800.8)
  =    by 0xC5C94DF: g_slice_alloc (in /usr/lib64/libglib-2.0.so.0.2800.8)
  =    by 0xC5CA5ED: g_slist_insert_sorted (in /usr/lib64/libglib-2.0.so.0.2800.8)
  =    by 0x697E8B8: dissect_smb_fid (packet-smb.c:3499)

svn path=/trunk/; revision=44067
2012-07-27 08:50:28 +00:00
Jakub Zawadzki 40e809be57 6lowpan: cleanup dynamic configuration construction.
g_string_printf() -> g_strdup_printf()

svn path=/trunk/; revision=44065
2012-07-27 08:47:54 +00:00
Jakub Zawadzki a920dbe177 Fix memory leak of errors GString
Valgrind log:
  = 308 (264 direct, 44 indirect) bytes in 11 blocks are definitely lost in loss record 39,914 of 41,651
  =    at 0x4C26ABB: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
  =    by 0xC5B0574: g_malloc (in /usr/lib64/libglib-2.0.so.0.2800.8)
  =    by 0xC5C94DF: g_slice_alloc (in /usr/lib64/libglib-2.0.so.0.2800.8)
  =    by 0xC5CEC52: g_string_sized_new (in /usr/lib64/libglib-2.0.so.0.2800.8)
  =    by 0x6A723C5: proto_register_xml (packet-xml.c:1249)

svn path=/trunk/; revision=44064
2012-07-27 08:45:53 +00:00
Jakub Zawadzki 9b03c418cc Fix bugs: #7532, 7534 dissect_ndr_cvstring returns ep-memory, don't free it.
(Likely to occur cause r44053)

svn path=/trunk/; revision=44063
2012-07-27 08:39:05 +00:00
Anders Broman ad7c4a4bba From Jacob Nordgren and Rishie Sharma:
- Added basic support for tracking flows over reconfigured transport channels + mindor bugfixes 

- small fix in rrc, and some small cleanups

svn path=/trunk/; revision=44062
2012-07-27 08:10:31 +00:00
Anders Broman 910a481c22 Error: the blurb for hf_scsi_bus ("scsi.bus") matches the field name in packet-scsi.c
svn path=/trunk/; revision=44060
2012-07-27 07:13:28 +00:00
Ronnie Sahlberg 9465a06fe7 SCSI/ISCSI: Add decode of LUNs with address mode/bus and lun
Dont implement the complex "extended logical unit addressing format" just
yet. That one is hairy  so wait until we actually see it in the wild first.

Add decoding of LUNs using
single level lun structure and flat addressing space modes



svn path=/trunk/; revision=44058
2012-07-27 05:09:13 +00:00
Jakub Zawadzki 835a1a1b9c Fix memleaks (tvb_get_unicode_string())
svn path=/trunk/; revision=44053
2012-07-26 17:26:05 +00:00
Jakub Zawadzki 8f308fe1b1 Revert r44049, frame_data_cleanup() is called when redissecting.
svn path=/trunk/; revision=44051
2012-07-26 16:41:34 +00:00
Bill Meier 3b36a23478 Minor cleanup;
- Create/use an extended value string to access a value string array;
- Reformat to match editor modelines (convert tabs to spaces).

svn path=/trunk/; revision=44050
2012-07-26 16:13:09 +00:00
Jakub Zawadzki 79c7230cc8 Free frame comment.
svn path=/trunk/; revision=44049
2012-07-26 16:09:41 +00:00
Bill Meier f5bc152e48 Minor cleanup, including:
- remove uneeded #include;
- remove uneeded col_clear();
- widen several var definitions to prevent potential overflow;
- remove uneeded initializers;
- use consistent indentation;
- whitespace.

svn path=/trunk/; revision=44048
2012-07-26 15:16:04 +00:00
Jörg Mayer 1df7174946 dfilter.h does not need to include epan.h
svn path=/trunk/; revision=44044
2012-07-26 14:37:31 +00:00
Michael Tüxen 14a808ea3f Get it linking (at least on Mac OS X).
svn path=/trunk/; revision=44040
2012-07-26 12:47:48 +00:00
Michael Tüxen baa41c7d99 Mark unused parameter as such.
svn path=/trunk/; revision=44039
2012-07-26 12:33:20 +00:00
Anders Broman 46d1c5c5ec If def offending code
packet-rlc.c:2290:7: error: variable ‘i’ set but not used [-Werror=unused-but-set-variable]

svn path=/trunk/; revision=44037
2012-07-26 11:39:11 +00:00
Anders Broman 180f7aa1e0 From Jacob Nordgren and Rishie Sharma:
-  FP and RLC fixed spelling 
- Fixed variable declaration in RRC 
- removed extra ppi in nbap

svn path=/trunk/; revision=44035
2012-07-26 09:42:07 +00:00
Anders Broman 71f4754f19 Extend a value string.
svn path=/trunk/; revision=44028
2012-07-26 08:16:07 +00:00
Anders Broman aed65b0c7b From Jacob Nordgren and Rishie Sharma:
- RRC now configures logical channels in HS-DSCH hs, and some HSDSCH common support added 
- RLC: modifed memory management, MAC: dch would set the incorrect logical channel for RLC

svn path=/trunk/; revision=44027
2012-07-26 08:15:20 +00:00
Bill Meier 65ebfc9db4 The comment in the file says:
; NOTE: TABS DON'T WORK IN THIS FILE, USE SPACES INSTEAD!!!

So: replace tabs by spaces.

Also: Adjust spacing in a few cases.


svn path=/trunk/; revision=44026
2012-07-26 04:52:42 +00:00
Chris Maynard a3a50ecb03 Fix Coverity CID 709737: Structurally dead code.
svn path=/trunk/; revision=44023
2012-07-26 02:16:37 +00:00
Chris Maynard 787d832da8 tvb_length_remaining() can return -1, so be sure to deal with it if it does.
svn path=/trunk/; revision=44022
2012-07-26 02:00:11 +00:00
Chris Maynard 368db9893c Export proto_unregister_field as requested by Helge Kruse.
Ref: http://www.wireshark.org/lists/wireshark-dev/201207/msg00210.html

svn path=/trunk/; revision=44020
2012-07-26 00:18:46 +00:00
Chris Maynard c6bf60f74b Fix Coverity CID 709738: Unused pointer value.
svn path=/trunk/; revision=44018
2012-07-25 22:48:14 +00:00
Martin Mathieson 1d1cc74e93 Zero a struct to avoid branching based upon uninitialised fields
(previousFrameNum & nextFrameNum).  Spotted by valgrind.

svn path=/trunk/; revision=44017
2012-07-25 22:02:29 +00:00
Jeff Morriss bcfadcbace zbee.aps was renamed zbee_aps (in r43990).
svn path=/trunk/; revision=44015
2012-07-25 21:27:19 +00:00
Bill Meier 7b869feb85 Minor cleanup:
- col_clear() not needed;
- remove some unneeded initializers;
- reformat hf[] entries.

svn path=/trunk/; revision=44013
2012-07-25 20:46:36 +00:00
Bill Meier 840a58f1f3 Minor cleanup:
- Create/use extended value string to access value string array;
- col_clear() not needed;
- Remove some unneeded initializers.

svn path=/trunk/; revision=44012
2012-07-25 20:42:16 +00:00
Pascal Quantin 70ea1804d8 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7524 :
8-PSK structure in GSM Classmark 3 is not properly dissected

svn path=/trunk/; revision=44008
2012-07-25 20:04:33 +00:00
Bill Meier 85e9ca3940 Create/use extended value strings as appropriate;
Remove unneeded initializers;
Do whitespace changes.

svn path=/trunk/; revision=44003
2012-07-25 17:38:05 +00:00
Bill Meier ced3a6c006 Minor cleanup:
- Use col_...() fcns in the proper manner and order;
- proto_reg_handoff...() not needed (does nothing useful);
- remove some unneeded initializers;
- reformat hf[] entries.

svn path=/trunk/; revision=44000
2012-07-25 15:32:29 +00:00
Bill Meier 19000cbaf5 Minor cleanup:
- Remove some unneeded initializers & casts;
- whitespace.

svn path=/trunk/; revision=43997
2012-07-25 15:04:19 +00:00
Bill Meier 7dd0cf41ce Minor cleanup:
- col_clear() not required;
 - use #if 0/#endif to comment out code (iso /* ... */)
 - whitespace.

svn path=/trunk/; revision=43996
2012-07-25 14:39:32 +00:00
Bill Meier 0800534e66 #include <stdio.h> not needed.
svn path=/trunk/; revision=43995
2012-07-25 13:59:41 +00:00
Bill Meier 572b4dae32 Minor cleanup:
- col_clear() not required;
- ...

svn path=/trunk/; revision=43994
2012-07-25 13:57:22 +00:00
Michael Mann 32ef0a1a18 Converted scsi dissectors display filter format from scsi.<protocol> to scsi_<protocol> (matching their registered filter name)
svn path=/trunk/; revision=43993
2012-07-25 13:56:15 +00:00
Bill Meier 2516627cd5 Minor cleanup:
col_clear() not required;
  unneeded initializers;
  whitespace.

svn path=/trunk/; revision=43992
2012-07-25 13:38:31 +00:00
Michael Mann 6d06ea6062 Converted ZigBee dissectors display filter format from zbee.<protocol> to zbee_<protocol>
Also corrected zbee_afp filters as they were incorrectly using zbee.app

svn path=/trunk/; revision=43990
2012-07-25 12:19:21 +00:00
Michael Mann cdee738998 Fix NULL deference (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7486).
I don't understand the relationship between the "frame data" and the "conversation" (to me they seem independent, but the code seems to put them together), but at least this fixes the crash 

svn path=/trunk/; revision=43985
2012-07-25 11:27:01 +00:00
Anders Broman 91763a17be From Johan Wåhl:
Make DNS ports configurable.

svn path=/trunk/; revision=43984
2012-07-25 09:40:18 +00:00
Anders Broman e5d974ec6a From Jacob Nordgren and Rishie Sharma:
- FP: added payload CRC validation, RLC: some more error reporting 
- RLC: fixed an exotic LI bug, some cosmetic fixes.

svn path=/trunk/; revision=43983
2012-07-25 09:09:32 +00:00
Bill Meier b63bb802ab (Trivial) Cleanup
svn path=/trunk/; revision=43975
2012-07-24 23:25:57 +00:00
Bill Meier 25336651ac (Minor) Create handle in proto_reg_handoff...() (where it's used);
Localize static variable to proto_reg_handoff...()

svn path=/trunk/; revision=43974
2012-07-24 22:57:25 +00:00
Bill Meier 3ef558ba7c (Minor) Localize a static variable;
svn path=/trunk/; revision=43973
2012-07-24 22:51:15 +00:00
Bill Meier 08c1114822 Move proto_register..() and proto_reg_handoff...() to the end of the file;
Do other minor cleanup.

svn path=/trunk/; revision=43971
2012-07-24 22:38:13 +00:00
Bill Meier 2be8004129 General cleanup, including:
- prevent potential array overflow: do some bounds checking;
- use emem_strbuf instead of buffers on the stack;
- check_col() not required;
- simplify code in several places;
- remove some boilerplate comments;
- ...

svn path=/trunk/; revision=43970
2012-07-24 21:30:25 +00:00
Martin Kaiser 295b919f5d MPEG PAT: set the tree item's length == number of bytes dissected
don't simply assume the PAT continues until the end of the input tvb

this is similar to packet_dvb_ait.c
I'll change this for other tables shortly

svn path=/trunk/; revision=43969
2012-07-24 21:24:33 +00:00
Bill Meier 05935f075a (Trivial) remove unneeded #include.
svn path=/trunk/; revision=43962
2012-07-24 15:11:18 +00:00
Bill Meier 0c8e6e8f90 Remove unneeded #include;
Create/use extended value strings for several value-string arrays;
Minor whitespace cleanup.

svn path=/trunk/; revision=43960
2012-07-24 14:47:19 +00:00
Bill Meier ca154aad10 (Trivial) whitespace cleanup
svn path=/trunk/; revision=43959
2012-07-24 14:05:20 +00:00
Anders Broman eceff8e0d4 H.248 cannot interpret value of Package 0x0022, Parameter 1
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7519

svn path=/trunk/; revision=43958
2012-07-24 13:05:25 +00:00
Anders Broman e83a8e4eee Use the correct symbols
COL_UTC_TIME and COL_UTC_DATE_TIME
insted of TS_UTC and TS_UTC_WITH_DATE.

svn path=/trunk/; revision=43957
2012-07-24 12:20:18 +00:00
Anders Broman 7f345354fe From Karsten Keil:
ISDN LAPD X.31 packet traffic can not be decoded

X.31 is X.25 over ISDN. It use SAPI 16 LAPD service.

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

svn path=/trunk/; revision=43956
2012-07-24 11:47:23 +00:00
Anders Broman 6572a8e55c From Peng Di:
GIOP request_id used for sub dissectors is not assigned when decoding GIOP 1.2 Request message.

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

svn path=/trunk/; revision=43955
2012-07-24 10:25:13 +00:00
Anders Broman 3743a01714 From Jacob Nordgren and Rishie Sharma:
- Added support for EDCH type 2 MAC-is reassembly and slightly improved RLC error reporting 

- RLC: fixed bug where complete sequences in the end of a trace where not reassembled

svn path=/trunk/; revision=43954
2012-07-24 07:31:46 +00:00
Ronnie Sahlberg 3b0eb70b23 SCSI: Add support for mode subpages
Add support for modepages that contain subpages and add
a simple subpage for the Control page.


svn path=/trunk/; revision=43952
2012-07-24 02:00:50 +00:00
Gilbert Ramirez 1cb4b7e06a Combine the two display filter README's into one,
and add a lot of explanation about how the display filter
engine works.

Modify dftest.c to remove printing of the dfilter_t pointer,
which has absolutely no value for the user.

svn path=/trunk/; revision=43941
2012-07-23 17:10:13 +00:00
Jeff Morriss 0a97a9c7d5 Get rid of non-ASCII chars. Also replace tabs with spaces and remove trailing white space.
svn path=/trunk/; revision=43940
2012-07-23 17:04:37 +00:00
Michael Mann 37ebb93a54 Added RFC 5285 functionality per https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5763
svn path=/trunk/; revision=43931
2012-07-23 15:52:17 +00:00
Anders Broman 533c63eed1 Fix reversed values for Bearer Context IE decodes Bearer Level Quality of Service (Bearer QoS) in ARP field the wireshark decoded preemption values.
As reported in
http://ask.wireshark.org/questions/12907/pre-emption-decoding-on-s11-interface

svn path=/trunk/; revision=43930
2012-07-23 15:27:52 +00:00
Martin Mathieson 248b758f82 Now check the first few bytes of the ftp-data segment to see if it looks
printable.  If binary, just show the number of bytes in summary.

Not that there are no items inside it, don't create ftp-data as a tree.
Also, fix the type of the variable 'ti'.

svn path=/trunk/; revision=43929
2012-07-23 14:40:05 +00:00
Jakub Zawadzki d2ba441c57 Initial version of VNTAG dissector (bug #7496)
svn path=/trunk/; revision=43928
2012-07-23 14:09:41 +00:00
Anders Broman 227327a1e6 Mark pinfo as unused.
svn path=/trunk/; revision=43927
2012-07-23 13:27:16 +00:00
Michael Mann a6af1fae2a Add dissector tables for RTCP extended feedback messages (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5764)
svn path=/trunk/; revision=43926
2012-07-23 11:58:51 +00:00
Michael Mann abc177f5d6 added dissect_sprt() to dissect_sprt_heur() so that the heuristics actually do something
svn path=/trunk/; revision=43923
2012-07-23 00:30:00 +00:00
Evan Huus daa0ff3ac8 The XMPP dissector was allocating a new parser for every packet and never
freeing them. This was slow and leaked gobs of memory.

Be like XML: allocate one parser during set-up and share it around.

svn path=/trunk/; revision=43920
2012-07-22 21:48:51 +00:00
Gerald Combs 79dd3fc264 [Automatic manuf, services and enterprise-numbers update for 2012-07-22]
svn path=/trunk/; revision=43911
2012-07-22 14:03:34 +00:00
Martin Mathieson 7abae04478 Calling tvb_format_text() for binary data segments (c1400 bytes) was
*very* slow (in a profiled run where FTP data is carried over LTE
MAC/RLC/PDCP/IP/TCP, this one function call was 20% of overall runtime).

Have limited to call to ITEM_LABEL_LENGTH, as that is all that
will be displayed anyway.  As per comment, I'm not convinced that doing
this for binary FTP data segments is worthwhile at all.  It doesn't
even display as hex.

svn path=/trunk/; revision=43908
2012-07-22 04:44:16 +00:00
Michael Mann 0d4eafb04d Update display filter names per Bug 2794. Part 1 of many.
svn path=/trunk/; revision=43907
2012-07-22 03:06:37 +00:00
Bill Meier 45f9935f04 Additional cleanup:
packet-sdp.c:
  Init 'proto_sprt' in proto_reg_handof..()
    [instead of using a registered init fcn];

packet-sprt.c:
  Fix some typos;
  Comment out dissect_sprt_heur() since it doesn't
   really do any dissection. Add an XXX comment re same.

packet-v150fw.c:
  Remove unused 'v150fw_handle' and thus unneeded proto_reg_handoff...();
  Add an XXX comment re the (commented out) dissect_v150fw() not actually
   doing any dissection.


svn path=/trunk/; revision=43902
2012-07-21 22:06:17 +00:00
Evan Huus 700524155d Fix mis-allocated key size as caught by valgrind.
We have to divide the 'length' field to work with guint32 pointer arithmetic,
but we still want to allocate and memcpy the original length value, since
both of those operate in raw bytes, not blocks of sizeof(guint32).

svn path=/trunk/; revision=43901
2012-07-21 19:18:12 +00:00
Evan Huus 4ddb02f6c1 Don't throw an assertion if we can't find certain XMPP attributes when
trying to track sessions for iq, jabber, et al. Just return, so we can
dissect whatever attributes we can find. An expert info already gets added
later on.

The other part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7509


svn path=/trunk/; revision=43899
2012-07-21 16:29:48 +00:00
Evan Huus 2949d44b74 The se_tree_* functions are destructive to the key, so save and restore
the key around each call.

Fixes part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7509

svn path=/trunk/; revision=43898
2012-07-21 16:10:16 +00:00
Bill Meier 67e3f64476 Move 99.9 % of packet-sprt.h to packet-sprt.c since it's used only there.
Convert "4 space tabs" to spaces (missed in previous commit).

svn path=/trunk/; revision=43897
2012-07-21 15:32:36 +00:00
Evan Huus f9ec58ae1d Because storing the address of a stack variable seemed like such
a good idea at the time...

Allocate seasonal memory for it instead.

svn path=/trunk/; revision=43896
2012-07-21 15:31:35 +00:00
Martin Mathieson 8a8adffcf5 Initialise ext_len to avoid an "uninitialised use" error.
svn path=/trunk/; revision=43895
2012-07-21 15:21:43 +00:00
Pascal Quantin f865ece795 Fix a typo in r43893
svn path=/trunk/; revision=43894
2012-07-21 14:45:44 +00:00
Pascal Quantin 1cba729222 Fix a few encoding arguments
svn path=/trunk/; revision=43893
2012-07-21 14:43:36 +00:00
Bill Meier 15e42f38d7 Remove unneeded #includes;
Convert "4 space tabs" to spaces;
Remove trailing whitespace;
Change hf[] entry blurbs from "" to NULL;
Add svn:id and svn:eol-style properties.

svn path=/trunk/; revision=43892
2012-07-21 14:14:07 +00:00
Bill Meier 918f05baa8 Calls to col_...() and expert...() functions should not be under 'if (tree)';
Remove unneeded #include;
Convert "4 space tabs" to spaces;
Remove trailing whitespace;
Add svn:id and svn:eol-style properties.

svn path=/trunk/; revision=43891
2012-07-21 14:03:46 +00:00
Evan Huus 6ed0c79956 Fix GCC build.
I'm not exactly sure what's up with the v150fw dissector, since
it defines a heuristic which is never used and registers in no tables.
The comments indicate it's carried over rtp, but rtp doesn't have a
heuristic table. Revision 43887 caused rtp to load a handle to v150fw,
but I've done a quick scan and I don't think it ever actually does anything
with the handle.

For now, #if 0 out the heuristic function to avoid compile errors. A better
fix is needed though.

svn path=/trunk/; revision=43890
2012-07-21 13:51:51 +00:00
Evan Huus 897d72c358 Fix some of the GCC build errors, more to come.
svn path=/trunk/; revision=43889
2012-07-21 13:25:14 +00:00
Bill Meier f701cc63e5 Add svn:keywords and svn:eol-style properties
Convert "4 space tabs" to spaces.

svn path=/trunk/; revision=43888
2012-07-21 13:18:36 +00:00
Michael Mann 3d502b97f1 Updated patch from https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3507
svn path=/trunk/; revision=43887
2012-07-21 12:38:59 +00:00
Pascal Quantin 996e2f58b8 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7508 :
Display snmp.contextName as FT_STRING

svn path=/trunk/; revision=43883
2012-07-21 08:50:32 +00:00
Guy Harris bddb918dc4 The 32-bit-key tree code assumes that the pointer to the key can be cast
to a pointer to a guint32 and dereferenced.  On some platforms, such as
SPARC, this requires that the pointer be aligned on a 4-byte boundary;
there is no guarantee that the data field of an address structure is
aligned on a 4-byte boundary, so allocate a buffer for a copy of that
data and copy the data into it, and free it when we're done with it.

Should fix bug 7501.

svn path=/trunk/; revision=43880
2012-07-21 01:24:54 +00:00
Bill Meier 7eb2b89e71 From Lori Tribble:
Attached is a patch which corrects the string construction issue in the
PropertyStates method.  This patch also corrects a spelling error for
'utcTimeSyncronization' and adds decode support for this property.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6475#c8

svn path=/trunk/; revision=43868
2012-07-20 19:09:05 +00:00
Pascal Quantin 40e08c936d Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7435 :
Check available length before trying to dissect SSL packet when desegmentation is not activated

svn path=/trunk/; revision=43862
2012-07-20 15:37:45 +00:00
Jaap Keuter c4702a40ef Add some relevant ethertypes.
svn path=/trunk/; revision=43850
2012-07-20 06:26:35 +00:00
Martin Mathieson 18acb1c43e Pass in proper offset to dfilter_sip_status_line(). Was seeing problems
with 180 + 200 responses in same frame (over TCP).

svn path=/trunk/; revision=43841
2012-07-20 00:40:44 +00:00
Martin Kaiser bdb0898ff8 dissect the ISO 7816 class byte
svn path=/trunk/; revision=43832
2012-07-19 20:32:24 +00:00
Martin Kaiser eb6823f6ed use defines for the ISO 7816 instruction byte
svn path=/trunk/; revision=43831
2012-07-19 19:51:36 +00:00
Guy Harris defeb589d6 Rename ENC_HDRLEN to BSD_ENC_HDRLEN, to see if that squelches the false
positive in the "you're passing an ENC_ value as a field value" check in
checkAPI.pl.

svn path=/trunk/; revision=43816
2012-07-19 03:28:39 +00:00
Michael Mann 757361f4d4 Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5469. Added more comments to make the function of vnc_is_client_or_server_version_message() very clear.
Also includes some minor cleanup of proto_tree_add_text -> proto_tree_add_item

svn path=/trunk/; revision=43814
2012-07-19 00:29:11 +00:00
Guy Harris 7b1be4c91e Fix non-proto_tree_add_item() calls passing an ENC_ value as the last
argument.

svn path=/trunk/; revision=43812
2012-07-18 23:44:15 +00:00
Guy Harris d91978600c Fix non-proto_tree_add_item() calls passing an ENC_ value as the last
argument.

svn path=/trunk/; revision=43810
2012-07-18 23:37:59 +00:00
Guy Harris 4c3fd1012a Fix non-proto_tree_add_item() calls passing an ENC_ value as the last
argument.

svn path=/trunk/; revision=43808
2012-07-18 23:34:59 +00:00
Guy Harris bdf148e3ea Fix non-proto_tree_add_item() calls passing an ENC_ value as the last
argument.

svn path=/trunk/; revision=43806
2012-07-18 23:30:45 +00:00
Guy Harris 9667a4703b Fix non-proto_tree_add_item() calls passing an ENC_ value as the last
argument.

svn path=/trunk/; revision=43804
2012-07-18 23:27:37 +00:00
Guy Harris 682d1f34b6 Fix non-proto_tree_add_item() calls passing an ENC_ value as the last
argument.

svn path=/trunk/; revision=43802
2012-07-18 23:18:01 +00:00
Guy Harris 4f84db81e2 Fix a non-proto_tree_add_item() passing an ENC_ value as the last
argument.

svn path=/trunk/; revision=43800
2012-07-18 23:06:20 +00:00
Guy Harris 754711b757 Fix a non-proto_tree_add_item() passing an ENC_ value as the last
argument.

svn path=/trunk/; revision=43798
2012-07-18 22:59:54 +00:00
Guy Harris 87ad190d49 exit() must not be used in dissectors. Use REPORT_DISSECTOR_BUG() and
just return NULL instead.

svn path=/trunk/; revision=43797
2012-07-18 22:57:04 +00:00
Guy Harris b40db9cf4c Add to the 802.11 pseudo-header a "this is already decrypted" flag, set
it as appropriate in the code to read Network Instruments Observer
captures (rather than tweaking the "protected" flag in the packet data),
and use that flag in the 802.11 dissector.

Fix indentation while we're at it (tabs are not *ipso facto* 4 spaces).

svn path=/trunk/; revision=43795
2012-07-18 22:10:34 +00:00
Guy Harris 1e7c2d7d51 Eliminate some gsize's I missed in the previous checkin.
svn path=/trunk/; revision=43794
2012-07-18 21:43:39 +00:00
Guy Harris d0df3d4c5a Nobody uses the return value of dissect_sender_array(), so don't have it
return anything.

Don't use gsize for offsets in packets; the type used in Wireshark is
int.

svn path=/trunk/; revision=43793
2012-07-18 21:22:10 +00:00
Guy Harris b695d863aa Set svn:keywords and svn:eol-style, and fix the EOL style (I'm on UN*X,
so with svn:eol-style native, there should be no CRs).

svn path=/trunk/; revision=43792
2012-07-18 20:56:24 +00:00
Michael Mann b16b7e951e Adds CliqueRM protocol (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2076)
svn path=/trunk/; revision=43791
2012-07-18 20:11:32 +00:00
Michael Mann e298722f5b svn path=/trunk/; revision=43789 2012-07-18 19:40:56 +00:00
Guy Harris bbe3a78d3a That comment might have confused the API checker into thinking we were
calling abort(); try changing it.

svn path=/trunk/; revision=43788
2012-07-18 18:50:29 +00:00
Balint Reczey 1f37a8cf14 Fix crash in PPP dissector
Make sure that there is enough space allocated for PPP encapsulated CRTP
packet's header.
The bug can be triggered on an x86_64 system using the cpature file attached to
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680056

svn path=/trunk/; revision=43784
2012-07-18 15:14:45 +00:00
Pascal Quantin 2350d1aecf Put back r43768 that got removed by error in r43781
svn path=/trunk/; revision=43783
2012-07-18 08:37:46 +00:00
Anders Broman 0649041b1c Merge the rest of Jacob Nordgren and Rishie Sharmas work on
Updateing conversation handling to dissect FP/MAC/RLC
(Work in progress).

svn path=/trunk/; revision=43782
2012-07-18 07:47:05 +00:00
Anders Broman fccbea6702 Merge the rest of Jacob Nordgren and Rishie Sharmas work on
Updateing conversation handling to dissect FP/MAC/RLC
(Work in progress).

svn path=/trunk/; revision=43781
2012-07-18 07:45:19 +00:00
Guy Harris 9d470cceb9 Clean up indentation.
svn path=/trunk/; revision=43780
2012-07-18 04:45:41 +00:00
Evan Huus a234b68ff0 Fix some system header files that were #included with "" instead of <>.
They made cppcheck unhappy.

svn path=/trunk/; revision=43779
2012-07-18 02:47:56 +00:00
Martin Mathieson c0a913afda Match R9 versions of some more LTE protocols to registered dissector names.
svn path=/trunk/; revision=43777
2012-07-18 01:19:48 +00:00
Pascal Quantin c0a5bc9aa8 Fix copy/paste error
svn path=/trunk/; revision=43775
2012-07-17 21:36:34 +00:00
Jörg Mayer c8579ac82c - Make dns srv elemnts filterable (were: text only)
- Don't suppress first character in srv service and protocol
  as some services don't use _ as first character

svn path=/trunk/; revision=43774
2012-07-17 21:10:02 +00:00
Pascal Quantin 574f57d5ba From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7491 :
DNP3 protocol dissector does not fully decode application layer object 50 variation 3

svn path=/trunk/; revision=43772
2012-07-17 19:54:35 +00:00
Pascal Quantin e9de91f53e Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7470 :
Add support for OID 1.3.6.1.5.2.2

svn path=/trunk/; revision=43771
2012-07-17 19:43:17 +00:00
Chris Maynard 2c773fad77 Fix Coverity CID 709726: Structurally dead code. Also, convert tabs to spaces.
svn path=/trunk/; revision=43769
2012-07-17 19:22:55 +00:00
Pascal Quantin c2883b7be2 Fix 'dereferencing type-punned pointer will break strict-aliasing rules' warning when compiling with gcc 4.1.3
svn path=/trunk/; revision=43768
2012-07-17 14:55:27 +00:00
Pascal Quantin c312f14022 More a few ASN.1 based dissectors from the dirty to celan lib (as they should compile without any error now)
svn path=/trunk/; revision=43765
2012-07-17 13:14:23 +00:00
Pascal Quantin babe622987 Use G_MININT32 instead of -2^31 so as to get rid of 'this decimal constant is unsigned only in ISO C90' warning
svn path=/trunk/; revision=43764
2012-07-17 13:12:50 +00:00
Jakub Zawadzki a8016f6a57 Fix bug #7488: Unable to correctly identify IEC 61850 MMS packets
In r39066 was added 'final check to see if the next SPDU, if present, is also valid',
but it didn't properly check for tvb length which causes exception if there's no next SPDU.

svn path=/trunk/; revision=43763
2012-07-17 13:01:17 +00:00
Anders Broman db3f6fe80c From Peter Paluch:
recognize VLAN-bridge STP 

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

svn path=/trunk/; revision=43762
2012-07-17 12:55:37 +00:00
Pascal Quantin 777bbfb20d Use same capitalization for Service request message as for other messages
svn path=/trunk/; revision=43761
2012-07-17 10:35:21 +00:00
Pascal Quantin 3a682212f5 Remove extra space after message name
svn path=/trunk/; revision=43760
2012-07-17 10:13:22 +00:00
Pascal Quantin ec17920a3e From Wayne Brassem via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7485 :
Add support for IPv6 over PPP in Jmirror dissector

svn path=/trunk/; revision=43759
2012-07-17 07:33:20 +00:00
Pascal Quantin a76f4990b8 Comment a few unused variables / functions
svn path=/trunk/; revision=43754
2012-07-16 15:54:53 +00:00
Jakub Zawadzki b0e44929a3 Gadu-Gadu: dissect more packets.
svn path=/trunk/; revision=43753
2012-07-16 14:34:35 +00:00
Alexis La Goutte c9690704be From Zdravko Velinov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7483
Enhancements to the HP ERM protocol dissector 

I have done some reverse engineering of the HP ERM protocol. I had injected
some 802.1Q frames on a network that contained a HP ProCurve 5406zl switch,
then I examined the resulting encapsulated traffic. It was quite easy to spot
the VLAN identifier and the priority field because part of the header closely
resembled the 802.1Q header. There were just some minor differences in the
priority numbering between 802.1Q and HP ERM.


From me :
Add Modeline info
Fix Clang warning

svn path=/trunk/; revision=43752
2012-07-16 14:23:28 +00:00
Anders Broman d8be496cd5 From Jacob Nordgren and Rishie Sharma:
Updated conversation handling to dissect FP/MAC/RLC

svn path=/trunk/; revision=43751
2012-07-16 14:06:36 +00:00
Anders Broman 37fdb21ec2 From Jacob Nordgren and Rishie Sharma:
Updated conversation handling to dissect FP/MAC/RLC

svn path=/trunk/; revision=43750
2012-07-16 13:54:20 +00:00
Anders Broman fe630ec1df From Jacob Nordgren and Rishie Sharma:
Updated conversation handling to dissect FP/MAC/RLC

svn path=/trunk/; revision=43749
2012-07-16 13:11:20 +00:00
Bill Meier f41a04b7ab Minor cleanup, including:
- Remove unneeded #includes;
- Simplify code slightly;
- Remove unused ett variable and related;
- Remove empty proto_reg_handoff...() functions;
- Fix a few cases of "set but unused".
- Do some whitespace changes.

svn path=/trunk/; revision=43748
2012-07-16 12:34:33 +00:00
Jakub Zawadzki 1e95104860 proto_tree_add_boolean() takes value not ENC_ flag.
svn path=/trunk/; revision=43747
2012-07-16 12:09:19 +00:00
Bill Meier 66f163af90 (trivial) Explicitly initialize a static variable to NULL.
svn path=/trunk/; revision=43746
2012-07-16 11:47:55 +00:00
Anders Broman ac335fc5f4 From Jacob Nordgren and Rishie Sharma:
Handle RRC_MESSAGE_TYPE_BCCH_FACH.

svn path=/trunk/; revision=43741
2012-07-16 07:02:29 +00:00
Anders Broman 5d9d9b8221 From Wonil Kim: Enable statistics menu register for the tap plug-in. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7466
svn path=/trunk/; revision=43726
2012-07-15 16:24:35 +00:00
Pascal Quantin 7deecbf36b Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7479 :
Provide an empty string when data pointer is not NULL (regression introduced in r43703)

svn path=/trunk/; revision=43724
2012-07-15 15:26:57 +00:00
Chris Maynard e173f01c5c Be sure to assign the return value of tvb_length_remaining() to a signed integer and not an unsigned integer, and then check that value is > 0.
svn path=/trunk/; revision=43720
2012-07-15 14:31:40 +00:00
Chris Maynard 0d41b6edad tvb_length_remaining() can return -1, so check that it's > 0, and not != 0. If tvb_length_remaining() is > 0, then tvb_reported_length_remaining() should also be > 0, so I don't think there's a need for further checks there.
svn path=/trunk/; revision=43719
2012-07-15 14:29:06 +00:00
Gerald Combs c788e585a9 [Automatic manuf, services and enterprise-numbers update for 2012-07-15]
svn path=/trunk/; revision=43718
2012-07-15 14:03:28 +00:00
Chris Maynard 1ff8c1fcba Don't pass the return value of tvb_length_remaining() to fragment_add_check(), as it might have been -1.
Fixes Coverity CID 280510: Improper use of negative value.

svn path=/trunk/; revision=43716
2012-07-14 19:52:18 +00:00
Chris Maynard 590cec6962 tvb_length_remaining() can return -1, so be sure to deal with it if it does. Should fix a bunch of Coverity CID's.
svn path=/trunk/; revision=43715
2012-07-14 19:28:40 +00:00
Pascal Quantin adfe9d3ced Fix a few 'value stored is never read' warnings and a typo error
svn path=/trunk/; revision=43714
2012-07-14 18:54:32 +00:00
Pascal Quantin d6959d2715 As suggested by Richard Sharpe in http://www.wireshark.org/lists/wireshark-dev/201207/msg00111.html :
Make the NTLMSSP Unknown message type string more explicit

svn path=/trunk/; revision=43713
2012-07-14 18:31:08 +00:00
Chris Maynard a4ec2596bc If the offset is out of range, just assign to len to 0 so we don't end up passing a huge value to fragment_add().
Fixes Coverity CID 280246: Improper use of negative value.

svn path=/trunk/; revision=43712
2012-07-14 16:29:45 +00:00
Ronnie Sahlberg a14d130713 Add support for SCSI SBC ORWRITE command
svn path=/trunk/; revision=43711
2012-07-14 08:00:03 +00:00
Ronnie Sahlberg 285ee0f9b5 Add support for SCSI SBC COMPARE_AND_WRITE opcode
svn path=/trunk/; revision=43709
2012-07-14 02:19:32 +00:00
Chris Maynard 33b0d13dec tvb_length_remaining() can return -1, so be sure to deal with it if it does.
svn path=/trunk/; revision=43708
2012-07-13 22:20:09 +00:00
Bill Meier 7320ebcfd9 Various minor cleanup, including:
- remove unneeded #includes;
- remove some unneeded initializers;
- use tvb_reported_length() instead of tvb_length();
- use  val_to_str_const() instead of val_to_str();
- fix some typos;
- do some whitespace changes and some reformatting.

svn path=/trunk/; revision=43707
2012-07-13 22:06:40 +00:00
Bill Meier b1eb22bd51 Minor cleanup;
- Remove unneeded #includes;
 - Create/use value_string_ext for some value_string arrays;
 - Do some whitespace changes and reformat some lines.

svn path=/trunk/; revision=43706
2012-07-13 21:59:25 +00:00
Chris Maynard 5e12ba51e6 If there's not enough data left for a timestamp, be sure there's at least some data to pass off to the generic data dissector.
svn path=/trunk/; revision=43705
2012-07-13 21:58:58 +00:00
Chris Maynard a099ae38f5 tvb_length_remaining() can return -1, so be sure to deal with it if it does.
svn path=/trunk/; revision=43704
2012-07-13 21:46:27 +00:00
Chris Maynard 472db7609c tvb_length_remaining() can return -1, so be sure to deal with it if it does.
svn path=/trunk/; revision=43703
2012-07-13 21:43:46 +00:00
Chris Maynard ad3c388b4b tvb_length_remaining() can return -1, so check if its return value is <= 0 when aborting and not just == 0.
svn path=/trunk/; revision=43702
2012-07-13 21:32:15 +00:00
Chris Maynard ff63dcfa8e Jeff Morriss indicated the following and I obliged:
Actually I suppose what was meant is more about whether tp->name[0] is the NULL character (that is, that the name is empty).

But since the result of the lookup is already there in 'found' the whole condition can probably be taken out.


svn path=/trunk/; revision=43701
2012-07-13 21:20:00 +00:00
Pascal Quantin ba376235da Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7474 :
Dissect LTE RADIUS AVP 3GPP-User-Location-Info

svn path=/trunk/; revision=43700
2012-07-13 21:18:35 +00:00
Chris Maynard f8d42e6f61 tvb_length_remaining() can return -1, so don't assign its return value to an unsigned integer and don't check it against non-zero but greater than zero.
svn path=/trunk/; revision=43699
2012-07-13 21:14:43 +00:00
Chris Maynard a592bd657c tvb_length_remaining() can return -1, so don't assign its return value to an unsigned integer. Fixes Coverity CID 281367: Improper use of negative value.
svn path=/trunk/; revision=43698
2012-07-13 21:03:54 +00:00
Chris Maynard 7e3019c186 tvb_length_remaining() can return -1, so don't assign its return value to an unsigned integer. Fixes Coverity CID's 280233 and 280234.
svn path=/trunk/; revision=43696
2012-07-13 20:43:55 +00:00
Chris Maynard 86b2f69672 tp->name can't be NULL, but perhaps tp can be?
Fixes Coverity CID 709597: Array compared against 0.

svn path=/trunk/; revision=43695
2012-07-13 20:09:29 +00:00
Pascal Quantin ed47e7bae4 Remove unused filters found by checkhf.pl
svn path=/trunk/; revision=43693
2012-07-13 17:16:28 +00:00
Pascal Quantin e31dfd95ea From Harald Welte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7476 :
UMA dissector incorrectly passes MAC addresses to wireshark core

svn path=/trunk/; revision=43692
2012-07-13 17:04:43 +00:00
Chris Maynard 30e481a804 Update dissector to match asn1/pkcs1 sources.
svn path=/trunk/; revision=43690
2012-07-13 12:34:36 +00:00
Bill Meier e6818f164e Fix incorrect(duplicate) value in artnet_oem_code_vals[] value string array;
{ 0x0ae0, "chainzone:RoundTable:0 DMX Inputs,
   ...
-  { 0x0ae0, "STC Mecatronica:DDR 2404 Digital Dimmer Rack:...
+  { 0x0b00, "STC Mecatronica:DDR 2404 Digital Dimmer Rack:...

Correct value obtained from Bug #7407 attachment #8684:
  "Art-Net OEM manufacturer codes for 1.4be specification"
     https://bugs.wireshark.org/bugzilla/attachment.cgi?id=8684

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

(Issue noticed because value_string_ext search was 'linear' for this array).


svn path=/trunk/; revision=43689
2012-07-13 04:52:40 +00:00
Bill Meier dd5e3dcfea Fix crash in geoip_db_pref_init() when changing to a new profile.
(Use g_free() not free() for g_malloc'd memory).

svn path=/trunk/; revision=43688
2012-07-13 00:54:53 +00:00
Martin Mathieson 99bd7cfe44 Add a preference to that when the window scaling options are not
visible, we can still configure a scaling factor and therefore get
better TCP sequence analysis and see better stream graphs.

A single preference is used for any/all streams for which the true value
isn't known.  I tried to make it obvious when showing the calculated
window size that it came fromt he preference setting.  The default value
for this preference is off, i.e. it won't change existing behaviour.

This was discussed a little at Sharkfest and raised on the developers
list last week.

svn path=/trunk/; revision=43686
2012-07-12 23:57:51 +00:00
Bill Meier 5150511879 Do expert "telegrams lost" only of field is > 0;
Don't call expert...() under 'if (tree)'

svn path=/trunk/; revision=43683
2012-07-12 20:08:34 +00:00
Bill Meier d5b965176a Don't call subdissector / expert...() under 'if (tree)'
Reformat hf[] entries.

svn path=/trunk/; revision=43682
2012-07-12 19:36:35 +00:00
Bill Meier 859affc2bd Don't call subdissectors / expert...() / col...() under 'if (tree)'
Also:
 Remove some uneeded initializers;
 Do some whitespace cleanup and re-formatting.

svn path=/trunk/; revision=43681
2012-07-12 17:22:47 +00:00
Martin Mathieson 409cdcc5ed Speed up reading of out-header values, and add a couple of 'monitor'
fields.

svn path=/trunk/; revision=43678
2012-07-12 01:26:08 +00:00
Bill Meier 220958548c Fix compile error.
svn path=/trunk/; revision=43674
2012-07-11 20:52:52 +00:00
Bill Meier 26fd1cf862 Add some initializers to prevent some not really valid compiler warnings.
svn path=/trunk/; revision=43673
2012-07-11 20:49:35 +00:00
Bill Meier 38e9ae2805 Don't call col_...() and expert...() functions under 'if (tree)'
svn path=/trunk/; revision=43672
2012-07-11 20:44:22 +00:00
Bill Meier ac7b2df9e8 Don't call col...() and expert..() functions under 'if (tree)';
Reformat hf[] entries and various other.


svn path=/trunk/; revision=43671
2012-07-11 20:40:13 +00:00
Bill Meier fad55cdecc Remove unneeded #includes;
Rename header_fields[] tp hf[] as per convention;
Reformat hf[] entries;
Remove empty proto_reg_handoff...().

svn path=/trunk/; revision=43670
2012-07-11 20:31:47 +00:00
Bill Meier 4248fa670a Explicit value_string array size specifier not required.
svn path=/trunk/; revision=43669
2012-07-11 20:26:24 +00:00
Pascal Quantin 9ee1981c7f From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7468 :
DVB-CI/CI+: fix offset error in operator_info apdu

svn path=/trunk/; revision=43668
2012-07-11 20:20:10 +00:00
Bill Meier e38f07f29a Don't call expert_...() under 'if (tree)';
Prefs callback not needed.

svn path=/trunk/; revision=43667
2012-07-11 20:18:23 +00:00
Bill Meier 59e9b969e9 Fix [-Werror=sign-compare] compiler warning
svn path=/trunk/; revision=43666
2012-07-11 18:43:30 +00:00
Bill Meier 85504b052f Simplify code ....
svn path=/trunk/; revision=43665
2012-07-11 18:32:20 +00:00
Bill Meier 3b7e75852a Remove "comment to myself".
svn path=/trunk/; revision=43664
2012-07-11 16:24:01 +00:00
Bill Meier 0bace7313c General cleanup:
- Fix potential array overflow;
- Calls to expert...() should not be under 'if (tree)';
- Don't use DISSECTOR_ASSERT for bad data; use expert...();
- Add some XXX comments about enum item values different than
   specified in the comments associated with the enum items;
- Init global 'mfgCommandFlag' as appropriate before use;
- Add missing hf[] entries;
- #if 0 various unused #defines and enums;
- Reduce (somewhat) repeated fetches of the same tvb data;
- Remove unneeded initializers;
- Don't use 'l' as a variable name;
- Reformat long lines, hf[] array entries and other;;
- Fix some indentation;

svn path=/trunk/; revision=43663
2012-07-11 15:28:31 +00:00
Anders Broman 62f645715a failure cause is an OCTET STRING not a string.
svn path=/trunk/; revision=43662
2012-07-11 14:41:21 +00:00
Anders Broman 6dfa10bc57 Revert part of revision 43107 which broke sub dissection of
Signal and events as a new tvb wasn't created. 
|BASE_EXT_STRING also removed.

svn path=/trunk/; revision=43661
2012-07-11 14:40:35 +00:00
Anders Broman 0a27ca29b2 Add a new preference to make it possible to only use the hosts file
for a profile for name resolution.

svn path=/trunk/; revision=43659
2012-07-11 08:52:51 +00:00
Guy Harris fb095f288f From Ben Bowen:
Add additional named fields for IMAP.

svn path=/trunk/; revision=43651
2012-07-10 19:43:55 +00:00
Pascal Quantin 1410207421 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7438 :
Do not call tvb_ensure_length_remaining on an empty tvb

svn path=/trunk/; revision=43648
2012-07-10 15:43:03 +00:00
Jeff Morriss 9ece26aee9 Obey the new use-external-resolvers preference when translating IP
addresses into host names (in get_host_ipaddr() and get_host_ipaddr6()).

This may resolve
http://ask.wireshark.org/questions/12542/what-is-use-external-network-name-resolver-setting

svn path=/trunk/; revision=43647
2012-07-10 15:02:23 +00:00
Jeff Morriss 7a8a40946a host_lookup() and host_lookup6() are both called even when network-name
resolution is NOT enabled (it's always been like this and I'm not sure why
and I was hesitant to change that).  So: don't use the external name resolver
unless both network-name resolution AND use-external-resolvers are enabled.

svn path=/trunk/; revision=43645
2012-07-10 14:33:19 +00:00
Anders Broman 8ecd85f1ad Introduce a preference setting for application context version.
svn path=/trunk/; revision=43641
2012-07-10 11:39:06 +00:00
Anders Broman 8762bd56a3 Group the network name resolution boxes together and make a more verbose explanation on the intended use.
svn path=/trunk/; revision=43638
2012-07-10 07:24:01 +00:00
Pascal Quantin a0c58375be Move LPP and LPPe dissectors to the ASN.1 dirty library
svn path=/trunk/; revision=43637
2012-07-10 07:19:40 +00:00