[or-cvs] r14094: 16, not 64. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-03-18 10:30:46 -0400 (Tue, 18 Mar 2008)
New Revision: 14094

Modified:
   tor/trunk/
   tor/trunk/src/or/routerparse.c
Log:
 r18913 at catbus:  nickm | 2008-03-18 10:30:39 -0400
 16, not 64.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r18913] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/routerparse.c
===================================================================
--- tor/trunk/src/or/routerparse.c	2008-03-18 09:34:18 UTC (rev 14093)
+++ tor/trunk/src/or/routerparse.c	2008-03-18 14:30:46 UTC (rev 14094)
@@ -2171,13 +2171,12 @@
         goto err;
       }
       voter->addr = ntohl(in.s_addr);
-      /* XXX021 long to int to uint64 to uint16? what the hell? -rd */
-      voter->dir_port = (uint64_t)
-        (int) tor_parse_long(tok->args[4], 10, 0, 65535, &ok, NULL);
+      voter->dir_port = (uint16_t)
+        tor_parse_long(tok->args[4], 10, 0, 65535, &ok, NULL);
       if (!ok)
         goto err;
-      voter->or_port = (uint64_t)
-        (int) tor_parse_long(tok->args[5], 10, 0, 65535, &ok, NULL);
+      voter->or_port = (uint16_t)
+        tor_parse_long(tok->args[5], 10, 0, 65535, &ok, NULL);
       if (!ok)
         goto err;
     } else if (tok->tp == K_CONTACT) {