[BACK]Return to ip6_input.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_input.c between version 1.142.2.1 and 1.142.2.2

version 1.142.2.1, 2013/08/28 23:59:36 version 1.142.2.2, 2014/05/18 17:46:13
Line 806  static struct m_tag *
Line 806  static struct m_tag *
 ip6_setdstifaddr(struct mbuf *m, const struct in6_ifaddr *ia)  ip6_setdstifaddr(struct mbuf *m, const struct in6_ifaddr *ia)
 {  {
         struct m_tag *mtag;          struct m_tag *mtag;
           struct ip6aux *ip6a;
   
         mtag = ip6_addaux(m);          mtag = ip6_addaux(m);
         if (mtag != NULL) {          if (mtag == NULL)
                 struct ip6aux *ip6a;                  return NULL;
   
                 ip6a = (struct ip6aux *)(mtag + 1);          ip6a = (struct ip6aux *)(mtag + 1);
                 in6_setscope(&ip6a->ip6a_src, ia->ia_ifp, &ip6a->ip6a_scope_id);          if (in6_setscope(&ip6a->ip6a_src, ia->ia_ifp, &ip6a->ip6a_scope_id)) {
                 ip6a->ip6a_src = ia->ia_addr.sin6_addr;                  IP6_STATINC(IP6_STAT_BADSCOPE);
                 ip6a->ip6a_flags = ia->ia6_flags;                  return NULL;
         }          }
         return mtag;    /* NULL if failed to set */  
           ip6a->ip6a_src = ia->ia_addr.sin6_addr;
           ip6a->ip6a_flags = ia->ia6_flags;
           return mtag;
 }  }
   
 const struct ip6aux *  const struct ip6aux *
Line 1653  sysctl_net_inet6_ip6_setup(struct sysctl
Line 1657  sysctl_net_inet6_ip6_setup(struct sysctl
   
         sysctl_createv(clog, 0, NULL, NULL,          sysctl_createv(clog, 0, NULL, NULL,
                        CTLFLAG_PERMANENT,                         CTLFLAG_PERMANENT,
                        CTLTYPE_NODE, "net", NULL,  
                        NULL, 0, NULL, 0,  
                        CTL_NET, CTL_EOL);  
         sysctl_createv(clog, 0, NULL, NULL,  
                        CTLFLAG_PERMANENT,  
                        CTLTYPE_NODE, "inet6",                         CTLTYPE_NODE, "inet6",
                        SYSCTL_DESCR("PF_INET6 related settings"),                         SYSCTL_DESCR("PF_INET6 related settings"),
                        NULL, 0, NULL, 0,                         NULL, 0, NULL, 0,

Legend:
Removed from v.1.142.2.1  
changed lines
  Added in v.1.142.2.2

CVSweb <webmaster@jp.NetBSD.org>