Deleted Added
full compact
tun.c (73988) tun.c (78410)
1/*-
2 * Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/usr.sbin/ppp/tun.c 73988 2001-03-08 10:33:30Z brian $
26 * $FreeBSD: head/usr.sbin/ppp/tun.c 78410 2001-06-18 14:59:36Z brian $
27 */
28
29#include <sys/param.h>
27 */
28
29#include <sys/param.h>
30#ifndef __FreeBSD__
30
31#include <sys/socket.h> /* For IFF_ defines */
31#include <sys/socket.h> /* For IFF_ defines */
32#ifndef __FreeBSD__
32#include <net/if.h> /* For IFF_ defines */
33#endif
33#include <net/if.h> /* For IFF_ defines */
34#endif
35#include <net/route.h>
34#include <netinet/in.h>
35#include <net/if_types.h>
36#include <net/if_tun.h>
37#include <netinet/in_systm.h>
38#include <netinet/ip.h>
39#include <sys/un.h>
40
41#include <errno.h>

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

63#include "slcompress.h"
64#include "ipcp.h"
65#include "filter.h"
66#include "descriptor.h"
67#include "lcp.h"
68#include "ccp.h"
69#include "link.h"
70#include "mp.h"
36#include <netinet/in.h>
37#include <net/if_types.h>
38#include <net/if_tun.h>
39#include <netinet/in_systm.h>
40#include <netinet/ip.h>
41#include <sys/un.h>
42
43#include <errno.h>

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

65#include "slcompress.h"
66#include "ipcp.h"
67#include "filter.h"
68#include "descriptor.h"
69#include "lcp.h"
70#include "ccp.h"
71#include "link.h"
72#include "mp.h"
73#include "iface.h"
71#ifndef NORADIUS
72#include "radius.h"
73#endif
74#include "bundle.h"
75#include "tun.h"
76
77void
78tun_configure(struct bundle *bundle)

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

84 s = socket(AF_INET, SOCK_DGRAM, 0);
85
86 if (s < 0) {
87 log_Printf(LogERROR, "tun_configure: socket(): %s\n", strerror(errno));
88 return;
89 }
90
91 sprintf(ifr.ifr_name, "tun%d", bundle->unit);
74#ifndef NORADIUS
75#include "radius.h"
76#endif
77#include "bundle.h"
78#include "tun.h"
79
80void
81tun_configure(struct bundle *bundle)

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

87 s = socket(AF_INET, SOCK_DGRAM, 0);
88
89 if (s < 0) {
90 log_Printf(LogERROR, "tun_configure: socket(): %s\n", strerror(errno));
91 return;
92 }
93
94 sprintf(ifr.ifr_name, "tun%d", bundle->unit);
92 ifr.ifr_mtu = bundle->mtu;
95 ifr.ifr_mtu = bundle->iface->mtu;
93 if (ioctl(s, SIOCSIFMTU, &ifr) < 0)
94 log_Printf(LogERROR, "tun_configure: ioctl(SIOCSIFMTU): %s\n",
95 strerror(errno));
96
97 close(s);
98#else
99 struct tuninfo info;
100
101 memset(&info, '\0', sizeof info);
102 info.type = IFT_PPP;
96 if (ioctl(s, SIOCSIFMTU, &ifr) < 0)
97 log_Printf(LogERROR, "tun_configure: ioctl(SIOCSIFMTU): %s\n",
98 strerror(errno));
99
100 close(s);
101#else
102 struct tuninfo info;
103
104 memset(&info, '\0', sizeof info);
105 info.type = IFT_PPP;
103 info.mtu = bundle->mtu;
106 info.mtu = bundle->iface->mtu;
104
105 info.baudrate = bundle->bandwidth;
106#ifdef __OpenBSD__
107 info.flags = IFF_UP|IFF_POINTOPOINT;
108#endif
109 if (ID0ioctl(bundle->dev.fd, TUNSIFINFO, &info) < 0)
110 log_Printf(LogERROR, "tun_configure: ioctl(TUNSIFINFO): %s\n",
111 strerror(errno));
112#endif
113}
107
108 info.baudrate = bundle->bandwidth;
109#ifdef __OpenBSD__
110 info.flags = IFF_UP|IFF_POINTOPOINT;
111#endif
112 if (ID0ioctl(bundle->dev.fd, TUNSIFINFO, &info) < 0)
113 log_Printf(LogERROR, "tun_configure: ioctl(TUNSIFINFO): %s\n",
114 strerror(errno));
115#endif
116}