diff options
author | (no author) <(no author)@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-01-20 04:02:58 +0000 |
---|---|---|
committer | (no author) <(no author)@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-01-20 04:02:58 +0000 |
commit | da648773e512f7764faed2c7dd5dc250be6b61b1 (patch) | |
tree | bad43da7b3b6ddcd5fe7e0e1aca0b501d4af5b58 /acl.c | |
parent | 27a9c96742202c8188b53a0173649de479256b69 (diff) |
This commit was manufactured by cvs2svn to create tag 'v1-0-4'.
git-svn-id: http://svn.digium.com/svn/asterisk/tags/v1-0-4@4850 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'acl.c')
-rwxr-xr-x | acl.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -242,20 +242,19 @@ int ast_ouraddrfor(struct in_addr *them, struct in_addr *us) memset(&m_rtmsg, 0, sizeof(m_rtmsg)); m_rtmsg.m_rtm.rtm_type = RTM_GET; - m_rtmsg.m_rtm.rtm_flags = RTF_UP | RTF_HOST; m_rtmsg.m_rtm.rtm_version = RTM_VERSION; ast_mutex_lock(&routeseq_lock); seq = ++routeseq; ast_mutex_unlock(&routeseq_lock); m_rtmsg.m_rtm.rtm_seq = seq; - m_rtmsg.m_rtm.rtm_addrs = RTA_IFA | RTA_DST; + m_rtmsg.m_rtm.rtm_addrs = RTA_DST | RTA_IFA; m_rtmsg.m_rtm.rtm_msglen = sizeof(struct rt_msghdr) + sizeof(struct sockaddr_in); sin = (struct sockaddr_in *)m_rtmsg.m_space; sin->sin_family = AF_INET; sin->sin_len = sizeof(struct sockaddr_in); sin->sin_addr = *them; - if ((s = socket(PF_ROUTE, SOCK_RAW, 0)) < 0) { + if ((s = socket(PF_ROUTE, SOCK_RAW, AF_UNSPEC)) < 0) { ast_log(LOG_ERROR, "Error opening routing socket\n"); return -1; } @@ -268,7 +267,7 @@ int ast_ouraddrfor(struct in_addr *them, struct in_addr *us) } do { l = read(s, (char *)&m_rtmsg, sizeof(m_rtmsg)); - } while (l > 0 && (m_rtmsg.m_rtm.rtm_seq != 1 || m_rtmsg.m_rtm.rtm_pid != pid)); + } while (l > 0 && (m_rtmsg.m_rtm.rtm_seq != seq || m_rtmsg.m_rtm.rtm_pid != pid)); if (l < 0) { if (errno != EAGAIN) ast_log(LOG_ERROR, "Error reading from routing socket\n"); |