make router_get_by_nickname consider this router.

svn:r1497

doc/TODO

@@ -144,6 +144,9 @@ On-going
         . Update the spec so it matches the code
 
 Mid-term:
+	- Refactor: add own routerinfo to routerlist.  Right now, only
+	  router_get_by_nickname knows about 'this router', as a hack to
+	  get circuit_launch_new to do the right thing.
         - Rotate tls-level connections -- make new ones, expire old ones.
           So we get actual key rotation, not just symmetric key rotation
         o Are there anonymity issues with sequential streamIDs? Sequential

src/or/or.h

@@ -977,6 +977,7 @@ void router_retry_connections(void);
 void router_upload_dir_desc_to_dirservers(void);
 void router_post_to_dirservers(uint8_t purpose, const char *payload, int payload_len);
 int router_compare_to_my_exit_policy(connection_t *conn);
+routerinfo_t *router_get_my_routerinfo(void);
 const char *router_get_my_descriptor(void);
 int router_rebuild_descriptor(void);
 int router_dump_router_to_string(char *s, int maxlen, routerinfo_t *router,

src/or/router.c

@@ -320,6 +320,18 @@ int router_compare_to_my_exit_policy(connection_t *conn) {
 
 }
 
+routerinfo_t *router_get_my_routerinfo(void)
+{
+  if (!options.ORPort)
+    return NULL;
+
+  if (!desc_routerinfo) {
+    if (router_rebuild_descriptor())
+      return NULL;
+  }
+  return desc_routerinfo;
+}
+
 const char *router_get_my_descriptor(void) {
   if (!desc_routerinfo) {
     if (router_rebuild_descriptor())

src/or/routerlist.c

@@ -314,6 +314,10 @@ routerinfo_t *router_get_by_nickname(char *nickname)
     if (0 == strcmp(router->nickname, nickname))
       return router;
   }
+  router = router_get_my_routerinfo();
+  if (router && 0 == strcmp(router->nickname, nickname))
+    return router;
+
   return NULL;
 }