diff options
| author | Sean Bright <sean@malleable.com> | 2012-02-27 16:31:24 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2012-02-27 16:31:24 +0000 |
| commit | 3cf09f40f749c8889de7d2b1aadf05d122ccba4f (patch) | |
| tree | da5f3d455d9753ae5fca5670e3454ebd8cdbb687 /include | |
| parent | 299dd5d4fc2f6617ee924112c1edf2cc071a160b (diff) | |
Convert netsock.h over to use ast_sockaddrs rather than sockaddr_in and update
chan_iax2 to pass in the correct types.
chan_iax2 is the only consumer for the various ast_netsock_* functions in trunk
at this point, so this feels like a safe change to make.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@357005 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/netsock.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/asterisk/netsock.h b/include/asterisk/netsock.h index 01c877b91..f85bd381a 100644 --- a/include/asterisk/netsock.h +++ b/include/asterisk/netsock.h @@ -30,6 +30,7 @@ extern "C" { #include "asterisk/network.h" #include "asterisk/io.h" +#include "asterisk/netsock2.h" struct ast_netsock; @@ -43,12 +44,12 @@ struct ast_netsock *ast_netsock_bind(struct ast_netsock_list *list, struct io_co const char *bindinfo, int defaultport, int tos, int cos, ast_io_cb callback, void *data); struct ast_netsock *ast_netsock_bindaddr(struct ast_netsock_list *list, struct io_context *ioc, - struct sockaddr_in *bindaddr, int tos, int cos, ast_io_cb callback, void *data); + struct ast_sockaddr *bindaddr, int tos, int cos, ast_io_cb callback, void *data); int ast_netsock_release(struct ast_netsock_list *list); struct ast_netsock *ast_netsock_find(struct ast_netsock_list *list, - struct sockaddr_in *sa); + struct ast_sockaddr *addr); /*! * \deprecated Use ast_seq_qos in netsock2.h which properly handles IPv4 and IPv6 @@ -58,7 +59,7 @@ int ast_netsock_set_qos(int sockfd, int tos, int cos, const char *desc); int ast_netsock_sockfd(const struct ast_netsock *ns); -const struct sockaddr_in *ast_netsock_boundaddr(const struct ast_netsock *ns); +const struct ast_sockaddr *ast_netsock_boundaddr(const struct ast_netsock *ns); void *ast_netsock_data(const struct ast_netsock *ns); |