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 /bsd-rresvport.c | |
parent | 25e4256ad4f453d8a7c1866243ec1984f859b1de (diff) |
- 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 'bsd-rresvport.c')
-rw-r--r-- | bsd-rresvport.c | 107 |
1 files changed, 107 insertions, 0 deletions
diff --git a/bsd-rresvport.c b/bsd-rresvport.c new file mode 100644 index 000000000..c29165faa --- /dev/null +++ b/bsd-rresvport.c | |||
@@ -0,0 +1,107 @@ | |||
1 | /* | ||
2 | * Copyright (c) 1995, 1996, 1998 Theo de Raadt. All rights reserved. | ||
3 | * Copyright (c) 1983, 1993, 1994 | ||
4 | * The Regents of the University of California. All rights reserved. | ||
5 | * | ||
6 | * Redistribution and use in source and binary forms, with or without | ||
7 | * modification, are permitted provided that the following conditions | ||
8 | * are met: | ||
9 | * 1. Redistributions of source code must retain the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer. | ||
11 | * 2. Redistributions in binary form must reproduce the above copyright | ||
12 | * notice, this list of conditions and the following disclaimer in the | ||
13 | * documentation and/or other materials provided with the distribution. | ||
14 | * 3. All advertising materials mentioning features or use of this software | ||
15 | * must display the following acknowledgement: | ||
16 | * This product includes software developed by the University of | ||
17 | * California, Berkeley and its contributors. | ||
18 | * This product includes software developed by Theo de Raadt. | ||
19 | * 4. Neither the name of the University nor the names of its contributors | ||
20 | * may be used to endorse or promote products derived from this software | ||
21 | * without specific prior written permission. | ||
22 | * | ||
23 | * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND | ||
24 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
25 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
26 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE | ||
27 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
28 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
29 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
30 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
31 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
32 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
33 | * SUCH DAMAGE. | ||
34 | */ | ||
35 | |||
36 | #include "config.h" | ||
37 | |||
38 | #ifndef HAVE_RRESVPORT_AF | ||
39 | |||
40 | #if defined(LIBC_SCCS) && !defined(lint) | ||
41 | static char *rcsid = "$OpenBSD: rresvport.c,v 1.4 1999/12/17 20:48:03 deraadt Exp $"; | ||
42 | #endif /* LIBC_SCCS and not lint */ | ||
43 | |||
44 | #include "includes.h" | ||
45 | |||
46 | #if 0 | ||
47 | int | ||
48 | rresvport(alport) | ||
49 | int *alport; | ||
50 | { | ||
51 | return rresvport_af(alport, AF_INET); | ||
52 | } | ||
53 | #endif | ||
54 | |||
55 | int | ||
56 | rresvport_af(alport, af) | ||
57 | int *alport; | ||
58 | int af; | ||
59 | { | ||
60 | struct sockaddr_storage ss; | ||
61 | struct sockaddr *sa; | ||
62 | u_int16_t *portp; | ||
63 | int s; | ||
64 | int sa_len; | ||
65 | |||
66 | bzero(&ss, sizeof ss); | ||
67 | sa = (struct sockaddr *)&ss; | ||
68 | |||
69 | switch (af) { | ||
70 | case AF_INET: | ||
71 | sa_len = sizeof(struct sockaddr_in); | ||
72 | portp = &((struct sockaddr_in *)sa)->sin_port; | ||
73 | break; | ||
74 | case AF_INET6: | ||
75 | sa_len = sizeof(struct sockaddr_in6); | ||
76 | portp = &((struct sockaddr_in6 *)sa)->sin6_port; | ||
77 | break; | ||
78 | default: | ||
79 | errno = EPFNOSUPPORT; | ||
80 | return (-1); | ||
81 | } | ||
82 | sa->sa_family = af; | ||
83 | |||
84 | s = socket(af, SOCK_STREAM, 0); | ||
85 | if (s < 0) | ||
86 | return (-1); | ||
87 | |||
88 | *portp = htons(*alport); | ||
89 | if (*alport < IPPORT_RESERVED - 1) { | ||
90 | if (bind(s, sa, sa_len) >= 0) | ||
91 | return (s); | ||
92 | if (errno != EADDRINUSE) { | ||
93 | (void)close(s); | ||
94 | return (-1); | ||
95 | } | ||
96 | } | ||
97 | |||
98 | *portp = 0; | ||
99 | if (bindresvport_af(s, sa, af) == -1) { | ||
100 | (void)close(s); | ||
101 | return (-1); | ||
102 | } | ||
103 | *alport = ntohs(*portp); | ||
104 | return (s); | ||
105 | } | ||
106 | |||
107 | #endif /* HAVE_RRESVPORT_AF */ | ||