Commit Graph

1325 Commits

Author SHA1 Message Date
hidnplayr
e12b00bee6 Bugfix in pci.inc for network drivers.
git-svn-id: svn://kolibrios.org@2929 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-18 00:06:27 +00:00
hidnplayr
54202798c2 Removing deprecated branch "hd_kolibri"
The same can be achieved on trunk kolibri by using the "/sys" path.
A backup of the files can be found on the KolibriOS FTP server.

git-svn-id: svn://kolibrios.org@2928 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-17 23:31:35 +00:00
hidnplayr
78aa083db1 some updates for i8254x driver
git-svn-id: svn://kolibrios.org@2925 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-16 13:42:00 +00:00
hidnplayr
8140e5df69 Some markup changes in network stack.
git-svn-id: svn://kolibrios.org@2924 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-15 16:15:57 +00:00
hidnplayr
a31be47dbc some markup changes in dec21x4x.asm
git-svn-id: svn://kolibrios.org@2923 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-15 15:04:34 +00:00
hidnplayr
70c292f418 fixed find_mmio32 in pci.inc
git-svn-id: svn://kolibrios.org@2922 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-15 10:50:36 +00:00
hidnplayr
85ca6be824 i8254x driver stub (works in vBox)
git-svn-id: svn://kolibrios.org@2921 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-15 10:46:06 +00:00
hidnplayr
4fcb9b82ce Removed useless button from NetCFG
git-svn-id: svn://kolibrios.org@2919 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-10 12:28:14 +00:00
hidnplayr
68230a94d8 Fixed bug in RTL8169 driver
git-svn-id: svn://kolibrios.org@2918 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-09 20:27:09 +00:00
hidnplayr
26aeed8f84 added rtl8169 device 0x813610ec, and a whole list of i8254x devices
git-svn-id: svn://kolibrios.org@2917 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-09 19:42:16 +00:00
hidnplayr
3b724316fb Some cleanup in rtl8169 driver
git-svn-id: svn://kolibrios.org@2916 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-09 14:35:51 +00:00
hidnplayr
cfa8509ec1 Added crude loopback device.
git-svn-id: svn://kolibrios.org@2914 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-08 13:14:32 +00:00
hidnplayr
a9f1828898 Fixed bugs in SIS900 RX:
-Receiver MUST be re-enabled by the driver.
-Driver MUST check for multiple packets at once.

git-svn-id: svn://kolibrios.org@2913 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-08 10:21:59 +00:00
hidnplayr
940c0c5fa6 Completion of the new SIS900 driver.
-cleanup of used packets after they are sent
-transmit function now checks first if the descriptor is free

git-svn-id: svn://kolibrios.org@2912 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-08 10:03:47 +00:00
hidnplayr
8ba3e5e11b added latency config macro to pci.inc
git-svn-id: svn://kolibrios.org@2911 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-07 20:26:26 +00:00
hidnplayr
5ae9070151 SIS900:
-refactoring
-fixed SIS900-635 MAC read
-fixed alignment issues
-added multiple TX descriptor support
TODO: clear sent packets from memory

git-svn-id: svn://kolibrios.org@2910 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-07 20:22:07 +00:00
hidnplayr
c9bbdd57de Bugfix in SIS900 init, added some debug output, Bugfix in set_rxd, some refactoring
git-svn-id: svn://kolibrios.org@2909 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-07 09:59:58 +00:00
hidnplayr
0b4a7112cd Bugfix in 'hook' procedure for SIS900 driver
git-svn-id: svn://kolibrios.org@2908 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-07 09:03:26 +00:00
hidnplayr
04bafecfc8 Now NetCFG also works with PCI devices wich have multiple functions.
git-svn-id: svn://kolibrios.org@2907 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-07 08:49:16 +00:00
hidnplayr
8c28651ace Removed unused libini from network library
git-svn-id: svn://kolibrios.org@2905 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-06 09:12:07 +00:00
hidnplayr
7dadbba2bb last AGP updates
git-svn-id: svn://kolibrios.org@2902 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-02 09:05:35 +00:00
hidnplayr
3ee5118adc More debug output and some fixes for AGP
git-svn-id: svn://kolibrios.org@2901 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-02 07:30:54 +00:00
hidnplayr
aaaa8209f1 Fixed the obvious bugs
git-svn-id: svn://kolibrios.org@2900 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-01 10:55:11 +00:00
hidnplayr
954d3f5012 AGP driver stub
git-svn-id: svn://kolibrios.org@2899 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-08-01 08:33:50 +00:00
hidnplayr
e838b363d6 Fixed debug output for previous revision
git-svn-id: svn://kolibrios.org@2894 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-27 22:24:08 +00:00
hidnplayr
5133c50635 TCP_send now sends correct data under all conditions
git-svn-id: svn://kolibrios.org@2893 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-27 22:14:12 +00:00
hidnplayr
ad2eb55fab code improvements and cleanup for FTPd
git-svn-id: svn://kolibrios.org@2892 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-26 23:24:24 +00:00
hidnplayr
83c26b2500 Better debug info for network, lots of improvements in TCP code
git-svn-id: svn://kolibrios.org@2891 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-26 23:21:35 +00:00
hidnplayr
0287f5c75b Bugfixes & further development of TCP_output
git-svn-id: svn://kolibrios.org@2890 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-26 14:54:57 +00:00
turbanoff
d205bffbfa ext4 support
git-svn-id: svn://kolibrios.org@2889 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-25 16:26:11 +00:00
hidnplayr
e19d06cb9f network code cleanup, implemented TCP_sendalot
git-svn-id: svn://kolibrios.org@2888 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-24 20:29:46 +00:00
hidnplayr
c95986da86 netdrv.inc cleanup
git-svn-id: svn://kolibrios.org@2887 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-22 20:07:20 +00:00
hidnplayr
8a10e28dfe added pci.inc for drivers, removed redundant code from netdrv.inc
git-svn-id: svn://kolibrios.org@2886 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-22 19:47:29 +00:00
hidnplayr
a105ce8fd8 Fixed bug with TCP_close
git-svn-id: svn://kolibrios.org@2882 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-19 13:17:11 +00:00
hidnplayr
ca262f8c90 Disable keepalive timer on listening socket.
git-svn-id: svn://kolibrios.org@2880 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-17 22:53:05 +00:00
hidnplayr
3c7b5955e3 Correct TCP socket closing after keepalive expires.
git-svn-id: svn://kolibrios.org@2879 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-17 22:20:18 +00:00
hidnplayr
ffd03b26b7 Fixed bug in FTP type command.
git-svn-id: svn://kolibrios.org@2878 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-17 22:01:08 +00:00
hidnplayr
eda11ddd36 Getting ready for better IP routing
git-svn-id: svn://kolibrios.org@2877 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-17 21:36:34 +00:00
hidnplayr
986cee8866 Renamed icmp.asm to ping.asm and added parameter support
git-svn-id: svn://kolibrios.org@2872 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-14 07:48:41 +00:00
hidnplayr
645e347dff Implemented proper closing/disconnecting for TCP sockets.
git-svn-id: svn://kolibrios.org@2869 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-13 16:24:41 +00:00
hidnplayr
b419831aa5 Bugfix in SOCKET_process_end
git-svn-id: svn://kolibrios.org@2868 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-13 14:06:16 +00:00
hidnplayr
5a6b1713d2 Fixed sysfn 18.2
git-svn-id: svn://kolibrios.org@2867 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-13 14:02:54 +00:00
hidnplayr
96f1dd834c Added CMOVcc replacements to kernel macros (for eBox)
git-svn-id: svn://kolibrios.org@2866 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-13 13:29:28 +00:00
hidnplayr
7aeabda91e R6040 driver now keeps track of number of received/sent packets/bytes.
git-svn-id: svn://kolibrios.org@2865 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-13 12:39:22 +00:00
hidnplayr
042f832f0c netstat now works with all network interfaces instead of default device 0.
git-svn-id: svn://kolibrios.org@2864 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-13 12:35:23 +00:00
hidnplayr
ce6a93da60 PCNet driver now keeps track of number of received/sent packets/bytes.
git-svn-id: svn://kolibrios.org@2863 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-13 10:03:25 +00:00
hidnplayr
a6337bc8cd Telnet for net branch: better UI, all threads now automatically exit when console window is closed, application now accepts parameters.
git-svn-id: svn://kolibrios.org@2860 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-12 22:50:11 +00:00
hidnplayr
bd062d9661 Bugfixes for ZeroConf
git-svn-id: svn://kolibrios.org@2859 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-12 13:57:34 +00:00
hidnplayr
80ecf0f5ee Made network library compatible with new API numbers
git-svn-id: svn://kolibrios.org@2858 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-11 12:08:45 +00:00
hidnplayr
86ee484807 More of the same
git-svn-id: svn://kolibrios.org@2857 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-11 12:03:24 +00:00
hidnplayr
dfd433a9b9 Quick-n-dirty fix for ZeroConf
git-svn-id: svn://kolibrios.org@2856 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-11 11:59:14 +00:00
hidnplayr
20e789a104 Fixed SynergyC
git-svn-id: svn://kolibrios.org@2854 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-09 12:47:07 +00:00
hidnplayr
08c92f8c50 Updated network programs to use new network function numbers from network.inc
git-svn-id: svn://kolibrios.org@2853 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-09 12:45:04 +00:00
hidnplayr
fd138cc362 Replaced all 'equ' with '=' for network drivers, where possible.
git-svn-id: svn://kolibrios.org@2852 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-09 11:31:56 +00:00
hidnplayr
bf6bf90871 Bugfix for RTL8139 driver. Updated imports.inc
git-svn-id: svn://kolibrios.org@2851 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-09 11:18:32 +00:00
hidnplayr
dcc40f38fe Terminate sockets when process exits.
git-svn-id: svn://kolibrios.org@2849 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-07-09 10:06:17 +00:00
Asper
3bb023473d Fix for r.2112
git-svn-id: svn://kolibrios.org@2802 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-06-16 23:07:17 +00:00
hidnplayr
3760cb5564 IPv4: Pre-calculate broadcast address once.
+ some stubs for IPv6

git-svn-id: svn://kolibrios.org@2731 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-06-03 19:28:01 +00:00
ead399f144 kernel: docs updated (r2727)
git-svn-id: svn://kolibrios.org@2730 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-06-03 14:32:49 +00:00
22e876669a kernel, f65: native grayscale images support
git-svn-id: svn://kolibrios.org@2727 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-06-03 13:57:12 +00:00
Marat Zakiyanov (Mario79)
dfaeeb56ff Functions 66.6, 66.7 - control input from the keyboard for hotkeys
git-svn-id: svn://kolibrios.org@2709 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-06-01 00:58:16 +00:00
Sergey Semyonov (Serge)
ddf1ff4eea infinity: SetTimeBase now reset internal stream position
git-svn-id: svn://kolibrios.org@2694 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-05-27 11:01:55 +00:00
Marat Zakiyanov (Mario79)
33c4ad3cba Not redraw the frame of window when re-activating of active window.
git-svn-id: svn://kolibrios.org@2669 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-05-23 22:29:15 +00:00
Marat Zakiyanov (Mario79)
01431c16e7 Function 18.24 - set limits of screen.
git-svn-id: svn://kolibrios.org@2654 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-30 22:07:24 +00:00
CleverMouse
6ea08a8bb3 disk_sync now flushes both caches even in compatibility mode
git-svn-id: svn://kolibrios.org@2653 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-27 16:37:37 +00:00
Marat Zakiyanov (Mario79)
63be312755 Fix for r.2575
git-svn-id: svn://kolibrios.org@2652 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-27 13:22:07 +00:00
Marat Zakiyanov (Mario79)
0d4cc5f003 F18.23 - minimize all windows
git-svn-id: svn://kolibrios.org@2648 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-26 14:21:46 +00:00
Marat Zakiyanov (Mario79)
1b604d2521 Fix for r.1345
git-svn-id: svn://kolibrios.org@2647 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-25 21:35:25 +00:00
Marat Zakiyanov (Mario79)
4d2c067661 Description F68.21 is added to the documentation.
git-svn-id: svn://kolibrios.org@2646 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-25 19:49:25 +00:00
CleverMouse
ccb3bac301 driver for managing temporary memory-based disks
git-svn-id: svn://kolibrios.org@2644 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-23 09:23:53 +00:00
CleverMouse
46ebef439c support for PnP disks, part 3: FAT16/FAT32
git-svn-id: svn://kolibrios.org@2643 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-23 09:19:34 +00:00
Marat Zakiyanov (Mario79)
2643d953b1 A more detailed log of the boot in a black screen.
git-svn-id: svn://kolibrios.org@2642 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-21 11:41:37 +00:00
Marat Zakiyanov (Mario79)
8f439a5b9a The fonts char.mt and char2.mt are included in the kernel is now.
git-svn-id: svn://kolibrios.org@2640 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-20 22:22:57 +00:00
hidnplayr
30a21108d8 Better SendFTP macro for FTPd
git-svn-id: svn://kolibrios.org@2635 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-20 10:02:31 +00:00
hidnplayr
1e3b48239a ARP_IP_to_MAC no longer blocks. Updated SOCKET_process_end (altough kernel does not call it yet). Updated TCP_output to time a retransmit on ARP error.
git-svn-id: svn://kolibrios.org@2629 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-18 16:01:38 +00:00
hidnplayr
d123dd899e Bugfix in FTPd for r2624
git-svn-id: svn://kolibrios.org@2627 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-18 14:07:03 +00:00
Marat Zakiyanov (Mario79)
8d6608fe2d Function 9 - returning is really 11 char is now, for: +10 = +0xA: 11 bytes: name of the process (name of the started file - executable file without extension).
git-svn-id: svn://kolibrios.org@2625 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-17 22:17:20 +00:00
hidnplayr
b4ebddc5ca FTPd: closing of threads when client disconnects, main program now also exits when console is closed, + some other bugfixes
git-svn-id: svn://kolibrios.org@2624 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-17 20:00:07 +00:00
hidnplayr
9c870d827e Socket_send_tcp now no longer returns an error when sending 0 bytes.
git-svn-id: svn://kolibrios.org@2623 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-17 19:08:41 +00:00
hidnplayr
4f5e5cb45b SOCKET_bind now checks if the localport is not already in use.
SOCKET_check_port now works correctly if the computer has multiple IP addresses

git-svn-id: svn://kolibrios.org@2622 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-17 19:00:13 +00:00
hidnplayr
a83978c197 -Bugfix for 2614 (had forgotten read_ip subfunction)
-Bugfix in socket_send_tcp
-IPv4 now simply ignores options, but does not drop the packet
-refactored sys_network api code 

git-svn-id: svn://kolibrios.org@2621 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-17 18:41:58 +00:00
Marat Zakiyanov (Mario79)
263603725b The procedure minimize_window does not calculatescreen and redrawscreen, if window width and/or height is equal zero is now
git-svn-id: svn://kolibrios.org@2620 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-17 16:32:18 +00:00
hidnplayr
ba80d953e5 Cleanup in Net Branch + stub for PPPoE I wrote some months ago
git-svn-id: svn://kolibrios.org@2614 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-14 21:15:00 +00:00
hidnplayr
ac28d0fed6 Added old VNC client, converted to work with net branch.
git-svn-id: svn://kolibrios.org@2613 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-14 18:22:38 +00:00
hidnplayr
6b6bbac3ce Proper initialization for TCP socket (net branch)
git-svn-id: svn://kolibrios.org@2612 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-14 18:20:01 +00:00
Marat Zakiyanov (Mario79)
d6ef0c989b Fix for r.92 (you see the correct revision number - sometimes you have to dig out the mammoth)
git-svn-id: svn://kolibrios.org@2611 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-13 21:39:02 +00:00
hidnplayr
02ea12584c More updates and bugfixes for FTPd (net branch)
git-svn-id: svn://kolibrios.org@2610 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-13 15:54:21 +00:00
hidnplayr
ea68a6e1ce Updates and bugfixes for FTPd (net branch)
git-svn-id: svn://kolibrios.org@2609 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-12 23:32:43 +00:00
hidnplayr
ba524f3821 More bugfixes for TFTPc (net branch)
git-svn-id: svn://kolibrios.org@2608 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-12 23:10:57 +00:00
hidnplayr
f0bcb2828e Bugfixes for ethernet and IPv4 (net branch)
git-svn-id: svn://kolibrios.org@2607 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-12 23:09:15 +00:00
hidnplayr
4a382514dd Bugfixes in TFTPc (net branch)
git-svn-id: svn://kolibrios.org@2606 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-12 22:35:56 +00:00
hidnplayr
705460f746 fixed bug in dll.inc (net branch)
git-svn-id: svn://kolibrios.org@2604 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-12 14:47:26 +00:00
hidnplayr
a34e3e8e18 Bugfixes and refactoring of FTPd (net branch)
git-svn-id: svn://kolibrios.org@2602 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-12 09:58:58 +00:00
CleverMouse
bf4cb45023 API for external keyboards
git-svn-id: svn://kolibrios.org@2601 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-11 19:06:32 +00:00
hidnplayr
cb6e8e3fb9 Fixed bug in TCP.
Error occured when receiving a TCP segment wich has no local socket. (netbranch)

git-svn-id: svn://kolibrios.org@2600 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-11 13:07:45 +00:00
hidnplayr
5dd08c56bf Updates and bugfixes for FTPd (net branch)
git-svn-id: svn://kolibrios.org@2598 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-10 19:44:51 +00:00
Sergey Semyonov (Serge)
1f1bf0a470 new_mem_resize hotfix
git-svn-id: svn://kolibrios.org@2595 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-09 15:19:40 +00:00
Sergey Semyonov (Serge)
fdbd14a1ca rewritten new_mem_resize
git-svn-id: svn://kolibrios.org@2594 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-09 13:19:32 +00:00
Marat Zakiyanov (Mario79)
9b04adedbd Fix for r.2497
git-svn-id: svn://kolibrios.org@2586 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-07 20:20:25 +00:00
hidnplayr
70caf20c58 Some cosmetic changes in FTPd (net branch)
git-svn-id: svn://kolibrios.org@2585 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-07 18:42:58 +00:00