diff options
author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-31 19:52:49 +0000 |
---|---|---|
committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-31 19:52:49 +0000 |
commit | bf33319d6d759ebe284281d5e3cf2f99dc13ff06 (patch) | |
tree | 718c1185d426a0e20bb55f2470dfad06d1565472 | |
parent | 2a36e9138cea6ff680186b3731f7add62e3999ff (diff) |
Solaris compat fixes for struct in_addr funkiness.
Issue #11885, patch by snuffy.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@101482 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | channels/chan_iax2.c | 6 | ||||
-rw-r--r-- | channels/chan_sip.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 09aef0fae..ca5c12fdc 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -2689,8 +2689,9 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in if (var && sin) { for (tmp = var; tmp; tmp = tmp->next) { if (!strcasecmp(tmp->name, "host")) { - struct in_addr sin2 = { 0, }; + struct in_addr sin2; struct ast_dnsmgr_entry *dnsmgr = NULL; + memset(&sin2, 0, sizeof(sin2)); if ((ast_dnsmgr_lookup(tmp->value, &sin2, &dnsmgr) < 0) || (memcmp(&sin2, &sin->sin_addr, sizeof(sin2)) != 0)) { /* No match */ ast_variables_destroy(var); @@ -2803,8 +2804,9 @@ static struct iax2_user *realtime_user(const char *username, struct sockaddr_in if (var) { for (tmp = var; tmp; tmp = tmp->next) { if (!strcasecmp(tmp->name, "host")) { - struct in_addr sin2 = { 0, }; + struct in_addr sin2; struct ast_dnsmgr_entry *dnsmgr = NULL; + memset(&sin2, 0, sizeof(sin2)); if ((ast_dnsmgr_lookup(tmp->value, &sin2, &dnsmgr) < 0) || (memcmp(&sin2, &sin->sin_addr, sizeof(sin2)) != 0)) { /* No match */ ast_variables_destroy(var); diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 7a8a7dfab..13351e7fb 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -2521,8 +2521,9 @@ static struct sip_peer *realtime_peer(const char *newpeername, struct sockaddr_i if (var) { for (tmp = var; tmp; tmp = tmp->next) { if (!strcasecmp(var->name, "host")) { - struct in_addr sin2 = { 0, }; + struct in_addr sin2; struct ast_dnsmgr_entry *dnsmgr = NULL; + memset(&sin2, 0, sizeof(sin2)); if ((ast_dnsmgr_lookup(tmp->value, &sin2, &dnsmgr) < 0) || (memcmp(&sin2, &sin->sin_addr, sizeof(sin2)) != 0)) { /* No match */ ast_variables_destroy(var); |