From 7d4e0b32e14f2d43d69b0cc04262a35a2659045f Mon Sep 17 00:00:00 2001 From: Thorsten lockert Date: Wed, 22 Oct 2003 04:09:28 +0000 Subject: [PATCH] Route fixes for OpenBSD (bug #415) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1655 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- acl.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/acl.c b/acl.c index 399586a84f..98e2feab6b 100755 --- a/acl.c +++ b/acl.c @@ -30,6 +30,7 @@ #include #include #ifdef __OpenBSD__ +#include #include static ast_mutex_t routeseq_lock = AST_MUTEX_INITIALIZER; @@ -172,7 +173,7 @@ int ast_ouraddrfor(struct in_addr *them, struct in_addr *us) char m_space[512]; } m_rtmsg; char *cp, *p = ast_strdupa(inet_ntoa(*them)); - int i, l, s, seq; + int i, l, s, seq, flags; pid_t pid = getpid(); static int routeseq; /* Protected by "routeseq_lock" mutex */ @@ -197,6 +198,8 @@ int ast_ouraddrfor(struct in_addr *them, struct in_addr *us) ast_log(LOG_ERROR, "Error opening routing socket\n"); return -1; } + flags = fcntl(s, F_GETFL); + fcntl(s, F_SETFL, flags | O_NONBLOCK); if (write(s, (char *)&m_rtmsg, m_rtmsg.m_rtm.rtm_msglen) < 0) { ast_log(LOG_ERROR, "Error writing to routing socket: %s\n", strerror(errno)); close(s); @@ -205,11 +208,13 @@ 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)); - close(s); if (l < 0) { - ast_log(LOG_ERROR, "Error reading from routing socket\n"); + if (errno != EAGAIN) + ast_log(LOG_ERROR, "Error reading from routing socket\n"); + close(s); return -1; } + close(s); if (m_rtmsg.m_rtm.rtm_version != RTM_VERSION) { ast_log(LOG_ERROR, "Unsupported route socket protocol version\n");