diff options
| author | Mark Michelson <mmichelson@digium.com> | 2010-07-08 22:08:07 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2010-07-08 22:08:07 +0000 |
| commit | cd4ebd336f6fdd1fe5d2ad57f06654a9678d88d4 (patch) | |
| tree | c05335b563c3f7cb9a3edbf3e101d8e1b80e0be4 /include/asterisk/tcptls.h | |
| parent | 816f26c16ce6cf03cf97b7d0e7af64837283e79d (diff) | |
Add IPv6 to Asterisk.
This adds a generic API for accommodating IPv6 and IPv4 addresses
within Asterisk. While many files have been updated to make use of the
API, chan_sip and the RTP code are the files which actually support
IPv6 addresses at the time of this commit. The way has been paved for
easier upgrading for other files in the near future, though.
Big thanks go to Simon Perrault, Marc Blanchet, and Jean-Philippe Dionne
for their hard work on this.
(closes issue #17565)
Reported by: russell
Patches:
asteriskv6-test-report.pdf uploaded by russell (license 2)
Review: https://reviewboard.asterisk.org/r/743
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@274783 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/tcptls.h')
| -rw-r--r-- | include/asterisk/tcptls.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/asterisk/tcptls.h b/include/asterisk/tcptls.h index ad0438583..2cc2c0fa3 100644 --- a/include/asterisk/tcptls.h +++ b/include/asterisk/tcptls.h @@ -48,6 +48,7 @@ #ifndef _ASTERISK_TCPTLS_H #define _ASTERISK_TCPTLS_H +#include "asterisk/netsock2.h" #include "asterisk/utils.h" #if defined(HAVE_OPENSSL) && (defined(HAVE_FUNOPEN) || defined(HAVE_FOPENCOOKIE)) @@ -120,9 +121,9 @@ struct ast_tls_config { * arguments for the accepting thread */ struct ast_tcptls_session_args { - struct sockaddr_in local_address; - struct sockaddr_in old_address; /*!< copy of the local or remote address depending on if its a client or server session */ - struct sockaddr_in remote_address; + struct ast_sockaddr local_address; + struct ast_sockaddr old_address; /*!< copy of the local or remote address depending on if its a client or server session */ + struct ast_sockaddr remote_address; char hostname[MAXHOSTNAMELEN]; /*!< only necessary for SSL clients so we can compare to common name */ struct ast_tls_config *tls_cfg; /*!< points to the SSL configuration if any */ int accept_fd; @@ -143,7 +144,7 @@ struct ast_tcptls_session_instance { SSL *ssl; /* ssl state */ /* iint (*ssl_setup)(SSL *); */ int client; - struct sockaddr_in remote_address; + struct ast_sockaddr remote_address; struct ast_tcptls_session_args *parent; ast_mutex_t lock; }; |