Changeset 525 for branches/garlicat/src/ocat.h

Timestamp:

11/13/09 13:11:06 (3 years ago)

Author:

eagle

Message:

Garlicat, 1st try

File:

• branches/garlicat/src/ocat.h (modified) (8 diffs)

branches/garlicat/src/ocat.h

@@ -102 +102 @@
 
 #define IP6HLEN sizeof(struct ip6_hdr)
-//! TOR prefix: FD87:D87E:EB43::/48
+/*//! 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
@@ -111 +111 @@
 #define TOR_PREFIX4 {0x0a000000}
 #define TOR_PREFIX4_MASK 0xff000000
-#endif
+#endif*/
 //! Length of an .onion-URL (without ".onion" and '\0')
 #define ONION_URL_LEN 16
-//! Total length of .onion-URL
+/*//! 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 ONION_NAME_LEN ONION_NAME_SIZE*/
 
 #define MAXPEERS 1024
-//! Local listening port for incoming connections from TOR.
+/*//! Local listening port for incoming connections from TOR.
 #define OCAT_LISTEN_PORT 8060
 //! Local control port for querying status information.
@@ -127 +127 @@
 #define OCAT_DEST_PORT 8060
 //! SOCKS port of TOR proxy
-#define TOR_SOCKS_PORT 9050
+#define TOR_SOCKS_PORT 9050*/
 #ifdef __OpenBSD__
 #define OCAT_UNAME "_tor"
@@ -235 +235 @@
 #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 +259 @@
    //! 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
@@ -308 +311 @@
    //! communication pipe for socks "selected" connector
    int socksfd[2];
+   int net_type;
 };
 
@@ -359 +363 @@
    unsigned inm;
    unsigned outm;
-   PeerType_t type;
 } OcatPeer_t;
 
@@ -566 +569 @@
 void print_setup_struct(FILE *);
 void init_setup(void);
+void post_init_setup(void);
 void lock_setup(void);
 void unlock_setup(void);