summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/ChangeLog5
-rw-r--r--lib/vty.c12
2 files changed, 14 insertions, 3 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog
index b52370f7..e95e2a3a 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-03 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+ * vty.c: (vty_log_out) Debug messages to terminal vty sessions
+ should include timestamps.
+
2006-06-28 Paul Jakma <paul.jakma@sun.com>
* memory.c: Fix typo in cpp conditional around malloc.h, from
diff --git a/lib/vty.c b/lib/vty.c
index b037c70c..8de32870 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -154,12 +154,18 @@ vty_log_out (struct vty *vty, const char *level, const char *proto_str,
int ret;
int len;
char buf[1024];
+ struct tm *tm;
+
+ if ((tm = localtime(&recent_time.tv_sec)) != NULL)
+ len = strftime(buf, sizeof(buf), "%Y/%m/%d %H:%M:%S ", tm);
+ else
+ len = 0;
if (level)
- len = snprintf(buf, sizeof(buf), "%s: %s: ", level, proto_str);
+ ret = snprintf(buf+len, sizeof(buf)-len, "%s: %s: ", level, proto_str);
else
- len = snprintf(buf, sizeof(buf), "%s: ", proto_str);
- if ((len < 0) || ((size_t)len >= sizeof(buf)))
+ ret = snprintf(buf+len, sizeof(buf)-len, "%s: ", proto_str);
+ if ((ret < 0) || ((size_t)(len += ret) >= sizeof(buf)))
return -1;
if (((ret = vsnprintf(buf+len, sizeof(buf)-len, format, va)) < 0) ||