diff options
| author | millert@openbsd.org <millert@openbsd.org> | 2023-06-05 15:24:36 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2023-06-20 02:07:06 +0200 |
| commit | b53a809a549dcd4fbde554c6aa283e597b15ea33 (patch) | |
| tree | 39b385eb9a48e7489ed389a29ec5d0a06ac92944 /channels.h | |
| parent | fixup! if -s & -p specified, mention 'sftp -P' on (diff) | |
| download | openssh-b53a809a549dcd4fbde554c6aa283e597b15ea33.tar.xz openssh-b53a809a549dcd4fbde554c6aa283e597b15ea33.zip | |
upstream: Store timeouts as int, not u_int as they are limited to
INT_MAX. Fixes sign compare warnings systems with 32-bit time_t due to type
promotion. OK djm@
OpenBSD-Commit-ID: 48081e9ad35705c5f1705711704a4c2ff94e87b7
Diffstat (limited to 'channels.h')
| -rw-r--r-- | channels.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels.h b/channels.h index 91cc466cc..90f6d2904 100644 --- a/channels.h +++ b/channels.h @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.h,v 1.149 2023/03/04 03:22:59 dtucker Exp $ */ +/* $OpenBSD: channels.h,v 1.150 2023/06/05 13:24:36 millert Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -210,7 +210,7 @@ struct Channel { /* Last traffic seen for OPEN channels */ time_t lastused; /* Inactivity timeout deadline in seconds (0 = no timeout) */ - u_int inactive_deadline; + int inactive_deadline; }; #define CHAN_EXTENDED_IGNORE 0 @@ -308,7 +308,7 @@ int channel_close_fd(struct ssh *, Channel *, int *); void channel_send_window_changes(struct ssh *); /* channel inactivity timeouts */ -void channel_add_timeout(struct ssh *, const char *, u_int); +void channel_add_timeout(struct ssh *, const char *, int); void channel_clear_timeouts(struct ssh *); /* mux proxy support */ |