Просмотр исходного кода

r12700@catbus: nickm | 2007-05-09 17:22:53 -0400
[Backport candidate] On windows, open cached-routers with the sharing mode "FILE_SHARE_READ so that other processes can read it while Tor is running. (Reported by Janbar).


svn:r10148

Nick Mathewson 19 лет назад
Родитель
Сommit
a7696a936d
2 измененных файлов с 4 добавлено и 2 удалено
  1. 2 0
      ChangeLog
  2. 2 2
      src/common/compat.c

+ 2 - 0
ChangeLog

@@ -113,6 +113,8 @@ Changes in version 0.2.0.1-alpha - 2007-??-??
     - Add even more asserts to hunt down bug 417.
     - Add even more asserts to hunt down bug 417.
     - When we are reporting the DirServer line we just parsed, we were
     - When we are reporting the DirServer line we just parsed, we were
       logging the second stanza of the key fingerprint, not the first.
       logging the second stanza of the key fingerprint, not the first.
+    - On Windows, we were preventing other processes from reading
+      cached-routers while Tor was running.  (Reported by janbar)
 
 
   o Minor bugfixes (controller), reported by daejees:
   o Minor bugfixes (controller), reported by daejees:
     - Make 'getinfo fingerprint' return a 551 error if we're not a
     - Make 'getinfo fingerprint' return a 551 error if we're not a

+ 2 - 2
src/common/compat.c

@@ -199,8 +199,8 @@ tor_mmap_file(const char *filename)
   res->mmap_handle = NULL;
   res->mmap_handle = NULL;
 
 
   res->file_handle = CreateFile(filename,
   res->file_handle = CreateFile(filename,
-                                GENERIC_READ,
-                                0, NULL,
+                                GENERIC_READ, FILE_SHARE_READ,
+                                NULL,
                                 OPEN_EXISTING,
                                 OPEN_EXISTING,
                                 FILE_ATTRIBUTE_NORMAL,
                                 FILE_ATTRIBUTE_NORMAL,
                                 0);
                                 0);