Rename public object server_instance to ast_tcptls_server_instance

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@105773 f38db490-d61c-443f-a65b-d21fe96a405b

7 files changed, 31 insertions, 31 deletions

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 8b017eb30..8fdb1a375 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -777,7 +777,7 @@ struct sip_socket {
 	enum sip_transport type;
 	int fd;
 	uint16_t port;
-	struct server_instance *ser;
+	struct ast_tcptls_server_instance *ser;
 };
 
 /*! \brief sip_request: The data grabbed from the UDP socket
@@ -1551,7 +1551,7 @@ struct sip_registry {
 struct sip_threadinfo {
 	int stop;
 	pthread_t threadid;
-	struct server_instance *ser;
+	struct ast_tcptls_server_instance *ser;
 	enum sip_transport type;	/* We keep a copy of the type here so we can display it in the connection list */
 	AST_LIST_ENTRY(sip_threadinfo) list;
 };
@@ -2129,25 +2129,25 @@ static struct ast_rtp_protocol sip_rtp = {
 	.get_codec = sip_get_codec,
 };
 
-static void *_sip_tcp_helper_thread(struct sip_pvt *pvt, struct server_instance *ser);
+static void *_sip_tcp_helper_thread(struct sip_pvt *pvt, struct ast_tcptls_server_instance *ser);
 
 static void *sip_tcp_helper_thread(void *data)
 {
 	struct sip_pvt *pvt = data;
-	struct server_instance *ser = pvt->socket.ser;
+	struct ast_tcptls_server_instance *ser = pvt->socket.ser;
 
 	return _sip_tcp_helper_thread(pvt, ser);
 }
 
 static void *sip_tcp_worker_fn(void *data)
 {
-	struct server_instance *ser = data;
+	struct ast_tcptls_server_instance *ser = data;
 
 	return _sip_tcp_helper_thread(NULL, ser);
 }
 
 /*! \brief SIP TCP helper function */
-static void *_sip_tcp_helper_thread(struct sip_pvt *pvt, struct server_instance *ser) 
+static void *_sip_tcp_helper_thread(struct sip_pvt *pvt, struct ast_tcptls_server_instance *ser) 
 {
 	int res, cl;
 	struct sip_request req = { 0, } , reqcpy = { 0, };
@@ -18063,7 +18063,7 @@ static int sip_standard_port(struct sip_socket s)
 }
 
 /*! \todo document this function. */
-static struct server_instance *sip_tcp_locate(struct sockaddr_in *s)
+static struct ast_tcptls_server_instance *sip_tcp_locate(struct sockaddr_in *s)
 {
 	struct sip_threadinfo *th;
 
@@ -18085,7 +18085,7 @@ static int sip_prepare_socket(struct sip_pvt *p)
 {
 	struct sip_socket *s = &p->socket;
 	static const char name[] = "SIP socket";
-	struct server_instance *ser;
+	struct ast_tcptls_server_instance *ser;
 	struct server_args ca = {
 		.name = name,
 		.accept_fd = -1,
diff --git a/include/asterisk/http.h b/include/asterisk/http.h
index 4cda5cacc..320d5bc23 100644
--- a/include/asterisk/http.h
+++ b/include/asterisk/http.h
@@ -65,7 +65,7 @@
    content is specified) 
 \endverbatim
 */
-typedef struct ast_str *(*ast_http_callback)(struct server_instance *ser, const char *uri, struct ast_variable *params, int *status, char **title, int *contentlength);
+typedef struct ast_str *(*ast_http_callback)(struct ast_tcptls_server_instance *ser, const char *uri, struct ast_variable *params, int *status, char **title, int *contentlength);
 
 /*! \brief Definition of a URI reachable in the embedded HTTP server */
 struct ast_http_uri {
diff --git a/include/asterisk/tcptls.h b/include/asterisk/tcptls.h
index 6b8260c5d..348e78082 100644
--- a/include/asterisk/tcptls.h
+++ b/include/asterisk/tcptls.h
@@ -102,7 +102,7 @@ struct ast_tls_config {
  * or equivalent with a timeout of 'poll_timeout' milliseconds, and if the
  * following accept() is successful it creates a thread in charge of
  * running the session, whose body is desc->worker_fn(). The argument of
- * worker_fn() is a struct server_instance, which contains the address
+ * worker_fn() is a struct ast_tcptls_server_instance, which contains the address
  * of the other party, a pointer to desc, the file descriptors (fd) on which
  * we can do a select/poll (but NOT IO/, and a FILE *on which we can do I/O.
  * We have both because we want to support plain and SSL sockets, and
@@ -111,7 +111,7 @@ struct ast_tls_config {
  *
  * NOTE: in order to let other parts of asterisk use these services,
  * we need to do the following:
- * + move struct server_instance and struct server_args to
+ * + move struct ast_tcptls_server_instance and struct server_args to
  * a common header file, together with prototypes for
  * server_start() and server_root().
  */
@@ -119,7 +119,7 @@ struct ast_tls_config {
 /*! \brief
  * describes a server instance
  */
-struct server_instance {
+struct ast_tcptls_server_instance {
 	FILE *f;    /* fopen/funopen result */
 	int fd;     /* the socket returned by accept() */
 	SSL *ssl;   /* ssl state */
@@ -154,7 +154,7 @@ struct server_args {
 #define LEN_T size_t
 #endif
 
-struct server_instance *client_start(struct server_args *desc);
+struct ast_tcptls_server_instance *client_start(struct server_args *desc);
 
 void *server_root(void *);
 void server_start(struct server_args *desc);
@@ -163,7 +163,7 @@ int ssl_setup(struct ast_tls_config *cfg);
 
 void *ast_make_file_from_fd(void *data);
 
-HOOK_T server_read(struct server_instance *ser, void *buf, size_t count);
-HOOK_T server_write(struct server_instance *ser, void *buf, size_t count);
+HOOK_T server_read(struct ast_tcptls_server_instance *ser, void *buf, size_t count);
+HOOK_T server_write(struct ast_tcptls_server_instance *ser, void *buf, size_t count);
 
 #endif /* _ASTERISK_SERVER_H */
diff --git a/main/http.c b/main/http.c
index c1ec9f759..487200256 100644
--- a/main/http.c
+++ b/main/http.c
@@ -137,7 +137,7 @@ static const char *ftype2mtype(const char *ftype, char *wkspace, int wkspacelen)
 	return wkspace;
 }
 
-static struct ast_str *static_callback(struct server_instance *ser, const char *uri, struct ast_variable *vars, int *status, char **title, int *contentlength)
+static struct ast_str *static_callback(struct ast_tcptls_server_instance *ser, const char *uri, struct ast_variable *vars, int *status, char **title, int *contentlength)
 {
 	char *path;
 	char *ftype;
@@ -207,7 +207,7 @@ out403:
 }
 
 
-static struct ast_str *httpstatus_callback(struct server_instance *ser, const char *uri, struct ast_variable *vars, int *status, char **title, int *contentlength)
+static struct ast_str *httpstatus_callback(struct ast_tcptls_server_instance *ser, const char *uri, struct ast_variable *vars, int *status, char **title, int *contentlength)
 {
 	struct ast_str *out = ast_str_create(512);
 	struct ast_variable *v;
@@ -392,7 +392,7 @@ static void post_raw(struct mm_mimepart *part, const char *post_dir, const char
 	fclose(f);
 }
 
-static struct ast_str *handle_post(struct server_instance *ser, char *uri, 
+static struct ast_str *handle_post(struct ast_tcptls_server_instance *ser, char *uri, 
 	int *status, char **title, int *contentlength, struct ast_variable *headers,
 	struct ast_variable *cookies)
 {
@@ -535,7 +535,7 @@ static struct ast_str *handle_post(struct server_instance *ser, char *uri,
 	return ast_http_error(200, "OK", NULL, "File successfully uploaded.");
 }
 
-static struct ast_str *handle_uri(struct server_instance *ser, char *uri, int *status, 
+static struct ast_str *handle_uri(struct ast_tcptls_server_instance *ser, char *uri, int *status, 
 	char **title, int *contentlength, struct ast_variable **cookies, 
 	unsigned int *static_content)
 {
@@ -683,7 +683,7 @@ static void *httpd_helper_thread(void *data)
 {
 	char buf[4096];
 	char cookie[4096];
-	struct server_instance *ser = data;
+	struct ast_tcptls_server_instance *ser = data;
 	struct ast_variable *var, *prev=NULL, *vars=NULL, *headers = NULL;
 	char *uri, *title=NULL;
 	int status = 200, contentlength = 0;
diff --git a/main/manager.c b/main/manager.c
index 3eeecd5b6..6c96def39 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -2818,7 +2818,7 @@ static int do_message(struct mansession *s)
  */
 static void *session_do(void *data)
 {
-	struct server_instance *ser = data;
+	struct ast_tcptls_server_instance *ser = data;
 	struct mansession *s = ast_calloc(1, sizeof(*s));
 	int flags;
 	int res;
@@ -3562,17 +3562,17 @@ generic_callback_out:
 	return out;
 }
 
-static struct ast_str *manager_http_callback(struct server_instance *ser, const char *uri, struct ast_variable *params, int *status, char **title, int *contentlength)
+static struct ast_str *manager_http_callback(struct ast_tcptls_server_instance *ser, const char *uri, struct ast_variable *params, int *status, char **title, int *contentlength)
 {
 	return generic_http_callback(FORMAT_HTML, &ser->requestor, uri, params, status, title, contentlength);
 }
 
-static struct ast_str *mxml_http_callback(struct server_instance *ser, const char *uri, struct ast_variable *params, int *status, char **title, int *contentlength)
+static struct ast_str *mxml_http_callback(struct ast_tcptls_server_instance *ser, const char *uri, struct ast_variable *params, int *status, char **title, int *contentlength)
 {
 	return generic_http_callback(FORMAT_XML, &ser->requestor, uri, params, status, title, contentlength);
 }
 
-static struct ast_str *rawman_http_callback(struct server_instance *ser, const char *uri, struct ast_variable *params, int *status, char **title, int *contentlength)
+static struct ast_str *rawman_http_callback(struct ast_tcptls_server_instance *ser, const char *uri, struct ast_variable *params, int *status, char **title, int *contentlength)
 {
 	return generic_http_callback(FORMAT_RAW, &ser->requestor, uri, params, status, title, contentlength);
 }
diff --git a/main/tcptls.c b/main/tcptls.c
index e11155a3e..acb012d60 100644
--- a/main/tcptls.c
+++ b/main/tcptls.c
@@ -81,7 +81,7 @@ static int ssl_close(void *cookie)
 }
 #endif	/* DO_SSL */
 
-HOOK_T server_read(struct server_instance *ser, void *buf, size_t count)
+HOOK_T server_read(struct ast_tcptls_server_instance *ser, void *buf, size_t count)
 {
 #ifdef DO_SSL
 	if (ser->ssl)
@@ -90,7 +90,7 @@ HOOK_T server_read(struct server_instance *ser, void *buf, size_t count)
 	return read(ser->fd, buf, count);
 }
 
-HOOK_T server_write(struct server_instance *ser, void *buf, size_t count)
+HOOK_T server_write(struct ast_tcptls_server_instance *ser, void *buf, size_t count)
 {
 #ifdef DO_SSL
 	if (ser->ssl)
@@ -105,7 +105,7 @@ void *server_root(void *data)
 	int fd;
 	struct sockaddr_in sin;
 	socklen_t sinlen;
-	struct server_instance *ser;
+	struct ast_tcptls_server_instance *ser;
 	pthread_t launched;
 	
 	for (;;) {
@@ -204,10 +204,10 @@ int ssl_setup(struct ast_tls_config *cfg)
 /*! \brief A generic client routine for a TCP client
  *  and starts a thread for handling accept()
  */
-struct server_instance *client_start(struct server_args *desc)
+struct ast_tcptls_server_instance *client_start(struct server_args *desc)
 {
 	int flags;
-	struct server_instance *ser = NULL;
+	struct ast_tcptls_server_instance *ser = NULL;
 
 	/* Do nothing if nothing has changed */
 	if(!memcmp(&desc->oldsin, &desc->sin, sizeof(desc->oldsin))) {
@@ -353,7 +353,7 @@ void server_stop(struct server_args *desc)
 */
 void *ast_make_file_from_fd(void *data)
 {
-	struct server_instance *ser = data;
+	struct ast_tcptls_server_instance *ser = data;
 #ifdef DO_SSL
 	int (*ssl_setup)(SSL *) = (ser->client) ? SSL_connect : SSL_accept;
 	int ret;
diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c
index 288b236f6..7d647a903 100644
--- a/res/res_phoneprov.c
+++ b/res/res_phoneprov.c
@@ -323,7 +323,7 @@ static int load_file(const char *filename, char **ret)
 }
 
 /*! \brief Callback that is executed everytime an http request is received by this module */
-static struct ast_str *phoneprov_callback(struct server_instance *ser, const char *uri, struct ast_variable *vars, int *status, char **title, int *contentlength)
+static struct ast_str *phoneprov_callback(struct ast_tcptls_server_instance *ser, const char *uri, struct ast_variable *vars, int *status, char **title, int *contentlength)
 {
 	struct http_route *route;
 	struct http_route search_route = {