[or-cvs] [torsocks/master] Rename tsocks.h to torsocks.h
hoganrobert at torproject.org
hoganrobert at torproject.org
Mon Feb 14 20:29:48 UTC 2011
commit da043e7e57a6ad0bd7c2a48292fa0b8ee04188cb
Author: Robert Hogan <robert at roberthogan.net>
Date: Mon Feb 14 20:13:09 2011 +0000
Rename tsocks.h to torsocks.h
---
src/torsocks.c | 2 +-
src/torsocks.h | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/tsocks.h | 104 --------------------------------------------------------
3 files changed, 105 insertions(+), 105 deletions(-)
diff --git a/src/torsocks.c b/src/torsocks.c
index 538a182..6f3bb39 100644
--- a/src/torsocks.c
+++ b/src/torsocks.c
@@ -70,7 +70,7 @@ const char *torsocks_progname = "libtorsocks"; /* Name used in err msgs
#endif
#include <resolv.h>
#include <parser.h>
-#include <tsocks.h>
+#include <torsocks.h>
#include "dead_pool.h"
/* Some function names are macroized on Darwin. Allow those names
diff --git a/src/torsocks.h b/src/torsocks.h
new file mode 100644
index 0000000..ea298f0
--- /dev/null
+++ b/src/torsocks.h
@@ -0,0 +1,104 @@
+/***************************************************************************
+ * *
+ * Copyright (C) 2000-2008 Shaun Clowes <delius at progsoc.org> *
+ * Copyright (C) 2008-2011 Robert Hogan <robert at roberthogan.net> *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+/* torsocks.h - Structures used by tsocks to form SOCKS requests */
+
+#ifndef _TORSOCKS_H
+
+#define _TORSOCKS_H 1
+
+#include <parser.h>
+
+/* Structure representing a socks connection request */
+struct sockreq {
+ int8_t version;
+ int8_t command;
+ int16_t dstport;
+ int32_t dstip;
+ /* A null terminated username goes here */
+};
+
+/* Structure representing a socks connection request response */
+struct sockrep {
+ int8_t version;
+ int8_t result;
+ int16_t ignore1;
+ int32_t ignore2;
+};
+
+/* Structure representing a socket which we are currently proxying */
+struct connreq {
+ /* Information about the socket and target */
+ int sockid;
+ struct sockaddr_in connaddr;
+ struct sockaddr_in serveraddr;
+
+ /* Pointer to the config entry for the socks server */
+ struct serverent *path;
+
+ /* Current state of this proxied socket */
+ int state;
+
+ /* Next state to go to when the send or receive is finished */
+ int nextstate;
+
+ /* When connections fail but an error number cannot be reported
+ * because the socket is non blocking we keep the connreq struct until
+ * the status is queried with connect() again, we then return
+ * this value */
+ int err;
+
+ /* Events that were set for this socket upon call to select() or
+ * poll() */
+ int selectevents;
+
+ /* Buffer for sending and receiving on the socket */
+ unsigned int datalen;
+ unsigned int datadone;
+ char buffer[2048];
+
+ struct connreq *next;
+};
+
+/* Connection statuses */
+#define UNSTARTED 0
+#define CONNECTING 1
+#define CONNECTED 2
+#define SENDING 3
+#define RECEIVING 4
+#define SENTV4REQ 5
+#define GOTV4REQ 6
+#define SENTV5METHOD 7
+#define GOTV5METHOD 8
+#define SENTV5AUTH 9
+#define GOTV5AUTH 10
+#define SENTV5CONNECT 11
+#define GOTV5CONNECT 12
+#define DONE 13
+#define FAILED 14
+
+/* Flags to indicate what events a socket was select()ed for */
+#define READ (1<<0)
+#define WRITE (1<<1)
+#define EXCEPT (1<<2)
+#define READWRITE (READ|WRITE)
+#define READWRITEEXCEPT (READ|WRITE|EXCEPT)
+
+#endif
diff --git a/src/tsocks.h b/src/tsocks.h
deleted file mode 100644
index b637331..0000000
--- a/src/tsocks.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/***************************************************************************
- * *
- * Copyright (C) 2000-2008 Shaun Clowes <delius at progsoc.org> *
- * Copyright (C) 2008-2011 Robert Hogan <robert at roberthogan.net> *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
- ***************************************************************************/
-/* tsocks.h - Structures used by tsocks to form SOCKS requests */
-
-#ifndef _TSOCKS_H
-
-#define _TSOCKS_H 1
-
-#include <parser.h>
-
-/* Structure representing a socks connection request */
-struct sockreq {
- int8_t version;
- int8_t command;
- int16_t dstport;
- int32_t dstip;
- /* A null terminated username goes here */
-};
-
-/* Structure representing a socks connection request response */
-struct sockrep {
- int8_t version;
- int8_t result;
- int16_t ignore1;
- int32_t ignore2;
-};
-
-/* Structure representing a socket which we are currently proxying */
-struct connreq {
- /* Information about the socket and target */
- int sockid;
- struct sockaddr_in connaddr;
- struct sockaddr_in serveraddr;
-
- /* Pointer to the config entry for the socks server */
- struct serverent *path;
-
- /* Current state of this proxied socket */
- int state;
-
- /* Next state to go to when the send or receive is finished */
- int nextstate;
-
- /* When connections fail but an error number cannot be reported
- * because the socket is non blocking we keep the connreq struct until
- * the status is queried with connect() again, we then return
- * this value */
- int err;
-
- /* Events that were set for this socket upon call to select() or
- * poll() */
- int selectevents;
-
- /* Buffer for sending and receiving on the socket */
- unsigned int datalen;
- unsigned int datadone;
- char buffer[2048];
-
- struct connreq *next;
-};
-
-/* Connection statuses */
-#define UNSTARTED 0
-#define CONNECTING 1
-#define CONNECTED 2
-#define SENDING 3
-#define RECEIVING 4
-#define SENTV4REQ 5
-#define GOTV4REQ 6
-#define SENTV5METHOD 7
-#define GOTV5METHOD 8
-#define SENTV5AUTH 9
-#define GOTV5AUTH 10
-#define SENTV5CONNECT 11
-#define GOTV5CONNECT 12
-#define DONE 13
-#define FAILED 14
-
-/* Flags to indicate what events a socket was select()ed for */
-#define READ (1<<0)
-#define WRITE (1<<1)
-#define EXCEPT (1<<2)
-#define READWRITE (READ|WRITE)
-#define READWRITEEXCEPT (READ|WRITE|EXCEPT)
-
-#endif
More information about the tor-commits
mailing list