diff options
| author | Damien Miller <djm@mindrot.org> | 2000-01-14 15:45:46 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2000-01-14 15:45:46 +1100 |
| commit | 34132e54cbd221d17d373fc54f4e3f7b85727f7f (patch) | |
| tree | 7c73917b1082ff91786f9e02d25b853bedd1d472 /ssh.h | |
| parent | 25e4256ad4f453d8a7c1866243ec1984f859b1de (diff) | |
| download | openssh-git-34132e54cbd221d17d373fc54f4e3f7b85727f7f.tar.gz | |
- Merged OpenBSD IPv6 patch:
- [sshd.c sshd.8 sshconnect.c ssh.h ssh.c servconf.h servconf.c scp.1]
[scp.c packet.h packet.c login.c log.c canohost.c channels.c]
[hostfile.c sshd_config]
ipv6 support: mostly gethostbyname->getaddrinfo/getnameinfo, new
features: sshd allows multiple ListenAddress and Port options. note
that libwrap is not IPv6-ready. (based on patches from
fujiwara@rcac.tdi.co.jp)
- [ssh.c canohost.c]
more hints (hints.ai_socktype=SOCK_STREAM) for getaddrinfo,
from itojun@
- [channels.c]
listen on _all_ interfaces for X11-Fwd (hints.ai_flags = AI_PASSIVE)
- [packet.h]
allow auth-kerberos for IPv4 only
- [scp.1 sshd.8 servconf.h scp.c]
document -4, -6, and 'ssh -L 2022/::1/22'
- [ssh.c]
'ssh @host' is illegal (null user name), from
karsten@gedankenpolizei.de
- [sshconnect.c]
better error message
- [sshd.c]
allow auth-kerberos for IPv4 only
- Big IPv6 merge:
- Cleanup overrun in sockaddr copying on RHL 6.1
- Replacements for getaddrinfo, getnameinfo, etc based on versions
from patch from KIKUCHI Takahiro <kick@kyoto.wide.ad.jp>
- Replacement for missing structures on systems that lack IPv6
- record_login needed to know about AF_INET6 addresses
- Borrowed more code from OpenBSD: rresvport_af and requisites
Diffstat (limited to 'ssh.h')
| -rw-r--r-- | ssh.h | 17 |
1 files changed, 12 insertions, 5 deletions
@@ -13,7 +13,7 @@ * */ -/* RCSID("$Id: ssh.h,v 1.23 1999/12/30 04:50:55 damien Exp $"); */ +/* RCSID("$Id: ssh.h,v 1.24 2000/01/14 04:45:52 damien Exp $"); */ #ifndef SSH_H #define SSH_H @@ -21,6 +21,8 @@ #include <netinet/in.h> /* For struct sockaddr_in */ #include <pwd.h> /* For struct pw */ #include <stdarg.h> /* For va_list */ +#include <sys/socket.h> /* For struct sockaddr_storage */ +#include "fake-socket.h" /* For struct sockaddr_storage */ #ifdef HAVE_SYS_SELECT_H # include <sys/select.h> #endif @@ -284,7 +286,7 @@ get_last_login_time(uid_t uid, const char *logname, */ void record_login(int pid, const char *ttyname, const char *user, uid_t uid, - const char *host, struct sockaddr_in * addr); + const char *host, struct sockaddr *addr); /* * Records that the user has logged out. This does many thigs normally done @@ -304,7 +306,7 @@ void record_logout(int pid, const char *ttyname); * packet_set_connection for the connection. */ int -ssh_connect(const char *host, struct sockaddr_in * hostaddr, +ssh_connect(const char *host, struct sockaddr_storage * hostaddr, u_short port, int connection_attempts, int anonymous, uid_t original_real_uid, const char *proxy_command); @@ -320,7 +322,7 @@ ssh_connect(const char *host, struct sockaddr_in * hostaddr, void ssh_login(int host_key_valid, RSA * host_key, const char *host, - struct sockaddr_in * hostaddr, uid_t original_real_uid); + struct sockaddr * hostaddr, uid_t original_real_uid); /*------------ Definitions for various authentication methods. -------*/ @@ -380,8 +382,10 @@ const char *get_remote_ipaddr(void); /* Returns the port number of the peer of the socket. */ int get_peer_port(int sock); -/* Returns the port number of the remote host. */ +/* Returns the port number of the remote/local host. */ int get_remote_port(void); +int get_local_port(void); + /* * Tries to match the host name (which must be in all lowercase) against the @@ -741,6 +745,9 @@ char *skey_fake_keyinfo(char *username); int auth_skey_password(struct passwd * pw, const char *password); #endif /* SKEY */ +/* AF_UNSPEC or AF_INET or AF_INET6 */ +extern int IPv4or6; + #ifdef USE_PAM #include "auth-pam.h" #endif /* USE_PAM */ |