Module Name: src
Committed By: christos
Date: Wed Sep 1 06:12:51 UTC 2021
Modified Files:
src/tests/usr.sbin/inetd: Makefile t_inetd.c test_server.c
Log Message:
fix warnings
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.sbin/inetd/Makefile \
src/tests/usr.sbin/inetd/t_inetd.c src/tests/usr.sbin/inetd/test_server.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.sbin/inetd/Makefile
diff -u src/tests/usr.sbin/inetd/Makefile:1.1 src/tests/usr.sbin/inetd/Makefile:1.2
--- src/tests/usr.sbin/inetd/Makefile:1.1 Sun Aug 29 05:54:18 2021
+++ src/tests/usr.sbin/inetd/Makefile Wed Sep 1 02:12:50 2021
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2021/08/29 09:54:18 christos Exp $
+# $NetBSD: Makefile,v 1.2 2021/09/01 06:12:50 christos Exp $
+WARNS=6
.include <bsd.own.mk>
TESTSDIR=${TESTSBASE}/usr.sbin/inetd
Index: src/tests/usr.sbin/inetd/t_inetd.c
diff -u src/tests/usr.sbin/inetd/t_inetd.c:1.1 src/tests/usr.sbin/inetd/t_inetd.c:1.2
--- src/tests/usr.sbin/inetd/t_inetd.c:1.1 Sun Aug 29 05:54:18 2021
+++ src/tests/usr.sbin/inetd/t_inetd.c Wed Sep 1 02:12:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: t_inetd.c,v 1.1 2021/08/29 09:54:18 christos Exp $ */
+/* $NetBSD: t_inetd.c,v 1.2 2021/09/01 06:12:50 christos Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_inetd.c,v 1.1 2021/08/29 09:54:18 christos Exp $");
+__RCSID("$NetBSD: t_inetd.c,v 1.2 2021/09/01 06:12:50 christos Exp $");
#include <atf-c.h>
#include <spawn.h>
@@ -51,7 +51,7 @@ __RCSID("$NetBSD: t_inetd.c,v 1.1 2021/0
#define TCP 6
#define UDP 17
-static pid_t run(const char *, char **);
+static pid_t run(const char *, char *const *);
static char *concat(const char *restrict, const char *restrict);
static void waitfor(pid_t, const char *);
static bool run_udp_client(const char *);
@@ -83,15 +83,15 @@ ATF_TC_BODY(test_ratelimit, tc)
);
/* Run inetd in debug mode using specified config file */
- proc = run("inetd", (char*[]) {
- "inetd", "-d",
+ proc = run("inetd", (char* const []) {
+ __UNCONST("inetd"), __UNCONST("-d"),
concat(atf_tc_get_config_var(tc, "srcdir"),
"/inetd_ratelimit.conf"),
NULL
});
/* Wait for inetd to load services */
- CHECK_ERROR(sleep(1));
+ sleep(1);
/*
* TODO test dgram/nowait? Specified in manpage but doesn't seem to
@@ -151,6 +151,8 @@ ATF_TC_BODY(test_ratelimit, tc)
ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, test_ratelimit);
+
+ return atf_no_error();
}
/* Return true if successfully received message, false if timeout */
@@ -177,10 +179,6 @@ run_udp_client(const char *port)
.msg_iovlen = 1
};
- struct mmsghdr msglist = {
- .msg_hdr = &msg
- };
-
ssize_t count = recvmsg(udp, &msg, 0);
if (count == -1) {
if (errno == EAGAIN) {
@@ -254,7 +252,7 @@ create_socket(const char *address, const
ATF_REQUIRE_MSG(res->ai_next == NULL, "Ambiguous create_socket args");
CHECK_ERROR(fd = socket(res->ai_family,
res->ai_socktype, res->ai_protocol));
- struct timeval timeout = { timeout_sec };
+ struct timeval timeout = { timeout_sec, 0 };
CHECK_ERROR(setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &timeout,
sizeof(timeout)));
memcpy(dst, res->ai_addr, res->ai_addrlen);
@@ -264,7 +262,7 @@ create_socket(const char *address, const
/* Run program with args */
static pid_t
-run(const char *prog, char **args)
+run(const char *prog, char *const *args)
{
pid_t proc;
extern char **environ;
@@ -278,7 +276,9 @@ static void
waitfor(pid_t pid, const char *taskname)
{
int status;
- CHECK_ERROR(waitpid(pid, &status, WALLSIG) == pid);
+ int rpid = waitpid(pid, &status, WALLSIG);
+ ATF_REQUIRE_MSG(rpid == pid, "wait %d != %d %s",
+ rpid, pid, strerror(errno));
ATF_REQUIRE_EQ_MSG(WEXITSTATUS(status), EXIT_SUCCESS,
"%s failed with "
Index: src/tests/usr.sbin/inetd/test_server.c
diff -u src/tests/usr.sbin/inetd/test_server.c:1.1 src/tests/usr.sbin/inetd/test_server.c:1.2
--- src/tests/usr.sbin/inetd/test_server.c:1.1 Sun Aug 29 05:54:18 2021
+++ src/tests/usr.sbin/inetd/test_server.c Wed Sep 1 02:12:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: test_server.c,v 1.1 2021/08/29 09:54:18 christos Exp $ */
+/* $NetBSD: test_server.c,v 1.2 2021/09/01 06:12:50 christos Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: test_server.c,v 1.1 2021/08/29 09:54:18 christos Exp $");
+__RCSID("$NetBSD: test_server.c,v 1.2 2021/09/01 06:12:50 christos Exp $");
#include <sys/socket.h>
#include <unistd.h>
@@ -91,18 +91,18 @@ main(int argc, char **argv)
}
static void
-stream_nowait_service()
+stream_nowait_service(void)
{
ssize_t count;
char buffer[10];
CHECK(count = recv(0, buffer, sizeof(buffer), 0));
syslog(LOG_WARNING, "Received stream/nowait message \"%.*s\"\n",
- count, buffer);
- CHECK(send(1, buffer, count, 0));
+ (int)count, buffer);
+ CHECK(send(1, buffer, (size_t)count, 0));
}
static void
-stream_wait_service()
+stream_wait_service(void)
{
struct sockaddr_storage addr;
ssize_t count;
@@ -113,18 +113,17 @@ stream_wait_service()
CHECK(fd = accept(0, (struct sockaddr*)&addr, &addr_len));
CHECK(count = recv(fd, buffer, sizeof(buffer), 0));
syslog(LOG_WARNING, "Received stream/wait message \"%.*s\"\n",
- count, buffer);
- CHECK(send(fd, buffer, count, 0));
+ (int)count, buffer);
+ CHECK(send(fd, buffer, (size_t)count, 0));
CHECK(shutdown(fd, SHUT_RDWR));
CHECK(close(fd));
}
static void
-dgram_wait_service()
+dgram_wait_service(void)
{
char buffer[256];
char name[NI_MAXHOST];
- socklen_t source_size;
struct sockaddr_storage addr;
struct iovec store = {
@@ -138,14 +137,13 @@ dgram_wait_service()
.msg_iovlen = 1
/* scatter/gather and control info is null */
};
- int count;
+ ssize_t count;
/* Peek so service can still get the packet */
CHECK(count = recvmsg(0, &header, 0));
- CHECK(sendto(1, buffer, count, 0,
- (struct sockaddr*)(&addr),
- addr.ss_len));
+ CHECK(sendto(1, buffer, (size_t)count, 0,
+ (struct sockaddr*)(&addr), addr.ss_len));
int error = getnameinfo((struct sockaddr*)&addr,
addr.ss_len, name, NI_MAXHOST,
@@ -156,5 +154,5 @@ dgram_wait_service()
exit(EXIT_FAILURE);
}
syslog(LOG_WARNING, "Received dgram/wait message \"%.*s\" from %s\n",
- count, buffer, name);
+ (int)count, buffer, name);
}
