Changeset 518 for branches/i2prep/src/ocatv6conv.c

Timestamp:

11/12/09 15:44:48 (3 years ago)

Author:

eagle

Message:

 

File:

• branches/i2prep/src/ocatv6conv.c (modified) (5 diffs)

branches/i2prep/src/ocatv6conv.c

@@ -41 +41 @@
       15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25 };  
 static const struct in6_addr tor_prefix_ = TOR_PREFIX;
+static const struct in6_addr i2p_prefix_ = I2P_PREFIX;
 
 
@@ -52 +53 @@
 {
    memcpy(addr, &tor_prefix_, 6);
+}
+
+
+void set_i2p_prefix(struct in6_addr *addr)
+{
+   memcpy(addr, &i2p_prefix_, 6);
 }
 
@@ -72 +79 @@
 
 
-int oniontipv6(const char *onion, struct in6_addr *ip6)
+int b32_decode(const char *onion, struct in6_addr *ip6)
 {
    int i, j;
@@ -88 +95 @@
       *(((char*) ip6) + 15) |= j;
    }
+   return 0;
+}
+
+
+int oniontipv6(const char *onion, struct in6_addr *ip6)
+{
+   b32_decode(onion, ip6);
    set_tor_prefix(ip6);
-   return 0;
+}
+
+
+int i2ptipv6(const char *onion, struct in6_addr *ip6)
+{
+   b32_decode(onion, ip6);
+   set_i2p_prefix(ip6);
 }
 
@@ -148 +168 @@
 
 
+peer_t check_net_id(char *id_str)
+{
+   char *s;
+
+   if (!(s = strtok(id_str, ".")))
+      return PT_TOR;
+   if (!strcmp(s, ONION_TLD))
+      return PT_TOR;
+   if (!strcmp(s, I2P_TLD))
+      return PT_I2P;
+   return -1;
+}
+
+
 /*! Convert struct sockaddr to stuct sockaddr_str which holds the address
  *  in string representation.