diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-31 19:54:46 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-31 19:54:46 +0000 |
| commit | 427a0d5d52b907ba3540ccaab0be7e45caee29f0 (patch) | |
| tree | c01b2f79adf44bed6320eeb5b1ea346068a6802b /channels | |
| parent | 5a0490139c27a63a1d908f3cede907269e731e3e (diff) | |
Merged revisions 101482 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r101482 | qwell | 2008-01-31 13:52:49 -0600 (Thu, 31 Jan 2008) | 4 lines
Solaris compat fixes for struct in_addr funkiness.
Issue #11885, patch by snuffy.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@101483 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -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 faa8337f8..221219bc5 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -2956,8 +2956,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); @@ -3068,8 +3069,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 5b8b08742..041ddaa31 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -3499,8 +3499,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); |