]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
20 years agoCheckpoint in-progress fixes:
Roger Dingledine [Sun, 27 Feb 2005 09:47:01 +0000 (09:47 +0000)] 
Checkpoint in-progress fixes:
Add 'testing' circuit purpose, for reachability testing.
Notice when our IP changes, and reset stats.
Try to pull down a directory via Tor to see if our DirPort is working.
Try to extend a circuit back to us to see if our ORPort is working.
Only publish a descriptor if they're both reachable.

These mostly work, and I'd better get them in before I cause conflicts.

svn:r3703

20 years agoMake sure that router_get_by_* can always return "me"
Nick Mathewson [Sun, 27 Feb 2005 07:23:42 +0000 (07:23 +0000)] 
Make sure that router_get_by_* can always return "me"

svn:r3702

20 years agodistribute exitlist in the tarball too
Roger Dingledine [Fri, 25 Feb 2005 21:28:13 +0000 (21:28 +0000)] 
distribute exitlist in the tarball too

svn:r3701

20 years agoclean up alphabetization some
Roger Dingledine [Fri, 25 Feb 2005 21:15:04 +0000 (21:15 +0000)] 
clean up alphabetization some

svn:r3700

20 years agoBe specific about which "illegal character" we just saw in the cert.
Nick Mathewson [Fri, 25 Feb 2005 21:05:42 +0000 (21:05 +0000)] 
Be specific about which "illegal character" we just saw in the cert.

svn:r3699

20 years agodocument changed option name
Nick Mathewson [Fri, 25 Feb 2005 20:47:25 +0000 (20:47 +0000)] 
document changed option name

svn:r3698

20 years agoMake some control spec stuff done
Nick Mathewson [Fri, 25 Feb 2005 20:47:12 +0000 (20:47 +0000)] 
Make some control spec stuff done

svn:r3697

20 years agoImplement more control spec functionality
Nick Mathewson [Fri, 25 Feb 2005 20:46:13 +0000 (20:46 +0000)] 
Implement more control spec functionality
- Mapaddress
- Postdescriptor
- GetInfo on descriptors

Required changes elsewhere:
- Keep the most recent running_routers_t in the routerlist_t. That way we
  can learn about new routers and remember whether we were last told that
  they were up or down.  Also enables more simplifications.
- Keep the signed descriptor inside routerinfo_t.  This makes
  descriptor_entry_t in dirservers.c unneeded.
- Rename AddressMap (the verb) to MapAddress. Keep AddressMap as a noun.
- Check addresses for plausibility before mapping them.

svn:r3696

20 years agoNote done things on TODO
Nick Mathewson [Fri, 25 Feb 2005 06:37:28 +0000 (06:37 +0000)] 
Note done things on TODO

svn:r3695

20 years agoImplement some of GETINFO control message
Nick Mathewson [Fri, 25 Feb 2005 06:37:07 +0000 (06:37 +0000)] 
Implement some of GETINFO control message

svn:r3694

20 years agoStub functions for new control-spec logic.
Nick Mathewson [Fri, 25 Feb 2005 06:16:28 +0000 (06:16 +0000)] 
Stub functions for new control-spec logic.

svn:r3693

20 years agosimple python script to parse directories and find tor nodes that exit to listed...
Nick Mathewson [Fri, 25 Feb 2005 05:45:40 +0000 (05:45 +0000)] 
simple python script to parse directories and find tor nodes that exit to listed nodes/ports.  interface could be more polished, but this should do.

svn:r3692

20 years agoCheck returns from libevent calls better; stop poking at internals of events to see...
Nick Mathewson [Fri, 25 Feb 2005 05:42:01 +0000 (05:42 +0000)] 
Check returns from libevent calls better; stop poking at internals of events to see if they are live.

svn:r3691

20 years agofix a seg fault from tor_free_all
Roger Dingledine [Thu, 24 Feb 2005 23:01:26 +0000 (23:01 +0000)] 
fix a seg fault from tor_free_all

svn:r3690

20 years agocaching .exit stuff is done
Roger Dingledine [Thu, 24 Feb 2005 22:44:56 +0000 (22:44 +0000)] 
caching .exit stuff is done

svn:r3689

20 years agoforward-port the 0.0.9.5 changelog
Roger Dingledine [Thu, 24 Feb 2005 22:38:33 +0000 (22:38 +0000)] 
forward-port the 0.0.9.5 changelog

svn:r3688

20 years agoAdd a log-related item.
Nick Mathewson [Thu, 24 Feb 2005 21:17:33 +0000 (21:17 +0000)] 
Add a log-related item.

svn:r3686

20 years agoInsert missing ! in assert_connection_ok; test was accidentally reversed in revision...
Nick Mathewson [Thu, 24 Feb 2005 17:08:27 +0000 (17:08 +0000)] 
Insert missing ! in assert_connection_ok; test was accidentally reversed in revision 1.329 yesterday. Should fix bug 102

svn:r3685

20 years agocache .exit address better (i think)
Roger Dingledine [Thu, 24 Feb 2005 11:44:08 +0000 (11:44 +0000)] 
cache .exit address better (i think)

svn:r3684

20 years agoman page entry for httpsproxy
Roger Dingledine [Thu, 24 Feb 2005 11:00:06 +0000 (11:00 +0000)] 
man page entry for httpsproxy

svn:r3683

20 years agoadd support for CONNECTing through https proxies.
Roger Dingledine [Thu, 24 Feb 2005 10:56:55 +0000 (10:56 +0000)] 
add support for CONNECTing through https proxies.
not sure if it works. i don't have an https proxy.

svn:r3682

20 years agostop a potential overflow (pointed out by ilja)
Roger Dingledine [Thu, 24 Feb 2005 10:22:00 +0000 (10:22 +0000)] 
stop a potential overflow (pointed out by ilja)

svn:r3681

20 years agoa list of things to do so we can decentralize
Roger Dingledine [Wed, 23 Feb 2005 22:42:17 +0000 (22:42 +0000)] 
a list of things to do so we can decentralize

svn:r3678

20 years agoImprove log message on unrecognized encoding to indicate that we can cope.
Nick Mathewson [Wed, 23 Feb 2005 22:14:34 +0000 (22:14 +0000)] 
Improve log message on unrecognized encoding to indicate that we can cope.

svn:r3676

20 years agomore 010x todos
Nick Mathewson [Wed, 23 Feb 2005 21:59:09 +0000 (21:59 +0000)] 
more 010x todos

svn:r3675

20 years agoassign a few tasks
Roger Dingledine [Wed, 23 Feb 2005 21:58:05 +0000 (21:58 +0000)] 
assign a few tasks

svn:r3674

20 years agoFirst cut at labelinging things for 0.1.0.x
Nick Mathewson [Wed, 23 Feb 2005 21:47:40 +0000 (21:47 +0000)] 
First cut at labelinging things for 0.1.0.x

svn:r3673

20 years agoa few more items for the todo
Roger Dingledine [Wed, 23 Feb 2005 21:12:25 +0000 (21:12 +0000)] 
a few more items for the todo

svn:r3672

20 years agoClarify comment. Use CONN_IS_EDGE more. Try to be more zealous about calling connecti...
Nick Mathewson [Wed, 23 Feb 2005 20:35:26 +0000 (20:35 +0000)] 
Clarify comment. Use CONN_IS_EDGE more. Try to be more zealous about calling connection_edge_end when things go bad with edge conns in connection.c

svn:r3671

20 years agoand to the win32 and os x doc pages
Roger Dingledine [Wed, 23 Feb 2005 07:09:54 +0000 (07:09 +0000)] 
and to the win32 and os x doc pages

svn:r3669

20 years agomake slightly clearer that mapaddress arguments are strings
Roger Dingledine [Wed, 23 Feb 2005 06:58:18 +0000 (06:58 +0000)] 
make slightly clearer that mapaddress arguments are strings

svn:r3668

20 years agoclarify comment
Nick Mathewson [Wed, 23 Feb 2005 06:46:54 +0000 (06:46 +0000)] 
clarify comment

svn:r3667

20 years agoAddressmap tweak: Make "addressmap x x" remove any mapping from the address x.
Nick Mathewson [Wed, 23 Feb 2005 06:40:48 +0000 (06:40 +0000)] 
Addressmap tweak: Make "addressmap x x" remove any mapping from the address x.

svn:r3666

20 years agoForward-port fix to make dual-purpose NT executable work.
Nick Mathewson [Wed, 23 Feb 2005 05:34:25 +0000 (05:34 +0000)] 
Forward-port fix to make dual-purpose NT executable work.

svn:r3665

20 years agoForward-port the trick to bump up ConnLimit as far as it can
Roger Dingledine [Tue, 22 Feb 2005 23:52:44 +0000 (23:52 +0000)] 
Forward-port the trick to bump up ConnLimit as far as it can
go, but not past MAXCONNECTIONS. Also throw away the FAKE_POLL
caveats since 0.1.0 doesn't need it any more.

svn:r3657

20 years agoChange from inet_ntoa to a threadproof tor_inet_ntoa.
Nick Mathewson [Tue, 22 Feb 2005 08:18:36 +0000 (08:18 +0000)] 
Change from inet_ntoa to a threadproof tor_inet_ntoa.

svn:r3656

20 years agoNote a non-bug in read_file_to_str as used. If we start to rely on it behaving differ...
Nick Mathewson [Tue, 22 Feb 2005 07:18:46 +0000 (07:18 +0000)] 
Note a non-bug in read_file_to_str as used. If we start to rely on it behaving differently, we need to change how it behaves. [Noticed by Chris Palmer]

svn:r3655

20 years agoBut on windows, localtime and gmtime _are_ threadsafe.
Nick Mathewson [Tue, 22 Feb 2005 07:09:17 +0000 (07:09 +0000)] 
But on windows, localtime and gmtime _are_ threadsafe.

svn:r3654

20 years agoPatch to localtime/gmtime handling: use the _r variants where available. Use mutexes...
Nick Mathewson [Tue, 22 Feb 2005 07:03:03 +0000 (07:03 +0000)] 
Patch to localtime/gmtime handling: use the _r variants where available.  Use mutexes to fake _r where necessary.  Make mutexes no-ops where no threading is enabled.

svn:r3653

20 years agoRemove assumptions that maximum path length is anything like 1024. From comments...
Nick Mathewson [Tue, 22 Feb 2005 06:38:39 +0000 (06:38 +0000)] 
Remove assumptions that maximum path length is anything like 1024.  From comments by Chris Palmer

svn:r3652

20 years agoCheck for pthread dependency on pthread_detach as well as pthread_create
Nick Mathewson [Tue, 22 Feb 2005 05:07:31 +0000 (05:07 +0000)] 
Check for pthread dependency on pthread_detach as well as pthread_create

svn:r3651

20 years agoremove spurious semicolons
Nick Mathewson [Tue, 22 Feb 2005 04:55:19 +0000 (04:55 +0000)] 
remove spurious semicolons

svn:r3650

20 years agoSnarf some logic from python, adapted to our own needs, to handle gethostbyname_r...
Nick Mathewson [Tue, 22 Feb 2005 04:50:31 +0000 (04:50 +0000)] 
Snarf some logic from python, adapted to our own needs, to handle gethostbyname_r correctly across platforms.

svn:r3649

20 years agoInitial IRIX compatibility fixes: check for inttypes.h; check for platform cell_t.
Nick Mathewson [Tue, 22 Feb 2005 04:26:45 +0000 (04:26 +0000)] 
Initial IRIX compatibility fixes: check for inttypes.h; check for platform cell_t.

svn:r3648

20 years agoAfter we successfully connect, try handling pending stuff immediately, rather than...
Nick Mathewson [Tue, 22 Feb 2005 03:02:33 +0000 (03:02 +0000)] 
After we successfully connect, try handling pending stuff immediately, rather than waiting for the next call to connection_handle_write.  Roger: is this right?

svn:r3647

20 years agoPrint uname on start of unittests.
Nick Mathewson [Tue, 22 Feb 2005 03:01:31 +0000 (03:01 +0000)] 
Print uname on start of unittests.

svn:r3646

20 years agoFix windows build: juggle }s and #endifs around in main.c
Nick Mathewson [Tue, 22 Feb 2005 02:57:43 +0000 (02:57 +0000)] 
Fix windows build: juggle }s and #endifs around in main.c

svn:r3645

20 years agoFix windows build: do not spuriously include openssl where not needed; handle lack...
Nick Mathewson [Tue, 22 Feb 2005 02:51:55 +0000 (02:51 +0000)] 
Fix windows build: do not spuriously include openssl where not needed; handle lack of gethostbyname_r properly.

svn:r3644

20 years agomake the addressmap internals less noisy
Roger Dingledine [Tue, 22 Feb 2005 00:55:50 +0000 (00:55 +0000)] 
make the addressmap internals less noisy

svn:r3643

20 years agoman page entries for addressmap and trackhostexits
Roger Dingledine [Tue, 22 Feb 2005 00:53:43 +0000 (00:53 +0000)] 
man page entries for addressmap and trackhostexits

svn:r3642

20 years agoAdd a new AddressMap directive to rewrite incoming socks addresses.
Roger Dingledine [Tue, 22 Feb 2005 00:53:08 +0000 (00:53 +0000)] 
Add a new AddressMap directive to rewrite incoming socks addresses.
Add a new TrackHostExits directive to trigger addressmaps for
certain incoming socks addresses, for sites that break when your exit
keeps changing.
Redo the client-side dns cache so it's just an addressmap too.

svn:r3641

20 years agobugfix: actually use the argument to strmap_free()
Roger Dingledine [Sun, 20 Feb 2005 23:12:20 +0000 (23:12 +0000)] 
bugfix: actually use the argument to strmap_free()

svn:r3640

20 years agoforward-port the onion queue thing
Roger Dingledine [Sun, 20 Feb 2005 09:27:48 +0000 (09:27 +0000)] 
forward-port the onion queue thing

svn:r3639

20 years agoavoid case (not yet triggered) where smartlists could grow out
Roger Dingledine [Sat, 19 Feb 2005 03:02:33 +0000 (03:02 +0000)] 
avoid case (not yet triggered) where smartlists could grow out
of control

svn:r3636

20 years agoTweak control-spec: add a GETINFO/INFOVALUE type pair to handle non-configuration...
Nick Mathewson [Fri, 18 Feb 2005 18:34:37 +0000 (18:34 +0000)] 
Tweak control-spec: add a GETINFO/INFOVALUE type pair to handle non-configuration stuff and to avoid proliferating more GETFOO/FOOVALUE pairs.  Remove spurious 0x from signal codes.  Simplify address-mapping format.  Clarify what an identity looks like.

svn:r3635

20 years agomake it clearer that our screenshots are of old versions.
Roger Dingledine [Fri, 18 Feb 2005 03:38:38 +0000 (03:38 +0000)] 
make it clearer that our screenshots are of old versions.

svn:r3634

20 years agoforward-port some fixes
Roger Dingledine [Thu, 17 Feb 2005 01:12:50 +0000 (01:12 +0000)] 
forward-port some fixes

svn:r3631

20 years agointegrating changes related to building circuits, assigning streams, and exchanging...
Geoff Goodell [Wed, 16 Feb 2005 19:49:39 +0000 (19:49 +0000)] 
integrating changes related to building circuits, assigning streams, and exchanging descriptors (discussed on return trip from airport)

svn:r3630

20 years agoremove unused code
Roger Dingledine [Wed, 16 Feb 2005 02:06:54 +0000 (02:06 +0000)] 
remove unused code

svn:r3629

20 years agoMore fixes for IRIX compilation: make very sure we have NULL in configure.in. This...
Nick Mathewson [Tue, 15 Feb 2005 19:48:07 +0000 (19:48 +0000)] 
More fixes for IRIX compilation: make very sure we have NULL in configure.in. This may work now.

svn:r3627

20 years agoFix check for NULL representation to include string.h; this makes fixes building...
Nick Mathewson [Tue, 15 Feb 2005 00:40:36 +0000 (00:40 +0000)] 
Fix check for NULL representation to include string.h; this makes fixes building on Irix, I hope.

svn:r3625

20 years agomake the wikipedia statement less strict
Roger Dingledine [Mon, 14 Feb 2005 22:17:54 +0000 (22:17 +0000)] 
make the wikipedia statement less strict

svn:r3624

20 years agoFix another crash bug found by Jaroslaw--it is possible for dns_resolve to mark a...
Nick Mathewson [Mon, 14 Feb 2005 21:16:27 +0000 (21:16 +0000)] 
Fix another crash bug found by Jaroslaw--it is possible for dns_resolve to mark a connection to be freed, if the circuit it was attached to fails for some reason.

svn:r3623

20 years agoTell openssl how to use locks and how to find thread ids -- this may prevent race...
Nick Mathewson [Sun, 13 Feb 2005 22:32:25 +0000 (22:32 +0000)] 
Tell openssl how to use locks and how to find thread ids -- this may prevent race conditions surrounding the error queue.

svn:r3622

20 years agoAdd a missing prototype to or.h
Nick Mathewson [Sun, 13 Feb 2005 22:31:26 +0000 (22:31 +0000)] 
Add a missing prototype to or.h

svn:r3621

20 years agoremove redundant unpack in critical path
Nick Mathewson [Sun, 13 Feb 2005 16:17:32 +0000 (16:17 +0000)] 
remove redundant unpack in critical path

svn:r3620

20 years agoGive a better error message when zlib.h is not found.
Nick Mathewson [Sat, 12 Feb 2005 21:06:06 +0000 (21:06 +0000)] 
Give a better error message when zlib.h is not found.

svn:r3618

20 years agoApply windows patch from Dmitri Bely
Nick Mathewson [Sat, 12 Feb 2005 21:03:37 +0000 (21:03 +0000)] 
Apply windows patch from Dmitri Bely

svn:r3617

20 years agoDo not try to double-aquire lock when rotating keys. May fix deadlock bug found...
Nick Mathewson [Fri, 11 Feb 2005 07:56:10 +0000 (07:56 +0000)] 
Do not try to double-aquire lock when rotating keys.  May fix deadlock bug found by weasel.

svn:r3616

20 years agoFree tls resources on exit too
Nick Mathewson [Fri, 11 Feb 2005 01:41:19 +0000 (01:41 +0000)] 
Free tls resources on exit too

svn:r3615

20 years agoFree even more things on shutdown. Temporarily move tor_free_all out from #ifdef...
Nick Mathewson [Fri, 11 Feb 2005 01:26:47 +0000 (01:26 +0000)] 
Free even more things on shutdown.  Temporarily move tor_free_all out from #ifdef so it gets tested more.

svn:r3614

20 years agoAdd more functions to free things to help dmalloc allong.
Nick Mathewson [Thu, 10 Feb 2005 23:18:39 +0000 (23:18 +0000)] 
Add more functions to free things to help dmalloc allong.

svn:r3613

20 years agomention 0.0.9.4 on win32 and osx doc pages
Roger Dingledine [Thu, 10 Feb 2005 07:58:04 +0000 (07:58 +0000)] 
mention 0.0.9.4 on win32 and osx doc pages

svn:r3612

20 years agoif we're hibernating and we get a sigint, exit immediately.
Roger Dingledine [Thu, 10 Feb 2005 07:34:19 +0000 (07:34 +0000)] 
if we're hibernating and we get a sigint, exit immediately.
closes bug 91.

svn:r3611

20 years agostop picking unverified dir mirrors, ever.
Roger Dingledine [Thu, 10 Feb 2005 07:00:23 +0000 (07:00 +0000)] 
stop picking unverified dir mirrors, ever.
it only leads to misery.

svn:r3610

20 years agowhen a client asks us for a dir mirror and we don't have one,
Roger Dingledine [Thu, 10 Feb 2005 06:31:34 +0000 (06:31 +0000)] 
when a client asks us for a dir mirror and we don't have one,
launch an attempt to get a fresh one.

svn:r3609

20 years agosome more tweaks on the paper
Roger Dingledine [Thu, 10 Feb 2005 06:20:18 +0000 (06:20 +0000)] 
some more tweaks on the paper

svn:r3608

20 years agoremove redundant lines
Roger Dingledine [Wed, 9 Feb 2005 23:54:30 +0000 (23:54 +0000)] 
remove redundant lines

svn:r3607

20 years agoPatch from adam langley: always remove sockets from libevent before closing them...
Nick Mathewson [Wed, 9 Feb 2005 23:16:31 +0000 (23:16 +0000)] 
Patch from adam langley: always remove sockets from libevent before closing them.  Should fix epoll-related bugs.

svn:r3606

20 years agoMore tweaks, grammar, etc. I say it's ready to submit.
Paul Syverson [Wed, 9 Feb 2005 17:42:21 +0000 (17:42 +0000)] 
More tweaks, grammar, etc. I say it's ready to submit.

svn:r3605

20 years agofix wordo
Roger Dingledine [Wed, 9 Feb 2005 12:13:38 +0000 (12:13 +0000)] 
fix wordo

svn:r3604

20 years agoThis section is first up against the wall when the revolution comes.
Roger Dingledine [Wed, 9 Feb 2005 11:58:35 +0000 (11:58 +0000)] 
This section is first up against the wall when the revolution comes.

svn:r3603

20 years agomark this one as a draft, so people who cache it will look dumb
Roger Dingledine [Wed, 9 Feb 2005 11:42:20 +0000 (11:42 +0000)] 
mark this one as a draft, so people who cache it will look dumb
in two years

svn:r3602

20 years agoupdate pdf draft
Roger Dingledine [Wed, 9 Feb 2005 11:31:37 +0000 (11:31 +0000)] 
update pdf draft

svn:r3601

20 years agoStyle wars
Paul Syverson [Wed, 9 Feb 2005 10:48:57 +0000 (10:48 +0000)] 
Style wars

svn:r3600

20 years agoput a pdf in place so people can read it.
Roger Dingledine [Wed, 9 Feb 2005 10:12:48 +0000 (10:12 +0000)] 
put a pdf in place so people can read it.
(i've learned my lesson about giving people url's other than
the final url.)

svn:r3599

20 years agomore fixes. i declare this the first draft.
Roger Dingledine [Wed, 9 Feb 2005 10:10:22 +0000 (10:10 +0000)] 
more fixes. i declare this the first draft.

svn:r3598

20 years agotighten related work
Roger Dingledine [Wed, 9 Feb 2005 08:47:16 +0000 (08:47 +0000)] 
tighten related work

svn:r3597

20 years agonot all tor use is abusive
Roger Dingledine [Wed, 9 Feb 2005 07:31:06 +0000 (07:31 +0000)] 
not all tor use is abusive

svn:r3596

20 years agoCommit changes to nonclique section
Nick Mathewson [Wed, 9 Feb 2005 06:30:42 +0000 (06:30 +0000)] 
Commit changes to nonclique section

svn:r3595

20 years agoblacklists, middleman nodes, pressure to shut down
Roger Dingledine [Wed, 9 Feb 2005 05:06:56 +0000 (05:06 +0000)] 
blacklists, middleman nodes, pressure to shut down

svn:r3594

20 years agolots more cleanups. people should check these over.
Roger Dingledine [Wed, 9 Feb 2005 04:34:50 +0000 (04:34 +0000)] 
lots more cleanups. people should check these over.

svn:r3593

20 years agodon't list version in the win32 service display name or service name,
Roger Dingledine [Wed, 9 Feb 2005 02:26:24 +0000 (02:26 +0000)] 
don't list version in the win32 service display name or service name,
since they'll keep changing and people will get messed up about which
one is installed.

svn:r3592

20 years agoAs another exception, the controller can getconf the "version" string,
Roger Dingledine [Wed, 9 Feb 2005 02:24:16 +0000 (02:24 +0000)] 
As another exception, the controller can getconf the "version" string,
and Tor will return a string describing its version number. Setconf on
"version" will not work.

svn:r3591

20 years agoStill more edits
Nick Mathewson [Tue, 8 Feb 2005 22:58:02 +0000 (22:58 +0000)] 
Still more edits

svn:r3590

20 years agoispell
Roger Dingledine [Tue, 8 Feb 2005 22:26:24 +0000 (22:26 +0000)] 
ispell

svn:r3589

20 years agoTighten, clarify
Nick Mathewson [Tue, 8 Feb 2005 22:10:04 +0000 (22:10 +0000)] 
Tighten, clarify

svn:r3588

20 years agoA few more minor tweaks
Paul Syverson [Tue, 8 Feb 2005 20:47:12 +0000 (20:47 +0000)] 
A few more minor tweaks

svn:r3587

20 years agoTweaks and typos throughout. Nearly there.
Paul Syverson [Tue, 8 Feb 2005 20:34:57 +0000 (20:34 +0000)] 
Tweaks and typos throughout. Nearly there.

svn:r3586

20 years agoadded section for Tor+Blossom desiderata
Geoff Goodell [Tue, 8 Feb 2005 16:53:18 +0000 (16:53 +0000)] 
added section for Tor+Blossom desiderata

svn:r3585