Commit graph

2928 commits

Author SHA1 Message Date
Jörg Mayer
886332e74f Whitespace changes
svn path=/trunk/; revision=52109
2013-09-16 21:35:19 +00:00
Pascal Quantin
7d6899b96b Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9155 :
Ensure that codec_str string is always initialized 

svn path=/trunk/; revision=52107
2013-09-16 21:26:03 +00:00
Jörg Mayer
c5ffff76d8 Fix checkapi warnings (missing id)
Replace Makefile.{am,nmake,common} that did not conform by
their asn1/c133/ version.

svn path=/trunk/; revision=52062
2013-09-15 15:00:03 +00:00
Jörg Mayer
65ff43fada Finish asn1 emem -> wmem conversion.
Left are snmp and those functions that don't have wmem equivalents.

svn path=/trunk/; revision=52060
2013-09-15 14:37:46 +00:00
Jörg Mayer
c65459c729 emem -> wmem (don't forget about .cnf)
svn path=/trunk/; revision=52058
2013-09-15 14:33:38 +00:00
Jörg Mayer
888650324b emem -> wmem
svn path=/trunk/; revision=52054
2013-09-15 13:24:14 +00:00
Pascal Quantin
868b345eea Convert a few more dissectors to wmem API
svn path=/trunk/; revision=52053
2013-09-15 10:29:49 +00:00
Martin Kaiser
fd50ee16e8 dissect OCSP nonce extension
some minor reformatting of the ASN.1 imports

svn path=/trunk/; revision=51987
2013-09-12 21:29:50 +00:00
Pascal Quantin
efe18f199c Convert a few dissectors from emem to wmem API
svn path=/trunk/; revision=51983
2013-09-12 20:37:30 +00:00
Guy Harris
0c11b6f8da Give various files RCS IDs.
svn path=/trunk/; revision=51963
2013-09-12 03:41:22 +00:00
Chris Maynard
0c41507bad Change some internal dissector table UI names so it's clear which protocol they pertain to and it's easier to find in the list.
svn path=/trunk/; revision=51904
2013-09-09 21:55:57 +00:00
Michael Mann
9e3f9b449f expert_add_info_format_text -> expert_add_info_format
svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
Michael Mann
00dd0adc0d expert_add_info_format_text -> expert_add_info_format
svn path=/trunk/; revision=51851
2013-09-09 00:28:48 +00:00
Pascal Quantin
f54441c125 Add a chunk forgotten in r51846
svn path=/trunk/; revision=51847
2013-09-08 21:22:11 +00:00
Pascal Quantin
a6ae13dee9 Slightly different fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9117 :
Check that tvb returned by dissect_per_bit_string is not null before trying to use it

svn path=/trunk/; revision=51846
2013-09-08 21:10:36 +00:00
Evan Huus
57c28aeffd Fix the FSF address in the license header for the new ASN.1 dissectors.
svn path=/trunk/; revision=51830
2013-09-07 22:12:24 +00:00
Gerald Combs
52c9e57474 Deduplicate some type and field names.
svn path=/trunk/; revision=51800
2013-09-06 17:39:03 +00:00
Anders Broman
96d29a5d50 Get rid of a duplicated filter name.
svn path=/trunk/; revision=51792
2013-09-05 20:55:59 +00:00
Evan Huus
8552f0df64 The length field is retrieved from the packet in bytes, not bits, so stop
adjusting it by 8 everywhere.

Seems to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9087 though
someone more familiar with the protocol will have to verify it's actually
correct now.

svn path=/trunk/; revision=51784
2013-09-05 13:15:04 +00:00
Evan Huus
3b6f55c579 Convert atn-* dissectors to wmem. No emem in new code please!
svn path=/trunk/; revision=51780
2013-09-05 12:13:00 +00:00
Jörg Mayer
39bff3218a Missed 50% of the updates in last commit
svn path=/trunk/; revision=51773
2013-09-05 07:33:05 +00:00
Jörg Mayer
d4f2865595 CMakeLists was no longer in sync with Makefile.common
svn path=/trunk/; revision=51772
2013-09-05 07:28:47 +00:00
Jörg Mayer
022706764b Add missing CMakeLists.txt files
svn path=/trunk/; revision=51771
2013-09-05 06:05:15 +00:00
Jörg Mayer
02a61b07e4 Fix cmake syntax - so now it "only" warns about missing
CMakeLists.txt in the subdirectories.

svn path=/trunk/; revision=51770
2013-09-05 05:48:22 +00:00
Anders Broman
80cd0dca1d From Mathias Guettler:
New dissector for Air/Ground Datalink ICAO doc 9705 Ed2: ULCS, CM, CPDLC.

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

svn path=/trunk/; revision=51766
2013-09-05 05:26:04 +00:00
Evan Huus
7dbc052d78 More dissectors to wmem. There are no more dissectors using se_tree now, just a
few other places.

svn path=/trunk/; revision=51622
2013-09-01 01:00:11 +00:00
Martin Mathieson
a09ee6af03 The first step towards tracking and showing DRX info in MAC:
- send release from RRC
- show current DRX config from each frame, including a link back to the
  RRC config frame
- show simple DRX state for each frame (currently only offset into long
  cycle and whether within long cycle 'on' period)

TODO:
- simulate timers in response to new UL/DL transmissions or DL CRC
  errors
- maintain whether in long or short cycle
- show state of all timers

svn path=/trunk/; revision=51585
2013-08-30 04:08:57 +00:00
Anders Broman
7e3922cf43 Use dissector_delete_uint_range/dissector_add_uint_range
svn path=/trunk/; revision=51540
2013-08-27 19:21:20 +00:00
Evan Huus
b5900e53d9 Make sure our ldap_call_response_t struct is always completely initialized,
fixing a "Conditional jump or move depends on uninitialised value" error found
by valgrind fuzzing.

svn path=/trunk/; revision=51516
2013-08-25 17:31:15 +00:00
Guy Harris
0675ed7494 Clang, clang, clang went the warning....
Fix a memset (drb_mapping is a pointer, so its size is the size of a
pointer; we want the size of what it points to).

svn path=/trunk/; revision=51500
2013-08-23 23:51:52 +00:00
Pascal Quantin
ae4f556630 Simplify logic a bit now that we do not use anymore GUINT_TO_POINTER macro
svn path=/trunk/; revision=51490
2013-08-23 12:51:07 +00:00
Pascal Quantin
483ee317f7 From Martin Mathieson:
Follow-up of r51429 that
- uses accessors to lazily allocate a private_data struct and returns the different parts based upon their use
- includes the v1130 DRX Config

svn path=/trunk/; revision=51489
2013-08-23 10:42:11 +00:00
Pascal Quantin
75f4fa5b4b Remove tree check when dissecting PCCH message so as to avoid filtering expert info on first pass
svn path=/trunk/; revision=51477
2013-08-22 19:55:25 +00:00
Chris Maynard
b3dc1eed1c Fix Coverity CID's 1063706-1063710: Out-of-bounds read (OVERRUN_STATIC)
svn path=/trunk/; revision=51450
2013-08-21 14:08:42 +00:00
Martin Mathieson
641032ea44 Gather together dedicated DRX configuration, and make sure that it
is internally consistent.

TODO: include r11 sequence that can overwrite some of these values.
TODO: actx->private_data gets reused for several purposes, need to
separate these uses out and avoid possible conflicts...

svn path=/trunk/; revision=51429
2013-08-19 17:06:42 +00:00
Pascal Quantin
b46f9bebe2 Change some dissectors to use pinfo memory pool instead of malloc if it can trigger an exception between between buffer allocation and tvb_set_free_cb call
svn path=/trunk/; revision=51427
2013-08-19 14:55:41 +00:00
Pascal Quantin
02cae558f9 Do not use ephemeral memory when adding a new data source
svn path=/trunk/; revision=51424
2013-08-19 11:11:11 +00:00
Guy Harris
64f079430b Fix $Id$.
svn path=/trunk/; revision=51373
2013-08-15 03:55:09 +00:00
Jörg Mayer
3b5aaefce3 - Extract variables from Makefile.common.
- Apply this to asn1/c1222/

svn path=/trunk/; revision=51324
2013-08-12 22:17:06 +00:00
Pascal Quantin
24e7b8aefd Fix copy paste error and reinitialize actx->private_data to NULL once used
svn path=/trunk/; revision=51311
2013-08-12 09:26:24 +00:00
Alexis La Goutte
467ece42b3 Fix (-W)documentation error found by Clang
../../asn1/c1222/packet-c1222-template.c:348:15: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param pinfo
   ~~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:349:14: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param tree
   ~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:350:16: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param length
   ~~~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:351:16: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param offset
   ~~~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:758:11: error: parameter 'keybuf' not
      found in the function declaration [-Werror,-Wdocumentation]
 * \param keybuf is updated with a copy of the key data if successful lookup.
          ^~~~~~
../../asn1/c1222/packet-c1222-template.c:758:11: note: did you mean 'keybuff'?
 * \param keybuf is updated with a copy of the key data if successful lookup.
          ^~~~~~
          keybuff
../../asn1/c1222/packet-c1222-template.c:879:13: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param tvb
   ~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:880:16: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param offset
   ~~~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:881:13: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param len
   ~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:882:15: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param pinfo
   ~~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:883:14: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param tree
   ~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:1023:13: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param tvb
   ~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:1024:15: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param pinfo
   ~~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:1025:14: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param tree
   ~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:1047:15: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param pinfo
   ~~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:1048:13: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param tvb
   ~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:1049:16: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param offset
   ~~~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:1068:13: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param tvb
   ~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:1069:15: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param pinfo
   ~~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:1070:14: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param tree
   ~~~~~~~~~~^

svn path=/trunk/; revision=51272
2013-08-10 21:30:38 +00:00
Martin Mathieson
237182ba42 Use proper macros to cast between uint and pointer
svn path=/trunk/; revision=51246
2013-08-10 17:09:12 +00:00
Martin Mathieson
11304a30ee Try again...
svn path=/trunk/; revision=51245
2013-08-10 16:53:05 +00:00
Martin Mathieson
8cddb7a24e Try using guint.
svn path=/trunk/; revision=51244
2013-08-10 16:34:19 +00:00
Martin Mathieson
0fb73abcc9 Add a malformed check to show if GroupA has more RAPIDs than A & B
combined.

svn path=/trunk/; revision=51243
2013-08-10 16:17:33 +00:00
Stig Bjørlykke
cf6288e21f Added default ignore targets for new asn1 dissectors.
Removed cnf data from atn-cpdlc.asn to make it generate.

svn path=/trunk/; revision=51215
2013-08-08 11:15:45 +00:00
Anders Broman
77f4bef154 From Mathias Guettler:
New dissector for Air/Ground Datalink ICAO doc 9705 Ed2: ULCS, CM, CPDLC.

Add the files to the distribution.

svn path=/trunk/; revision=51212
2013-08-08 05:34:22 +00:00
Anders Broman
a4d1560fd1 From Mathias Guettler:
New dissector for Air/Ground Datalink ICAO doc 9705 Ed2: ULCS, CM, CPDLC.

Just adding the files to SVN for now.

svn path=/trunk/; revision=51210
2013-08-08 05:09:13 +00:00
Anders Broman
08d223eb71 When dissecting IMSI handle the zero length tvb case, fixes "Malformed Packet: CAMEL (empty IMSI tag)"
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9015

svn path=/trunk/; revision=51208
2013-08-08 04:36:54 +00:00
Martin Kaiser
2f072ac53c add a range check for dch_id
this should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9005

svn path=/trunk/; revision=51195
2013-08-07 20:18:11 +00:00
Jakub Zawadzki
9cfac1227d Replace hfinfo pointer to same_name_prev, with same_name_prev_id.
svn path=/trunk/; revision=51175
2013-08-06 20:53:47 +00:00
Jakub Zawadzki
518ac53e2c Make some global variables static
svn path=/trunk/; revision=51163
2013-08-05 20:15:06 +00:00
Michael Mann
af134c29ca Convert proto_item_set_expert_flags into filterable items.
svn path=/trunk/; revision=51140
2013-08-04 19:59:01 +00:00
Michael Mann
3eafc74e2b Convert proto_item_set_expert_flags to "filterable" items in alcap dissector. Unfortunately it had a few tentacles, so they needed to be brought along for the ride.
svn path=/trunk/; revision=51136
2013-08-04 13:46:25 +00:00
Jeff Morriss
f7843da692 md5.h is in wsutil now.
svn path=/trunk/; revision=51102
2013-08-01 23:53:35 +00:00
Jeff Morriss
2df54da6e2 Move a bunch of the crypt modules and pint.h into wsutil.
This means wsutil now links against libcrypt.

Protect a bunch of the crypt header files from multiple inclusion.

svn path=/trunk/; revision=51100
2013-08-01 23:34:47 +00:00
Anders Broman
82569132d9 Add the forgotten makefile updates.
svn path=/trunk/; revision=51017
2013-07-29 18:19:59 +00:00
Anders Broman
266e577aee Update to handle version 9.
svn path=/trunk/; revision=50981
2013-07-28 19:25:14 +00:00
Evan Huus
8441fff193 Use the pinfo pool for adding data sources in the h245 dissector. The packet
pool is freed before the packet is displayed or otherwise processed, so adding
data sources from it leads to use-after-free errors.

Not sure why this wasn't showing up in the fuzz-bot valgrind step, there
are lots of h245 captures in the menagerie...

svn path=/trunk/; revision=50897
2013-07-25 23:58:49 +00:00
Pascal Quantin
802e7bed77 Try to differentiate a non filled private_data (pointer set to NULL) from an enum with value = 0
svn path=/trunk/; revision=50837
2013-07-23 14:34:46 +00:00
Jakub Zawadzki
c702e92121 Replace relative timestamp with reference frame number. Saves 16B per frame.
svn path=/trunk/; revision=50772
2013-07-21 23:07:33 +00:00
Jakub Zawadzki
a18172147f Remove fragment_data, add fragment_head, fragment_item - for now alias it to the same structure.
This is begin of work to split fragment head and fragments items.

svn path=/trunk/; revision=50708
2013-07-17 21:12:24 +00:00
Chris Maynard
f5f20fa8e3 Fix warning: ISO C does not allow extra ';' outside of a function.
svn path=/trunk/; revision=50638
2013-07-15 20:42:57 +00:00
Jeff Morriss
54bb2e7a5c Move report_err.{h,c} from epan into wsutil: there's nothing epan-specific there and moving it avoids having to recompile the file for use in editcap and capinfos (which don't link against libwireshark).
svn path=/trunk/; revision=50598
2013-07-15 02:48:26 +00:00
Guy Harris
0e40234217 Make pointers to raw packet data pointers to guint8, not pointers to
char; they're chunks of raw octets, not characters.

svn path=/trunk/; revision=50586
2013-07-14 17:39:36 +00:00
Jakub Zawadzki
543ba2746b fix: ../../asn1/t38/packet-t38-template.c:346: warning: request for implicit conversion from 'gpointer' to 'char *' not permitted in C++
svn path=/trunk/; revision=50582
2013-07-14 15:51:15 +00:00
Jakub Zawadzki
c766e78cfa Rewrite reassemble API to use TVBs instead of raw data.
(it seems to be working for TCP ^^)

svn path=/trunk/; revision=50580
2013-07-14 14:42:05 +00:00
Pascal Quantin
8c9ab802ce Upgrade LTE RRC dissector to v11.4.0
svn path=/trunk/; revision=50473
2013-07-09 20:39:09 +00:00
Guy Harris
b2475c1c29 Squelch some warnings that show up with, for example, the GCC 4.2.1 that
comes with Xcode 3.2.6 (it's not a real problem, but that requires more
flow analysis than that version of the compiler does, apparently).

svn path=/trunk/; revision=50419
2013-07-06 19:34:21 +00:00
Evan Huus
74e1b830a9 Use epan-scoped memory for h248 packages. Fixes another ~24KB of leaks.
svn path=/trunk/; revision=50414
2013-07-06 18:14:04 +00:00
Michael Mann
225698ef0b Fix display filter errors caught by checkfiltername.pl
svn path=/trunk/; revision=50399
2013-07-06 02:53:45 +00:00
Michael Mann
eec311ef39 Fix duplicate diplay filter names found by checkfiltername.pl
svn path=/trunk/; revision=50396
2013-07-06 01:20:38 +00:00
Michael Mann
7878e93cad expert_add_info_format_text + proto_tree_add_text = proto_tree_add_expert_format, where applicable.
svn path=/trunk/; revision=50377
2013-07-03 23:43:26 +00:00
Pascal Quantin
b00abd1c43 Check actx->private_data validity before using it
svn path=/trunk/; revision=50339
2013-07-03 12:01:12 +00:00
Pascal Quantin
b91b990a77 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8880 :
Check actx->private_data validity before using it

svn path=/trunk/; revision=50338
2013-07-03 08:53:47 +00:00
Michael Mann
98492c5619 expert_add_info + proto_tree_add_text = proto_tree_add_expert, where applicable
svn path=/trunk/; revision=50337
2013-07-03 02:59:31 +00:00
Chris Maynard
17772df943 Fix Coverity CID 1040373 (Dereference before null check). Minor whitespace changes come along for the ride on this one.
svn path=/trunk/; revision=50297
2013-07-01 15:09:56 +00:00
Chris Maynard
997c6c7d8e Fix Coverity CID 712348 (Unused pointer value).
svn path=/trunk/; revision=50288
2013-07-01 06:15:37 +00:00
Guy Harris
95daae2290 Squelch some warnings.
svn path=/trunk/; revision=50286
2013-07-01 06:13:21 +00:00
Chris Maynard
bfcaf93bff Fix Coverity CID 1040372 (Printf arg count mismatch) by eliminating the double %'s.
svn path=/trunk/; revision=50283
2013-07-01 05:47:13 +00:00
Michael Mann
c1ddd6046d replace object_identifier_id with actx->external.direct_reference
svn path=/trunk/; revision=50209
2013-06-28 12:52:13 +00:00
Michael Mann
9009944d51 Remove all global variables in P1 dissector. Bug 8515 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8515)
Added a "subtree context" structure to asn1_ctx_t. This should allow other ASN.1 dissector global variables to be replaced when only used for transferring data between fields in a subtree.

svn path=/trunk/; revision=50208
2013-06-28 12:43:29 +00:00
Jeff Morriss
a441793cba Move a couple of time-related modules into wsutil.
A bunch of files didn't really need to include these header files so remove
the include line rather than changing it.

svn path=/trunk/; revision=50154
2013-06-25 22:02:20 +00:00
Pascal Quantin
d23f769c0d Add an option to dissect RRC-Container IE
svn path=/trunk/; revision=50130
2013-06-24 21:31:25 +00:00
Michael Mann
87eb22f464 More proper fix (per advice of bug 8515 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8515)) of global variables complained about in bug 7060 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7060). Not sure if algorithm_id of x509af dissector could also be a actx->external.direct_reference, so left it alone.
svn path=/trunk/; revision=50113
2013-06-22 15:08:18 +00:00
Pascal Quantin
de10bc6b5e Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8799 :
Display certificate as UINT64 and add support for a 64bits unsigned value in BER dissector

svn path=/trunk/; revision=50096
2013-06-20 23:37:16 +00:00
Martin Mathieson
64e15853fc Fix for bug 8826.
The global variable 'address_item' was not always being set to NULL
before the dissection of a new frame.  Do more to set it in the general
case, and in the particular case of an MTSBindResult_PDU, which was
triggering an error in the supplied capture.

There may be other entry points where this still safely isn't being
set.

svn path=/trunk/; revision=50083
2013-06-20 18:54:58 +00:00
Evan Huus
7c8530539c Ldap still needs to include wmem.h since it uses wmem during normal dissection,
just not for UAT purposes.

svn path=/trunk/; revision=50074
2013-06-20 14:01:54 +00:00
Evan Huus
d63bd5330f Back out some of the wmem conversions (r50063 and r50057).
These dissectors allocate ephemeral or seasonal memory in UAT callbacks, which
really makes no sense because UAT callbacks can occur when there is no packet or
file in scope, making this effectively a leak if the user is fiddling with their
UAT and never opens a capture.

Emem let you get away with this, wmem forces an assertion. Back out the changes
so that the UATs are usable until the code can be properly fixed to not use
out-of-scope allocators.

svn path=/trunk/; revision=50073
2013-06-20 06:26:03 +00:00
Evan Huus
0d3718b467 Add some missing wmem includes that apparently only show up on Windows.
svn path=/trunk/; revision=50071
2013-06-19 23:53:25 +00:00
Evan Huus
8b0f1addd9 Apparently one of our major global headers must include emem.h, because I just
found a bunch more asn1 dissectors using emem without ever directly including
the header. Convert those to wmem as well, which involves add a number of
#include directives since dissectors do *not* automatically pull in the wmem
headers.

svn path=/trunk/; revision=50066
2013-06-19 23:08:58 +00:00
Evan Huus
b1e12ec925 Convert the rest of the ASN1 dissectors from emem to wmem.
svn path=/trunk/; revision=50063
2013-06-19 22:47:36 +00:00
Evan Huus
9fa4a8e6b6 Convert a batch of asn1 dissectors from emem to wmem.
svn path=/trunk/; revision=50057
2013-06-19 20:43:03 +00:00
Jörg Mayer
b77119aca7 Remove traling whitespace.
svn path=/trunk/; revision=50048
2013-06-19 18:33:49 +00:00
Pascal Quantin
2eec913a4d Fet rid of a global variable
svn path=/trunk/; revision=50034
2013-06-19 07:16:14 +00:00
Pascal Quantin
830ebed406 Get rid of global variables
svn path=/trunk/; revision=50032
2013-06-19 06:44:39 +00:00
Jörg Mayer
d9b5210c61 Fix CID 712341: Dereference null return value (NULL_RETURNS)
Well, not really. Just catch that case and error out.

svn path=/trunk/; revision=50029
2013-06-19 03:23:31 +00:00
Martin Mathieson
2cf27a92a6 Set PDCP SN length for DRBs for separate RRC element.
svn path=/trunk/; revision=50021
2013-06-18 22:38:54 +00:00
Martin Mathieson
868f74d628 Also signal value of PDCP SN (only used if enabled by RLC preferences).
svn path=/trunk/; revision=50019
2013-06-18 21:44:48 +00:00
Martin Mathieson
ece132a5ce Configure MAC LCID -> RLC channel settings from RRC.
svn path=/trunk/; revision=50016
2013-06-18 21:02:00 +00:00
Pascal Quantin
458dcb7ea2 Add ability to export decrypted SSL/DTLS PDUs
svn path=/trunk/; revision=50001
2013-06-18 01:13:07 +00:00
Michael Mann
f42e5bc9c0 Remove check_col() and the occasional tree.
This leaves just the Pidl dissectors remaining for removal of check_col() in the dissectors directory.  A small handful of check_col() calls remain outside of the dissectors.

svn path=/trunk/; revision=49941
2013-06-14 19:46:54 +00:00
Jeff Morriss
9c26c32645 Add parentheses around assignment used as truth value.
svn path=/trunk/; revision=49929
2013-06-14 13:20:41 +00:00
Michael Mann
2dbf6c59a2 Remove check_col() from ASN.1 dissectors
svn path=/trunk/; revision=49927
2013-06-14 12:44:50 +00:00
Anders Broman
82e220f2bd Pretify dissection of date and Time.
svn path=/trunk/; revision=49905
2013-06-12 15:08:08 +00:00
Tomas Kukosa
822c02b5d0 Fix wrong offset in H.235 tokens causing malformed packet exception
svn path=/trunk/; revision=49899
2013-06-12 09:03:21 +00:00
Anders Broman
03a322661f Fix a crash when oid_info->value_typem is NULL
svn path=/trunk/; revision=49894
2013-06-12 04:21:40 +00:00
Michael Mann
93be0fb393 Batch of filterable expert infos with some minor cleanup I noticed while doing the filter conversions.
svn path=/trunk/; revision=49893
2013-06-12 03:33:44 +00:00
Anders Broman
bbb5aacd42 Show DisplayString as a string.
svn path=/trunk/; revision=49887
2013-06-11 16:35:06 +00:00
Gerald Combs
c891784de7 Quick fix for bug 8768. For now assume that only three logical channels
are valid. If we run into more add expert item and cap the channel
count.

svn path=/trunk/; revision=49787
2013-06-05 16:38:20 +00:00
Pascal Quantin
1bb2081fd2 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8746 :
Add procedure numbers to C12.22 dissection

svn path=/trunk/; revision=49775
2013-06-04 20:21:17 +00:00
Anders Broman
3bfeaff546 Add subdissection of:
- SNMPv2-MIB sysDescr
-  SNMPv2-MIB::sysName

svn path=/trunk/; revision=49774
2013-06-04 20:05:16 +00:00
Jeff Morriss
29d51623c2 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8762 :
Remove dead code (condition can never happen).

svn path=/trunk/; revision=49743
2013-06-04 01:38:53 +00:00
Anders Broman
5e408534c8 cc1: warnings being treated as errors
../../asn1/nbap/packet-nbap-template.c: In function 'add_hsdsch_bind':
../../asn1/nbap/packet-nbap-template.c:349: warning: unused parameter 'tree'

svn path=/trunk/; revision=49708
2013-06-03 04:25:31 +00:00
Michael Mann
7fe5422c4b Convert ASN.1 dissectors to use filterable expert info.
NOTE: Kerberos ASN.1 template was updated, but not generated to source.

svn path=/trunk/; revision=49707
2013-06-03 03:42:36 +00:00
Pascal Quantin
d7638de9b7 Also notify CMAS alerts
svn path=/trunk/; revision=49685
2013-06-01 23:27:16 +00:00
Pascal Quantin
c553280339 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8745 :
Upgrade AP-title ASN.1 description

svn path=/trunk/; revision=49684
2013-06-01 23:10:37 +00:00
Martin Mathieson
d41ce46c92 Make Earthquake and Tsunami Warning Sytem indications stand out a
bit more.

svn path=/trunk/; revision=49683
2013-06-01 22:26:47 +00:00
Pascal Quantin
c310bd7dcc Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8744 :
Display C12.22 Invocation Id as unsigned integer

svn path=/trunk/; revision=49682
2013-06-01 20:51:14 +00:00
Jeff Morriss
813dcf79a1 Don't intentionally use -1 as an hfindex: while only naughty before, with the
changes from r49644 you'll get complaints about the hf being unregistered...

Note that this code also intentionally passes -1 as an ett_index.  It doesn't
currently complain so I'm leaving it alone for now...

svn path=/trunk/; revision=49648
2013-05-31 02:27:40 +00:00
Martin Mathieson
3a80080fe9 Add some info to make it easier to see when SI config changes:
- show systemInfoModification in info column (and expert info), also
  show number of UEs paged
- add expert item when systemInfoValueTag changes
- for MIB, add SFN to info column

svn path=/trunk/; revision=49603
2013-05-28 22:11:56 +00:00
Pascal Quantin
ec1ebf5dd8 From LI Hai via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8708 :
Add MAC-DATA support to TETRA dissector and other minor improvements

svn path=/trunk/; revision=49567
2013-05-24 20:55:42 +00:00
Anders Broman
a68080a1c6 Don't access nbap_dch_chnl_info if the index is > maxNrOfDCHs
svn path=/trunk/; revision=49418
2013-05-19 15:21:33 +00:00
Pascal Quantin
4745ae8689 Revert r49406: it's not ready for prime time yet
svn path=/trunk/; revision=49410
2013-05-18 17:48:50 +00:00
Jörg Mayer
0531d214ad Move kerberos back from broken list to normal list
svn path=/trunk/; revision=49406
2013-05-18 09:25:45 +00:00
Pascal Quantin
c080dd0474 More compilation fixes when having HAVE_KERBEROS
svn path=/trunk/; revision=49385
2013-05-17 19:31:44 +00:00
Pascal Quantin
c3836c576e Fix link failure with Windows
svn path=/trunk/; revision=49349
2013-05-16 22:23:16 +00:00
Pascal Quantin
67c9aa88c7 Fix compilation for Linux (defined but not used errors, C++ incompatibilities, shadowed variables)
svn path=/trunk/; revision=49344
2013-05-16 21:16:45 +00:00
Pascal Quantin
3f2d89a64f Remove useless blurbs
svn path=/trunk/; revision=49340
2013-05-16 20:09:24 +00:00
Pascal Quantin
0ed32537c0 Remove useless exports and fix a compilation error
svn path=/trunk/; revision=49339
2013-05-16 19:55:16 +00:00
Michael Mann
7efa0fdb29 Updated the Kerberos ASN.1 dissector to the point I believe it can replace the "hand made" one. Bug 8649 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8649)
Letting the more experienced ASN.1 developers tweak it a little more before the "generated" dissector is accepted (which is why it's not included here)

svn path=/trunk/; revision=49328
2013-05-16 12:21:43 +00:00
Anders Broman
5b279569d2 Export CellGlobalIdOrServiceAreaIdOrLAI.
svn path=/trunk/; revision=49312
2013-05-15 16:48:49 +00:00
Anders Broman
be8dbe75c5 Upate to spec. 11.0.0
- fix problem with extension dissection.

svn path=/trunk/; revision=49294
2013-05-14 19:00:53 +00:00
Anders Broman
85a8e304dd Add the posibillity to use a key for per-packet-data.
svn path=/trunk/; revision=49259
2013-05-12 18:11:02 +00:00
Jörg Mayer
59417deed4 I added EXPORT_FILES in too many places, remove them
(via "copy - modify too little - paste" cycle)

svn path=/trunk/; revision=49255
2013-05-11 22:02:33 +00:00
Jörg Mayer
d266d38af0 Now all disectors requiring asn2wrs can be generated using
cmake.

svn path=/trunk/; revision=49254
2013-05-11 20:52:50 +00:00
Jörg Mayer
1c6784b8c5 Correct previous commit:
MCS-PROTOCOL.asn is needed after all, so include it using the correct
path and variable

svn path=/trunk/; revision=49244
2013-05-11 12:39:17 +00:00
Jörg Mayer
694d8d89b4 MCS-PROTOCOL.asn does not exists (in this directory) and does not
seem to be used.

svn path=/trunk/; revision=49243
2013-05-11 12:26:28 +00:00
Jörg Mayer
66eb2bed96 Small cleanups
svn path=/trunk/; revision=49242
2013-05-11 12:16:06 +00:00
Jörg Mayer
303e35a7db pkix1explicit_exp.cnf and pkix1implicit_exp.cnf are stored
in svn, so don't generate them.

svn path=/trunk/; revision=49234
2013-05-10 14:59:02 +00:00
Jörg Mayer
b22ed68d8d Some more protocols can be generated via cmake
svn path=/trunk/; revision=49233
2013-05-10 14:55:15 +00:00
Guy Harris
fa47c87e30 Distribute the kerberos and x721 subdirectories, even though we don't
build them.

svn path=/trunk/; revision=49224
2013-05-10 02:48:31 +00:00
Jörg Mayer
572d68a33b Small optical change
svn path=/trunk/; revision=49204
2013-05-07 17:52:51 +00:00
Jörg Mayer
5fa9c90ffd Some more
svn path=/trunk/; revision=49203
2013-05-07 16:26:35 +00:00
Jörg Mayer
7a58867626 x721 and kerberos: Use standard Makefile.am
idmp: remove an unused line
tetra, h460: Whitespace changes to be a "standard" Makefile.am
asn1/Makefile.am: don't try to build kerberos and x721 dissectors

svn path=/trunk/; revision=49201
2013-05-07 12:58:27 +00:00
Jörg Mayer
483d9d74ab Small formatting change
svn path=/trunk/; revision=49199
2013-05-07 11:55:50 +00:00
Jörg Mayer
84469a3216 Another hour gone, another set of protocols.
svn path=/trunk/; revision=49198
2013-05-07 11:31:26 +00:00
Jörg Mayer
d18b094a55 Another set of asn1 protocols can now be generated with cmake
svn path=/trunk/; revision=49197
2013-05-07 10:50:47 +00:00
Jörg Mayer
369c7b75ee Allow generating some more dissectors with cmake.
svn path=/trunk/; revision=49196
2013-05-07 04:40:37 +00:00
Jörg Mayer
1d5891111e Make exports actaully work
Add ansi_map as first generated file that uses exports (from gsm_map in
  this case).

svn path=/trunk/; revision=49195
2013-05-07 03:59:29 +00:00
Jörg Mayer
5ba458916a Move common code into UseAsn2Wrs.cmake.
Include the new file.
Use the new file.
Add cmake support to rebuild the gsm_map dissector.

svn path=/trunk/; revision=49194
2013-05-07 03:25:49 +00:00
Jörg Mayer
1b6e8300a6 Build the first (and one of the easiest) of 99 asn1 dissectors with
cmake. Just do "make" inside either the asn1 directory to rebuild all
finished dissectors or inside the asn1/HI2Operations to just rebuild
the given dissector.

svn path=/trunk/; revision=49193
2013-05-07 02:02:19 +00:00
Jörg Mayer
243e9c0ba5 Just whitespace changes
svn path=/trunk/; revision=49167
2013-05-05 08:49:18 +00:00
Michael Mann
195e87f3ea Protect a "divide by zero" operation. Bug 7359 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7359). This seems to have been generated through a corrupted UAT file switching between 1.8 and 1.10, but it's a good check to have regardless.
svn path=/trunk/; revision=49128
2013-05-01 23:59:16 +00:00
Guy Harris
1fe16c1d6a Fix warning.
svn path=/trunk/; revision=49118
2013-05-01 21:15:47 +00:00
Michael Mann
b787f03df3 Remove some global variables in favor of private_data member of asn1_ctx_t. Bug 7060 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7060). This should (mostly) passify the bug, but it appears like this could be done with a lot more ASN.1 dissectors.
svn path=/trunk/; revision=49117
2013-05-01 20:54:31 +00:00
Anders Broman
e9f90d8c42 Make C12.22 work over UDP.
svn path=/trunk/; revision=49104
2013-05-01 08:34:40 +00:00
Evan Huus
5b8a3df249 From me: only sign-extend BER integers if the field is actually signed
From Guy: override two fields in the GOOSE ASN.1 dissector to be unsigned

Together these fix
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8250


svn path=/trunk/; revision=49055
2013-04-26 19:23:36 +00:00
Jörg Mayer
8faa262e90 Stub cmake support for generating the asn1 dissectors.
It doesn't do anything yet, it is just to make svn status
readable again.

svn path=/trunk/; revision=49007
2013-04-23 23:05:33 +00:00
Jörg Mayer
048b751c21 tiny whitespace change
svn path=/trunk/; revision=48993
2013-04-22 23:04:22 +00:00
Pascal Quantin
5312d37e93 Update ASN.1 conformance files with the changes from r48634
svn path=/trunk/; revision=48741
2013-04-04 21:01:27 +00:00
Chris Maynard
e08b7c3a38 Fix encoding arg for proto_tree_add_item() and friends.
svn path=/trunk/; revision=48732
2013-04-04 15:33:14 +00:00
Anders Broman
a54f786099 Sort LocalCode value string.
svn path=/trunk/; revision=48721
2013-04-03 16:53:53 +00:00
Evan Huus
37600a157b Rename value string (and similar) functions to use a consistent pattern. This
was done using textual search+replace, not anything syntax-aware, so presumably
it got most comments as well (except where there were typos).

Use a consistent coding style, and make proper use of the WS_DLL_* defines.

Group the functions appropriately in the header.

I ended up getting rid of most of the explanatory comments since many of them
duplicated what was in the value_string.c file (and were out of sync with the
recent updates I made to those in r48633). Presumably most of the comments
should be in the .h file not the .c file, but there's enough churn ahead that
it's not worth fixing yet.

Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8467

svn path=/trunk/; revision=48634
2013-03-29 00:26:23 +00:00
Anders Broman
dafdc19d9e -Wmissing-prototypes
svn path=/trunk/; revision=48609
2013-03-28 07:34:13 +00:00
Chris Maynard
186d0c2006 Fix another incorrectly duplicated display filter, this time for hf_gsm_map_etsi_pdp_type_number.
#BACKPORT(1.6,1.8)

svn path=/trunk/; revision=48601
2013-03-27 21:41:56 +00:00
Chris Maynard
da30b9eb92 Fix the incorrectly duplicated display filter for hf_gsm_map_dlci.
#BACKPORT(1.6, 1.8)

svn path=/trunk/; revision=48597
2013-03-27 20:44:47 +00:00
Anders Broman
a6fbd905a5 Make the oid memeber a const.
svn path=/trunk/; revision=48558
2013-03-26 05:20:55 +00:00
Pascal Quantin
88c0e8e873 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8517 :
Do not tap an unknown Opration Code

svn path=/trunk/; revision=48539
2013-03-24 21:53:53 +00:00
Guy Harris
a2414d8909 Don't wire into the reassembly code the notion that reassemblies should
be done on flows from one address to another; reassembly for protocols
running atop TCP should be done on flows from one TCP endpoint to
another.

We do this by:

	adding "reassembly table" as a data structure;

	associating hash tables for both in-progress reassemblies and
	completed reassemblies with that data structure (currently, not
	all reassemblies use the latter; they might keep completed
	reassemblies in the first table);

	having functions to create and destroy keys in that table;

	offering standard routines for doing address-based and
	address-and-port-based flow processing, so that dissectors not
	needing their own specialized flow processing can just use them.

This fixes some mis-reassemblies of NIS YPSERV YPALL responses (where
the second YPALL response is processed as if it were a continuation of
a previous response between different endpoints, even though said
response is already reassembled), and also allows the DCE RPC-specific
stuff to be moved out of epan/reassembly.c into the DCE RPC dissector.

svn path=/trunk/; revision=48491
2013-03-22 23:59:54 +00:00
Anders Broman
2f450cf7c9 Add some of the global codes as asn2wrs handle them now.
svn path=/trunk/; revision=48478
2013-03-22 17:19:46 +00:00
Anders Broman
ed88660c9f Make Freephone-Operations parseable.
svn path=/trunk/; revision=48475
2013-03-22 06:43:49 +00:00
Pascal Quantin
8fa2e54773 Fix compilation for Linux
svn path=/trunk/; revision=48464
2013-03-21 21:12:26 +00:00
Pascal Quantin
7b3191e1b1 Upgrade LTE RRC dissector to v11.3.0
svn path=/trunk/; revision=48463
2013-03-21 20:51:19 +00:00
Bill Meier
1f083fd654 From beroset:
remove C++ incompatibilities
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachments #10423,#10424

svn path=/trunk/; revision=48450
2013-03-21 14:29:58 +00:00
Pascal Quantin
e704aaa14b Upgrade RRC dissector to v11.5.0
svn path=/trunk/; revision=48444
2013-03-20 21:15:19 +00:00
Pascal Quantin
52f342685d Upgrade LPP dissector to v11.2.0
svn path=/trunk/; revision=48443
2013-03-20 21:14:25 +00:00
Bill Meier
371d2dc915 From beroset:
remove C++ incompatibilities
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10401


svn path=/trunk/; revision=48441
2013-03-20 14:50:20 +00:00
Anders Broman
20c17246d4 svn path=/trunk/; revision=48440 2013-03-20 06:50:56 +00:00
Anders Broman
f92bd64966 [-Wmissing-prototypes]
Use explicit casts.

svn path=/trunk/; revision=48439
2013-03-20 05:59:22 +00:00
Anders Broman
7c56677cf9 From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48429
2013-03-19 21:22:31 +00:00
Anders Broman
a10b98284c From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48412
2013-03-19 04:54:30 +00:00
Anders Broman
84241f46ad From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48399
2013-03-18 20:44:36 +00:00
Alexis La Goutte
55cdb2b45b Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48374
2013-03-17 19:24:09 +00:00
Anders Broman
3e38475176 From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48356
2013-03-17 17:52:26 +00:00
Anders Broman
fad318ad44 From beroset:
changed implicit casts to explicit casts and corrected one erroneous cast (from void* to void**)

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

svn path=/trunk/; revision=48286
2013-03-14 06:26:55 +00:00
Anders Broman
d0efafbcb1 From beroset:
remove C++ incompatibilities from UAT_VS_DEF macro and all uses

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

svn path=/trunk/; revision=48259
2013-03-12 06:40:13 +00:00
Anders Broman
1b788d4061 Update to V11.5.0 (2012-12).
svn path=/trunk/; revision=48195
2013-03-08 17:55:53 +00:00
Pascal Quantin
d915e3c04f Prettify a bit dissection of sr-ProhibitTimer-r9 and drxShortCycleTimer
svn path=/trunk/; revision=48188
2013-03-08 08:19:26 +00:00
Anders Broman
37a86e4de6 Use explicit casts.
svn path=/trunk/; revision=48045
2013-03-04 06:48:36 +00:00
Anders Broman
04ec1e0984 Use explicit casts.
svn path=/trunk/; revision=48043
2013-03-03 21:22:25 +00:00
Anders Broman
9991973c37 Use explicit casts.
svn path=/trunk/; revision=48008
2013-03-02 14:51:04 +00:00
Balint Reczey
27320f87cb Remove asn1/dsp from autotools Makefile system since it lacks distclean target
svn path=/trunk/; revision=47994
2013-03-02 00:35:57 +00:00
Balint Reczey
1ebdb2e521 Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992
2013-03-01 23:53:11 +00:00
Guy Harris
c522bb09c2 The LDAP dissector uses register_frame_end_routine(), so it needs to
include packet-frame.h.

svn path=/trunk/; revision=47928
2013-02-28 00:09:26 +00:00
Pascal Quantin
7fdbff4822 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8378 :
A detailed diagnostic information contains either a SMS-SUBMIT-REPORT or a SMS-DELIVERY-REPORT. Set P2P direction accordingly.

svn path=/trunk/; revision=47927
2013-02-27 23:08:17 +00:00
Guy Harris
53fffe0414 Get rid of unnecessary includes of "packet-frame.h".
svn path=/trunk/; revision=47925
2013-02-27 23:02:18 +00:00
Guy Harris
6b629c4d92 Move show_exception() and show_reported_bounds_error() to
epan/show_exception.c, as it's used outside
epan/dissectors/packet-frame.c.  Update their callers to include
<epan/show_exception.h> to get their declaration.

Add a CATCH_NONFATAL_ERRORS macro that catches all exceptions that, if
there's more stuff in the packet to dissect after the dissector call
that threw the exception, doesn't mean you shouldn't go ahead and
dissect that stuff.  Use it in all those cases, including ones where
BoundsError was inappropriately being caught (you want those passed up
to the top level, so that the packet is reported as having been cut
short in the capture process).

Add a CATCH_BOUNDS_ERRORS macro that catches all exceptions that
correspond to running past the end of the data for a tvbuff; use it
rather than explicitly catching those exceptions individually, and
rather than just catching all exceptions (the only place that
DissectorError should be caught, for example, is at the top level, so
dissector bugs show up in the protocol tree).

Don't catch and then immediately rethrow exceptions without doing
anything else; just let the exceptions go up to the final catcher.

Use show_exception() to report non-fatal errors, rather than doing it
yourself.
 
If a dissector is called from Lua, catch all non-fatal errors and use
show_exception() to report them rather than catching only
ReportedBoundsError and adding a proto_malformed item.

Don't catch exceptions when constructing a trailer tvbuff in
packet-ieee8023.c - just construct it after the payload has been
dissected, and let whatever exceptions that throws be handled at the top
level.

Avoid some TRY/CATCH/ENDTRY cases by using checks such as
tvb_bytes_exist() before even looking in the tvbuff.

svn path=/trunk/; revision=47924
2013-02-27 22:43:54 +00:00
Michael Mann
8c0d526f58 SNMP dissector should handle aes256 (better version than r47690)
svn path=/trunk/; revision=47902
2013-02-26 11:38:39 +00:00
Bill Meier
96a24cc79f Fix spelling/typos found using a list of commonly misspelled words.
The misspellings were mostly in comments but some were
in text strings visible to the user.


svn path=/trunk/; revision=47899
2013-02-26 04:42:26 +00:00