remove obsolete ss.h

svn:r336

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index a3bbef41e4c7cc081bde0bc2929dcc79564bc4b5..11018d53f7e5fe72e500f91b313d2e26be7b1af3 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -5,5 +5,5 @@ noinst_LIBRARIES = libor.a
 
 libor_a_SOURCES = log.c crypto.c fakepoll.c util.c
 
-noinst_HEADERS = log.h ss.h crypto.h fakepoll.h test.h util.h
+noinst_HEADERS = log.h crypto.h fakepoll.h test.h util.h
 

diff --git a/src/common/ss.h b/src/common/ss.h
deleted file mode 100644 (file)
index 9298fa1..0000000
--- a/src/common/ss.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * ss.h
- * Standard structure and related definitions.
- * 
- * Matej Pfajfar <mp292@cam.ac.uk>
- */
-
-/*
- * Changes :
- * $Log$
- * Revision 1.1  2002/06/26 22:45:50  arma
- * Initial revision
- *
- * Revision 1.5  2002/04/02 14:27:11  badbytes
- * Final finishes.
- *
- * Revision 1.4  2002/01/26 22:45:34  mp292
- * Added ss-related error codes.
- *
- * Revision 1.3  2002/01/26 19:30:09  mp292
- * Reviewed according to Secure-Programs-HOWTO.
- *
- * Revision 1.2  2001/12/18 10:37:47  badbytes
- * Header files now only apply if they were not previously included from somewhere else.
- *
- * Revision 1.1  2001/12/14 13:14:03  badbytes
- * Split types.h into routent.h and ss.h. Keeping them all in one file created unnecesary dependencies.
- *
- * Revision 1.2  2001/12/11 16:31:03  badbytes
- * Changed type from ss to SS.
- *
- * Revision 1.1  2001/12/07 11:15:28  badbytes
- * Added the definition for the standard structure.
- *
- */
-
-#ifndef __SS_H
-
-/* protocol types, as used in the standard structure */
-#define SS_PROTOCOL_TELNET 1
-#define SS_PROTOCOL_HTTP   2
-#define SS_PROTOCOL_SMTP   3
-
-/* address format types, as used in the standard structure */
-#define SS_ADDR_FMT_ASCII_HOST_PORT 1
-
-/* error codes returned by the onion proxy */
-#define SS_ERROR_SUCCESS 0
-#define SS_ERROR_VERSION_UNSUPPORTED 1
-#define SS_ERROR_ADDR_FMT_UNSUPPORTED 2
-#define SS_ERROR_INVALID_ADDRESS 3
-#define SS_ERROR_INVALID_PORT 4
-
-/* standard structure */
-typedef struct
-{
-  unsigned char version; /* version */
-  unsigned char protocol; /* protocol */
-  unsigned char retry_count; /* retry count */
-  unsigned char addr_fmt; /* address format */
-} ss_t;
-#define __SS_H
-#endif

diff --git a/src/or/or.h b/src/or/or.h
index 3a75f29eaf224c7f14bac82cf2c01e9b24465954..2a0f716201583036e1463338c67452a1a5c3c422 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -39,7 +39,6 @@
 
 #include "../common/crypto.h"
 #include "../common/log.h"
-#include "../common/ss.h"
 #include "../common/util.h"
 
 #define MAXCONNECTIONS 1000 /* upper bound on max connections.