[BACK]Return to ip6_output.c CVS log [TXT][DIR] 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_output.c between version 1.163 and 1.164

version 1.163, 2015/02/02 03:14:02 version 1.164, 2015/04/24 08:53:06
Line 167  ip6_output(
Line 167  ip6_output(
         bool tso;          bool tso;
         struct route ip6route;          struct route ip6route;
         struct rtentry *rt = NULL;          struct rtentry *rt = NULL;
         const struct sockaddr_in6 *dst = NULL;          const struct sockaddr_in6 *dst;
         struct sockaddr_in6 src_sa, dst_sa;          struct sockaddr_in6 src_sa, dst_sa;
         int error = 0;          int error = 0;
         struct in6_ifaddr *ia = NULL;          struct in6_ifaddr *ia = NULL;
Line 543  ip6_output(
Line 543  ip6_output(
         /* scope check is done. */          /* scope check is done. */
   
         if (rt == NULL || IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst)) {          if (rt == NULL || IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst)) {
                 if (dst == NULL)                  dst = satocsin6(rtcache_getdst(ro));
                         dst = satocsin6(rtcache_getdst(ro));  
                 KASSERT(dst != NULL);                  KASSERT(dst != NULL);
         } else if (opt && rtcache_validate(&opt->ip6po_nextroute) != NULL) {          } else if (opt && rtcache_validate(&opt->ip6po_nextroute) != NULL) {
                 /*                  /*
Line 555  ip6_output(
Line 554  ip6_output(
                 dst = (struct sockaddr_in6 *)opt->ip6po_nexthop;                  dst = (struct sockaddr_in6 *)opt->ip6po_nexthop;
         } else if ((rt->rt_flags & RTF_GATEWAY))          } else if ((rt->rt_flags & RTF_GATEWAY))
                 dst = (struct sockaddr_in6 *)rt->rt_gateway;                  dst = (struct sockaddr_in6 *)rt->rt_gateway;
         else if (dst == NULL)          else
                 dst = satocsin6(rtcache_getdst(ro));                  dst = satocsin6(rtcache_getdst(ro));
   
         /*          /*

Legend:
Removed from v.1.163  
changed lines
  Added in v.1.164

CVSweb <webmaster@jp.NetBSD.org>