Git does not support the ability to replace a token with a version string during check-in. While it does have support for replacing a token on clone, this is somewhat sub-optimal: the token is replaced with the object hash, which is not particularly easy for human consumption. What's more, in practice, the source file version was often not terribly useful. Generally, when triaging bugs, the overall version of Asterisk is far more useful than an individual SVN version of a file. As a result, this patch removes Asterisk's support for showing source file versions. Specifically, it does the following: * Rename ASTERISK_FILE_VERSION macro to ASTERISK_REGISTER_FILE, and remove passing the version in with the macro. Other facilities than 'core show file version' make use of the file names, such as setting a debug level only on a specific file. As such, the act of registering source files with the Asterisk core still has use. The macro rename now reflects the new macro purpose. * main/asterisk: - Refactor the file_version structure to reflect that it no longer tracks a version field. - Remove the "core show file version" CLI command. Without the file version, it is no longer useful. - Remove the ast_file_version_find function. The file version is no longer tracked. - Rename ast_register_file_version/ast_unregister_file_version to ast_register_file/ast_unregister_file, respectively. * main/manager: Remove value from the Version key of the ModuleCheck Action. The actual key itself has not been removed, as doing so would absolutely constitute a backwards incompatible change. However, since the file version is no longer tracked, there is no need to attempt to include it in the Version key. * UPGRADE: Add notes for: - Modification to the ModuleCheck AMI Action - Removal of the "core show file version" CLI command Change-Id: I6cf0ff280e1668bf4957dc21f32a5ff43444a40e
204 lines
4.7 KiB
C
204 lines
4.7 KiB
C
/*
|
|
* Asterisk -- An open source telephony toolkit.
|
|
*
|
|
* Copyright (C) 1999 - 2005, Digium, Inc.
|
|
*
|
|
* Kevin P. Fleming <kpfleming@digium.com>
|
|
* Mark Spencer <markster@digium.com>
|
|
*
|
|
* See http://www.asterisk.org for more information about
|
|
* the Asterisk project. Please do not directly contact
|
|
* any of the maintainers of this project for assistance;
|
|
* the project provides a web site, mailing lists and IRC
|
|
* channels for your use.
|
|
*
|
|
* This program is free software, distributed under the terms of
|
|
* the GNU General Public License Version 2. See the LICENSE file
|
|
* at the top of the source tree.
|
|
*/
|
|
|
|
/*! \file
|
|
*
|
|
* \brief Network socket handling
|
|
*
|
|
* \author Kevin P. Fleming <kpfleming@digium.com>
|
|
* \author Mark Spencer <markster@digium.com>
|
|
*/
|
|
|
|
/*** MODULEINFO
|
|
<support_level>core</support_level>
|
|
***/
|
|
|
|
#include "asterisk.h"
|
|
|
|
ASTERISK_REGISTER_FILE()
|
|
|
|
#ifndef __linux__
|
|
#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__Darwin__) || defined(__GLIBC__)
|
|
#include <net/if_dl.h>
|
|
#endif
|
|
#endif
|
|
|
|
#if defined (SOLARIS)
|
|
#include <sys/sockio.h>
|
|
#elif defined(HAVE_GETIFADDRS)
|
|
#include <ifaddrs.h>
|
|
#endif
|
|
|
|
#include "asterisk/netsock.h"
|
|
#include "asterisk/netsock2.h"
|
|
#include "asterisk/utils.h"
|
|
#include "asterisk/astobj.h"
|
|
|
|
struct ast_netsock {
|
|
ASTOBJ_COMPONENTS(struct ast_netsock);
|
|
struct ast_sockaddr 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);
|
|
ast_free(netsock);
|
|
}
|
|
|
|
struct ast_netsock_list *ast_netsock_list_alloc(void)
|
|
{
|
|
return ast_calloc(1, sizeof(struct ast_netsock_list));
|
|
}
|
|
|
|
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);
|
|
ast_free(list);
|
|
|
|
return 0;
|
|
}
|
|
|
|
struct ast_netsock *ast_netsock_find(struct ast_netsock_list *list, struct ast_sockaddr *addr)
|
|
{
|
|
struct ast_netsock *sock = NULL;
|
|
|
|
ASTOBJ_CONTAINER_TRAVERSE(list, !sock, {
|
|
ASTOBJ_RDLOCK(iterator);
|
|
if (!ast_sockaddr_cmp(&iterator->bindaddr, addr)) {
|
|
sock = iterator;
|
|
}
|
|
ASTOBJ_UNLOCK(iterator);
|
|
});
|
|
|
|
return sock;
|
|
}
|
|
|
|
struct ast_netsock *ast_netsock_bindaddr(struct ast_netsock_list *list, struct io_context *ioc, struct ast_sockaddr *bindaddr, int tos, int cos, ast_io_cb callback, void *data)
|
|
{
|
|
int netsocket = -1;
|
|
int *ioref;
|
|
|
|
struct ast_netsock *ns;
|
|
const int reuseFlag = 1;
|
|
|
|
/* Make a UDP socket */
|
|
netsocket = socket(ast_sockaddr_is_ipv6(bindaddr) ? AST_AF_INET6 : AST_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 (setsockopt(netsocket, SOL_SOCKET, SO_REUSEADDR, (char *)&reuseFlag, sizeof reuseFlag) < 0) {
|
|
ast_log(LOG_WARNING, "Error setting SO_REUSEADDR on sockfd '%d'\n", netsocket);
|
|
}
|
|
if (ast_bind(netsocket, bindaddr)) {
|
|
ast_log(LOG_ERROR,
|
|
"Unable to bind to %s: %s\n",
|
|
ast_sockaddr_stringify(bindaddr),
|
|
strerror(errno));
|
|
close(netsocket);
|
|
return NULL;
|
|
}
|
|
|
|
ast_set_qos(netsocket, tos, cos, "IAX2");
|
|
|
|
ast_enable_packet_fragmentation(netsocket);
|
|
|
|
if (!(ns = ast_calloc(1, sizeof(*ns)))) {
|
|
close(netsocket);
|
|
return NULL;
|
|
}
|
|
|
|
/* Establish I/O callback for socket read */
|
|
if (!(ioref = ast_io_add(ioc, netsocket, callback, AST_IO_IN, ns))) {
|
|
close(netsocket);
|
|
ast_free(ns);
|
|
return NULL;
|
|
}
|
|
ASTOBJ_INIT(ns);
|
|
ns->ioref = ioref;
|
|
ns->ioc = ioc;
|
|
ns->sockfd = netsocket;
|
|
ns->data = data;
|
|
ast_sockaddr_copy(&ns->bindaddr, bindaddr);
|
|
ASTOBJ_CONTAINER_LINK(list, ns);
|
|
|
|
return ns;
|
|
}
|
|
|
|
int ast_netsock_set_qos(int sockfd, int tos, int cos, const char *desc)
|
|
{
|
|
return ast_set_qos(sockfd, tos, cos, desc);
|
|
}
|
|
|
|
struct ast_netsock *ast_netsock_bind(struct ast_netsock_list *list, struct io_context *ioc, const char *bindinfo, int defaultport, int tos, int cos, ast_io_cb callback, void *data)
|
|
{
|
|
struct ast_sockaddr addr;
|
|
|
|
if (ast_sockaddr_parse(&addr, bindinfo, 0)) {
|
|
|
|
if (!ast_sockaddr_port(&addr)) {
|
|
ast_sockaddr_set_port(&addr, defaultport);
|
|
}
|
|
|
|
return ast_netsock_bindaddr(list, ioc, &addr, tos, cos, callback, data);
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
int ast_netsock_sockfd(const struct ast_netsock *ns)
|
|
{
|
|
return ns ? ns-> sockfd : -1;
|
|
}
|
|
|
|
const struct ast_sockaddr *ast_netsock_boundaddr(const struct ast_netsock *ns)
|
|
{
|
|
return &ns->bindaddr;
|
|
}
|
|
|
|
void *ast_netsock_data(const struct ast_netsock *ns)
|
|
{
|
|
return ns->data;
|
|
}
|
|
|
|
void ast_netsock_unref(struct ast_netsock *ns)
|
|
{
|
|
ASTOBJ_UNREF(ns, ast_netsock_destroy);
|
|
}
|