src/sys/netinet/ip_input.c - diff

Return to ip_input.c CVS log

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

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

Diff for /src/sys/netinet/ip_input.c between version 1.337.2.4 and 1.344

version 1.337.2.4, 2017/03/20 06:57:50

version 1.344, 2016/10/18 07:30:31

Line 226 pfil_head_t * inet_pfil_hook __read_mo

ipid_state_t * ip_ids __read_mostly;

percpu_t * ipstat_percpu __read_mostly;

static struct route ipforward_rt __cacheline_aligned;

static percpu_t *ipforward_rt_percpu __cacheline_aligned;

uint16_t ip_id;

Line 287 static void ipintr(void *);

static void ip_input(struct mbuf *);

static void ip_forward(struct mbuf *, int, struct ifnet *);

static bool ip_dooptions(struct mbuf *);

static struct in_ifaddr *ip_rtaddr(struct in_addr, struct psref *);

static struct in_ifaddr *ip_rtaddr(struct in_addr);

static void sysctl_net_inet_ip_setup(struct sysctllog **);

static struct in_ifaddr *ip_match_our_address(struct ifnet *, struct ip *,

Line 335 ip_init(void)

ip_ids = ip_id_init();

ip_id = time_uptime & 0xfffff;

ip_mtudisc_timeout_q = rt_timer_queue_create(ip_mtudisc_timeout);

#ifdef GATEWAY

ipflow_init();

#endif

Line 353 ip_init(void)

Line 354 ip_init(void)

ipforward_rt_percpu = percpu_alloc(sizeof(struct route));

if (ipforward_rt_percpu == NULL)

panic("failed to allocate ipforward_rt_percpu");

ip_mtudisc_timeout_q = rt_timer_queue_create(ip_mtudisc_timeout);

}

static struct in_ifaddr *

Line 388 ip_match_our_address(struct ifnet *ifp,

Line 387 ip_match_our_address(struct ifnet *ifp,

continue;

if (checkif && ia->ia_ifp != ifp)

continue;

if ((ia->ia_ifp->if_flags & IFF_UP) != 0)

if ((ia->ia_ifp->if_flags & IFF_UP) != 0 &&

(ia->ia4_flags & IN_IFF_DETACHED) == 0)

break;

else

(*downmatch)++;

Line 408 ip_match_our_address_broadcast(struct if

if (ifa->ifa_addr->sa_family != AF_INET)

continue;

ia = ifatoia(ifa);

if (ia->ia4_flags & IN_IFF_NOTREADY)

if (ia->ia4_flags & (IN_IFF_NOTREADY | IN_IFF_DETACHED))

continue;

if (in_hosteq(ip->ip_dst, ia->ia_broadaddr.sin_addr) ||

in_hosteq(ip->ip_dst, ia->ia_netbroadcast) ||

Line 867 void

ip_slowtimo(void)

{

#ifndef NET_MPSAFE

mutex_enter(softnet_lock);

KERNEL_LOCK(1, NULL);

#endif

ip_reass_slowtimo();

#ifndef NET_MPSAFE

KERNEL_UNLOCK_ONE(NULL);

mutex_exit(softnet_lock);

#endif

}

Line 909 ip_dooptions(struct mbuf *m)

Line 905 ip_dooptions(struct mbuf *m)

int opt, optlen, cnt, off, code, type = ICMP_PARAMPROB, forward = 0;

struct in_addr dst;

n_time ntime;

struct ifaddr *ifa = NULL;

struct ifaddr *ifa;

int s;

dst = ip->ip_dst;

Line 947 ip_dooptions(struct mbuf *m)

Line 943 ip_dooptions(struct mbuf *m)

* address is on directly accessible net.

case IPOPT_LSRR:

case IPOPT_SSRR: {

case IPOPT_SSRR:

struct psref psref;

if (ip_allowsrcrt == 0) {

type = ICMP_UNREACH;

code = ICMP_UNREACH_NET_PROHIB;

Line 994 ip_dooptions(struct mbuf *m)

Line 989 ip_dooptions(struct mbuf *m)

memcpy((void *)&ipaddr.sin_addr, (void *)(cp + off),

sizeof(ipaddr.sin_addr));

s = pserialize_read_enter();

if (opt == IPOPT_SSRR) {

ifa = ifa_ifwithladdr_psref(sintosa(&ipaddr),

ifa = ifa_ifwithladdr(sintosa(&ipaddr));

&psref);

if (ifa != NULL)

ia = ifatoia(ifa);

else

ia = NULL;

} else {

ia = ip_rtaddr(ipaddr.sin_addr, &psref);

ia = ip_rtaddr(ipaddr.sin_addr);

}

if (ia == NULL) {

type = ICMP_UNREACH;

code = ICMP_UNREACH_SRCFAIL;

pserialize_read_exit(s);

goto bad;

}

ip->ip_dst = ipaddr.sin_addr;

bcopy((void *)&ia->ia_addr.sin_addr,

(void *)(cp + off), sizeof(struct in_addr));

ia4_release(ia, &psref);

pserialize_read_exit(s);

cp[IPOPT_OFFSET] += sizeof(struct in_addr);

* Let ip_intr's mcast routing check handle mcast pkts

forward = !IN_MULTICAST(ip->ip_dst.s_addr);

break;

}

case IPOPT_RR: {

case IPOPT_RR:

struct psref psref;

if (optlen < IPOPT_OFFSET + sizeof(*cp)) {

code = &cp[IPOPT_OLEN] - (u_char *)ip;

goto bad;

Line 1043 ip_dooptions(struct mbuf *m)

Line 1037 ip_dooptions(struct mbuf *m)

* locate outgoing interface; if we're the destination,

* use the incoming interface (should be same).

ifa = ifa_ifwithaddr_psref(sintosa(&ipaddr), &psref);

s = pserialize_read_enter();

ifa = ifa_ifwithaddr(sintosa(&ipaddr));

if (ifa == NULL) {

ia = ip_rtaddr(ipaddr.sin_addr, &psref);

ia = ip_rtaddr(ipaddr.sin_addr);

if (ia == NULL) {

pserialize_read_exit(s);

type = ICMP_UNREACH;

code = ICMP_UNREACH_HOST;

goto bad;

Line 1056 ip_dooptions(struct mbuf *m)

Line 1052 ip_dooptions(struct mbuf *m)

}

bcopy((void *)&ia->ia_addr.sin_addr,

(void *)(cp + off), sizeof(struct in_addr));

ia4_release(ia, &psref);

pserialize_read_exit(s);

cp[IPOPT_OFFSET] += sizeof(struct in_addr);

break;

}

case IPOPT_TS:

code = cp - (u_char *)ip;

Line 1099 ip_dooptions(struct mbuf *m)

Line 1094 ip_dooptions(struct mbuf *m)

ipaddr.sin_addr = dst;

_ss = pserialize_read_enter();

rcvif = m_get_rcvif(m, &_s);

if (__predict_true(rcvif != NULL)) {

ifa = ifaof_ifpforaddr(sintosa(&ipaddr), rcvif);

ifa = ifaof_ifpforaddr(sintosa(&ipaddr),

rcvif);

}

m_put_rcvif(rcvif, &_s);

if (ifa == NULL) {

pserialize_read_exit(_ss);

Line 1180 bad:

Line 1172 bad:

* return internet address info of interface to be used to get there.

static struct in_ifaddr *

ip_rtaddr(struct in_addr dst, struct psref *psref)

ip_rtaddr(struct in_addr dst)

{

struct rtentry *rt;

union {

struct sockaddr dst;

struct sockaddr_in dst4;

} u;

struct route *ro;

sockaddr_in_init(&u.dst4, &dst, 0);

SOFTNET_LOCK();

ro = percpu_getref(ipforward_rt_percpu);

rt = rtcache_lookup(ro, &u.dst);

if (rt == NULL) {

percpu_putref(ipforward_rt_percpu);

return NULL;

}

ia4_acquire(ifatoia(rt->rt_ifa), psref);

rtcache_unref(rt, ro);

percpu_putref(ipforward_rt_percpu);

SOFTNET_UNLOCK();

if (rt == NULL)

return NULL;

return ifatoia(rt->rt_ifa);

}

Line 1329 ip_forward(struct mbuf *m, int srcrt, st

Line 1319 ip_forward(struct mbuf *m, int srcrt, st

struct sockaddr_in dst4;

} u;

uint64_t *ips;

struct route *ro;

KASSERTMSG(cpu_softintr_p(), "ip_forward: not in the software "

"interrupt handler; synchronization assumptions violated");

Line 1358 ip_forward(struct mbuf *m, int srcrt, st

Line 1349 ip_forward(struct mbuf *m, int srcrt, st

sockaddr_in_init(&u.dst4, &ip->ip_dst, 0);

ro = percpu_getref(ipforward_rt_percpu);

rt = rtcache_lookup(ro, &u.dst);

if ((rt = rtcache_lookup(ro, &u.dst)) == NULL) {

if (rt == NULL) {

percpu_putref(ipforward_rt_percpu);

icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_NET, dest, 0);

return;

Line 1403 ip_forward(struct mbuf *m, int srcrt, st

Line 1393 ip_forward(struct mbuf *m, int srcrt, st

code = ICMP_REDIRECT_HOST;

}

rtcache_unref(rt, ro);

error = ip_output(m, NULL, &ipforward_rt,

error = ip_output(m, NULL, ro,

(IP_FORWARDING | (ip_directedbcast ? IP_ALLOWBROADCAST : 0)),

NULL, NULL);

Line 1427 ip_forward(struct mbuf *m, int srcrt, st

Line 1416 ip_forward(struct mbuf *m, int srcrt, st

if (mcopy) {

#ifdef GATEWAY

if (mcopy->m_flags & M_CANFASTFWD)

ipflow_create(&ipforward_rt, mcopy);

ipflow_create(ro, mcopy);

#endif

m_freem(mcopy);

}

Line 1461 error:

Line 1450 error:

type = ICMP_UNREACH;

code = ICMP_UNREACH_NEEDFRAG;

if ((rt = rtcache_validate(ro)) != NULL) {

if ((rt = rtcache_validate(ro)) != NULL)

destmtu = rt->rt_ifp->if_mtu;

rtcache_unref(rt, ro);

}

#ifdef IPSEC

if (ipsec_used)

(void)ipsec4_forward(mcopy, &destmtu);

Line 1600 sysctl_net_inet_ip_pmtudto(SYSCTLFN_ARGS

Line 1587 sysctl_net_inet_ip_pmtudto(SYSCTLFN_ARGS

int error, tmp;

struct sysctlnode node;

icmp_mtudisc_lock();

node = *rnode;

tmp = ip_mtudisc_timeout;

node.sysctl_data = &tmp;

error = sysctl_lookup(SYSCTLFN_CALL(&node));

if (error || newp == NULL)

goto out;

return (error);

if (tmp < 0) {

if (tmp < 0)

error = EINVAL;

return (EINVAL);

goto out;

}

mutex_enter(softnet_lock);

ip_mtudisc_timeout = tmp;

rt_timer_queue_change(ip_mtudisc_timeout_q, ip_mtudisc_timeout);

error = 0;

out:

mutex_exit(softnet_lock);

icmp_mtudisc_unlock();

return error;

return (0);

}

static int

CVSweb <webmaster@jp.NetBSD.org>