Changeset 534 for trunk/src/ocatv6conv.c

Timestamp:

11/29/09 22:37:56 (2 years ago)

Author:

eagle

Message:

merged GarliCat branch back into trunk
onioncat-privatehosts.pl added (code by zzz)

Location:

trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/ocatv6conv.c (modified) (3 diffs)

trunk/src/ocatv6conv.c

@@ -27 +27 @@
 
 #include "ocat.h"
+#include "ocat_netdesc.h"
 
 static const char BASE32[] = "abcdefghijklmnopqrstuvwxyz234567";
@@ -40 +41 @@
       50  51  52  53  54  55  56  57  58  59  5a */
       15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25 };  
-static const struct in6_addr tor_prefix_ = TOR_PREFIX;
 
 
 int has_tor_prefix(const struct in6_addr *addr)
 {
-   return memcmp(addr, &tor_prefix_, 6) == 0;
+   return memcmp(addr, &NDESC(prefix), 6) == 0;
 }
 
@@ -51 +51 @@
 void set_tor_prefix(struct in6_addr *addr)
 {
-   memcpy(addr, &tor_prefix_, 6);
+   memcpy(addr, &NDESC(prefix), 6);
 }