Module Name: src
Committed By: christos
Date: Tue Feb 11 17:43:16 UTC 2025
Modified Files:
src/external/bsd/blocklist/test: srvtest.c
Log Message:
- Allow specifying the socket path
- sys/cdefs.h portability
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/blocklist/test/srvtest.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/blocklist/test/srvtest.c
diff -u src/external/bsd/blocklist/test/srvtest.c:1.1.1.1 src/external/bsd/blocklist/test/srvtest.c:1.2
--- src/external/bsd/blocklist/test/srvtest.c:1.1.1.1 Sun Jun 14 21:52:54 2020
+++ src/external/bsd/blocklist/test/srvtest.c Tue Feb 11 12:43:16 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: srvtest.c,v 1.1.1.1 2020/06/15 01:52:54 christos Exp $ */
+/* $NetBSD: srvtest.c,v 1.2 2025/02/11 17:43:16 christos Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -32,8 +32,10 @@
#include "config.h"
#endif
+#ifdef HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
-__RCSID("$NetBSD: srvtest.c,v 1.1.1.1 2020/06/15 01:52:54 christos Exp $");
+#endif
+__RCSID("$NetBSD: srvtest.c,v 1.2 2025/02/11 17:43:16 christos Exp $");
#include <sys/types.h>
#include <sys/socket.h>
@@ -167,7 +169,11 @@ static __dead void
usage(int c)
{
warnx("Unknown option `%c'", (char)c);
- fprintf(stderr, "Usage: %s [-u] [-p <num>]\n", getprogname());
+ fprintf(stderr, "Usage: %s [-u] [-p <num>]"
+#ifdef BLDEBUG
+ " [-s <sockpath>]"
+#endif
+ "\n", getprogname());
exit(EXIT_FAILURE);
}
@@ -182,14 +188,16 @@ main(int argc, char *argv[])
struct pollfd pfd[NUMFD];
int type = SOCK_STREAM, c;
in_port_t port = 6161;
-
- signal(SIGCHLD, SIG_IGN);
-
#ifdef BLDEBUG
- b = bl_create(false, "blsock", vsyslog);
+ char *sockpath = "blsock";
+ const char *optstr = "up:s:";
+#else
+ const char *optstr = "up:";
#endif
- while ((c = getopt(argc, argv, "up:")) != -1)
+ signal(SIGCHLD, SIG_IGN);
+
+ while ((c = getopt(argc, argv, optstr)) != -1)
switch (c) {
case 'u':
type = SOCK_DGRAM;
@@ -197,10 +205,20 @@ main(int argc, char *argv[])
case 'p':
port = (in_port_t)atoi(optarg);
break;
+#ifdef BLDEBUG
+ case 's':
+ sockpath = (char *)optarg;
+ break;
+#endif
default:
usage(c);
}
+#ifdef BLDEBUG
+ b = bl_create(false, sockpath, vsyslog_r);
+#endif
+
+
pfd[0].fd = cr(AF_INET, type, port);
pfd[0].events = POLLIN;
#if NUMFD > 1
