src/sys/netinet6/ip6_input.c - diff

Return to ip6_input.c CVS log

Up to [cvs.NetBSD.org] / src / sys / netinet6

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/netinet6/ip6_input.c between version 1.64.2.4 and 1.73.2.1.2.3

version 1.64.2.4, 2004/11/29 07:25:04

version 1.73.2.1.2.3, 2007/06/04 19:22:52

Line 116 __KERNEL_RCSID(0, "$NetBSD$");

#include "loop.h"

#include "faith.h"

#include "gif.h"

#include "bpfilter.h"

#if NGIF > 0

#include <netinet6/in6_gif.h>

Line 996 ip6_savecontrol(in6p, mp, ip6, m)

Line 997 ip6_savecontrol(in6p, mp, ip6, m)

struct ip6_hdr *ip6;

struct mbuf *m;

{

struct proc *p = curproc; /* XXX */

int privileged;

privileged = 0;

if (p && !suser(p->p_ucred, &p->p_acflag))

privileged++;

#ifdef SO_TIMESTAMP

if (in6p->in6p_socket->so_options & SO_TIMESTAMP) {

Line 1008 ip6_savecontrol(in6p, mp, ip6, m)

Line 1015 ip6_savecontrol(in6p, mp, ip6, m)

mp = &(*mp)->m_next;

}

#endif

/* some OSes call this logic with IPv4 packet, for SO_TIMESTAMP */

if ((ip6->ip6_vfc & IPV6_VERSION_MASK) != IPV6_VERSION)

return;

if (in6p->in6p_flags & IN6P_RECVDSTADDR) {

*mp = sbcreatecontrol((caddr_t) &ip6->ip6_dst,

sizeof(struct in6_addr), IPV6_RECVDSTADDR, IPPROTO_IPV6);

Line 1048 ip6_savecontrol(in6p, mp, ip6, m)

Line 1060 ip6_savecontrol(in6p, mp, ip6, m)

/* IN6P_NEXTHOP - for outgoing packet only */

* IPV6_HOPOPTS socket option. Recall that we required super-user

* IPV6_HOPOPTS socket option. We require super-user privilege

* privilege for the option (see ip6_ctloutput), but it might be too

* for the option, but it might be too strict, since there might

* strict, since there might be some hop-by-hop options which can be

* be some hop-by-hop options which can be returned to normal user.

* returned to normal user.

* See RFC 2292 section 6.

* See also RFC 2292 section 6.

if ((in6p->in6p_flags & IN6P_HOPOPTS) != 0) {

if ((in6p->in6p_flags & IN6P_HOPOPTS) != 0 && privileged) {

* Check if a hop-by-hop options header is contatined in the

* received packet, and if so, store the options as ancillary

Line 1149 ip6_savecontrol(in6p, mp, ip6, m)

Line 1160 ip6_savecontrol(in6p, mp, ip6, m)

if (!in6p->in6p_flags & IN6P_DSTOPTS)

break;

* We also require super-user privilege for

* the option.

* See the comments on IN6_HOPOPTS.

if (!privileged)

break;

*mp = sbcreatecontrol((caddr_t)ip6e, elen,

IPV6_DSTOPTS, IPPROTO_IPV6);

if (*mp)

Line 1421 u_char inet6ctlerrmap[PRC_NCMDS] = {

Line 1440 u_char inet6ctlerrmap[PRC_NCMDS] = {

ENOPROTOOPT

};

static int

sysctl_net_inet6_ip6_rht0(SYSCTLFN_ARGS)

{

int error, tmp;

struct sysctlnode node;

node = *rnode;

tmp = ip6_rht0;

node.sysctl_data = &tmp;

error = sysctl_lookup(SYSCTLFN_CALL(&node));

if (error || newp == NULL)

return error;

switch (tmp) {

case -1: /* disable processing */

case 0: /* disable for host, enable for router */

case 1: /* enable for all */

break;

default:

return EINVAL;

}

ip6_rht0 = tmp;

return 0;

}

SYSCTL_SETUP(sysctl_net_inet6_ip6_setup, "sysctl net.inet6.ip6 subtree setup")

{

Line 1650 SYSCTL_SETUP(sysctl_net_inet6_ip6_setup,

Line 1694 SYSCTL_SETUP(sysctl_net_inet6_ip6_setup,

NULL, 0, &ip6_maxfrags, 0,

CTL_NET, PF_INET6, IPPROTO_IPV6,

IPV6CTL_MAXFRAGS, CTL_EOL);

sysctl_createv(clog, 0, NULL, NULL,

CTLFLAG_PERMANENT|CTLFLAG_READWRITE,

CTLTYPE_INT, "rht0",

SYSCTL_DESCR("Processing of routing header type 0 (IPv6)"),

sysctl_net_inet6_ip6_rht0, 0, &ip6_rht0, 0,

CTL_NET, PF_INET6, IPPROTO_IPV6,

CTL_CREATE, CTL_EOL);

}

CVSweb <webmaster@jp.NetBSD.org>