diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-06 00:11:09 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-06 00:11:09 +0000 |
| commit | c30ba146debc6b92b6875a7dc1ff951f4a6c6b70 (patch) | |
| tree | 11f7ecd8b9f5e34026e49161c85f2861401f79a5 /main/manager.c | |
| parent | cc4b6c80303144f1793c53728265669e35e9868a (diff) | |
Merged revisions 105773 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r105773 | russell | 2008-03-04 16:15:18 -0600 (Tue, 04 Mar 2008) | 2 lines
Rename public object server_instance to ast_tcptls_server_instance
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@106303 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/manager.c')
| -rw-r--r-- | main/manager.c | 8 |
1 files changed, 4 insertions, 4 deletions
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); } |