summaryrefslogtreecommitdiff
path: root/packet.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-01-19 21:33:13 +0000
committerDamien Miller <djm@mindrot.org>2019-01-20 09:02:20 +1100
commitad60b1179c9682ca5aef0b346f99ef68cbbbc4e5 (patch)
tree0c1df01c9924629b43337bb398e613f1b2f0ba6f /packet.h
parent0fa174ebe129f3d0aeaf4e2d1dd8de745870d0ff (diff)
downloadopenssh-git-ad60b1179c9682ca5aef0b346f99ef68cbbbc4e5.tar.gz
upstream: allow sshpkt_fatal() to take a varargs format; we'll
use this to give packet-related fatal error messages more context (esp. the remote endpoint) ok markus@ OpenBSD-Commit-ID: de57211f9543426b515a8a10a4f481666b2b2a50
Diffstat (limited to 'packet.h')
-rw-r--r--packet.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/packet.h b/packet.h
index c58b52d3..74bb5110 100644
--- a/packet.h
+++ b/packet.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.h,v 1.87 2019/01/19 21:31:32 djm Exp $ */
+/* $OpenBSD: packet.h,v 1.88 2019/01/19 21:33:14 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -176,7 +176,8 @@ int sshpkt_send(struct ssh *ssh);
int sshpkt_disconnect(struct ssh *, const char *fmt, ...)
__attribute__((format(printf, 2, 3)));
int sshpkt_add_padding(struct ssh *, u_char);
-void sshpkt_fatal(struct ssh *ssh, const char *tag, int r);
+void sshpkt_fatal(struct ssh *ssh, int r, const char *fmt, ...)
+ __attribute__((format(printf, 3, 4)));
int sshpkt_msg_ignore(struct ssh *, u_int);
int sshpkt_put(struct ssh *ssh, const void *v, size_t len);