kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-21 04:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert netsock.h over to use ast_sockaddrs rather than sockaddr_in and update

Browse Source 
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
This commit is contained in:
Sean Bright
2012-02-27 16:31:24 +00:00
parent 299dd5d4fc
commit 3cf09f40f7
3 changed files with 53 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
channels/chan_iax2.c
View File

@@ -12266,19 +12266,17 @@ static int get_auth_methods(const char *value)
/*! \brief Check if address can be used as packet source. /*! \brief Check if address can be used as packet source.
\return 0 address available, 1 address unavailable, -1 error \return 0 address available, 1 address unavailable, -1 error
*/ */
static int check_srcaddr(struct sockaddr *sa, socklen_t salen) static int check_srcaddr(struct ast_sockaddr *addr)
{ {
int sd; int sd;
int res;
sd = socket(AF_INET, SOCK_DGRAM, 0); sd = socket(ast_sockaddr_is_ipv4(addr) ? AF_INET : AF_INET6, SOCK_DGRAM, 0);
if (sd < 0) { if (sd < 0) {
ast_log(LOG_ERROR, "Socket: %s\n", strerror(errno)); ast_log(LOG_ERROR, "Socket: %s\n", strerror(errno));
return -1; return -1;
} }
res = bind(sd, sa, salen); if (ast_bind(sd, addr) < 0) {
if (res < 0) {
ast_debug(1, "Can't bind: %s\n", strerror(errno)); ast_debug(1, "Can't bind: %s\n", strerror(errno));
close(sd); close(sd);
return 1; return 1;
@@ -12293,19 +12291,18 @@ static int check_srcaddr(struct sockaddr *sa, socklen_t salen)
not found. */ not found. */
static int peer_set_srcaddr(struct iax2_peer *peer, const char *srcaddr) static int peer_set_srcaddr(struct iax2_peer *peer, const char *srcaddr)
{ {
struct sockaddr_in sin; struct ast_sockaddr addr;
struct ast_sockaddr sin_tmp;
int nonlocal = 1; int nonlocal = 1;
int port = IAX_DEFAULT_PORTNO; int port = IAX_DEFAULT_PORTNO;
int sockfd = defaultsockfd; int sockfd = defaultsockfd;
char *tmp; char *tmp;
char *addr; char *host;
char *portstr; char *portstr;
if (!(tmp = ast_strdupa(srcaddr))) if (!(tmp = ast_strdupa(srcaddr)))
return -1; return -1;
addr = strsep(&tmp, ":"); host = strsep(&tmp, ":");
portstr = tmp; portstr = tmp;
if (portstr) { if (portstr) {
@@ -12314,27 +12311,25 @@ static int peer_set_srcaddr(struct iax2_peer *peer, const char *srcaddr)
port = IAX_DEFAULT_PORTNO; port = IAX_DEFAULT_PORTNO;
} }
sin_tmp.ss.ss_family = AF_INET; addr.ss.ss_family = AF_INET;
if (!ast_get_ip(&sin_tmp, addr)) {
struct ast_netsock *sock;
int res;
ast_sockaddr_to_sin(&sin_tmp, &sin); if (!ast_get_ip(&addr, host)) {
sin.sin_port = 0; struct ast_netsock *sock;
sin.sin_family = AF_INET;
res = check_srcaddr((struct sockaddr *) &sin, sizeof(sin)); if (check_srcaddr(&addr) == 0) {
if (res == 0) {
/* ip address valid. */ /* ip address valid. */
sin.sin_port = htons(port); ast_sockaddr_set_port(&addr, port);
if (!(sock = ast_netsock_find(netsock, &sin)))
sock = ast_netsock_find(outsock, &sin); if (!(sock = ast_netsock_find(netsock, &addr)))
sock = ast_netsock_find(outsock, &addr);
if (sock) { if (sock) {
sockfd = ast_netsock_sockfd(sock); sockfd = ast_netsock_sockfd(sock);
nonlocal = 0; nonlocal = 0;
} else { } else {
/* INADDR_ANY matches anyway! */ /* INADDR_ANY matches anyway! */
sin.sin_addr.s_addr = INADDR_ANY; ast_sockaddr_parse(&addr, "0.0.0.0", 0);
if (ast_netsock_find(netsock, &sin)) { ast_sockaddr_set_port(&addr, port);
if (ast_netsock_find(netsock, &addr)) {
sock = ast_netsock_bind(outsock, io, srcaddr, port, qos.tos, qos.cos, socket_read, NULL); sock = ast_netsock_bind(outsock, io, srcaddr, port, qos.tos, qos.cos, socket_read, NULL);
if (sock) { if (sock) {
sockfd = ast_netsock_sockfd(sock); sockfd = ast_netsock_sockfd(sock);
@@ -12351,13 +12346,17 @@ static int peer_set_srcaddr(struct iax2_peer *peer, const char *srcaddr)
peer->sockfd = sockfd; peer->sockfd = sockfd;
if (nonlocal == 1) { if (nonlocal == 1) {
ast_log(LOG_WARNING, "Non-local or unbound address specified (%s) in sourceaddress for '%s', reverting to default\n", ast_log(LOG_WARNING,
srcaddr, peer->name); "Non-local or unbound address specified (%s) in sourceaddress for '%s', reverting to default\n",
srcaddr,
peer->name);
return -1;
} else if (nonlocal == 2) {
ast_log(LOG_WARNING,
"Unable to bind to sourceaddress '%s' for '%s', reverting to default\n",
srcaddr,
peer->name);
return -1; return -1;
} else if (nonlocal == 2) {
ast_log(LOG_WARNING, "Unable to bind to sourceaddress '%s' for '%s', reverting to default\n",
srcaddr, peer->name);
return -1;
} else { } else {
ast_debug(1, "Using sourceaddress %s for '%s'\n", srcaddr, peer->name); ast_debug(1, "Using sourceaddress %s for '%s'\n", srcaddr, peer->name);
return 0; return 0;

7
include/asterisk/netsock.h
View File

@@ -30,6 +30,7 @@ extern "C" {
#include "asterisk/network.h" #include "asterisk/network.h"
#include "asterisk/io.h" #include "asterisk/io.h"
#include "asterisk/netsock2.h"
struct ast_netsock; 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); 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 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); int ast_netsock_release(struct ast_netsock_list *list);
struct ast_netsock *ast_netsock_find(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 * \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); 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); void *ast_netsock_data(const struct ast_netsock *ns);

48
main/netsock.c
View File

@@ -48,7 +48,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
struct ast_netsock { struct ast_netsock {
ASTOBJ_COMPONENTS(struct ast_netsock); ASTOBJ_COMPONENTS(struct ast_netsock);
struct sockaddr_in bindaddr; struct ast_sockaddr bindaddr;
int sockfd; int sockfd;
int *ioref; int *ioref;
struct io_context *ioc; struct io_context *ioc;
@@ -89,22 +89,22 @@ int ast_netsock_release(struct ast_netsock_list *list)
return 0; return 0;
} }
struct ast_netsock *ast_netsock_find(struct ast_netsock_list *list, struct ast_netsock *ast_netsock_find(struct ast_netsock_list *list, struct ast_sockaddr *addr)
struct sockaddr_in *sa)
{ {
struct ast_netsock *sock = NULL; struct ast_netsock *sock = NULL;
ASTOBJ_CONTAINER_TRAVERSE(list, !sock, { ASTOBJ_CONTAINER_TRAVERSE(list, !sock, {
ASTOBJ_RDLOCK(iterator); ASTOBJ_RDLOCK(iterator);
if (!inaddrcmp(&iterator->bindaddr, sa)) if (!ast_sockaddr_cmp(&iterator->bindaddr, addr)) {
sock = iterator; sock = iterator;
}
ASTOBJ_UNLOCK(iterator); ASTOBJ_UNLOCK(iterator);
}); });
return sock; return sock;
} }
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_netsock *ast_netsock_bindaddr(struct ast_netsock_list *list, struct io_context *ioc, struct ast_sockaddr *bindaddr, int tos, int cos, ast_io_cb callback, void *data)
{ {
int netsocket = -1; int netsocket = -1;
int *ioref; int *ioref;
@@ -120,10 +120,13 @@ struct ast_netsock *ast_netsock_bindaddr(struct ast_netsock_list *list, struct i
return NULL; return NULL;
} }
if (setsockopt(netsocket, SOL_SOCKET, SO_REUSEADDR, (char *)&reuseFlag, sizeof reuseFlag) < 0) { if (setsockopt(netsocket, SOL_SOCKET, SO_REUSEADDR, (char *)&reuseFlag, sizeof reuseFlag) < 0) {
ast_log(LOG_WARNING, "Error setting SO_REUSEADDR on sockfd '%d'\n", netsocket); ast_log(LOG_WARNING, "Error setting SO_REUSEADDR on sockfd '%d'\n", netsocket);
} }
if (bind(netsocket,(struct sockaddr *)bindaddr, sizeof(struct sockaddr_in))) { if (ast_bind(netsocket, bindaddr)) {
ast_log(LOG_ERROR, "Unable to bind to %s port %d: %s\n", ast_inet_ntoa(bindaddr->sin_addr), ntohs(bindaddr->sin_port), strerror(errno)); ast_log(LOG_ERROR,
"Unable to bind to %s: %s\n",
ast_sockaddr_stringify(bindaddr),
strerror(errno));
close(netsocket); close(netsocket);
return NULL; return NULL;
} }
@@ -161,26 +164,17 @@ int ast_netsock_set_qos(int sockfd, int tos, int cos, const char *desc)
struct ast_netsock *ast_netsock_bind(struct ast_netsock_list *list, struct io_context *ioc, const char *bindinfo, int defaultport, int tos, int cos, ast_io_cb callback, void *data) struct ast_netsock *ast_netsock_bind(struct ast_netsock_list *list, struct io_context *ioc, const char *bindinfo, int defaultport, int tos, int cos, ast_io_cb callback, void *data)
{ {
struct sockaddr_in sin; struct ast_sockaddr addr;
char *tmp;
char *host;
char *port;
int portno;
memset(&sin, 0, sizeof(sin)); if (ast_sockaddr_parse(&addr, bindinfo, 0)) {
sin.sin_family = AF_INET; if (!ast_sockaddr_port(&addr)) {
sin.sin_port = htons(defaultport); ast_sockaddr_set_port(&addr, defaultport);
tmp = ast_strdupa(bindinfo); }
host = strsep(&tmp, ":"); return ast_netsock_bindaddr(list, ioc, &addr, tos, cos, callback, data);
port = tmp; }
if (port && ((portno = atoi(port)) > 0)) return NULL;
sin.sin_port = htons(portno);
inet_aton(host, &sin.sin_addr);
return ast_netsock_bindaddr(list, ioc, &sin, tos, cos, callback, data);
} }
int ast_netsock_sockfd(const struct ast_netsock *ns) int ast_netsock_sockfd(const struct ast_netsock *ns)
@@ -188,9 +182,9 @@ int ast_netsock_sockfd(const struct ast_netsock *ns)
return ns ? ns-> sockfd : -1; return ns ? ns-> sockfd : -1;
} }
const struct sockaddr_in *ast_netsock_boundaddr(const struct ast_netsock *ns) const struct ast_sockaddr *ast_netsock_boundaddr(const struct ast_netsock *ns)
{ {
return &(ns->bindaddr); return &ns->bindaddr;
} }
void *ast_netsock_data(const struct ast_netsock *ns) void *ast_netsock_data(const struct ast_netsock *ns)