[vidalia-svn] r1896: Recognize the REMAP stream status in STREAM events. (I appar (in trunk: . src/control)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-08-30 23:26:19 -0400 (Thu, 30 Aug 2007)
New Revision: 1896

Modified:
   trunk/
   trunk/src/control/stream.cpp
   trunk/src/control/stream.h
Log:
 r2109@adrastea:  edmanm | 2007-08-30 23:26:05 -0400
 Recognize the REMAP stream status in STREAM events. (I apparently had this
 lurking in my svk checkout for awhile and forgot about it.)



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /vidalia/local/trunk [r2109] on 54b3572a-7227-0410-958f-53ecd705b71a

Modified: trunk/src/control/stream.cpp
===================================================================
--- trunk/src/control/stream.cpp	2007-08-31 02:07:54 UTC (rev 1895)
+++ trunk/src/control/stream.cpp	2007-08-31 03:26:19 UTC (rev 1896)
@@ -110,7 +110,9 @@
   } else if (strStatus == "CLOSED") {
     status = Closed;
   } else if (strStatus == "DETACHED") {
-    status = Detached;
+    status = Detached; 
+  } else if (strStatus == "REMAP") {
+    status = Remap;
   } else {
     status = Unknown;
   }
@@ -132,6 +134,7 @@
     case Failed:        status = tr("Failed"); break;
     case Closed:        status = tr("Closed"); break;
     case Detached:      status = tr("Retrying"); break;
+    case Remap:         status = tr("Remapped"); break;
     default:            status = tr("Unknown"); break;
   }
   return status;

Modified: trunk/src/control/stream.h
===================================================================
--- trunk/src/control/stream.h	2007-08-31 02:07:54 UTC (rev 1895)
+++ trunk/src/control/stream.h	2007-08-31 03:26:19 UTC (rev 1896)
@@ -47,7 +47,8 @@
     Succeeded,    /**< Stream established */
     Failed,       /**< Stream failed */
     Closed,       /**< Stream closed */
-    Detached      /**< Detached from circuit */
+    Detached,     /**< Detached from circuit */
+    Remap         /**< Address re-mapped to another */
   };
     
   /** Default constructor */