ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch '46-just-use-clang-format-to-reformat-sources' into 'master'

Browse Source 
Reformat source code with clang-format

Closes #46

See merge request isc-projects/bind9!2156

(cherry picked from commit 7099e79a9b)

4c3b063e Import Linux kernel .clang-format with small modifications
f50b1e06 Use clang-format to reformat the source files
11341c76 Update the definition files for Windows
df6c1f76 Remove tkey_test (which is no-op anyway)
This commit is contained in:
Ondřej Surý
2020-02-12 14:33:32 +00:00
parent dbe15330fe
commit c931d8e417
974 changed files with 75952 additions and 74434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
bin/tests/optional/sock_test.c
View File

@@ -21,11 +21,12 @@
#include <isc/timer.h>
#include <isc/util.h>
isc_mem_t *mctx;
isc_mem_t * mctx;
isc_taskmgr_t *manager;
static void
my_shutdown(isc_task_t *task, isc_event_t *event) {
my_shutdown(isc_task_t *task, isc_event_t *event)
{
char *name = event->ev_arg;
printf("shutdown %s (%p)\n", name, task);
@@ -34,8 +35,9 @@ my_shutdown(isc_task_t *task, isc_event_t *event) {
}
static void
my_send(isc_task_t *task, isc_event_t *event) {
isc_socket_t *sock;
my_send(isc_task_t *task, isc_event_t *event)
{
isc_socket_t * sock;
isc_socketevent_t *dev;
sock = event->ev_sender;
@@ -43,9 +45,8 @@ my_send(isc_task_t *task, isc_event_t *event) {
printf("my_send: %s task %p\n\t(sock %p, base %p, length %u, n %u, "
"result %u)\n",
(char *)(event->ev_arg), task, sock,
dev->region.base, dev->region.length,
dev->n, dev->result);
(char *)(event->ev_arg), task, sock, dev->region.base,
dev->region.length, dev->n, dev->result);
if (dev->result != ISC_R_SUCCESS) {
isc_socket_detach(&sock);
@@ -59,28 +60,28 @@ my_send(isc_task_t *task, isc_event_t *event) {
}
static void
my_recv(isc_task_t *task, isc_event_t *event) {
isc_socket_t *sock;
my_recv(isc_task_t *task, isc_event_t *event)
{
isc_socket_t * sock;
isc_socketevent_t *dev;
isc_region_t region;
char buf[1024];
char host[256];
isc_region_t region;
char buf[1024];
char host[256];
sock = event->ev_sender;
dev = (isc_socketevent_t *)event;
printf("Socket %s (sock %p, base %p, length %u, n %u, result %u)\n",
(char *)(event->ev_arg), sock,
dev->region.base, dev->region.length,
dev->n, dev->result);
(char *)(event->ev_arg), sock, dev->region.base,
dev->region.length, dev->n, dev->result);
if (dev->address.type.sa.sa_family == AF_INET6) {
inet_ntop(AF_INET6, &dev->address.type.sin6.sin6_addr,
host, sizeof(host));
inet_ntop(AF_INET6, &dev->address.type.sin6.sin6_addr, host,
sizeof(host));
printf("\tFrom: %s port %d\n", host,
ntohs(dev->address.type.sin6.sin6_port));
} else {
inet_ntop(AF_INET, &dev->address.type.sin.sin_addr,
host, sizeof(host));
inet_ntop(AF_INET, &dev->address.type.sin.sin_addr, host,
sizeof(host));
printf("\tFrom: %s port %d\n", host,
ntohs(dev->address.type.sin.sin_port));
}
@@ -111,8 +112,8 @@ my_recv(isc_task_t *task, isc_event_t *event) {
isc_socket_send(sock, &region, task, my_send, event->ev_arg);
} else {
region = dev->region;
printf("\r\nReceived: %.*s\r\n\r\n",
(int)dev->n, (char *)region.base);
printf("\r\nReceived: %.*s\r\n\r\n", (int)dev->n,
(char *)region.base);
}
isc_socket_recv(sock, &dev->region, 1, task, my_recv, event->ev_arg);
@@ -121,8 +122,9 @@ my_recv(isc_task_t *task, isc_event_t *event) {
}
static void
my_http_get(isc_task_t *task, isc_event_t *event) {
isc_socket_t *sock;
my_http_get(isc_task_t *task, isc_event_t *event)
{
isc_socket_t * sock;
isc_socketevent_t *dev;
sock = event->ev_sender;
@@ -130,9 +132,8 @@ my_http_get(isc_task_t *task, isc_event_t *event) {
printf("my_http_get: %s task %p\n\t(sock %p, base %p, length %u, "
"n %u, result %u)\n",
(char *)(event->ev_arg), task, sock,
dev->region.base, dev->region.length,
dev->n, dev->result);
(char *)(event->ev_arg), task, sock, dev->region.base,
dev->region.length, dev->n, dev->result);
if (dev->result != ISC_R_SUCCESS) {
isc_socket_detach(&sock);
@@ -149,11 +150,12 @@ my_http_get(isc_task_t *task, isc_event_t *event) {
}
static void
my_connect(isc_task_t *task, isc_event_t *event) {
isc_socket_t *sock;
my_connect(isc_task_t *task, isc_event_t *event)
{
isc_socket_t * sock;
isc_socket_connev_t *dev;
isc_region_t region;
char buf[1024];
isc_region_t region;
char buf[1024];
sock = event->ev_sender;
dev = (isc_socket_connev_t *)event;
@@ -187,17 +189,18 @@ my_connect(isc_task_t *task, isc_event_t *event) {
}
static void
my_listen(isc_task_t *task, isc_event_t *event) {
char *name = event->ev_arg;
my_listen(isc_task_t *task, isc_event_t *event)
{
char * name = event->ev_arg;
isc_socket_newconnev_t *dev;
isc_region_t region;
isc_socket_t *oldsock;
isc_task_t *newtask;
isc_region_t region;
isc_socket_t * oldsock;
isc_task_t * newtask;
dev = (isc_socket_newconnev_t *)event;
printf("newcon %s (task %p, oldsock %p, newsock %p, result %u)\n",
name, task, event->ev_sender, dev->newsocket, dev->result);
printf("newcon %s (task %p, oldsock %p, newsock %p, result %u)\n", name,
task, event->ev_sender, dev->newsocket, dev->result);
fflush(stdout);
if (dev->result == ISC_R_SUCCESS) {
@@ -205,8 +208,8 @@ my_listen(isc_task_t *task, isc_event_t *event) {
* Queue another listen on this socket.
*/
RUNTIME_CHECK(isc_socket_accept(event->ev_sender, task,
my_listen, event->ev_arg)
== ISC_R_SUCCESS);
my_listen, event->ev_arg) ==
ISC_R_SUCCESS);
region.base = isc_mem_get(mctx, 20);
region.length = 20;
@@ -216,10 +219,10 @@ my_listen(isc_task_t *task, isc_event_t *event) {
* recv on it.
*/
newtask = NULL;
RUNTIME_CHECK(isc_task_create(manager, 0, &newtask)
== ISC_R_SUCCESS);
isc_socket_recv(dev->newsocket, &region, 1,
newtask, my_recv, event->ev_arg);
RUNTIME_CHECK(isc_task_create(manager, 0, &newtask) ==
ISC_R_SUCCESS);
isc_socket_recv(dev->newsocket, &region, 1, newtask, my_recv,
event->ev_arg);
isc_task_detach(&newtask);
} else {
printf("detaching from socket %p\n", event->ev_sender);
@@ -236,7 +239,8 @@ my_listen(isc_task_t *task, isc_event_t *event) {
}
static void
timeout(isc_task_t *task, isc_event_t *event) {
timeout(isc_task_t *task, isc_event_t *event)
{
isc_socket_t *sock = event->ev_arg;
printf("Timeout, canceling IO on socket %p (task %p)\n", sock, task);
@@ -252,20 +256,21 @@ static char xso1[] = "so1";
static char xso2[] = "so2";
int
main(int argc, char *argv[]) {
isc_task_t *t1, *t2;
isc_timermgr_t *timgr;
isc_time_t expires;
isc_interval_t interval;
isc_timer_t *ti1;
unsigned int workers;
main(int argc, char *argv[])
{
isc_task_t * t1, *t2;
isc_timermgr_t * timgr;
isc_time_t expires;
isc_interval_t interval;
isc_timer_t * ti1;
unsigned int workers;
isc_socketmgr_t *socketmgr;
isc_socket_t *so1, *so2;
isc_sockaddr_t sockaddr;
struct in_addr ina;
struct in6_addr in6a;
isc_result_t result;
int pf;
isc_socket_t * so1, *so2;
isc_sockaddr_t sockaddr;
struct in_addr ina;
struct in6_addr in6a;
isc_result_t result;
int pf;
if (argc > 1) {
workers = atoi(argv[1]);
@@ -337,14 +342,14 @@ main(int argc, char *argv[]) {
/*
* Queue up the first accept event.
*/
RUNTIME_CHECK(isc_socket_accept(so1, t1, my_listen, xso1)
== ISC_R_SUCCESS);
RUNTIME_CHECK(isc_socket_accept(so1, t1, my_listen, xso1) ==
ISC_R_SUCCESS);
isc_time_settoepoch(&expires);
isc_interval_set(&interval, 10, 0);
ti1 = NULL;
RUNTIME_CHECK(isc_timer_create(timgr, isc_timertype_once, &expires,
&interval, t1, timeout, so1, &ti1) ==
ISC_R_SUCCESS);
&interval, t1, timeout, so1,
&ti1) == ISC_R_SUCCESS);
/*
* Open up a socket that will connect to www.flame.org, port 80.
@@ -360,8 +365,8 @@ main(int argc, char *argv[]) {
isc_sockettype_tcp,
&so2) == ISC_R_SUCCESS);
RUNTIME_CHECK(isc_socket_connect(so2, &sockaddr, t2,
my_connect, xso2) == ISC_R_SUCCESS);
RUNTIME_CHECK(isc_socket_connect(so2, &sockaddr, t2, my_connect,
xso2) == ISC_R_SUCCESS);
/*
* Detaching these is safe, since the socket will attach to the