From 8ea87da749779881a3ab6621b2b07c24301248d9 Mon Sep 17 00:00:00 2001 From: Mark Spencer <markster@digium.com> Date: Wed, 22 Oct 2003 03:10:34 +0000 Subject: [PATCH] Make getaddrfor work with openbsd (bug #415) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1647 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- acl.c | 90 ++++++++++++++++++++++++++++++++++++++++++++- apps/app_intercom.c | 4 ++ channels/chan_oss.c | 4 ++ 3 files changed, 96 insertions(+), 2 deletions(-) diff --git a/acl.c b/acl.c index 9c832ed4a4..399586a84f 100755 --- a/acl.c +++ b/acl.c @@ -21,6 +21,7 @@ #include <unistd.h> #include <asterisk/acl.h> #include <asterisk/logger.h> +#include <asterisk/channel.h> #include <arpa/inet.h> #include <sys/socket.h> #include <netdb.h> @@ -28,6 +29,11 @@ #include <netinet/in_systm.h> #include <netinet/ip.h> #include <sys/ioctl.h> +#ifdef __OpenBSD__ +#include <net/route.h> + +static ast_mutex_t routeseq_lock = AST_MUTEX_INITIALIZER; +#endif #define AST_SENSE_DENY 0 #define AST_SENSE_ALLOW 1 @@ -158,6 +164,87 @@ int ast_lookup_iface(char *iface, struct in_addr *address) { int ast_ouraddrfor(struct in_addr *them, struct in_addr *us) { +#ifdef __OpenBSD__ + struct sockaddr_in *sin; + struct sockaddr *sa; + struct { + struct rt_msghdr m_rtm; + char m_space[512]; + } m_rtmsg; + char *cp, *p = ast_strdupa(inet_ntoa(*them)); + int i, l, s, seq; + pid_t pid = getpid(); + static int routeseq; /* Protected by "routeseq_lock" mutex */ + + memset(us, 0, sizeof(struct in_addr)); + + 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_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) { + ast_log(LOG_ERROR, "Error opening routing socket\n"); + return -1; + } + 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); + return -1; + } + 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"); + return -1; + } + + if (m_rtmsg.m_rtm.rtm_version != RTM_VERSION) { + ast_log(LOG_ERROR, "Unsupported route socket protocol version\n"); + return -1; + } + + if (m_rtmsg.m_rtm.rtm_msglen != l) + ast_log(LOG_WARNING, "Message length mismatch, in packet %d, returned %d\n", + m_rtmsg.m_rtm.rtm_msglen, l); + + if (m_rtmsg.m_rtm.rtm_errno) { + ast_log(LOG_ERROR, "RTM_GET got %s (%d)\n", + strerror(m_rtmsg.m_rtm.rtm_errno), m_rtmsg.m_rtm.rtm_errno); + return -1; + } + + cp = (char *)m_rtmsg.m_space; + if (m_rtmsg.m_rtm.rtm_addrs) + for (i = 1; i; i <<= 1) + if (m_rtmsg.m_rtm.rtm_addrs & i) { + sa = (struct sockaddr *)cp; + if (i == RTA_IFA && sa->sa_family == AF_INET) { + sin = (struct sockaddr_in *)sa; + *us = sin->sin_addr; + ast_log(LOG_DEBUG, "Found route to %s, output from our address %s.\n", p, inet_ntoa(*us)); + return 0; + } + cp += sa->sa_len > 0 ? + (1 + ((sa->sa_len - 1) | (sizeof(long) - 1))) : + sizeof(long); + } + + ast_log(LOG_DEBUG, "No route found for address %s!\n", p); + return -1; +#else FILE *PROC; unsigned int remote_ip; int res = 1; @@ -221,6 +308,5 @@ int ast_ouraddrfor(struct in_addr *them, struct in_addr *us) return -1; } return 0; +#endif } - - diff --git a/apps/app_intercom.c b/apps/app_intercom.c index 4c2379ca8c..925ea37c25 100755 --- a/apps/app_intercom.c +++ b/apps/app_intercom.c @@ -35,7 +35,11 @@ #endif #include <netinet/in.h> +#ifdef __OpenBSD__ +#define DEV_DSP "/dev/audio" +#else #define DEV_DSP "/dev/dsp" +#endif /* Number of 32 byte buffers -- each buffer is 2 ms */ #define BUFFER_SIZE 32 diff --git a/channels/chan_oss.c b/channels/chan_oss.c index d55f8569bd..3557ac0227 100755 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -46,7 +46,11 @@ #include "answer.h" /* Which device to use */ +#ifdef __OpenBSD__ +#define DEV_DSP "/dev/audio" +#else #define DEV_DSP "/dev/dsp" +#endif /* Lets use 160 sample frames, just like GSM. */ #define FRAME_SIZE 160 -- GitLab