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: https://origsvn.digium.com/svn/asterisk/trunk@101483 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index faa8337f87dea307e04496995750f901083bd632..221219bc5f5b44e35460cfff4afea914dd03f2ce 100644 (file)
--- 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 5b8b087423e50f993a37e55a049e90e2d1a580f8..041ddaa31a475e5084582e67394ae914f0799f18 100644 (file)
--- 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);