[or-cvs] Parse uptime into routerinfo

[Nick Mathewson]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/tmp/cvs-serv21260/src/or

Modified Files:
	routerparse.c 
Log Message:
Parse uptime into routerinfo

Index: routerparse.c
===================================================================
RCS file: /home/or/cvsroot/src/or/routerparse.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- routerparse.c	15 Aug 2004 08:15:12 -0000	1.32
+++ routerparse.c	17 Aug 2004 05:29:41 -0000	1.33
@@ -39,6 +39,7 @@
   K_DIRCACHEPORT,
   K_CONTACT,
   K_NETWORK_STATUS,
+  K_UPTIME,
   _UNRECOGNIZED,
   _ERR,
   _EOF,
@@ -111,6 +112,7 @@
   { "dircacheport",        K_DIRCACHEPORT,        ARGS,    NO_OBJ,  RTR_ONLY },
   { "contact",             K_CONTACT,         CONCAT_ARGS, NO_OBJ,  ANY },
   { "network-status",      K_NETWORK_STATUS,      NO_ARGS, NO_OBJ,  DIR_ONLY },
+  { "uptime",              K_UPTIME,              ARGS,    NO_OBJ,  RTR_ONLY },
   { NULL, -1 }
 };
 
@@ -642,6 +644,7 @@
   smartlist_t *tokens = NULL, *exit_policy_tokens = NULL;
   directory_token_t *tok;
   int t;
+  long lng;
   int ports_set, bw_set;
 
   if (!end) {
@@ -745,6 +748,14 @@
     bw_set = 1;
   }
 
+  if ((tok = find_first_by_keyword(tokens, K_UPTIME))) {
+    if (tok->n_args != 1) {
+      log_fn(LOG_WARN, "Unrecognized number of args on K_UPTIME; skipping.");
+    } else {
+      router->uptime = atol(tok->args[0]);
+    }
+  }
+
   if (!(tok = find_first_by_keyword(tokens, K_PUBLISHED))) {
     log_fn(LOG_WARN, "Missing published time"); goto err;
   }