From eb8dd9dca1228af0cd132f515509051ecfabf6f6 Mon Sep 17 00:00:00 2001 From: cvs2svn Date: Mon, 14 Apr 2025 17:32:06 +0000 Subject: This commit was manufactured by cvs2git to create tag 'tb_20250414'. --- src/regress/lib/libc/getaddrinfo/Makefile | 10 -- src/regress/lib/libc/getaddrinfo/answer | 110 --------------- src/regress/lib/libc/getaddrinfo/gaitest.c | 193 -------------------------- src/regress/lib/libc/getaddrinfo/testsuite.sh | 89 ------------ 4 files changed, 402 deletions(-) delete mode 100644 src/regress/lib/libc/getaddrinfo/Makefile delete mode 100644 src/regress/lib/libc/getaddrinfo/answer delete mode 100644 src/regress/lib/libc/getaddrinfo/gaitest.c delete mode 100644 src/regress/lib/libc/getaddrinfo/testsuite.sh (limited to 'src/regress/lib/libc/getaddrinfo') diff --git a/src/regress/lib/libc/getaddrinfo/Makefile b/src/regress/lib/libc/getaddrinfo/Makefile deleted file mode 100644 index 7a78438a12..0000000000 --- a/src/regress/lib/libc/getaddrinfo/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $OpenBSD: Makefile,v 1.5 2017/07/27 17:43:24 bluhm Exp $ - -PROG = gaitest -CLEANFILES = out - -run-regress-${PROG}: ${PROG} - sh ${.CURDIR}/testsuite.sh >out 2>&1 - diff -u10 out ${.CURDIR}/answer - -.include diff --git a/src/regress/lib/libc/getaddrinfo/answer b/src/regress/lib/libc/getaddrinfo/answer deleted file mode 100644 index af6d069bbe..0000000000 --- a/src/regress/lib/libc/getaddrinfo/answer +++ /dev/null @@ -1,110 +0,0 @@ -== basic ones -arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv http -ai1: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 80 -arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv http -ai1: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 80 -arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv http -ai1: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 80 -ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 80 -arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv tftp -ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 69 -arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv tftp -ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 69 -arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv tftp -ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 69 -ai2: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 69 -arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv echo -ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 7 -ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 7 -arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv echo -ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 7 -ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 7 -arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv echo -ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 7 -ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 7 -ai3: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 7 -ai4: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 7 - -== specific address family -arg: flags 0x2 family 2 socktype 0 protocol 0 addrlen 0 host localhost serv http -ai1: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 80 -arg: flags 0x2 family 24 socktype 0 protocol 0 addrlen 0 host localhost serv http -ai1: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 80 - -== empty hostname -arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv http -ai1: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 80 -ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 80 -arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv echo -ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 7 -ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 7 -ai3: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 7 -ai4: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 7 -arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv tftp -ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 69 -ai2: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 69 -arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv 80 -ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 80 -ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 80 -ai3: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 80 -ai4: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 80 -arg: flags 0x3 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv http -ai1: flags 0x3 family 2 socktype 1 protocol 6 addrlen 16 host 0.0.0.0 serv 80 -ai2: flags 0x3 family 24 socktype 1 protocol 6 addrlen 28 host :: serv 80 -arg: flags 0x3 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv echo -ai1: flags 0x3 family 2 socktype 2 protocol 17 addrlen 16 host 0.0.0.0 serv 7 -ai2: flags 0x3 family 2 socktype 1 protocol 6 addrlen 16 host 0.0.0.0 serv 7 -ai3: flags 0x3 family 24 socktype 2 protocol 17 addrlen 28 host :: serv 7 -ai4: flags 0x3 family 24 socktype 1 protocol 6 addrlen 28 host :: serv 7 -arg: flags 0x3 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv tftp -ai1: flags 0x3 family 2 socktype 2 protocol 17 addrlen 16 host 0.0.0.0 serv 69 -ai2: flags 0x3 family 24 socktype 2 protocol 17 addrlen 28 host :: serv 69 -arg: flags 0x3 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv 80 -ai1: flags 0x3 family 2 socktype 2 protocol 17 addrlen 16 host 0.0.0.0 serv 80 -ai2: flags 0x3 family 2 socktype 1 protocol 6 addrlen 16 host 0.0.0.0 serv 80 -ai3: flags 0x3 family 24 socktype 2 protocol 17 addrlen 28 host :: serv 80 -ai4: flags 0x3 family 24 socktype 1 protocol 6 addrlen 28 host :: serv 80 -arg: flags 0x2 family 0 socktype 1 protocol 0 addrlen 0 host (empty) serv 80 -ai1: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 80 -ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 80 -arg: flags 0x2 family 0 socktype 2 protocol 0 addrlen 0 host (empty) serv 80 -ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 80 -ai2: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 80 - -== empty servname -arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv (empty) -ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 0 -ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 0 -arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host 127.0.0.1 serv (empty) -ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 0 -ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 0 -arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv (empty) -ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 0 -ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 0 -ai3: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 0 -ai4: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 0 -arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv (empty) -name or service is not known - -== sock_raw -arg: flags 0x2 family 0 socktype 3 protocol 0 addrlen 0 host localhost serv (empty) -ai1: flags 0x2 family 2 socktype 3 protocol 0 addrlen 16 host 127.0.0.1 serv 0 -ai2: flags 0x2 family 24 socktype 3 protocol 0 addrlen 28 host ::1 serv 0 -arg: flags 0x2 family 0 socktype 3 protocol 59 addrlen 0 host localhost serv (empty) -ai1: flags 0x2 family 2 socktype 3 protocol 59 addrlen 16 host 127.0.0.1 serv 0 -ai2: flags 0x2 family 24 socktype 3 protocol 59 addrlen 28 host ::1 serv 0 -arg: flags 0x2 family 0 socktype 3 protocol 59 addrlen 0 host localhost serv 80 -service not supported for ai_socktype -arg: flags 0x2 family 0 socktype 3 protocol 59 addrlen 0 host localhost serv www -service not supported for ai_socktype -arg: flags 0x2 family 0 socktype 3 protocol 59 addrlen 0 host ::1 serv (empty) -ai1: flags 0x2 family 24 socktype 3 protocol 59 addrlen 28 host ::1 serv 0 - -== unsupported family -arg: flags 0x2 family 99 socktype 0 protocol 0 addrlen 0 host localhost serv (empty) -ai_family not supported - -== the following items are specified in jinmei scopeaddr format doc. -arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host fe80::1%lo0 serv http -ai1: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host fe80::1%lo0 serv 80 - diff --git a/src/regress/lib/libc/getaddrinfo/gaitest.c b/src/regress/lib/libc/getaddrinfo/gaitest.c deleted file mode 100644 index 2508c05e02..0000000000 --- a/src/regress/lib/libc/getaddrinfo/gaitest.c +++ /dev/null @@ -1,193 +0,0 @@ -/* $OpenBSD: gaitest.c,v 1.7 2020/02/14 19:17:33 schwarze Exp $ */ -/* $NetBSD: gaitest.c,v 1.3 2002/07/05 15:47:43 itojun Exp $ */ - -/* - * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, and 2002 WIDE Project. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * Please note: the order of the responses (and the regress test) - * is dependent on the "family" keywords in resolv.conf. - * - * This expects the default behaviour of "family inet4 inet6" - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -struct addrinfo ai; - -char host[NI_MAXHOST]; -char serv[NI_MAXSERV]; -int vflag = 0; - -static void usage(void); -static void print1(const char *, const struct addrinfo *, char *, char *); -int main(int, char *[]); - -static void -usage() -{ - fprintf(stderr, "usage: test [-f family] [-s socktype] [-p proto] [-DPRSv46] host serv\n"); -} - -static void -print1(title, res, h, s) - const char *title; - const struct addrinfo *res; - char *h; - char *s; -{ - char *start, *end; - int error; - const int niflag = NI_NUMERICHOST | NI_NUMERICSERV; - - if (res->ai_addr) { - error = getnameinfo(res->ai_addr, res->ai_addr->sa_len, - host, sizeof(host), serv, sizeof(serv), - niflag); - h = host; - s = serv; - } else - error = 0; - - if (vflag) { - start = "\t"; - end = "\n"; - } else { - start = " "; - end = ""; - } - printf("%s%s", title, end); - printf("%sflags 0x%x%s", start, res->ai_flags, end); - printf("%sfamily %d%s", start, res->ai_family, end); - printf("%ssocktype %d%s", start, res->ai_socktype, end); - printf("%sprotocol %d%s", start, res->ai_protocol, end); - printf("%saddrlen %d%s", start, res->ai_addrlen, end); - if (error) - printf("%serror %d%s", start, error, end); - else { - printf("%shost %s%s", start, h, end); - printf("%sserv %s%s", start, s, end); - } -#if 0 - if (res->ai_canonname) - printf("%scname \"%s\"%s", start, res->ai_canonname, end); -#endif - if (!vflag) - printf("\n"); - -} - -int -main(argc, argv) - int argc; - char *argv[]; -{ - struct addrinfo *res; - int error, i; - char *p, *q; - int c; - char nbuf[10]; - - memset(&ai, 0, sizeof(ai)); - ai.ai_family = PF_UNSPEC; - ai.ai_flags |= AI_CANONNAME; - while ((c = getopt(argc, argv, "Df:p:PRs:Sv46")) != -1) { - switch (c) { - case 'D': - ai.ai_socktype = SOCK_DGRAM; - break; - case 'f': - ai.ai_family = atoi(optarg); - break; - case 'p': - ai.ai_protocol = atoi(optarg); - break; - case 'P': - ai.ai_flags |= AI_PASSIVE; - break; - case 'R': - ai.ai_socktype = SOCK_RAW; - break; - case 's': - ai.ai_socktype = atoi(optarg); - break; - case 'S': - ai.ai_socktype = SOCK_STREAM; - break; - case 'v': - vflag++; - break; - case '4': - ai.ai_family = PF_INET; - break; - case '6': - ai.ai_family = PF_INET6; - break; - default: - usage(); - exit(1); - } - } - argc -= optind; - argv += optind; - - if (argc != 2){ - usage(); - exit(1); - } - - p = *argv[0] ? argv[0] : NULL; - q = *argv[1] ? argv[1] : NULL; - - print1("arg:", &ai, p ? p : "(empty)", q ? q : "(empty)"); - - error = getaddrinfo(p, q, &ai, &res); - if (error) { - printf("%s\n", gai_strerror(error)); - exit(1); - } - - i = 1; - do { - snprintf(nbuf, sizeof(nbuf), "ai%d:", i); - print1(nbuf, res, NULL, NULL); - - i++; - } while ((res = res->ai_next) != NULL); - - exit(0); -} diff --git a/src/regress/lib/libc/getaddrinfo/testsuite.sh b/src/regress/lib/libc/getaddrinfo/testsuite.sh deleted file mode 100644 index 1e4e524054..0000000000 --- a/src/regress/lib/libc/getaddrinfo/testsuite.sh +++ /dev/null @@ -1,89 +0,0 @@ -# $OpenBSD: testsuite.sh,v 1.1 2002/07/05 15:54:30 itojun Exp $ -# $NetBSD: testsuite.sh,v 1.3 2002/07/05 15:49:11 itojun Exp $ - -# -# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, and 2002 WIDE Project. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. Neither the name of the project nor the names of its contributors -# may be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# - -TEST=./gaitest -#TEST='./test -v' -#IF=`ifconfig -a | grep -v '^ ' | sed -e 's/:.*//' | head -1 | awk '{print $1}'` - -echo '== basic ones' -$TEST ::1 http -$TEST 127.0.0.1 http -$TEST localhost http -$TEST ::1 tftp -$TEST 127.0.0.1 tftp -$TEST localhost tftp -$TEST ::1 echo -$TEST 127.0.0.1 echo -$TEST localhost echo -echo - -echo '== specific address family' -$TEST -4 localhost http -$TEST -6 localhost http -echo - -echo '== empty hostname' -$TEST '' http -$TEST '' echo -$TEST '' tftp -$TEST '' 80 -$TEST -P '' http -$TEST -P '' echo -$TEST -P '' tftp -$TEST -P '' 80 -$TEST -S '' 80 -$TEST -D '' 80 -echo - -echo '== empty servname' -$TEST ::1 '' -$TEST 127.0.0.1 '' -$TEST localhost '' -$TEST '' '' -echo - -echo '== sock_raw' -$TEST -R -p 0 localhost '' -$TEST -R -p 59 localhost '' -$TEST -R -p 59 localhost 80 -$TEST -R -p 59 localhost www -$TEST -R -p 59 ::1 '' -echo - -echo '== unsupported family' -$TEST -f 99 localhost '' -echo - -echo '== the following items are specified in jinmei scopeaddr format doc.' -$TEST fe80::1%lo0 http -#$TEST fe80::1%$IF http -echo -- cgit v1.2.3-55-g6feb