Changeset 534 for trunk/src/ocatsocks.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/ocatsocks.c (modified) (5 diffs)

trunk/src/ocatsocks.c

@@ -26 +26 @@
 
 #include "ocat.h"
+#include "ocat_netdesc.h"
 
 
@@ -31 +32 @@
 static SocksQueue_t *socks_queue_ = NULL;
 
-#define SOCKS_BUFLEN (sizeof(SocksHdr_t) + ONION_NAME_SIZE + strlen(CNF(usrname)) + 2)
+#define SOCKS_BUFLEN (sizeof(SocksHdr_t) + NDESC(name_size) + strlen(CNF(usrname)) + 2)
 
 
@@ -37 +38 @@
 {
    int len, ret;
-   char buf[SOCKS_BUFLEN], onion[ONION_NAME_SIZE];
+   char buf[SOCKS_BUFLEN], onion[NDESC(name_size)];
    SocksHdr_t *shdr = (SocksHdr_t*) buf;
 
    ipv6tonion(&sq->addr, onion);
-   strlcat(onion, ".onion", sizeof(onion));
+   strlcat(onion, NDESC(domain), sizeof(onion));
    log_msg(LOG_INFO, "trying to connect to \"%s\" [%s]", onion, inet_ntop(AF_INET6, &sq->addr, buf, SOCKS_BUFLEN));
 
@@ -246 +247 @@
 {
    int i;
-   char addrstr[INET6_ADDRSTRLEN], onstr[ONION_NAME_LEN], buf[SIZE_1K];
+   char addrstr[INET6_ADDRSTRLEN], onstr[NDESC(name_size)], buf[SIZE_1K];
    SocksQueue_t *squeue;
 
@@ -257 +258 @@
       }
 
-      snprintf(buf, SIZE_1K, "%d: %39s, %s.onion, state = %d, %s(%d), retry = %d, connect_time = %d, restart_time = %d",
+      snprintf(buf, SIZE_1K, "%d: %39s, %s%s, state = %d, %s(%d), retry = %d, connect_time = %d, restart_time = %d",
             i, 
             addrstr, 
             ipv6tonion(&squeue->addr, onstr),
+            NDESC(domain),
             squeue->state,
             squeue->perm ? "PERMANENT" : "TEMPORARY",