1 files changed, 25 insertions, 7 deletions

diff --git a/packet.c b/packet.c
index f114ea52c..4bfb50726 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.264 2017/09/12 06:32:07 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.269 2017/12/18 23:13:42 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -557,6 +557,18 @@ ssh_local_port(struct ssh *ssh)
         return ssh->local_port;
 }
 
+/* Returns the routing domain of the input socket, or NULL if unavailable */
+const char *
+ssh_packet_rdomain_in(struct ssh *ssh)
+{
+        if (ssh->rdomain_in != NULL)
+                return ssh->rdomain_in;
+        if (!ssh_packet_connection_is_on_socket(ssh))
+                return NULL;
+        ssh->rdomain_in = get_rdomain(ssh->state->connection_in);
+        return ssh->rdomain_in;
+}
+
 /* Closes the connection and clears and frees internal data structures. */
 
 static void
@@ -1320,7 +1332,7 @@ ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p)
                 for (;;) {
                         if (state->packet_timeout_ms != -1) {
                                 ms_to_timeval(&timeout, ms_remain);
-                                gettimeofday(&start, NULL);
+                                monotime_tv(&start);
                         }
                         if ((r = select(state->connection_in + 1, setp,
                             NULL, NULL, timeoutp)) >= 0)
@@ -1774,6 +1786,8 @@ ssh_packet_send_debug(struct ssh *ssh, const char *fmt,...)
         vsnprintf(buf, sizeof(buf), fmt, args);
         va_end(args);
 
+        debug3("sending debug message: %s", buf);
+
         if ((r = sshpkt_start(ssh, SSH2_MSG_DEBUG)) != 0 ||
             (r = sshpkt_put_u8(ssh, 0)) != 0 || /* always display */
             (r = sshpkt_put_cstring(ssh, buf)) != 0 ||
@@ -1783,8 +1797,8 @@ ssh_packet_send_debug(struct ssh *ssh, const char *fmt,...)
                 fatal("%s: %s", __func__, ssh_err(r));
 }
 
-static void
-fmt_connection_id(struct ssh *ssh, char *s, size_t l)
+void
+sshpkt_fmt_connection_id(struct ssh *ssh, char *s, size_t l)
 {
         snprintf(s, l, "%.200s%s%s port %d",
             ssh->log_preamble ? ssh->log_preamble : "",
@@ -1800,7 +1814,7 @@ sshpkt_fatal(struct ssh *ssh, const char *tag, int r)
 {
         char remote_id[512];
 
-        fmt_connection_id(ssh, remote_id, sizeof(remote_id));
+        sshpkt_fmt_connection_id(ssh, remote_id, sizeof(remote_id));
 
         switch (r) {
         case SSH_ERR_CONN_CLOSED:
@@ -1862,7 +1876,7 @@ ssh_packet_disconnect(struct ssh *ssh, const char *fmt,...)
          * Format the message.  Note that the caller must make sure the
          * message is of limited size.
          */
-        fmt_connection_id(ssh, remote_id, sizeof(remote_id));
+        sshpkt_fmt_connection_id(ssh, remote_id, sizeof(remote_id));
         va_start(args, fmt);
         vsnprintf(buf, sizeof(buf), fmt, args);
         va_end(args);
@@ -1945,7 +1959,7 @@ ssh_packet_write_wait(struct ssh *ssh)
                 for (;;) {
                         if (state->packet_timeout_ms != -1) {
                                 ms_to_timeval(&timeout, ms_remain);
-                                gettimeofday(&start, NULL);
+                                monotime_tv(&start);
                         }
                         if ((ret = select(state->connection_out + 1,
                             NULL, setp, NULL, timeoutp)) >= 0)
@@ -2159,7 +2173,9 @@ kex_to_blob(struct sshbuf *m, struct kex *kex)
         if ((r = sshbuf_put_string(m, kex->session_id,
             kex->session_id_len)) != 0 ||
             (r = sshbuf_put_u32(m, kex->we_need)) != 0 ||
+            (r = sshbuf_put_cstring(m, kex->hostkey_alg)) != 0 ||
             (r = sshbuf_put_u32(m, kex->hostkey_type)) != 0 ||
+            (r = sshbuf_put_u32(m, kex->hostkey_nid)) != 0 ||
             (r = sshbuf_put_u32(m, kex->kex_type)) != 0 ||
             (r = sshbuf_put_stringb(m, kex->my)) != 0 ||
             (r = sshbuf_put_stringb(m, kex->peer)) != 0 ||
@@ -2323,7 +2339,9 @@ kex_from_blob(struct sshbuf *m, struct kex **kexp)
         }
         if ((r = sshbuf_get_string(m, &kex->session_id, &kex->session_id_len)) != 0 ||
             (r = sshbuf_get_u32(m, &kex->we_need)) != 0 ||
+            (r = sshbuf_get_cstring(m, &kex->hostkey_alg, NULL)) != 0 ||
             (r = sshbuf_get_u32(m, (u_int *)&kex->hostkey_type)) != 0 ||
+            (r = sshbuf_get_u32(m, (u_int *)&kex->hostkey_nid)) != 0 ||
             (r = sshbuf_get_u32(m, &kex->kex_type)) != 0 ||
             (r = sshbuf_get_stringb(m, kex->my)) != 0 ||
             (r = sshbuf_get_stringb(m, kex->peer)) != 0 ||