From c38c05f5c7c93c8737227601a95500db9a5044cd Mon Sep 17 00:00:00 2001
From: David Troy <dave@popvox.com>
Date: Fri, 7 Apr 2006 16:33:38 +0000
Subject: git-svn-id:
 http://svncommunity.digium.com/svn/astmanproxy/branches/1.20pre@90
 f02b47b9-160a-0410-81a6-dc3441afb0ec

---
 src/astmanproxy.c         |  2 +-
 src/include/astmanproxy.h | 11 +++++++++++
 src/include/ssl.h         |  6 ++----
 src/ssl.c                 |  1 -
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/astmanproxy.c b/src/astmanproxy.c
index a22f1b8..0cc3a6a 100644
--- a/src/astmanproxy.c
+++ b/src/astmanproxy.c
@@ -168,7 +168,7 @@ void destroy_session(struct mansession *s)
 }
 
 int WriteClients(struct message *m) {
-    struct mansession *c, *d;
+    struct mansession *c;
     char *actionid;
 
     c = sessions;
diff --git a/src/include/astmanproxy.h b/src/include/astmanproxy.h
index fa57126..a8cb26b 100644
--- a/src/include/astmanproxy.h
+++ b/src/include/astmanproxy.h
@@ -136,3 +136,14 @@ int SetIOHandlers(struct mansession *s, char *ifmt, char *ofmt);
 void destroy_session(struct mansession *s);
 int ast_carefulwrite(int fd, char *s, int len, int timeoutms);
 extern void *SendError(struct mansession *s, char *errmsg);
+
+int close_sock(int socket);
+int ProxyChallenge(struct mansession *s, struct message *m);
+int ast_connect(struct mansession *a);
+int is_encrypt_request(int sslclhellotimeout, int fd);
+int saccept(int s);
+int get_real_fd(int fd);
+int client_init_secure(void);
+int init_secure(char *certfile);
+int m_send(int fd, const void *data, size_t len);
+int m_recv(int s, void *buf, size_t len, int flags);
diff --git a/src/include/ssl.h b/src/include/ssl.h
index 19c74a7..123bd43 100644
--- a/src/include/ssl.h
+++ b/src/include/ssl.h
@@ -17,11 +17,9 @@
 #define _SSL_ADDON_H_
 
 #include <openssl/ssl.h>
+#include "astmanproxy.h"
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+int connect_nonb(struct mansession *a);
 
 /*! \brief
    This data structure holds the additional SSL data needed to use the ssl functions.
diff --git a/src/ssl.c b/src/ssl.c
index 9f9ff0f..9f5b341 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -53,7 +53,6 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 
-#include "astmanproxy.h"
 #include "ssl.h"
 
 SSL_CTX *sctx;
-- 
cgit