--- a/src/core/log.cc	Mon Apr 14 10:40:46 2008 -0700
+++ b/src/core/log.cc	Mon Apr 14 11:30:15 2008 -0700
@@ -18,8 +18,6 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 
-// What about print-list!!!!!!???????
-
 #ifdef NS3_LOG_ENABLE
 
 #include <list>
@@ -36,6 +34,8 @@
 
 namespace ns3 {
 
+LogTimePrinter g_logTimePrinter = 0;
+
 typedef std::list<std::pair <std::string, LogComponent *> > ComponentList;
 typedef std::list<std::pair <std::string, LogComponent *> >::iterator ComponentListI;
 
@@ -173,9 +173,13 @@
                     {
                       level |= LOG_ALL;
                     }
-                  else if (lev == "prefix")
+                  else if (lev == "prefix_func")
                     {
-                      level |= LOG_PREFIX_ALL;
+                      level |= LOG_PREFIX_FUNC;
+                    }
+                  else if (lev == "prefix_time")
+                    {
+                      level |= LOG_PREFIX_TIME;
                     }
                   else if (lev == "level_error")
                     {
@@ -358,13 +362,21 @@
     }
 }
 
-ParameterLogger::ParameterLogger ()
-  : m_itemNumber (0)
+void LogRegisterTimePrinter (LogTimePrinter printer)
+{
+  g_logTimePrinter = printer;
+}
+LogTimePrinter LogGetTimePrinter(void)
+{
+  return g_logTimePrinter;
+}
+
+
+ParameterLogger::ParameterLogger (std::ostream &os)
+  : m_itemNumber (0),
+    m_os (os)
 {}
 
-ParameterLogger g_parameterLogger;
-
-
 } // namespace ns3
 
 #endif // NS3_LOG_ENABLE