[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.110.4.1 and 1.111

version 1.110.4.1, 2007/11/13 16:02:56 version 1.111, 2007/10/24 06:37:22
Line 149  struct pfil_head inet6_pfil_hook;
Line 149  struct pfil_head inet6_pfil_hook;
 struct ip6stat ip6stat;  struct ip6stat ip6stat;
   
 static void ip6_init2(void *);  static void ip6_init2(void *);
 static struct m_tag *ip6_setdstifaddr(struct mbuf *, const struct in6_ifaddr *);  static struct m_tag *ip6_setdstifaddr __P((struct mbuf *, struct in6_ifaddr *));
   
 static int ip6_hopopts_input(u_int32_t *, u_int32_t *, struct mbuf **, int *);  static int ip6_hopopts_input(u_int32_t *, u_int32_t *, struct mbuf **, int *);
 static struct mbuf *ip6_pullexthdr(struct mbuf *, size_t, int);  static struct mbuf *ip6_pullexthdr(struct mbuf *, size_t, int);
Line 827  ip6_input(struct mbuf *m)
Line 827  ip6_input(struct mbuf *m)
  * set/grab in6_ifaddr correspond to IPv6 destination address.   * set/grab in6_ifaddr correspond to IPv6 destination address.
  */   */
 static struct m_tag *  static struct m_tag *
 ip6_setdstifaddr(struct mbuf *m, const struct in6_ifaddr *ia)  ip6_setdstifaddr(struct mbuf *m, struct in6_ifaddr *ia6)
 {  {
         struct m_tag *mtag;          struct m_tag *mtag;
   
         mtag = ip6_addaux(m);          mtag = ip6_addaux(m);
         if (mtag != NULL) {          if (mtag)
                 struct ip6aux *ip6a;                  ((struct ip6aux *)(mtag + 1))->ip6a_dstia6 = ia6;
   
                 ip6a = (struct ip6aux *)(mtag + 1);  
                 in6_setscope(&ip6a->ip6a_src, ia->ia_ifp, &ip6a->ip6a_scope_id);  
                 ip6a->ip6a_src = ia->ia_addr.sin6_addr;  
                 ip6a->ip6a_flags = ia->ia6_flags;  
         }  
         return mtag;    /* NULL if failed to set */          return mtag;    /* NULL if failed to set */
 }  }
   
 const struct ip6aux *  struct in6_ifaddr *
 ip6_getdstifaddr(struct mbuf *m)  ip6_getdstifaddr(struct mbuf *m)
 {  {
         struct m_tag *mtag;          struct m_tag *mtag;
   
         mtag = ip6_findaux(m);          mtag = ip6_findaux(m);
         if (mtag != NULL)          if (mtag)
                 return (struct ip6aux *)(mtag + 1);                  return ((struct ip6aux *)(mtag + 1))->ip6a_dstia6;
         else          else
                 return NULL;                  return NULL;
 }  }

Legend:
Removed from v.1.110.4.1  
changed lines
  Added in v.1.111

CVSweb <webmaster@jp.NetBSD.org>