summaryrefslogtreecommitdiff
path: root/packet.c
diff options
context:
space:
mode:
Diffstat (limited to 'packet.c')
-rw-r--r--packet.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/packet.c b/packet.c
index 832019492..3c1c23d3a 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.c,v 1.267 2017/11/25 06:46:22 dtucker Exp $ */ 1/* $OpenBSD: packet.c,v 1.268 2017/12/10 05:55:29 dtucker Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1797,8 +1797,8 @@ ssh_packet_send_debug(struct ssh *ssh, const char *fmt,...)
1797 fatal("%s: %s", __func__, ssh_err(r)); 1797 fatal("%s: %s", __func__, ssh_err(r));
1798} 1798}
1799 1799
1800static void 1800void
1801fmt_connection_id(struct ssh *ssh, char *s, size_t l) 1801sshpkt_fmt_connection_id(struct ssh *ssh, char *s, size_t l)
1802{ 1802{
1803 snprintf(s, l, "%.200s%s%s port %d", 1803 snprintf(s, l, "%.200s%s%s port %d",
1804 ssh->log_preamble ? ssh->log_preamble : "", 1804 ssh->log_preamble ? ssh->log_preamble : "",
@@ -1814,7 +1814,7 @@ sshpkt_fatal(struct ssh *ssh, const char *tag, int r)
1814{ 1814{
1815 char remote_id[512]; 1815 char remote_id[512];
1816 1816
1817 fmt_connection_id(ssh, remote_id, sizeof(remote_id)); 1817 sshpkt_fmt_connection_id(ssh, remote_id, sizeof(remote_id));
1818 1818
1819 switch (r) { 1819 switch (r) {
1820 case SSH_ERR_CONN_CLOSED: 1820 case SSH_ERR_CONN_CLOSED:
@@ -1876,7 +1876,7 @@ ssh_packet_disconnect(struct ssh *ssh, const char *fmt,...)
1876 * Format the message. Note that the caller must make sure the 1876 * Format the message. Note that the caller must make sure the
1877 * message is of limited size. 1877 * message is of limited size.
1878 */ 1878 */
1879 fmt_connection_id(ssh, remote_id, sizeof(remote_id)); 1879 sshpkt_fmt_connection_id(ssh, remote_id, sizeof(remote_id));
1880 va_start(args, fmt); 1880 va_start(args, fmt);
1881 vsnprintf(buf, sizeof(buf), fmt, args); 1881 vsnprintf(buf, sizeof(buf), fmt, args);
1882 va_end(args); 1882 va_end(args);