Commit db999335 authored by David Ahern's avatar David Ahern Committed by Jakub Kicinski
Browse files

selftests: Add missing newline in nettest error messages 



A few logging lines are missing the newline, or need it moved up for
cleaner logging.

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent f222c37c

tools/testing/selftests/net/nettest.c

+6 −8
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static void log_address(const char *desc, struct sockaddr *sa) 
	if (sa->sa_family == AF_INET) {

		struct sockaddr_in *s = (struct sockaddr_in *) sa;



		log_msg("%s %s:%d",

		log_msg("%s %s:%d\n",

			desc,

			inet_ntop(AF_INET, &s->sin_addr, addrstr,

				  sizeof(addrstr)),
@@ -208,15 +208,13 @@ static void log_address(const char *desc, struct sockaddr *sa) 
	} else if (sa->sa_family == AF_INET6) {

		struct sockaddr_in6 *s6 = (struct sockaddr_in6 *) sa;



		log_msg("%s [%s]:%d",

		log_msg("%s [%s]:%d\n",

			desc,

			inet_ntop(AF_INET6, &s6->sin6_addr, addrstr,

				  sizeof(addrstr)),

			ntohs(s6->sin6_port));

	}



	printf("\n");



	fflush(stdout);

}
@@ -594,7 +592,7 @@ static int expected_addr_match(struct sockaddr *sa, void *expected, 
		struct in_addr *exp_in = (struct in_addr *) expected;



		if (s->sin_addr.s_addr != exp_in->s_addr) {

			log_error("%s address does not match expected %s",

			log_error("%s address does not match expected %s\n",

				  desc,

				  inet_ntop(AF_INET, exp_in,

					    addrstr, sizeof(addrstr)));
@@ -605,14 +603,14 @@ static int expected_addr_match(struct sockaddr *sa, void *expected, 
		struct in6_addr *exp_in = (struct in6_addr *) expected;



		if (memcmp(&s6->sin6_addr, exp_in, sizeof(*exp_in))) {

			log_error("%s address does not match expected %s",

			log_error("%s address does not match expected %s\n",

				  desc,

				  inet_ntop(AF_INET6, exp_in,

					    addrstr, sizeof(addrstr)));

			rc = 1;

		}

	} else {

		log_error("%s address does not match expected - unknown family",

		log_error("%s address does not match expected - unknown family\n",

			  desc);

		rc = 1;

	}
@@ -731,7 +729,7 @@ static int convert_addr(struct sock_args *args, const char *_str, 
		}

		break;

	default:

		log_error("unknown address type");

		log_error("unknown address type\n");

		exit(1);

	}