Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv19368
Modified Files:
Makefile acl.c
Added Files:
netsock.c
Log Message:
split acl and netsock code into separate files, in preparation for new netsock
implementation
various minor cleanups
--- NEW FILE: netsock.c ---
/*
* Asterisk -- A telephony toolkit for Linux.
*
* Network socket handling
*
* Copyright (C) 2004-2005, Digium, Inc.
*
* Mark Spencer <[EMAIL PROTECTED]>
* Kevin P. Fleming <[EMAIL PROTECTED]>
*
* This program is free software, distributed under the terms of
* the GNU General Public License
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/time.h>
#include <signal.h>
#include <errno.h>
#include <unistd.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <sys/socket.h>
#include <netdb.h>
#include <net/if.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
#include <sys/ioctl.h>
#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
#include <fcntl.h>
#include <net/route.h>
#endif
#if defined (SOLARIS)
#include <sys/sockio.h>
#endif
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.1 $")
#include "asterisk/netsock.h"
#include "asterisk/logger.h"
#include "asterisk/channel.h"
#include "asterisk/options.h"
#include "asterisk/utils.h"
#include "asterisk/lock.h"
#include "asterisk/srv.h"
struct ast_netsock {
ASTOBJ_COMPONENTS(struct ast_netsock);
struct sockaddr_in bindaddr;
int sockfd;
int *ioref;
struct io_context *ioc;
void *data;
};
struct ast_netsock_list {
ASTOBJ_CONTAINER_COMPONENTS(struct ast_netsock);
struct io_context *ioc;
};
static void ast_netsock_destroy(struct ast_netsock *netsock)
{
ast_io_remove(netsock->ioc, netsock->ioref);
close(netsock->sockfd);
free(netsock);
}
struct ast_netsock_list *ast_netsock_list_alloc(void)
{
struct ast_netsock_list *res;
res = calloc(1, sizeof(*res));
return res;
}
int ast_netsock_init(struct ast_netsock_list *list)
{
memset(list, 0, sizeof(*list));
ASTOBJ_CONTAINER_INIT(list);
return 0;
}
int ast_netsock_release(struct ast_netsock_list *list)
{
ASTOBJ_CONTAINER_DESTROYALL(list, ast_netsock_destroy);
ASTOBJ_CONTAINER_DESTROY(list);
return 0;
}
struct ast_netsock *ast_netsock_find(struct ast_netsock_list *list,
struct sockaddr_in *sa)
{
struct ast_netsock *sock = NULL;
ASTOBJ_CONTAINER_TRAVERSE(list, !sock, {
ASTOBJ_RDLOCK(iterator);
if (!inaddrcmp(&iterator->bindaddr, sa))
sock = iterator;
ASTOBJ_UNLOCK(iterator);
});
return sock;
}
struct ast_netsock *ast_netsock_bindaddr(struct ast_netsock_list *list, struct
io_context *ioc, struct sockaddr_in *bindaddr, int tos, ast_io_cb callback,
void *data)
{
int netsocket = -1;
int *ioref;
char iabuf[INET_ADDRSTRLEN];
struct ast_netsock *ns;
/* Make a UDP socket */
netsocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
if (netsocket < 0) {
ast_log(LOG_ERROR, "Unable to create network socket: %s\n",
strerror(errno));
return NULL;
}
if (bind(netsocket,(struct sockaddr *)bindaddr, sizeof(struct
sockaddr_in))) {
ast_log(LOG_ERROR, "Unable to bind to %s port %d: %s\n",
ast_inet_ntoa(iabuf, sizeof(iabuf), bindaddr->sin_addr),
ntohs(bindaddr->sin_port), strerror(errno));
close(netsocket);
return NULL;
}
if (option_verbose > 1)
ast_verbose(VERBOSE_PREFIX_2 "Using TOS bits %d\n", tos);
if (setsockopt(netsocket, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)))
ast_log(LOG_WARNING, "Unable to set TOS to %d\n", tos);
ns = malloc(sizeof(struct ast_netsock));
if (ns) {
/* Establish I/O callback for socket read */
ioref = ast_io_add(ioc, netsocket, callback, AST_IO_IN, ns);
if (!ioref) {
ast_log(LOG_WARNING, "Out of memory!\n");
close(netsocket);
free(ns);
return NULL;
}
ASTOBJ_INIT(ns);
ns->ioref = ioref;
ns->ioc = ioc;
ns->sockfd = netsocket;
ns->data = data;
memcpy(&ns->bindaddr, bindaddr, sizeof(ns->bindaddr));
ASTOBJ_CONTAINER_LINK(list, ns);
} else {
ast_log(LOG_WARNING, "Out of memory!\n");
close(netsocket);
}
return ns;
}
struct ast_netsock *ast_netsock_bind(struct ast_netsock_list *list, struct
io_context *ioc, const char *bindinfo, int defaultport, int tos, ast_io_cb
callback, void *data)
{
struct sockaddr_in sin;
char *tmp;
char *host;
char *port;
int portno;
memset(&sin, 0, sizeof(sin));
sin.sin_family = AF_INET;
sin.sin_port = htons(defaultport);
tmp = ast_strdupa(bindinfo);
if (!tmp) {
ast_log(LOG_WARNING, "Out of memory!\n");
return NULL;
}
host = strsep(&tmp, ":");
port = tmp;
if (port && ((portno = atoi(port)) > 0))
sin.sin_port = htons(portno);
inet_aton(host, &sin.sin_addr);
return ast_netsock_bindaddr(list, ioc, &sin, tos, callback, data);
}
int ast_netsock_sockfd(const struct ast_netsock *ns)
{
return ns ? ns-> sockfd : -1;
}
const struct sockaddr_in *ast_netsock_boundaddr(const struct ast_netsock *ns)
{
return &(ns->bindaddr);
}
void *ast_netsock_data(const struct ast_netsock *ns)
{
return ns->data;
}
Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- Makefile 18 Jul 2005 20:09:09 -0000 1.184
+++ Makefile 19 Jul 2005 23:17:02 -0000 1.185
@@ -275,7 +275,8 @@
cdr.o tdd.o acl.o rtp.o manager.o asterisk.o \
dsp.o chanvars.o indications.o autoservice.o db.o privacy.o \
astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
- utils.o config_old.o plc.o jitterbuf.o dnsmgr.o devicestate.o
+ utils.o config_old.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
+ netsock.o
ifeq (${OSARCH},Darwin)
OBJS+=poll.o dlfcn.o
ASTLINK=-Wl,-dynamic
Index: acl.c
===================================================================
RCS file: /usr/cvsroot/asterisk/acl.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- acl.c 12 Jul 2005 02:19:41 -0000 1.49
+++ acl.c 19 Jul 2005 23:17:02 -0000 1.50
@@ -3,9 +3,9 @@
*
* Various sorts of access control
*
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999-2005, Digium, Inc.
*
- * Mark Spencer <[EMAIL PROTECTED]>
+ * Mark Spencer <[EMAIL PROTECTED]>
*
* This program is free software, distributed under the terms of
* the GNU General Public License
@@ -52,16 +52,6 @@
AST_MUTEX_DEFINE_STATIC(routeseq_lock);
#endif
-struct ast_netsock {
- ASTOBJ_COMPONENTS(struct ast_netsock);
- struct sockaddr_in bindaddr;
- int sockfd;
- int *ioref;
- struct io_context *ioc;
- void *data;
-};
-
-
struct ast_ha {
/* Host access rule */
struct in_addr netaddr;
@@ -294,135 +284,6 @@
return 0;
}
-int ast_netsock_sockfd(struct ast_netsock *ns)
-{
- if (ns)
- return ns->sockfd;
- return -1;
-}
-
-struct ast_netsock *ast_netsock_bindaddr(struct ast_netsock_list *list, struct
io_context *ioc, struct sockaddr_in *bindaddr, int tos, ast_io_cb callback,
void *data)
-{
- int netsocket = -1;
- int *ioref;
- char iabuf[INET_ADDRSTRLEN];
-
- struct ast_netsock *ns;
-
- /* Make a UDP socket */
- netsocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
-
- if (netsocket < 0) {
- ast_log(LOG_ERROR, "Unable to create network socket: %s\n",
strerror(errno));
- return NULL;
- }
- if (bind(netsocket,(struct sockaddr *)bindaddr, sizeof(struct
sockaddr_in))) {
- ast_log(LOG_ERROR, "Unable to bind to %s port %d: %s\n",
ast_inet_ntoa(iabuf, sizeof(iabuf), bindaddr->sin_addr),
ntohs(bindaddr->sin_port), strerror(errno));
- close(netsocket);
- return NULL;
- }
- if (option_verbose > 1)
- ast_verbose(VERBOSE_PREFIX_2 "Using TOS bits %d\n", tos);
-
- if (setsockopt(netsocket, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)))
- ast_log(LOG_WARNING, "Unable to set TOS to %d\n", tos);
-
- ns = malloc(sizeof(struct ast_netsock));
- if (ns) {
- /* Establish I/O callback for socket read */
- ioref = ast_io_add(ioc, netsocket, callback, AST_IO_IN, ns);
- if (!ioref) {
- ast_log(LOG_WARNING, "Out of memory!\n");
- close(netsocket);
- free(ns);
- return NULL;
- }
- ASTOBJ_INIT(ns);
- ns->ioref = ioref;
- ns->ioc = ioc;
- ns->sockfd = netsocket;
- ns->data = data;
- memcpy(&ns->bindaddr, bindaddr, sizeof(ns->bindaddr));
- ASTOBJ_CONTAINER_LINK(list, ns);
- } else {
- ast_log(LOG_WARNING, "Out of memory!\n");
- close(netsocket);
- }
- return ns;
-}
-
-static void ast_netsock_destroy(struct ast_netsock *netsock)
-{
- ast_io_remove(netsock->ioc, netsock->ioref);
- close(netsock->sockfd);
- free(netsock);
-}
-
-int ast_netsock_init(struct ast_netsock_list *list)
-{
- memset(list, 0, sizeof(struct ast_netsock_list));
- ASTOBJ_CONTAINER_INIT(list);
- return 0;
-}
-
-int ast_netsock_release(struct ast_netsock_list *list)
-{
- ASTOBJ_CONTAINER_DESTROYALL(list, ast_netsock_destroy);
- ASTOBJ_CONTAINER_DESTROY(list);
- return 0;
-}
-
-struct ast_netsock *ast_netsock_find(struct ast_netsock_list *list,
- struct sockaddr_in *sa)
-{
- struct ast_netsock *sock = NULL;
-
- ASTOBJ_CONTAINER_TRAVERSE(list, !sock, {
- ASTOBJ_RDLOCK(iterator);
- if (!inaddrcmp(&iterator->bindaddr, sa))
- sock = iterator;
- ASTOBJ_UNLOCK(iterator);
- });
-
- return sock;
-}
-
-
-const struct sockaddr_in *ast_netsock_boundaddr(struct ast_netsock *ns)
-{
- return &(ns->bindaddr);
-}
-
-void *ast_netsock_data(struct ast_netsock *ns)
-{
- return ns->data;
-}
-
-struct ast_netsock *ast_netsock_bind(struct ast_netsock_list *list, struct
io_context *ioc, const char *bindinfo, int defaultport, int tos, ast_io_cb
callback, void *data)
-{
- struct sockaddr_in sin;
- char *tmp;
- char *port;
- int portno;
- memset(&sin, 0, sizeof(sin));
- sin.sin_family = AF_INET;
- sin.sin_port = htons(defaultport);
- tmp = ast_strdupa(bindinfo);
- if (tmp) {
- port = strchr(tmp, ':');
- if (port) {
- *port = '\0';
- port++;
- if ((portno = atoi(port)) > 0)
- sin.sin_port = htons(portno);
- }
- inet_aton(tmp, &sin.sin_addr);
- return ast_netsock_bindaddr(list, ioc, &sin, tos, callback,
data);
- } else
- ast_log(LOG_WARNING, "Out of memory!\n");
- return NULL;
-}
-
int ast_find_ourip(struct in_addr *ourip, struct sockaddr_in bindaddr)
{
char ourhost[MAXHOSTNAMELEN]="";
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
