diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2011-11-23 23:03:32 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2011-11-23 23:03:32 +0000 |
| commit | 7d9ba4875baa4b50522627c38e271e5574deb0ac (patch) | |
| tree | 2158e70a49eae0974541a790dba3690c4dd1a8d8 /channels | |
| parent | 2ee874178ef8a1a109ee31fe23e10707387f255b (diff) | |
Fix calls to ast_get_ip() not initializing the address family.
........
Merged revisions 346239 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 346240 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@346241 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_h323.c | 1 | ||||
| -rw-r--r-- | channels/chan_iax2.c | 4 | ||||
| -rw-r--r-- | channels/chan_skinny.c | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c index 9f416ba20..23952b7db 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -1463,6 +1463,7 @@ static struct oh323_user *build_user(const char *name, struct ast_variable *v, s } else { struct ast_sockaddr tmp; + tmp.ss.ss_family = AF_INET; if (ast_get_ip(&tmp, v->value)) { ASTOBJ_UNREF(user, oh323_destroy_user); return NULL; diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 391f5a172..6a4d19695 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -12367,7 +12367,8 @@ static int peer_set_srcaddr(struct iax2_peer *peer, const char *srcaddr) if (port < 1) port = IAX_DEFAULT_PORTNO; } - + + sin_tmp.ss.ss_family = AF_INET; if (!ast_get_ip(&sin_tmp, addr)) { struct ast_netsock *sock; int res; @@ -12583,6 +12584,7 @@ static struct iax2_peer *build_peer(const char *name, struct ast_variable *v, st } else if (!strcasecmp(v->name, "defaultip")) { struct ast_sockaddr peer_defaddr_tmp; + peer_defaddr_tmp.ss.ss_family = AF_INET; if (ast_get_ip(&peer_defaddr_tmp, v->value)) { return peer_unref(peer); } diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 942cc30b1..a61e21a77 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -7385,6 +7385,7 @@ static struct ast_channel *skinny_request(const char *type, struct ast_format_ca if (type & (TYPE_DEVICE)) { struct ast_sockaddr CDEV_addr_tmp; + CDEV_addr_tmp.ss.ss_family = AF_INET; if (ast_get_ip(&CDEV_addr_tmp, v->value)) { ast_log(LOG_WARNING, "Bad IP '%s' at line %d.\n", v->value, v->lineno); } |