[asterisk-commits] russell: branch 1.6.0 r108348 - in /branches/1.6.0: ./ channels/ include/aste...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Mar 12 17:50:15 CDT 2008
Author: russell
Date: Wed Mar 12 17:50:14 2008
New Revision: 108348
URL: http://svn.digium.com/view/asterisk?view=rev&rev=108348
Log:
Merged revisions 108295 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r108295 | russell | 2008-03-12 17:13:18 -0500 (Wed, 12 Mar 2008) | 3 lines
Rename ast_tcptls_server_instance to session_instance, since this pertains to
server and client usage.
........
Modified:
branches/1.6.0/ (props changed)
branches/1.6.0/channels/chan_sip.c
branches/1.6.0/include/asterisk/http.h
branches/1.6.0/include/asterisk/tcptls.h
branches/1.6.0/main/http.c
branches/1.6.0/main/manager.c
branches/1.6.0/main/tcptls.c
branches/1.6.0/res/res_phoneprov.c
Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=108348&r1=108347&r2=108348
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Wed Mar 12 17:50:14 2008
@@ -777,7 +777,7 @@
enum sip_transport type;
int fd;
uint16_t port;
- struct ast_tcptls_server_instance *ser;
+ struct ast_tcptls_session_instance *ser;
};
/*! \brief sip_request: The data grabbed from the UDP socket
@@ -1551,7 +1551,7 @@
struct sip_threadinfo {
int stop;
pthread_t threadid;
- struct ast_tcptls_server_instance *ser;
+ struct ast_tcptls_session_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 @@
.get_codec = sip_get_codec,
};
-static void *_sip_tcp_helper_thread(struct sip_pvt *pvt, struct ast_tcptls_server_instance *ser);
+static void *_sip_tcp_helper_thread(struct sip_pvt *pvt, struct ast_tcptls_session_instance *ser);
static void *sip_tcp_helper_thread(void *data)
{
struct sip_pvt *pvt = data;
- struct ast_tcptls_server_instance *ser = pvt->socket.ser;
+ struct ast_tcptls_session_instance *ser = pvt->socket.ser;
return _sip_tcp_helper_thread(pvt, ser);
}
static void *sip_tcp_worker_fn(void *data)
{
- struct ast_tcptls_server_instance *ser = data;
+ struct ast_tcptls_session_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 ast_tcptls_server_instance *ser)
+static void *_sip_tcp_helper_thread(struct sip_pvt *pvt, struct ast_tcptls_session_instance *ser)
{
int res, cl;
struct sip_request req = { 0, } , reqcpy = { 0, };
@@ -2238,7 +2238,7 @@
ast_free(me);
cleanup2:
fclose(ser->f);
- ser = ast_tcptls_server_instance_destroy(ser);
+ ser = ast_tcptls_session_instance_destroy(ser);
if (req.socket.lock) {
ast_mutex_destroy(req.socket.lock);
@@ -18091,7 +18091,7 @@
}
/*! \todo document this function. */
-static struct ast_tcptls_server_instance *sip_tcp_locate(struct sockaddr_in *s)
+static struct ast_tcptls_session_instance *sip_tcp_locate(struct sockaddr_in *s)
{
struct sip_threadinfo *th;
@@ -18113,7 +18113,7 @@
{
struct sip_socket *s = &p->socket;
static const char name[] = "SIP socket";
- struct ast_tcptls_server_instance *ser;
+ struct ast_tcptls_session_instance *ser;
struct server_args ca = {
.name = name,
.accept_fd = -1,
Modified: branches/1.6.0/include/asterisk/http.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/http.h?view=diff&rev=108348&r1=108347&r2=108348
==============================================================================
--- branches/1.6.0/include/asterisk/http.h (original)
+++ branches/1.6.0/include/asterisk/http.h Wed Mar 12 17:50:14 2008
@@ -65,7 +65,7 @@
content is specified)
\endverbatim
*/
-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);
+typedef struct ast_str *(*ast_http_callback)(struct ast_tcptls_session_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 {
Modified: branches/1.6.0/include/asterisk/tcptls.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/tcptls.h?view=diff&rev=108348&r1=108347&r2=108348
==============================================================================
--- branches/1.6.0/include/asterisk/tcptls.h (original)
+++ branches/1.6.0/include/asterisk/tcptls.h Wed Mar 12 17:50:14 2008
@@ -102,7 +102,7 @@
* 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 ast_tcptls_server_instance, which contains the address
+ * worker_fn() is a struct ast_tcptls_session_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 @@
*
* NOTE: in order to let other parts of asterisk use these services,
* we need to do the following:
- * + move struct ast_tcptls_server_instance and struct server_args to
+ * + move struct ast_tcptls_session_instance and struct server_args to
* a common header file, together with prototypes for
* server_start() and server_root().
*/
@@ -119,7 +119,7 @@
/*! \brief
* describes a server instance
*/
-struct ast_tcptls_server_instance {
+struct ast_tcptls_session_instance {
FILE *f; /* fopen/funopen result */
int fd; /* the socket returned by accept() */
SSL *ssl; /* ssl state */
@@ -154,7 +154,7 @@
#define LEN_T size_t
#endif
-struct ast_tcptls_server_instance *ast_tcptls_client_start(struct server_args *desc);
+struct ast_tcptls_session_instance *ast_tcptls_client_start(struct server_args *desc);
void *ast_tcptls_server_root(void *);
void ast_tcptls_server_start(struct server_args *desc);
@@ -163,14 +163,14 @@
void *ast_make_file_from_fd(void *data);
-HOOK_T ast_tcptls_server_read(struct ast_tcptls_server_instance *ser, void *buf, size_t count);
-HOOK_T ast_tcptls_server_write(struct ast_tcptls_server_instance *ser, void *buf, size_t count);
+HOOK_T ast_tcptls_server_read(struct ast_tcptls_session_instance *ser, void *buf, size_t count);
+HOOK_T ast_tcptls_server_write(struct ast_tcptls_session_instance *ser, void *buf, size_t count);
/*!
* \brief Destroy a server instance
*
* \return NULL for convenience
*/
-struct ast_tcptls_server_instance *ast_tcptls_server_instance_destroy(struct ast_tcptls_server_instance *i);
+struct ast_tcptls_session_instance *ast_tcptls_session_instance_destroy(struct ast_tcptls_session_instance *i);
#endif /* _ASTERISK_SERVER_H */
Modified: branches/1.6.0/main/http.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/http.c?view=diff&rev=108348&r1=108347&r2=108348
==============================================================================
--- branches/1.6.0/main/http.c (original)
+++ branches/1.6.0/main/http.c Wed Mar 12 17:50:14 2008
@@ -136,7 +136,7 @@
return wkspace;
}
-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)
+static struct ast_str *static_callback(struct ast_tcptls_session_instance *ser, const char *uri, struct ast_variable *vars, int *status, char **title, int *contentlength)
{
char *path;
char *ftype;
@@ -206,7 +206,7 @@
}
-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)
+static struct ast_str *httpstatus_callback(struct ast_tcptls_session_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;
@@ -391,7 +391,7 @@
fclose(f);
}
-static struct ast_str *handle_post(struct ast_tcptls_server_instance *ser, char *uri,
+static struct ast_str *handle_post(struct ast_tcptls_session_instance *ser, char *uri,
int *status, char **title, int *contentlength, struct ast_variable *headers,
struct ast_variable *cookies)
{
@@ -534,7 +534,7 @@
return ast_http_error(200, "OK", NULL, "File successfully uploaded.");
}
-static struct ast_str *handle_uri(struct ast_tcptls_server_instance *ser, char *uri, int *status,
+static struct ast_str *handle_uri(struct ast_tcptls_session_instance *ser, char *uri, int *status,
char **title, int *contentlength, struct ast_variable **cookies,
unsigned int *static_content)
{
@@ -682,7 +682,7 @@
{
char buf[4096];
char cookie[4096];
- struct ast_tcptls_server_instance *ser = data;
+ struct ast_tcptls_session_instance *ser = data;
struct ast_variable *var, *prev=NULL, *vars=NULL, *headers = NULL;
char *uri, *title=NULL;
int status = 200, contentlength = 0;
@@ -826,7 +826,7 @@
done:
fclose(ser->f);
- ser = ast_tcptls_server_instance_destroy(ser);
+ ser = ast_tcptls_session_instance_destroy(ser);
return NULL;
}
Modified: branches/1.6.0/main/manager.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/manager.c?view=diff&rev=108348&r1=108347&r2=108348
==============================================================================
--- branches/1.6.0/main/manager.c (original)
+++ branches/1.6.0/main/manager.c Wed Mar 12 17:50:14 2008
@@ -2818,7 +2818,7 @@
*/
static void *session_do(void *data)
{
- struct ast_tcptls_server_instance *ser = data;
+ struct ast_tcptls_session_instance *ser = data;
struct mansession *s = ast_calloc(1, sizeof(*s));
int flags;
int res;
@@ -2882,7 +2882,7 @@
destroy_session(s);
done:
- ser = ast_tcptls_server_instance_destroy(ser);
+ ser = ast_tcptls_session_instance_destroy(ser);
return NULL;
}
@@ -3562,17 +3562,17 @@
return out;
}
-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)
+static struct ast_str *manager_http_callback(struct ast_tcptls_session_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 ast_tcptls_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_session_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 ast_tcptls_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_session_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);
}
Modified: branches/1.6.0/main/tcptls.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/tcptls.c?view=diff&rev=108348&r1=108347&r2=108348
==============================================================================
--- branches/1.6.0/main/tcptls.c (original)
+++ branches/1.6.0/main/tcptls.c Wed Mar 12 17:50:14 2008
@@ -81,7 +81,7 @@
}
#endif /* DO_SSL */
-HOOK_T ast_tcptls_server_read(struct ast_tcptls_server_instance *ser, void *buf, size_t count)
+HOOK_T ast_tcptls_server_read(struct ast_tcptls_session_instance *ser, void *buf, size_t count)
{
#ifdef DO_SSL
if (ser->ssl)
@@ -90,7 +90,7 @@
return read(ser->fd, buf, count);
}
-HOOK_T ast_tcptls_server_write(struct ast_tcptls_server_instance *ser, void *buf, size_t count)
+HOOK_T ast_tcptls_server_write(struct ast_tcptls_session_instance *ser, void *buf, size_t count)
{
#ifdef DO_SSL
if (ser->ssl)
@@ -105,7 +105,7 @@
int fd;
struct sockaddr_in sin;
socklen_t sinlen;
- struct ast_tcptls_server_instance *ser;
+ struct ast_tcptls_session_instance *ser;
pthread_t launched;
for (;;) {
@@ -204,10 +204,10 @@
/*! \brief A generic client routine for a TCP client
* and starts a thread for handling accept()
*/
-struct ast_tcptls_server_instance *ast_tcptls_client_start(struct server_args *desc)
+struct ast_tcptls_session_instance *ast_tcptls_client_start(struct server_args *desc)
{
int flags;
- struct ast_tcptls_server_instance *ser = NULL;
+ struct ast_tcptls_session_instance *ser = NULL;
/* Do nothing if nothing has changed */
if(!memcmp(&desc->oldsin, &desc->sin, sizeof(desc->oldsin))) {
@@ -353,7 +353,7 @@
*/
void *ast_make_file_from_fd(void *data)
{
- struct ast_tcptls_server_instance *ser = data;
+ struct ast_tcptls_session_instance *ser = data;
#ifdef DO_SSL
int (*ssl_setup)(SSL *) = (ser->client) ? SSL_connect : SSL_accept;
int ret;
@@ -447,7 +447,7 @@
return ser;
}
-struct ast_tcptls_server_instance *ast_tcptls_server_instance_destroy(struct ast_tcptls_server_instance *i)
+struct ast_tcptls_session_instance *ast_tcptls_session_instance_destroy(struct ast_tcptls_session_instance *i)
{
ast_free(i);
return NULL;
Modified: branches/1.6.0/res/res_phoneprov.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/res/res_phoneprov.c?view=diff&rev=108348&r1=108347&r2=108348
==============================================================================
--- branches/1.6.0/res/res_phoneprov.c (original)
+++ branches/1.6.0/res/res_phoneprov.c Wed Mar 12 17:50:14 2008
@@ -323,7 +323,7 @@
}
/*! \brief Callback that is executed everytime an http request is received by this module */
-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)
+static struct ast_str *phoneprov_callback(struct ast_tcptls_session_instance *ser, const char *uri, struct ast_variable *vars, int *status, char **title, int *contentlength)
{
struct http_route *route;
struct http_route search_route = {
More information about the asterisk-commits
mailing list