Commit Graph

38134 Commits

Author SHA1 Message Date
Martin Mathieson ed5ac34224 Append important details from LI and SURI trees to root item.
Show some SNs in the info column.

svn path=/trunk/; revision=39852
2011-11-15 15:36:39 +00:00
Bill Meier 47b290c7f5 Fix some props
svn path=/trunk/; revision=39851
2011-11-15 15:28:20 +00:00
Bill Meier 49a47e9745 Fix some svn properties
svn path=/trunk/; revision=39850
2011-11-15 15:16:37 +00:00
Bill Meier 58d87a7230 Fix svn:keywords prop: 'svn:eol-style'->'Id'
svn path=/trunk/; revision=39849
2011-11-15 15:11:35 +00:00
Bill Meier 19e53850b6 Fix svn:keywords prop: 'svn:eol-style'->'Id'
svn path=/trunk/; revision=39848
2011-11-15 15:08:43 +00:00
Bill Meier c26221f6ad Fix props: svn:keyword->svn:keywords; remove svn:executable
svn path=/trunk/; revision=39847
2011-11-15 15:02:01 +00:00
Martin Mathieson 62d16f0fbb UMTS RLC:
- add lookup for "unknown" channel type dissector (mode is known)
- set length extent for SUFI root item
- show data frames in the info column (at least for AM...)

DCT:
- call RLCDCH with "unknown" channel type (as don't know whether IP or RRC)
- support R9

svn path=/trunk/; revision=39846
2011-11-15 12:03:52 +00:00
Alexis La Goutte 8f9b3c6435 Add svn:keywords and svn:eol-style properties
svn path=/trunk/; revision=39845
2011-11-15 08:05:42 +00:00
Alexis La Goutte 9edf24f1ef Enhance CPHA dissector
* Remove struct and sizeof
* Replace proto_tree_add_* by proto_tree_add_item
* Replace CPHA function (report2str, opcode2str...) by standard Wireshark functions
* and minor bug fix

svn path=/trunk/; revision=39844
2011-11-15 07:56:06 +00:00
Anders Broman 47bc2af5fd From Michael Mann:
Bugfixes for both Buildbot issues:
1. seg-fault with multiple_service_packet
2. infinite loop

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

svn path=/trunk/; revision=39843
2011-11-15 07:18:39 +00:00
Anders Broman f8467706ac From Michael Mann:
Make it possible to use TortoiseSVN's SubWCRev.exe to update svnversion.h

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

svn path=/trunk/; revision=39842
2011-11-15 07:12:19 +00:00
Guy Harris e600a12538 OK, *that's* what Clang Cat was going on about:
packet-dcerpc-pn-io.c:8438:17: warning: Although the value
	stored to 'prm_flag2' is used in the enclosing expression, the
	value is never actually read from 'prm_flag2'

OK, thanks for telling me that, technically,

	prm_flag1 = prm_flag2 = 0;

can be implemented by storing the 0 into prm_flag1 directly rather than
storing 0 into prm_flag2 and copying it to prm_flag1.  Yes, you can haz
cheeseburger.

I guess it would matter if we were actually depending on some
side-effect of fetching prm_flag2, but we're not.  Rewrite this one to
squelch the complaint.

svn path=/trunk/; revision=39841
2011-11-15 05:37:56 +00:00
Guy Harris c8283d1291 Rewrite some odd code. Clang Cat does not want:
packet-reload.c:2875:13: warning: Although the value stored to
	'local_offset' is used in the enclosing expression, the value is
	never actually read from 'local_offset'

although as I read the C90 spec the code is doing pretty much what it
should be doing and the rewritten code does the same thing.  However,
it's also a bit more complicated and harder to read than the rewritten
code.

svn path=/trunk/; revision=39840
2011-11-15 05:25:17 +00:00
Guy Harris 0c530d222a At least as I read the code, there can be up to 3 receive channels (the
number of channels is XXX & 0x03, hence in the range 0-3.

Thanks and a tip of the hat to Clang Cat for catching this.

svn path=/trunk/; revision=39839
2011-11-15 05:10:56 +00:00
Guy Harris 70a8b27948 Get rid of the depth argument to dfilter_macro_apply(); have an internal
routine that does all the work and that takes a depth argumen, and an
external routine that calls that internal routine with a depth argument
of 0.  The depth is only of use internally, to avoid infinite recursion.

When recursing with that routine, pass depth+1 as the depth value,
rather than passing depth and incrementing it afterwards; the latter
doesn't prevent infinite recursion.  (Thanks and a tip of the hat to
Clang Cat for catching this.)

Squelch some other (harmless) warnings from Clang Cat.

Clean up indentation.

svn path=/trunk/; revision=39838
2011-11-15 04:26:38 +00:00
Chris Maynard 91398db56b Append each op name to the operations sub-tree so you don't necessarily have to expand the tree to see which ops are present. I think it makes more sense to append the names here rather than at the top level which was done to resolve bug 6078, but for now, I leave them appended in both places.
svn path=/trunk/; revision=39837
2011-11-14 20:38:05 +00:00
Bill Meier 47c4f27e0e Remove uneeded #includes, forward refs & check_col();
tvb_reported_length_remaining() can return -1;
Localize a variable.

svn path=/trunk/; revision=39836
2011-11-14 20:04:04 +00:00
Bill Meier 5f73d64e50 'guint8=tvb_get_guint8() + 2' can wrap. Use 'gint=...' instead. ditto for 'gint16=...'
Also:
 - remove unneeded #include;
 - Remove unneeded check_col();
 - use val_to_str_const() in several cases.

svn path=/trunk/; revision=39835
2011-11-14 19:58:12 +00:00
Chris Maynard 5facddf760 The Originator protocol identifier is not present in the "provisioning actions operation -61", only the "session management operatin -60". Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6570.
svn path=/trunk/; revision=39834
2011-11-14 19:57:45 +00:00
Bill Meier 07c90fb536 Add svn:keywords and svn:eol-style properties
svn path=/trunk/; revision=39833
2011-11-14 19:18:18 +00:00
Anders Broman f5ca06136a From Martin Kaiser:
DVB-CI / CI+ dissect X.509 certificates.

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

svn path=/trunk/; revision=39832
2011-11-14 19:16:47 +00:00
Guy Harris bbed650915 Do some more length checking to avoid a dissector bug error. Should fix
bug 6564.

svn path=/trunk/; revision=39831
2011-11-14 18:42:11 +00:00
Bill Meier eed8e49aff Very minor cleanup: remove some unneeded #includes & some trailing whitespace
svn path=/trunk/; revision=39830
2011-11-14 18:19:14 +00:00
Anders Broman 34ea886454 [-Wunused-but-set-variable]
svn path=/trunk/; revision=39829
2011-11-14 17:35:04 +00:00
Anders Broman fa5c7f85aa packet-sip.c:1412: warning: 'uri_param_end_offset' may be used uninitialized in this function
svn path=/trunk/; revision=39828
2011-11-14 17:27:18 +00:00
Anders Broman c46bda538d From Johan Wåhl:
- dissect Route and Via header.
- Dissect URI parameters.

svn path=/trunk/; revision=39827
2011-11-14 17:10:49 +00:00
Martin Mathieson 8df10bb4b5 Add remaining UMTS RLC primitive parameters preceding RLC payload.
svn path=/trunk/; revision=39826
2011-11-14 12:22:54 +00:00
Martin Mathieson e31d76c4cd Make exit_status volatile to avoid warning.
svn path=/trunk/; revision=39825
2011-11-14 11:36:53 +00:00
Anders Broman 75afa0bd3f Fix Id tag.
svn path=/trunk/; revision=39824
2011-11-14 08:24:47 +00:00
Bill Meier a42a82ed1d Don't use generic shared function/typedef/struct names;
Remove unneeded #includes;
Cleanup trailing whitespace.

svn path=/trunk/; revision=39823
2011-11-13 23:33:47 +00:00
Guy Harris a6ccc83e22 If we set "column.hidden" on the command line but don't set
"column.format" in a later argument, make sure we mark the appropriate
existing columns as hidden.

As part of cleaning up the infrastructure for doing this, store the COL_
code for a column in a fmt_data structure rather than a pointer to the
raw column format string; this simplifies some code.

Have a routine to return whether a column is visible, not hidden, as
it's used to set a "visible" flag.

svn path=/trunk/; revision=39822
2011-11-13 22:51:49 +00:00
Guy Harris c32a5e7d8b As we're no longer checking whether we're constructing the Info column,
we can't bail out early on dissection merely because we're not
constructing the protocol tree, as that would mean we wouldn't construct
the Info column unless we're constructing a protocol tree.

Clean up indentation.

svn path=/trunk/; revision=39821
2011-11-13 22:44:51 +00:00
Gerald Combs a22d69fd72 [Automatic manuf, services and enterprise-numbers update for 2011-11-13]
svn path=/trunk/; revision=39818
2011-11-13 15:03:25 +00:00
Guy Harris 833908d49b The sum of a guint16 and 2 does not necessarily fit in a guint16. Put
it into a gint, instead.  This should fix bug 6572, by preventing an
infinite loop if the sum in question is 0 modulo 2^16.

svn path=/trunk/; revision=39817
2011-11-13 01:38:46 +00:00
Guy Harris f5d4a4c7ba Clean up white space.
Note that we don't need to set the FCS length, but might as well do so
anyway.

svn path=/trunk/; revision=39816
2011-11-13 00:04:49 +00:00
Bill Meier 9b715d6a99 Various additional fixes ....
svn path=/trunk/; revision=39815
2011-11-12 23:25:29 +00:00
Bill Meier d9e9f429da Fix a formatting error.
svn path=/trunk/; revision=39814
2011-11-12 23:03:30 +00:00
Bill Meier 29986f07ed Fix some compile errors and rework some code.
svn path=/trunk/; revision=39813
2011-11-12 22:26:06 +00:00
Michael Tüxen 0f1ddc857b Fix compilation if HAVE_LIBGCRYPT is not defined.
svn path=/trunk/; revision=39812
2011-11-12 22:03:55 +00:00
Guy Harris 5692f59337 Update URL.
svn path=/trunk/; revision=39811
2011-11-12 21:16:43 +00:00
Bill Meier 3227cade47 Add entries for WTAP_ENCAP_NETANALYZER... to encap_table_base[]
svn path=/trunk/; revision=39810
2011-11-12 20:27:32 +00:00
Bill Meier d38970f73f Remove some unneeded 'if(pinfo)' tests;
Remove some unneeded forward refs.

svn path=/trunk/; revision=39809
2011-11-12 20:17:43 +00:00
Bill Meier f5d913ac84 Fix 2 typos.
svn path=/trunk/; revision=39808
2011-11-12 20:14:26 +00:00
Bill Meier ba8f3f4195 Remove unneeded code.
svn path=/trunk/; revision=39807
2011-11-12 19:45:21 +00:00
Bill Meier cbb32e6b00 Fix 2 typos
svn path=/trunk/; revision=39806
2011-11-12 19:27:07 +00:00
Bill Meier 7ad9251beb Fix some additional [-Wunused-but-set-variable]
Fix some spelling typos

svn path=/trunk/; revision=39805
2011-11-12 19:17:21 +00:00
Anders Broman af25c3e77b From Holger Pfrommer:
Enhancement of Hilscher Analyzer Dissector.

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

svn path=/trunk/; revision=39804
2011-11-12 18:01:38 +00:00
Anders Broman fa7ea2ea34 fix [-Wunused-but-set-variable]
svn path=/trunk/; revision=39803
2011-11-12 12:37:38 +00:00
Anders Broman 0f0f260fb4 fix [-Wunused-but-set-variable]
svn path=/trunk/; revision=39802
2011-11-12 11:49:37 +00:00
Anders Broman 264975e29c Add a cast.
svn path=/trunk/; revision=39801
2011-11-12 11:27:41 +00:00