From 3b6f098d8e983e8c16f88cfb275e878127855454 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Thu, 27 Jun 2019 10:05:35 -0400 Subject: [PATCH] TT#61850 normalize `address:port` log printing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit «IP»:«port» vs (preferred) «IP:port» Change-Id: I785cedfc155c107b7798762ef43f6d35bdf8bd05 --- daemon/media_socket.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/daemon/media_socket.c b/daemon/media_socket.c index 288250bec..bb12b7cb8 100644 --- a/daemon/media_socket.c +++ b/daemon/media_socket.c @@ -1045,8 +1045,8 @@ void kernelize(struct packet_stream *stream) { if (stream->media->monologue->block_media || call->block_media) goto no_kernel; - ilog(LOG_INFO, "Kernelizing media stream: %s%s%s:%s%d%s", - FMT_M(sockaddr_print_buf(&stream->endpoint.address)), FMT_M(stream->endpoint.port)); + ilog(LOG_INFO, "Kernelizing media stream: %s%s:%d%s", + FMT_M(sockaddr_print_buf(&stream->endpoint.address), stream->endpoint.port)); sink = packet_stream_sink(stream); if (!sink) { @@ -1560,11 +1560,11 @@ static int media_packet_address_check(struct packet_handler_ctx *phc) if (tmp && PS_ISSET(phc->mp.stream, STRICT_SOURCE)) { ilog(LOG_INFO | LOG_FLAG_LIMIT, "Drop due to strict-source attribute; " - "got %s%s%s:%s%d%s, " - "expected %s%s%s:%s%d%s", - FMT_M(sockaddr_print_buf(&endpoint.address)), FMT_M(endpoint.port), - FMT_M(sockaddr_print_buf(&phc->mp.stream->endpoint.address)), - FMT_M(phc->mp.stream->endpoint.port)); + "got %s%s:%d%s, " + "expected %s%s:%d%s", + FMT_M(sockaddr_print_buf(&endpoint.address), endpoint.port), + FMT_M(sockaddr_print_buf(&phc->mp.stream->endpoint.address), + phc->mp.stream->endpoint.port)); atomic64_inc(&phc->mp.stream->stats.errors); ret = -1; goto out;