Changeset 534 for trunk/src/ocat.h

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/ocat.h (modified) (8 diffs)

trunk/src/ocat.h

@@ -102 +102 @@
 
 #define IP6HLEN sizeof(struct ip6_hdr)
-//! TOR prefix: FD87:D87E:EB43::/48
-#define TOR_PREFIX {{{0xfd,0x87,0xd8,0x7e,0xeb,0x43,0,0,0,0,0,0,0,0,0,0}}}
-#define TOR_PREFIX_LEN 48
-#if BYTE_ORDER == LITTLE_ENDIAN
-#define TOR_PREFIX4 {0x0000000a}
-#define TOR_PREFIX4_MASK 0x000000ff
-#else
-#define TOR_PREFIX4 {0x0a000000}
-#define TOR_PREFIX4_MASK 0xff000000
-#endif
 //! Length of an .onion-URL (without ".onion" and '\0')
 #define ONION_URL_LEN 16
-//! Total length of .onion-URL
-#define ONION_NAME_SIZE (ONION_URL_LEN + 7)
-//! Total length of .onion-URL (equal to ONION_NAME_SIZE)
-#define ONION_NAME_LEN ONION_NAME_SIZE
 
 #define MAXPEERS 1024
-//! Local listening port for incoming connections from TOR.
-#define OCAT_LISTEN_PORT 8060
-//! Local control port for querying status information.
-#define OCAT_CTRL_PORT 8066
-//! Virtual destination port for hidden services
-#define OCAT_DEST_PORT 8060
-//! SOCKS port of TOR proxy
-#define TOR_SOCKS_PORT 9050
 #ifdef __OpenBSD__
 #define OCAT_UNAME "_tor"
@@ -235 +213 @@
 #define VERSION_STRING_LEN 256
 
-typedef enum PeerType {PT_TOR, PT_I2P} PeerType_t;
+
+#define NTYPE_TOR 0
+#define NTYPE_I2P 1
+
 
 struct OcatSetup
@@ -256 +237 @@
    //! user name to change uid to
    char *usrname;
-   char onion_url[ONION_NAME_SIZE];
+   char onion_url[SIZE_256];
    struct in6_addr ocat_addr;
    //! flag to create connection log
@@ -282 +263 @@
    int use_syslog;
    int daemon;
+#ifdef CONNECT_ROOT_PEERS
    //! hardcoded permanent peers
 #define ROOT_PEERS 1
    struct in6_addr root_peer[ROOT_PEERS];
+#endif
    time_t uptime;
    char *frandn;
@@ -308 +291 @@
    //! communication pipe for socks "selected" connector
    int socksfd[2];
+   int net_type;
 };
 
@@ -359 +343 @@
    unsigned inm;
    unsigned outm;
-   PeerType_t type;
 } OcatPeer_t;
 
@@ -566 +549 @@
 void print_setup_struct(FILE *);
 void init_setup(void);
+void post_init_setup(void);
 void lock_setup(void);
 void unlock_setup(void);
@@ -599 +583 @@
 int strsockaddr(const char *, struct sockaddr *);
 void add_local_listeners(void);
-void add_listener(const char *, const char *);
+void add_listener(const char *);
 void delete_listeners(struct sockaddr **, int *, int);
 int fdprintf(int, const char *, va_list);