Deleted Added
full compact
ftp.c (65994) ftp.c (78064)
1/* $KAME$ */
1/* $KAME: ftp.c,v 1.10 2000/09/14 00:23:39 itojun Exp $ */
2
3/*
4 * Copyright (C) 1997 and 1998 WIDE Project.
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:

--- 13 unchanged lines hidden (view full) ---

23 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE.
30 *
2
3/*
4 * Copyright (C) 1997 and 1998 WIDE Project.
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
9 * are met:

--- 13 unchanged lines hidden (view full) ---

23 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE.
30 *
31 * $FreeBSD: head/usr.sbin/faithd/ftp.c 65994 2000-09-17 16:44:51Z ume $
31 * $FreeBSD: head/usr.sbin/faithd/ftp.c 78064 2001-06-11 12:39:29Z ume $
32 */
33
34#include <sys/param.h>
35#include <sys/types.h>
36#include <sys/socket.h>
37#include <sys/ioctl.h>
38#include <sys/time.h>
39

--- 469 unchanged lines hidden (view full) ---

509 return n;
510 }
511#ifdef IPV6_FAITH
512 {
513 int on = 1;
514 error = setsockopt(wport6, IPPROTO_IPV6, IPV6_FAITH,
515 &on, sizeof(on));
516 if (error == -1)
32 */
33
34#include <sys/param.h>
35#include <sys/types.h>
36#include <sys/socket.h>
37#include <sys/ioctl.h>
38#include <sys/time.h>
39

--- 469 unchanged lines hidden (view full) ---

509 return n;
510 }
511#ifdef IPV6_FAITH
512 {
513 int on = 1;
514 error = setsockopt(wport6, IPPROTO_IPV6, IPV6_FAITH,
515 &on, sizeof(on));
516 if (error == -1)
517 exit_error("setsockopt(IPV6_FAITH): %s", ERRSTR);
517 exit_failure("setsockopt(IPV6_FAITH): %s", ERRSTR);
518 }
519#endif
520 error = bind(wport6, (struct sockaddr *)sin6, sin6->sin6_len);
521 if (error == -1) {
522 close(wport6);
523 wport6 = -1;
524 goto passivefail;
525 }

--- 393 unchanged lines hidden (view full) ---

919 if (n != 1 || af != 2) {
920 n = snprintf(sbuf, sizeof(sbuf),
921 "501 unsupported address family to EPRT\r\n");
922 write(src, sbuf, n);
923 return n;
924 }
925 memset(&hints, 0, sizeof(hints));
926 hints.ai_family = AF_UNSPEC;
518 }
519#endif
520 error = bind(wport6, (struct sockaddr *)sin6, sin6->sin6_len);
521 if (error == -1) {
522 close(wport6);
523 wport6 = -1;
524 goto passivefail;
525 }

--- 393 unchanged lines hidden (view full) ---

919 if (n != 1 || af != 2) {
920 n = snprintf(sbuf, sizeof(sbuf),
921 "501 unsupported address family to EPRT\r\n");
922 write(src, sbuf, n);
923 return n;
924 }
925 memset(&hints, 0, sizeof(hints));
926 hints.ai_family = AF_UNSPEC;
927 hints.ai_socktype = SOCK_STREAM;
927 error = getaddrinfo(hostp, portp, &hints, &res);
928 if (error) {
929 n = snprintf(sbuf, sizeof(sbuf),
930 "501 EPRT: %s\r\n", gai_strerror(error));
931 write(src, sbuf, n);
932 return n;
933 }
934 if (res->ai_next) {

--- 206 unchanged lines hidden ---
928 error = getaddrinfo(hostp, portp, &hints, &res);
929 if (error) {
930 n = snprintf(sbuf, sizeof(sbuf),
931 "501 EPRT: %s\r\n", gai_strerror(error));
932 write(src, sbuf, n);
933 return n;
934 }
935 if (res->ai_next) {

--- 206 unchanged lines hidden ---