Commit Graph

261 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
hidnplayr
e22890bbd0 Fixed PORT command (active mode) for FTPd (net branch)
git-svn-id: svn://kolibrios.org@2581 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-07 11:36:00 +00:00
hidnplayr
0d44338d5d Added multithread-capabilities to FTPd (net branch)
git-svn-id: svn://kolibrios.org@2578 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-06 18:37:00 +00:00
hidnplayr
d0105fc6d5 Changes in net branch:
Fixed bug in socket_ring_write concerning very big numbers. 
Socket_send now returns number of sent bytes.

git-svn-id: svn://kolibrios.org@2573 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-05 16:23:47 +00:00
hidnplayr
a268aaffd6 Changed SOCKET_accept to bind the new socket to the active thread. (net branch)
git-svn-id: svn://kolibrios.org@2572 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-05 13:52:26 +00:00
hidnplayr
843b584cd7 Added RETR command to FTP daemon (net branch)
Also fixed some bugs and added CDUP (untested)

git-svn-id: svn://kolibrios.org@2571 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-05 13:00:39 +00:00
hidnplayr
d277a579f2 Added CWD command to FTP daemon (net branch)
git-svn-id: svn://kolibrios.org@2563 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-04 17:19:00 +00:00
hidnplayr
0833e5c02d Implemented Passive mode and LIST command in new FTP daemon (net branch)
git-svn-id: svn://kolibrios.org@2562 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-04 13:08:07 +00:00
hidnplayr
742df45545 Added some more commands to the new FTP Daemon (net branch)
git-svn-id: svn://kolibrios.org@2560 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-04 09:24:08 +00:00
hidnplayr
a3b3514e59 Further development of the new FTP daemon (net branch)
git-svn-id: svn://kolibrios.org@2557 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-03 20:28:26 +00:00
hidnplayr
c552138150 Better text printing for TCPserv (net branch)
git-svn-id: svn://kolibrios.org@2556 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-03 18:35:40 +00:00
hidnplayr
a1174dce46 Fixed bug in TCP_input.listen, clarified some of the debug output (net branch)
git-svn-id: svn://kolibrios.org@2555 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-03 18:26:53 +00:00
hidnplayr
07aba6c98f added FTP daemon stub (net branch)
git-svn-id: svn://kolibrios.org@2554 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-03 16:37:24 +00:00
hidnplayr
b326834b2e Bugfix for ICMP sockets in net branch
git-svn-id: svn://kolibrios.org@2553 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-03 16:34:37 +00:00
hidnplayr
f10b7bd3bc Fixed bug in some network drivers. (net branch)
git-svn-id: svn://kolibrios.org@2544 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-02 18:49:13 +00:00
hidnplayr
087ba52a9f Bugfix in telnet when connection cannot be made (net branch)
git-svn-id: svn://kolibrios.org@2543 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-02 17:11:33 +00:00
hidnplayr
a4e79969dd Bugfix for Telnet and tcp socket close in net branch
git-svn-id: svn://kolibrios.org@2541 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-02 16:18:12 +00:00
hidnplayr
dd88d5bff6 Sync net branch with trunk
git-svn-id: svn://kolibrios.org@2540 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-02 15:18:46 +00:00
hidnplayr
f28853c51d Fixed Telnet for net branch.
Not the most elegant sollution but at least it works now!

git-svn-id: svn://kolibrios.org@2539 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-04-02 12:06:31 +00:00
hidnplayr
946e05cb81 Fixed socket_ring_write in net branch.
git-svn-id: svn://kolibrios.org@2404 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-25 13:02:09 +00:00
hidnplayr
4aee41218a Forgot init_mutex ...
git-svn-id: svn://kolibrios.org@2403 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-25 12:07:41 +00:00
hidnplayr
815cb2a26f Usage of new mutexes in net branch.
git-svn-id: svn://kolibrios.org@2402 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-25 12:03:22 +00:00
hidnplayr
0478f45357 Bugfix in PCnet32 driver for net branch
git-svn-id: svn://kolibrios.org@2401 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-24 22:04:04 +00:00
hidnplayr
85c176d7f5 Fixed TCP and UDP checksum in net branch.
git-svn-id: svn://kolibrios.org@2390 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-23 22:21:40 +00:00
hidnplayr
997d83d275 Added error reporting to some of the network drivers in net branch
git-svn-id: svn://kolibrios.org@2387 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-23 21:18:16 +00:00
hidnplayr
d0e0776223 Fixed ICMP in net branch
git-svn-id: svn://kolibrios.org@2386 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-23 20:35:40 +00:00
hidnplayr
33ab203c14 Sync net branch with trunk
git-svn-id: svn://kolibrios.org@2385 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-23 19:01:26 +00:00
hidnplayr
e6242dd229 Synced net branch with trunk
git-svn-id: svn://kolibrios.org@2382 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-22 16:06:05 +00:00
hidnplayr
586aa010e8 Trying to fix the makefile for new stack
git-svn-id: svn://kolibrios.org@2373 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-22 13:20:18 +00:00
hidnplayr
8030c874a3 Fixed problem with UDP_input when checksum was 0.
git-svn-id: svn://kolibrios.org@2369 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-22 10:44:57 +00:00
hidnplayr
dc66507e60 Bugfixes in net branch:
-Disabled UDP remote IP checking because it blocks valid packets in certain situations (DNS resolving)
-Removed device '0' (application level) as default device because it was not correctly implemented and would require a lot of changes. Yet need to find a better solution for this.

git-svn-id: svn://kolibrios.org@2366 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-21 14:09:00 +00:00
hidnplayr
e8a8f9b75d Changed net branch specific kernel function numbers to make room for function 73 in main branch.
git-svn-id: svn://kolibrios.org@2364 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-21 10:57:36 +00:00
hidnplayr
f156bb294d Markup changes in net branch + updates in TCP_output
git-svn-id: svn://kolibrios.org@2362 a494cfbc-eb01-0410-851d-a64ba20cac60
2012-02-21 08:44:51 +00:00
hidnplayr
c518777ac6 NET branch: Fixed errors in socket_open and socket_fork
git-svn-id: svn://kolibrios.org@2315 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-13 16:17:05 +00:00
hidnplayr
61a835651a -Fixed build.bat for NET branch
-Removed some unrelated files
-updates in telnet

git-svn-id: svn://kolibrios.org@2314 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-13 15:19:27 +00:00
hidnplayr
dfbe402a16 Updated i8255x driver for NET branch
git-svn-id: svn://kolibrios.org@2313 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-13 13:29:43 +00:00
hidnplayr
82c4a67737 Added missing struct.inc to NET branch
git-svn-id: svn://kolibrios.org@2312 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-13 13:23:38 +00:00
hidnplayr
343d6e80ca more small updates and fixes in net branch
git-svn-id: svn://kolibrios.org@2311 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-12 22:35:01 +00:00
hidnplayr
3ce07b4be0 more small updates and fixes in net branch
git-svn-id: svn://kolibrios.org@2310 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-12 20:05:07 +00:00
hidnplayr
29c0d093db small updates and fixes in TCP for net branch
git-svn-id: svn://kolibrios.org@2309 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-12 19:20:33 +00:00
hidnplayr
63bc53c598 small updates and fixes in net branch
git-svn-id: svn://kolibrios.org@2308 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-12 15:39:15 +00:00
hidnplayr
255c2b5ab3 NET branch: re-organised all structs to use struct.inc from fasm
git-svn-id: svn://kolibrios.org@2305 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-08 23:06:26 +00:00
hidnplayr
92f2253d7a Making SIS900 driver for net branch compileable
git-svn-id: svn://kolibrios.org@2304 a494cfbc-eb01-0410-851d-a64ba20cac60
2011-11-08 17:24:46 +00:00