[Pkg-privacy-commits] [onioncat] 15/241: git-svn-id: https://www.cypherpunk.at/svn/onioncat/trunk at 130 58e1ccc2-750e-0410-8d0d-f93ca75ab447

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to branch upstream-master
in repository onioncat.

commit 23b486b5e72b9f4d6743fd72913ada4909b868d2
Author: eagle <eagle at 58e1ccc2-750e-0410-8d0d-f93ca75ab447>
Date:   Sun Feb 10 21:58:09 2008 +0000

    git-svn-id: https://www.cypherpunk.at/svn/onioncat/trunk@130 58e1ccc2-750e-0410-8d0d-f93ca75ab447
---
 ocat.h      | 27 ++++++++++++++++++++++++---
 ocatroute.c | 10 +++++++++-
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/ocat.h b/ocat.h
index 3e89c9e..c8259a2 100644
--- a/ocat.h
+++ b/ocat.h
@@ -47,7 +47,6 @@
 #define PEER_OUTGOING 1
 
 #define THREAD_NAME_LEN 11
-//#define MAX_THREADS 8
 
 
 typedef struct PacketQueue
@@ -88,12 +87,34 @@ typedef struct OcatThread
    char name[THREAD_NAME_LEN];
 } OcatThread_t;
 
+typedef struct SocksQueue
+{
+   struct SocksQueue *next;
+   struct in6_addr addr;
+} SocksQueue_t;
+
+// next header value for ocat internal use (RFC3692)
+#define OCAT_NEXT_HEADER 254
+
 typedef struct OcatHdr
 {
-   struct ip6_hdrctl oh_ip6hdrctl;
-   char oh_srcid[10];
+   uint16_t oh_plen;
+   uint8_t oh_nxt;
+/*   struct ip6_hdrctl oh_ip6hdrctl;
+   char oh_srcid[10];*/
 } OcatHdr_t;
 
+
+#define OCAT_CTL_SRC 1
+#define OCAT_CTL_EREQ 2
+#define OCAT_CTL_ERES 3
+
+typedef struct OcatCtrlHdr
+{
+   uint8_t oct_type;
+   char oct_srcid[10];
+} OcatCtrlHdr_t;
+
 extern uint16_t tor_socks_port_;
 extern uint16_t ocat_listen_port_;
 extern uint16_t ocat_dest_port_;
diff --git a/ocatroute.c b/ocatroute.c
index 5798cfd..7a9acf0 100644
--- a/ocatroute.c
+++ b/ocatroute.c
@@ -40,6 +40,13 @@ static PacketQueue_t *queue_ = NULL;
 static pthread_mutex_t queue_mutex_ = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t queue_cond_ = PTHREAD_COND_INITIALIZER;
 
+// SOCKS connector queue vars
+static SocksQueue_t *socks_queue_ = NULL;
+static int socks_queue_cnt_ = 0;
+static int socks_cth_cnt_ = 0;
+static pthread_mutex_t socks_queue_mutex_ = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t socks_queue_cond_ = PTHREAD_COND_INITIALIZER;
+
 // frame header of local OS in network byte order
 uint32_t fhd_key_ = 0;
 
@@ -89,13 +96,14 @@ void delete_peer(OcatPeer_t *peer)
    memset(peer, 0, sizeof(OcatPeer_t));
 }
 
-
+/*
 void mk_ocat_frame(const struct in6_addr *addr, const struct ip6_hdr *ihd, OcatHdr_t *ohd)
 {
    memcpy(ohd, ihd, sizeof(struct ip6_hdrctl));
    memcpy(ohd->oh_srcid, (char*)addr + 6, 10);
    memcpy(ohd + 1, ihd + 1, ihd->ip6_plen);
 }
+*/
 
 
 void rewrite_framehdr(char *buf, int len)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onioncat.git