Stig Bjørlykke
7ce16533b4
Added packet-pkixac.h
...
svn path=/trunk/; revision=32462
2010-04-14 10:04:13 +00:00
Stig Bjørlykke
0efd2d8629
Moved pkixac to clean dissectors.
...
svn path=/trunk/; revision=32461
2010-04-14 08:51:28 +00:00
Stig Bjørlykke
81aede3f8c
Added PKIXAttributeCertificate (RFC3281).
...
svn path=/trunk/; revision=32460
2010-04-14 08:42:24 +00:00
Stig Bjørlykke
cb4a91a8ca
Register SignedData as a BER syntax dissector.
...
svn path=/trunk/; revision=32459
2010-04-14 07:57:01 +00:00
Sake Blok
810861bcd0
Fix for bug 4535: The SSL dissector can not correctly resemple SSL records when the record header is spit between packets
...
svn path=/trunk/; revision=32456
2010-04-13 19:37:44 +00:00
Anders Broman
0424d1716c
Extract encoding name and sample rate
...
i.e "AMR/8000"
This string can then be put in the hastable, extracted by
packet-rtp.c and split into "AMR" and "8000"
sample rate can then be a part of rtp_info and get rid of the
clock rate maping.
(I have some problem splitting the string, help apreciated) :-)
svn path=/trunk/; revision=32455
2010-04-13 19:27:14 +00:00
Jaap Keuter
b2be3b5ee8
From Ivan Sy:
...
Patch allows display of CD (Checking Disable) bit for DNS request and response. Section 3.2.2 of RFC 4035 revised section 6.1 of RFC 2535
for the CD Bit.
svn path=/trunk/; revision=32453
2010-04-13 17:38:53 +00:00
Anders Broman
d05485a32b
Update to V9.2.0 (2010-03).
...
svn path=/trunk/; revision=32451
2010-04-12 19:35:51 +00:00
Anders Broman
057b934cfa
Update to V9.2.0 (2010-03).
...
svn path=/trunk/; revision=32450
2010-04-12 19:13:36 +00:00
Anders Broman
ddb29f962b
More hf renaming.
...
svn path=/trunk/; revision=32437
2010-04-09 05:58:48 +00:00
Anders Broman
6f36921448
From Jouni Malinen:
...
Add a dissection ofr FT Action frames (part of IEEE 802.11r)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4658
From me name header fields a bit more consistent.
svn path=/trunk/; revision=32436
2010-04-09 05:46:30 +00:00
Guy Harris
17865148a1
Squelch compiler warnings. (We know that header.content_length is less
...
than a value that fits into an int, so we know its value will fit into
an int.)
svn path=/trunk/; revision=32434
2010-04-09 02:00:07 +00:00
Jeff Morriss
873a93c7b1
Use a 64-bit number to store the content length. This fixes:
...
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1958
Of course this doesn't mean we can reassemble that much data.
svn path=/trunk/; revision=32433
2010-04-09 01:42:12 +00:00
Gerasimos Dimitriadis
ecf1a60a12
Fix for Bug 4651:
...
Dissector call used uninitialized packet_info pointer
svn path=/trunk/; revision=32432
2010-04-08 19:40:57 +00:00
Anders Broman
441c3f63b2
From Stephen Donnelly:
...
InfiniBand Link Packet (flow control) dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4656
svn path=/trunk/; revision=32425
2010-04-08 08:41:56 +00:00
Anders Broman
9a76e5fafb
From Jouni Malinen:
...
Add a dissector for FTIE (part of IEEE 802.11r).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4654
svn path=/trunk/; revision=32424
2010-04-08 06:36:38 +00:00
Bill Meier
9ade30a7b1
#include <string.h> and/or #include <stdio.h> not needed.
...
svn path=/trunk/; revision=32417
2010-04-07 16:54:29 +00:00
Guy Harris
95c9580817
Squelch a compiler warning.
...
svn path=/trunk/; revision=32415
2010-04-07 00:45:18 +00:00
Guy Harris
8084fd5152
Squelch a compiler warning.
...
svn path=/trunk/; revision=32414
2010-04-07 00:41:44 +00:00
Guy Harris
bfe08e2b9f
Squelch a compiler warning.
...
Just make dtmf_digits and bcd_digits arrays; no need for the extra level
of indirection.
svn path=/trunk/; revision=32413
2010-04-07 00:39:35 +00:00
Guy Harris
5c394ee15f
Squelch some compiler warnings (including warnings about the last member
...
of a structure being an empty array; that is *not* supported by all the
compilers that can be used to build Wireshark).
svn path=/trunk/; revision=32412
2010-04-07 00:34:20 +00:00
Bill Meier
69df32fb11
#include <string.h> not needed.
...
svn path=/trunk/; revision=32411
2010-04-06 22:09:47 +00:00
Bill Meier
055dd62063
#include <string.h> not needed.
...
svn path=/trunk/; revision=32410
2010-04-06 21:14:01 +00:00
Anders Broman
176c304090
Try to fix Bug 4648 - pkcs12 ASN1 generated dissector differs from epan/dissectors version.
...
It's a pain to get these circular dependencies right.
svn path=/trunk/; revision=32409
2010-04-06 20:22:19 +00:00
Bill Meier
37f7a9b3b5
#include <stdio.h> not needed.
...
(Note: the change in a generated function name looks benign:
dissect_x411_PrintableString_SIZE_CONSTR4299806048 ==>
dissect_x411_PrintableString_SIZE_CONSTR32134928)
svn path=/trunk/; revision=32407
2010-04-06 18:46:08 +00:00
Bill Meier
e770891329
#include <stdio.h> not needed
...
svn path=/trunk/; revision=32406
2010-04-06 18:16:50 +00:00
Bill Meier
f8b92f8d0b
#include <stdio.h> not needed.
...
svn path=/trunk/; revision=32405
2010-04-06 17:01:14 +00:00
Bill Meier
efe6763988
"Web Cache Coordination Protocol" ==> "Web Cache Communication Protocol"
...
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4643
svn path=/trunk/; revision=32392
2010-04-05 21:42:28 +00:00
Bill Meier
580a243361
As requested by David Aggeler:
...
About hf_, in
{ &hf_vmlab_flags_fragment, { "More Fragments", "vmlab.fragment",
FT_UINT8, BASE_HEX, VALS(fragment_vals), 0x04, NULL, HFILL }},
I'd like to keep BASE_NONE to avoid the number to show in brackets.
svn path=/trunk/; revision=32391
2010-04-05 21:14:05 +00:00
Bill Meier
23b15ef8aa
Remove 'if (tree)' around code so that ethertype always gets called with correct values.
...
svn path=/trunk/; revision=32386
2010-04-05 17:55:57 +00:00
Bill Meier
a05d96aa8e
Cleanup:
...
- hf[] array:fix some "Display" fields: eg: FT_BOOLEAN to BASE_HEX
- There's no prefs: thus no need for prefs_register_protocol
- whitespace;
...
svn path=/trunk/; revision=32385
2010-04-05 17:31:28 +00:00
Guy Harris
9d52e57783
Put volatile back - without it, the compiler warns you.
...
svn path=/trunk/; revision=32384
2010-04-05 17:16:08 +00:00
Kovarththanan Rajaratnam
16c4e0d63f
Remove volatile
...
svn path=/trunk/; revision=32383
2010-04-05 16:36:58 +00:00
Guy Harris
6b3033299d
Get rid of unused variable.
...
svn path=/trunk/; revision=32382
2010-04-05 16:17:42 +00:00
Anders Broman
14e79052f8
From David Aggeler:
...
Support for VMware Lab Manager Host Spanning
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4186
svn path=/trunk/; revision=32380
2010-04-05 15:48:11 +00:00
Anders Broman
9188bcc9ef
From David Aggeler:
...
Fixed wrong declaration in packet-vlan.c
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4186
svn path=/trunk/; revision=32379
2010-04-05 09:24:25 +00:00
Anders Broman
57229a36fa
From David Aggeler:
...
Added 0x88DE to etypes.h
Added ETHERTYPE_VMLAB
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4186
svn path=/trunk/; revision=32378
2010-04-05 09:21:48 +00:00
Anders Broman
b3607a98ae
From Toshihiro KATAOKA:
...
The decoded MSISDN AVP in 3GPP diameter AVP and the decoded MSISDN IE in 3GPP
GTPv2 IE are not correct.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4638
svn path=/trunk/; revision=32377
2010-04-05 07:37:04 +00:00
Stig Bjørlykke
209eafec01
From Jelmer Vernooij via bug 4640:
...
This patch adds a dissector for the Git smart server protocol (git://),
splitting the stream up into packets.
svn path=/trunk/; revision=32375
2010-04-04 20:30:33 +00:00
Guy Harris
b706db2b01
packet-ssl-utils.h now includes <stdio.h> itself.
...
svn path=/trunk/; revision=32371
2010-04-04 03:06:25 +00:00
Bill Meier
f3710b8d26
Needs #include <stdio.h>.
...
svn path=/trunk/; revision=32369
2010-04-04 02:25:32 +00:00
Guy Harris
f588599e6d
packet-ssl-utils.h uses "FILE *"; at least on Solaris, we need to
...
include <stdio.h> to get "FILE *" declared.
svn path=/trunk/; revision=32368
2010-04-04 00:48:17 +00:00
Bill Meier
09764dd969
Remove unneeded #include <stdio.h>
...
svn path=/trunk/; revision=32367
2010-04-03 21:55:23 +00:00
Bill Meier
0d372283b3
(Trivial): indentation & whitespace cleanup.
...
svn path=/trunk/; revision=32366
2010-04-03 19:20:07 +00:00
Bill Meier
6812b68eb1
From Yaniv Kaul: constify parameters
...
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422
From me: Fix a number of instances where the function prototype or
the function definition wasn't changed so there was a mismatch
thus causing Windows (but not gcc) compilation errors.
svn path=/trunk/; revision=32365
2010-04-03 18:18:50 +00:00
Bill Meier
d32b4c0758
Revert SVN #32360 until Windows compilation errors corrected.
...
svn path=/trunk/; revision=32361
2010-04-02 15:18:03 +00:00
Bill Meier
049f9eac85
From Yaniv Kaul: constify parameters
...
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4422
svn path=/trunk/; revision=32360
2010-04-02 14:37:49 +00:00
Anders Broman
49d8719056
From KATAOKA Toshihiro:
...
Protocol preference for x2ap port.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4634
svn path=/trunk/; revision=32355
2010-04-01 20:20:25 +00:00
Anders Broman
5c2af3980f
Fix Tag value wrong in ansi_map.asn file for ServiceId in ServiceRequest message.
...
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4637
svn path=/trunk/; revision=32354
2010-04-01 20:07:17 +00:00
Bill Meier
7728979e61
From Aniruddha A: ANCP (Access Node Control Protocol) Dissector.
...
see: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4590
From me: A few minor changes:
- Make ancp_info a local variable rather than a static global variable;
- Use Stats ! ANCP rather than Stats ! ANCP ! Packet Types.
svn path=/trunk/; revision=32353
2010-04-01 17:49:26 +00:00
Anders Broman
e7c985f0a8
From Jouni Malinen:
...
Dissect IEEE 802.11r and IEEE 802.11w features.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4626
With extra minor code cleanup.
svn path=/trunk/; revision=32342
2010-03-31 19:10:43 +00:00
Anders Broman
2867bd0f49
Use IANA asigned PPID and port.
...
svn path=/trunk/; revision=32338
2010-03-31 08:53:00 +00:00
Anders Broman
1257bf19bb
From KATAOKA Toshihiro:
...
Add sctp default port for S1AP.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4630
svn path=/trunk/; revision=32337
2010-03-31 08:51:29 +00:00
Bill Meier
b2ea72b514
(Trivial) cleanup some indentation/whitespace.
...
svn path=/trunk/; revision=32335
2010-03-31 02:30:52 +00:00
Gerasimos Dimitriadis
3915bb8bab
Add routine and tables for analyzing International Signalling Point
...
Codes (ISPCs) according to Q.708. Update the MTP3 dissector to use
this function when the routing label carries ISPCs
svn path=/trunk/; revision=32329
2010-03-30 22:05:47 +00:00
Anders Broman
bdfb16fda0
Revert commit 31798 and 31799 as requested by Johannes Berg
...
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4283
Follow up in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4421
svn path=/trunk/; revision=32328
2010-03-30 21:20:48 +00:00
Gerald Combs
b3a1cd8859
Temporary (?) fix for bug 4623.
...
svn path=/trunk/; revision=32327
2010-03-30 21:12:52 +00:00
Tomas Kukosa
6fe3d98de8
Do not reassemble messages if segment is not complete (packet size limited during capture)
...
svn path=/trunk/; revision=32326
2010-03-30 12:23:52 +00:00
Bill Meier
478e670dd0
From Ben Greear: Update to the LANforge dissector to handle newer protocol formats.
...
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4611
From me:
- Remove #if 0'd #includes;
- Use tvb_reported_length_remaining (instead of tvb_length_remaining)
- Other minor cleanup (including whitespace).
svn path=/trunk/; revision=32319
2010-03-28 18:27:40 +00:00
Anders Broman
081aa44683
- Make dfilter_sip_request_line() take offset as an argument to get the right offset in case there is more than one SIP message in an tvb.
...
- Use correct line end offset to dissect_sip_uri().
Fixes bug
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4570
svn path=/trunk/; revision=32309
2010-03-27 18:09:37 +00:00
Bill Meier
9290840c4d
#include <stdio.h> not req'd; cleanup whitespace & indentation.
...
svn path=/trunk/; revision=32308
2010-03-27 17:06:22 +00:00
Bill Meier
45e2e811a4
Fix an "unused variable" warning: remove 'infoStrings'
...
svn path=/trunk/; revision=32307
2010-03-27 15:46:36 +00:00
Anders Broman
861ada7227
From Chuck Kristofek:
...
DIS update to introduce hf_ based filtering and radio family dissection.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4610
svn path=/trunk/; revision=32306
2010-03-27 15:23:16 +00:00
Gerasimos Dimitriadis
7eb0269c54
Add another MCC for India
...
svn path=/trunk/; revision=32297
2010-03-26 21:19:19 +00:00
Anders Broman
058274f711
From Mike Morrin:
...
There were 2 dissectors for GPRS-NS (GSM 48.016) protocol, packet-gprs-ns.c and
packet-gprs-ns.c. packet-nsip.c seemed to be the more complete, and has a
cleaner output.
I have polished up nsip.c and changed it so that it identifies itself as the
dissector for gprs-ns.
packet-gprs-ns.c can be deleted.
(Removed from the makefile for now).
svn path=/trunk/; revision=32295
2010-03-26 20:31:47 +00:00
Gerasimos Dimitriadis
8c1b0a8500
Update MNC list with all amendments up to No. 17 (ITU
...
Operational Bulletin 951)
svn path=/trunk/; revision=32291
2010-03-25 22:52:55 +00:00
Jaap Keuter
deef2df47d
From Alexis La Goutte:
...
Add IKE Notify Message from RFC5685: Redirect Mechanism for IKEv2
Add IKE Notify Message from RFC5723: Session Resumption for IKEv2
Add IKE Notify Message from Cisco Unity
svn path=/trunk/; revision=32290
2010-03-25 22:41:46 +00:00
Bill Meier
32e4784dc3
Remove svn:executable property.
...
svn path=/trunk/; revision=32289
2010-03-25 22:35:29 +00:00
Jaap Keuter
b899efbaf4
From Alexis La Goutte:
...
Add IKEv2 Config Attributes from Experimental RFC5739:
IPv6 Configuration in IKEv2
Updates missing IKEv2 Config Attributes from RFC4306 (SUPPORTED_ATTRIBUTES and INTERNAL_IP6_SUBNET)
svn path=/trunk/; revision=32288
2010-03-25 22:29:17 +00:00
Jaap Keuter
991e709d56
Update for RFC 4578.
...
svn path=/trunk/; revision=32286
2010-03-25 22:15:11 +00:00
Bill Meier
9d5ddeb46c
Fix properties:
...
svn:eol-stle --> svn:eol-style
svn:keywords: native --> Ids
remove svn:kewywords
svn path=/trunk/; revision=32284
2010-03-25 20:54:03 +00:00
Bill Meier
9beaab0ce2
From Samu Varjonen: "New patch to the locators"
...
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3378#c25
From me:
Fix typo: "REALY_UDP_HIP" --> "RELAY_UDP_HIP";
Cleanup whitespace.
svn path=/trunk/; revision=32276
2010-03-25 15:18:39 +00:00
Gerasimos Dimitriadis
4fd14a25ff
Incorporate changes to the MNC list as mandated from Amendments 1-3
...
to the 'Annex to ITU Operational Bulletin No. 935'
svn path=/trunk/; revision=32275
2010-03-24 21:23:37 +00:00
Gerasimos Dimitriadis
a16a5e89c6
Triggered by a comment from Mark Wallis:
...
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4588#c6
2 and 3 digits long MNCs with the same arithmetic value (e.g.
21 and 021) are possible under the same MCC, yet in the
mcc_mnc_codes they would get mapped to the same entry. To
avoid this aliasing, the encoding of the MCC/MNC pair into a
single arithmetic value in the mcc_mnc_codes list is changed.
svn path=/trunk/; revision=32274
2010-03-24 20:31:11 +00:00
Jaap Keuter
3f6e8b0284
From Martin Visser:
...
Please change the dissector so that TCP packets that have the "SACK permitted"
option set, set the "tcp.options.sack_perm" field to 1.
svn path=/trunk/; revision=32273
2010-03-23 20:05:04 +00:00
Martin Mathieson
cfb6f1531a
Improve reporting of Scheduling Request failure.
...
svn path=/trunk/; revision=32272
2010-03-23 13:24:01 +00:00
Bill Meier
b28dbd9656
Minor Reformatting; Rename some enum constant identifiers to be a bit more specific;
...
svn path=/trunk/; revision=32270
2010-03-22 20:59:35 +00:00
Martin Mathieson
90b1fb287d
Show oob items outside of context tree.
...
svn path=/trunk/; revision=32269
2010-03-22 19:20:37 +00:00
Bill Meier
0929a5625d
From Venkateshwaran Dorai: Server/Application State Protocol v1 (RFC 4678 ) Dissector
...
See: http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4584
From me:
- Change dissect_sasp_pdu() to return void: tcp_dissect_pdus() ignores
any return value when it calls a dissector and thus trying to register/use
the dissector as a 'new-style' dissector doesn't work as intended;.
- Add some 'expert' messages for invalid SASP Header Type and unknown Message Type.
- Use consistent indentation & cleanup whitespace;
- (A few other minor changes).
svn path=/trunk/; revision=32266
2010-03-22 18:09:09 +00:00
Gerasimos Dimitriadis
eaba9a1147
Include the leading zeroes when decoding the MNC
...
svn path=/trunk/; revision=32265
2010-03-22 18:06:03 +00:00
Gerasimos Dimitriadis
dfde72f247
Fix for Bug 4588:
...
RANAP and friends want the MNC encoded in big endian form.
svn path=/trunk/; revision=32257
2010-03-20 23:53:22 +00:00
Anders Broman
5df12df600
Update offset outside of if statement.
...
svn path=/trunk/; revision=32250
2010-03-20 00:04:39 +00:00
Jaap Keuter
56351b2c50
From Jochen Bartl:
...
EIGRP IPX routing updates TLV cleanup. I have replaced the remaining
proto_tree_add_text by proto_tree_add_item in IPX routing update TLVs.
svn path=/trunk/; revision=32247
2010-03-19 22:02:01 +00:00
Guy Harris
237b930ec4
Squelch a bunch of compiler warnings.
...
svn path=/trunk/; revision=32246
2010-03-19 20:24:06 +00:00
Tomas Kukosa
02a8a77f03
add some Q.931 messages from older specifications
...
svn path=/trunk/; revision=32244
2010-03-19 13:03:14 +00:00
Guy Harris
85a6e18cc1
Squelch some compiler warnings.
...
svn path=/trunk/; revision=32243
2010-03-19 08:37:34 +00:00
Guy Harris
d6aaf3369b
Squelch some compiler warnings.
...
Use "#if 0"/#endif rather than commenting out some code; that also means
we don't have to use "/ *" and "* /" in the #if'ed-out code, so don't.
Clean up indentation.
svn path=/trunk/; revision=32239
2010-03-19 01:33:12 +00:00
Ronnie Sahlberg
56bd4cd88e
Update the dissection of NFSv3 SETATTR Mode bits and dissect each
...
individual bit with a display filter name.
svn path=/trunk/; revision=32238
2010-03-18 23:04:31 +00:00
Bill Meier
8024cbd206
(Minor) Fix a gcc -Wshadow warning.
...
svn path=/trunk/; revision=32233
2010-03-18 20:19:07 +00:00
Bill Meier
2f07f816b2
From Hadar Shoham: Bootp option 61
...
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4583
svn path=/trunk/; revision=32232
2010-03-18 19:18:02 +00:00
Anders Broman
7ad6ee5056
Add dissection of "multiplexing with RTP header compression"
...
inspired by Sourabh Rathors bug
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4591
svn path=/trunk/; revision=32229
2010-03-17 20:45:50 +00:00
Bill Meier
97767a5a7b
Revert SVN #32222 : The handling of TLVs within the "LOCATOR" TLV needs to be reworked.
...
svn path=/trunk/; revision=32228
2010-03-17 20:38:43 +00:00
Martin Mathieson
64d949c97e
Trivial reformatting
...
svn path=/trunk/; revision=32226
2010-03-17 19:40:34 +00:00
Bill Meier
0c1991d488
From Samu Varjonen: Locator presentation change for HIP dissector.
...
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3378
From me: use consistent (tab) indentation; replace use of C++ style comment.
svn path=/trunk/; revision=32222
2010-03-17 18:23:56 +00:00
Bill Meier
c63cb48b5b
Minor changes:
...
- stdio/stdlib/string includes not req'd;
- Use less generic names for a few enum identifiers;
- Use coonsistent indentation in a few palces.
svn path=/trunk/; revision=32221
2010-03-17 18:08:45 +00:00
Anders Broman
8fc17fa447
Change som proto_tree_add_text() regarding protocoll errors to
...
expert info's.
svn path=/trunk/; revision=32219
2010-03-17 17:13:55 +00:00
Tomas Kukosa
cd719af33a
Add heuristic table for Q.931 User-specific protocol
...
svn path=/trunk/; revision=32218
2010-03-17 15:25:20 +00:00
Jaap Keuter
70168234a1
Update according to IANA registery.
...
svn path=/trunk/; revision=32216
2010-03-17 06:27:34 +00:00
Anders Broman
04edfe3b2a
From Harald Welte:
...
Add new GSMTAP dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4508
(I incorporated the .h file into the .c file).
svn path=/trunk/; revision=32214
2010-03-16 21:38:03 +00:00
Anders Broman
ee1fca6a19
Fix unused parameter 'num_fci' warning.
...
svn path=/trunk/; revision=32212
2010-03-16 21:09:47 +00:00