Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

More public API name changes to use an appropriate ast_ prefix

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105785 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.1
Russell Bryant 18 years ago
parent efb1e30a38
commit cc55483858
5 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File

18
channels/chan_sip.c
Unescape View File

@ -2075,7 +2075,7 @@ static struct server_args sip_tcp_desc = {
.tls_cfg = NULL, .tls_cfg = NULL,
.poll_timeout = -1, .poll_timeout = -1,
.name = "sip tcp server", .name = "sip tcp server",
.accept_fn = server_root, .accept_fn = ast_tcptls_server_root,
.worker_fn = sip_tcp_worker_fn, .worker_fn = sip_tcp_worker_fn,
}; };
@ -2085,7 +2085,7 @@ static struct server_args sip_tls_desc = {
.tls_cfg = &sip_tls_cfg, .tls_cfg = &sip_tls_cfg,
.poll_timeout = -1, .poll_timeout = -1,
.name = "sip tls server", .name = "sip tls server",
.accept_fn = server_root, .accept_fn = ast_tcptls_server_root,
.worker_fn = sip_tcp_worker_fn, .worker_fn = sip_tcp_worker_fn,
}; };
@ -2526,7 +2526,7 @@ static int __sip_xmit(struct sip_pvt *p, char *data, int len)
res = sendto(p->socket.fd, data, len, 0, (const struct sockaddr *)dst, sizeof(struct sockaddr_in)); res = sendto(p->socket.fd, data, len, 0, (const struct sockaddr *)dst, sizeof(struct sockaddr_in));
else { else {
if (p->socket.ser->f) if (p->socket.ser->f)
res = server_write(p->socket.ser, data, len); res = ast_tcptls_server_write(p->socket.ser, data, len);
else else
ast_debug(1, "No p->socket.ser->f len=%d\n", len); ast_debug(1, "No p->socket.ser->f len=%d\n", len);
} }
@ -18119,7 +18119,7 @@ static int sip_prepare_socket(struct sip_pvt *p)
ast_copy_string(ca.hostname, p->tohost, sizeof(ca.hostname)); ast_copy_string(ca.hostname, p->tohost, sizeof(ca.hostname));
} }
} }
s->ser = (!s->ser) ? client_start(&ca) : s->ser; s->ser = (!s->ser) ? ast_tcptls_client_start(&ca) : s->ser;
if (!s->ser) { if (!s->ser) {
if (ca.tls_cfg) if (ca.tls_cfg)
@ -20702,10 +20702,10 @@ static int reload_config(enum channelreloadreason reason)
notify_types = ast_config_load(notify_config, config_flags); notify_types = ast_config_load(notify_config, config_flags);
memcpy(sip_tls_desc.tls_cfg, &default_tls_cfg, sizeof(default_tls_cfg)); memcpy(sip_tls_desc.tls_cfg, &default_tls_cfg, sizeof(default_tls_cfg));
server_start(&sip_tcp_desc); ast_tcptls_server_start(&sip_tcp_desc);
if (ssl_setup(sip_tls_desc.tls_cfg)) if (ast_ssl_setup(sip_tls_desc.tls_cfg))
server_start(&sip_tls_desc); ast_tcptls_server_start(&sip_tls_desc);
else if (sip_tls_desc.tls_cfg->enabled) { else if (sip_tls_desc.tls_cfg->enabled) {
sip_tls_desc.tls_cfg = NULL; sip_tls_desc.tls_cfg = NULL;
ast_log(LOG_WARNING, "SIP TLS server did not load because of errors.\n"); ast_log(LOG_WARNING, "SIP TLS server did not load because of errors.\n");
@ -21394,9 +21394,9 @@ static int unload_module(void)
/* Kill TCP/TLS server threads */ /* Kill TCP/TLS server threads */
if (sip_tcp_desc.master) if (sip_tcp_desc.master)
server_stop(&sip_tcp_desc); ast_tcptls_server_stop(&sip_tcp_desc);
if (sip_tls_desc.master) if (sip_tls_desc.master)
server_stop(&sip_tls_desc); ast_tcptls_server_stop(&sip_tls_desc);
/* Kill all existing TCP/TLS threads */ /* Kill all existing TCP/TLS threads */
AST_LIST_LOCK(&threadl); AST_LIST_LOCK(&threadl);

14
include/asterisk/tcptls.h
Unescape View File

@ -154,16 +154,16 @@ struct server_args {
#define LEN_T size_t #define LEN_T size_t
#endif #endif
struct ast_tcptls_server_instance *client_start(struct server_args *desc); struct ast_tcptls_server_instance *ast_tcptls_client_start(struct server_args *desc);
void *server_root(void *); void *ast_tcptls_server_root(void *);
void server_start(struct server_args *desc); void ast_tcptls_server_start(struct server_args *desc);
void server_stop(struct server_args *desc); void ast_tcptls_server_stop(struct server_args *desc);
int ssl_setup(struct ast_tls_config *cfg); int ast_ssl_setup(struct ast_tls_config *cfg);
void *ast_make_file_from_fd(void *data); void *ast_make_file_from_fd(void *data);
HOOK_T server_read(struct ast_tcptls_server_instance *ser, void *buf, size_t count); HOOK_T ast_tcptls_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); HOOK_T ast_tcptls_server_write(struct ast_tcptls_server_instance *ser, void *buf, size_t count);
#endif /* _ASTERISK_SERVER_H */ #endif /* _ASTERISK_SERVER_H */

10
main/http.c
Unescape View File

@ -73,7 +73,7 @@ static struct server_args http_desc = {
.tls_cfg = NULL, .tls_cfg = NULL,
.poll_timeout = -1, .poll_timeout = -1,
.name = "http server", .name = "http server",
.accept_fn = server_root, .accept_fn = ast_tcptls_server_root,
.worker_fn = httpd_helper_thread, .worker_fn = httpd_helper_thread,
}; };
@ -83,7 +83,7 @@ static struct server_args https_desc = {
.tls_cfg = &http_tls_cfg, .tls_cfg = &http_tls_cfg,
.poll_timeout = -1, .poll_timeout = -1,
.name = "https server", .name = "https server",
.accept_fn = server_root, .accept_fn = ast_tcptls_server_root,
.worker_fn = httpd_helper_thread, .worker_fn = httpd_helper_thread,
}; };
@ -1028,9 +1028,9 @@ static int __ast_http_load(int reload)
if (strcmp(prefix, newprefix)) if (strcmp(prefix, newprefix))
ast_copy_string(prefix, newprefix, sizeof(prefix)); ast_copy_string(prefix, newprefix, sizeof(prefix));
enablestatic = newenablestatic; enablestatic = newenablestatic;
server_start(&http_desc); ast_tcptls_server_start(&http_desc);
if (ssl_setup(https_desc.tls_cfg)) if (ast_ssl_setup(https_desc.tls_cfg))
server_start(&https_desc); ast_tcptls_server_start(&https_desc);
return 0; return 0;
} }

10
main/manager.c
Unescape View File

@ -3618,7 +3618,7 @@ static struct server_args ami_desc = {
.poll_timeout = 5000, /* wake up every 5 seconds */ .poll_timeout = 5000, /* wake up every 5 seconds */
.periodic_fn = purge_old_stuff, .periodic_fn = purge_old_stuff,
.name = "AMI server", .name = "AMI server",
.accept_fn = server_root, /* thread doing the accept() */ .accept_fn = ast_tcptls_server_root, /* thread doing the accept() */
.worker_fn = session_do, /* thread handling the session */ .worker_fn = session_do, /* thread handling the session */
}; };
@ -3628,7 +3628,7 @@ static struct server_args amis_desc = {
.tls_cfg = &ami_tls_cfg, .tls_cfg = &ami_tls_cfg,
.poll_timeout = -1, /* the other does the periodic cleanup */ .poll_timeout = -1, /* the other does the periodic cleanup */
.name = "AMI TLS server", .name = "AMI TLS server",
.accept_fn = server_root, /* thread doing the accept() */ .accept_fn = ast_tcptls_server_root, /* thread doing the accept() */
.worker_fn = session_do, /* thread handling the session */ .worker_fn = session_do, /* thread handling the session */
}; };
@ -3937,9 +3937,9 @@ static int __init_manager(int reload)
manager_event(EVENT_FLAG_SYSTEM, "Reload", "Module: Manager\r\nStatus: %s\r\nMessage: Manager reload Requested\r\n", manager_enabled ? "Enabled" : "Disabled"); manager_event(EVENT_FLAG_SYSTEM, "Reload", "Module: Manager\r\nStatus: %s\r\nMessage: Manager reload Requested\r\n", manager_enabled ? "Enabled" : "Disabled");
server_start(&ami_desc); ast_tcptls_server_start(&ami_desc);
if (ssl_setup(amis_desc.tls_cfg)) if (ast_ssl_setup(amis_desc.tls_cfg))
server_start(&amis_desc); ast_tcptls_server_start(&amis_desc);
return 0; return 0;
} }

14
main/tcptls.c
Unescape View File

@ -81,7 +81,7 @@ static int ssl_close(void *cookie)
} }
#endif /* DO_SSL */ #endif /* DO_SSL */
HOOK_T server_read(struct ast_tcptls_server_instance *ser, void *buf, size_t count) HOOK_T ast_tcptls_server_read(struct ast_tcptls_server_instance *ser, void *buf, size_t count)
{ {
#ifdef DO_SSL #ifdef DO_SSL
if (ser->ssl) if (ser->ssl)
@ -90,7 +90,7 @@ HOOK_T server_read(struct ast_tcptls_server_instance *ser, void *buf, size_t cou
return read(ser->fd, buf, count); return read(ser->fd, buf, count);
} }
HOOK_T server_write(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)
{ {
#ifdef DO_SSL #ifdef DO_SSL
if (ser->ssl) if (ser->ssl)
@ -99,7 +99,7 @@ HOOK_T server_write(struct ast_tcptls_server_instance *ser, void *buf, size_t co
return write(ser->fd, buf, count); return write(ser->fd, buf, count);
} }
void *server_root(void *data) void *ast_tcptls_server_root(void *data)
{ {
struct server_args *desc = data; struct server_args *desc = data;
int fd; int fd;
@ -196,7 +196,7 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
#endif #endif
} }
int ssl_setup(struct ast_tls_config *cfg) int ast_ssl_setup(struct ast_tls_config *cfg)
{ {
return __ssl_setup(cfg, 0); return __ssl_setup(cfg, 0);
} }
@ -204,7 +204,7 @@ int ssl_setup(struct ast_tls_config *cfg)
/*! \brief A generic client routine for a TCP client /*! \brief A generic client routine for a TCP client
* and starts a thread for handling accept() * and starts a thread for handling accept()
*/ */
struct ast_tcptls_server_instance *client_start(struct server_args *desc) struct ast_tcptls_server_instance *ast_tcptls_client_start(struct server_args *desc)
{ {
int flags; int flags;
struct ast_tcptls_server_instance *ser = NULL; struct ast_tcptls_server_instance *ser = NULL;
@ -271,7 +271,7 @@ error:
* which does the socket/bind/listen and starts a thread for handling * which does the socket/bind/listen and starts a thread for handling
* accept(). * accept().
*/ */
void server_start(struct server_args *desc) void ast_tcptls_server_start(struct server_args *desc)
{ {
int flags; int flags;
int x = 1; int x = 1;
@ -334,7 +334,7 @@ error:
} }
/*! \brief Shutdown a running server if there is one */ /*! \brief Shutdown a running server if there is one */
void server_stop(struct server_args *desc) void ast_tcptls_server_stop(struct server_args *desc)
{ {
if (desc->master != AST_PTHREADT_NULL) { if (desc->master != AST_PTHREADT_NULL) {
pthread_cancel(desc->master); pthread_cancel(desc->master);

Write Preview
Loading…
Cancel
Save