Deleted Added
sdiff udiff text old ( 88680 ) new ( 88739 )
full compact
bootp_subr.c (88680) bootp_subr.c (88739)
1/*
2 * Copyright (c) 1995 Gordon Ross, Adam Glass
3 * Copyright (c) 1992 Regents of the University of California.
4 * All rights reserved.
5 *
6 * This software was developed by the Computer Systems Engineering group
7 * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
8 * contributed to Berkeley.

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

36 * SUCH DAMAGE.
37 *
38 * based on:
39 * nfs/krpc_subr.c
40 * $NetBSD: krpc_subr.c,v 1.10 1995/08/08 20:43:43 gwr Exp $
41 */
42
43#include <sys/cdefs.h>
1/*
2 * Copyright (c) 1995 Gordon Ross, Adam Glass
3 * Copyright (c) 1992 Regents of the University of California.
4 * All rights reserved.
5 *
6 * This software was developed by the Computer Systems Engineering group
7 * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
8 * contributed to Berkeley.

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

36 * SUCH DAMAGE.
37 *
38 * based on:
39 * nfs/krpc_subr.c
40 * $NetBSD: krpc_subr.c,v 1.10 1995/08/08 20:43:43 gwr Exp $
41 */
42
43#include <sys/cdefs.h>
44__FBSDID("$FreeBSD: head/sys/nfsclient/bootp_subr.c 88680 2001-12-30 02:35:09Z ambrisko $");
44__FBSDID("$FreeBSD: head/sys/nfsclient/bootp_subr.c 88739 2001-12-31 17:45:16Z rwatson $");
45
46#include "opt_bootp.h"
47
48#include <sys/param.h>
49#include <sys/systm.h>
50#include <sys/kernel.h>
51#include <sys/sockio.h>
52#include <sys/malloc.h>

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

581 int outstanding;
582 int gotrootpath;
583 int retry;
584 const char *s;
585
586 /*
587 * Create socket and set its recieve timeout.
588 */
45
46#include "opt_bootp.h"
47
48#include <sys/param.h>
49#include <sys/systm.h>
50#include <sys/kernel.h>
51#include <sys/sockio.h>
52#include <sys/malloc.h>

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

581 int outstanding;
582 int gotrootpath;
583 int retry;
584 const char *s;
585
586 /*
587 * Create socket and set its recieve timeout.
588 */
589 error = socreate(AF_INET, &so, SOCK_DGRAM, 0, td);
589 error = socreate(AF_INET, &so, SOCK_DGRAM, 0, td->td_proc->p_ucred,
590 td);
590 if (error != 0)
591 goto out;
592
593 tv.tv_sec = 1;
594 tv.tv_usec = 0;
595 bzero(&sopt, sizeof(sopt));
596 sopt.sopt_level = SOL_SOCKET;
597 sopt.sopt_name = SO_RCVTIMEO;

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

966{
967 struct sockaddr_in *sin;
968 int error;
969 struct ifreq *ireq;
970 struct socket *so;
971 struct ifaddr *ifa;
972 struct sockaddr_dl *sdl;
973
591 if (error != 0)
592 goto out;
593
594 tv.tv_sec = 1;
595 tv.tv_usec = 0;
596 bzero(&sopt, sizeof(sopt));
597 sopt.sopt_level = SOL_SOCKET;
598 sopt.sopt_name = SO_RCVTIMEO;

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

967{
968 struct sockaddr_in *sin;
969 int error;
970 struct ifreq *ireq;
971 struct socket *so;
972 struct ifaddr *ifa;
973 struct sockaddr_dl *sdl;
974
974 error = socreate(AF_INET, &ifctx->so, SOCK_DGRAM, 0, td);
975 error = socreate(AF_INET, &ifctx->so, SOCK_DGRAM, 0,
976 td->td_proc->p_ucred, td);
975 if (error != 0)
976 panic("nfs_boot: socreate, error=%d", error);
977
978 ireq = &ifctx->ireq;
979 so = ifctx->so;
980
981 /*
982 * Bring up the interface.

--- 1013 unchanged lines hidden --- 		977 if (error != 0)
978 panic("nfs_boot: socreate, error=%d", error);
979
980 ireq = &ifctx->ireq;
981 so = ifctx->so;
982
983 /*
984 * Bring up the interface.

--- 1013 unchanged lines hidden ---