diff options
| author | Russell Bryant <russell@russellbryant.com> | 2008-03-04 22:15:18 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2008-03-04 22:15:18 +0000 |
| commit | efb1e30a387ae8ec3c92cc094bca542579007639 (patch) | |
| tree | c68fb7815e708808b7831a1d5e05682f93f9c5f3 /channels | |
| parent | 7b1e335999eac4754e9be43953dbd67fc11ff07a (diff) | |
Rename public object server_instance to ast_tcptls_server_instance
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105773 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 16 |
1 files changed, 8 insertions, 8 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, |