[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.106 and 1.107

version 1.106, 2007/05/17 11:48:42 version 1.107, 2007/05/23 17:15:02
Line 830  ip6_input(struct mbuf *m)
Line 830  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(m, ia6)  ip6_setdstifaddr(struct mbuf *m, struct in6_ifaddr *ia6)
         struct mbuf *m;  
         struct in6_ifaddr *ia6;  
 {  {
         struct m_tag *mtag;          struct m_tag *mtag;
   
Line 843  ip6_setdstifaddr(m, ia6)
Line 841  ip6_setdstifaddr(m, ia6)
 }  }
   
 struct in6_ifaddr *  struct in6_ifaddr *
 ip6_getdstifaddr(m)  ip6_getdstifaddr(struct mbuf *m)
         struct mbuf *m;  
 {  {
         struct m_tag *mtag;          struct m_tag *mtag;
   
Line 858  ip6_getdstifaddr(m)
Line 855  ip6_getdstifaddr(m)
 /*  /*
  * Hop-by-Hop options header processing. If a valid jumbo payload option is   * Hop-by-Hop options header processing. If a valid jumbo payload option is
  * included, the real payload length will be stored in plenp.   * included, the real payload length will be stored in plenp.
    *
    * rtalertp - XXX: should be stored more smart way
  */   */
 static int  static int
 ip6_hopopts_input(plenp, rtalertp, mp, offp)  ip6_hopopts_input(u_int32_t *plenp, u_int32_t *rtalertp,
         u_int32_t *plenp;          struct mbuf **mp, int *offp)
         u_int32_t *rtalertp;    /* XXX: should be stored more smart way */  
         struct mbuf **mp;  
         int *offp;  
 {  {
         struct mbuf *m = *mp;          struct mbuf *m = *mp;
         int off = *offp, hbhlen;          int off = *offp, hbhlen;
Line 908  ip6_hopopts_input(plenp, rtalertp, mp, o
Line 904  ip6_hopopts_input(plenp, rtalertp, mp, o
  * opthead + hbhlen is located in continuous memory region.   * opthead + hbhlen is located in continuous memory region.
  */   */
 int  int
 ip6_process_hopopts(m, opthead, hbhlen, rtalertp, plenp)  ip6_process_hopopts(struct mbuf *m, u_int8_t *opthead, int hbhlen,
         struct mbuf *m;          u_int32_t *rtalertp, u_int32_t *plenp)
         u_int8_t *opthead;  
         int hbhlen;  
         u_int32_t *rtalertp;  
         u_int32_t *plenp;  
 {  {
         struct ip6_hdr *ip6;          struct ip6_hdr *ip6;
         int optlen = 0;          int optlen = 0;
Line 1045  ip6_process_hopopts(m, opthead, hbhlen, 
Line 1037  ip6_process_hopopts(m, opthead, hbhlen, 
  * is not continuous in order to return an ICMPv6 error.   * is not continuous in order to return an ICMPv6 error.
  */   */
 int  int
 ip6_unknown_opt(optp, m, off)  ip6_unknown_opt(u_int8_t *optp, struct mbuf *m, int off)
         u_int8_t *optp;  
         struct mbuf *m;  
         int off;  
 {  {
         struct ip6_hdr *ip6;          struct ip6_hdr *ip6;
   
Line 1090  ip6_unknown_opt(optp, m, off)
Line 1079  ip6_unknown_opt(optp, m, off)
  * you are using IP6_EXTHDR_CHECK() not m_pulldown())   * you are using IP6_EXTHDR_CHECK() not m_pulldown())
  */   */
 void  void
 ip6_savecontrol(in6p, mp, ip6, m)  ip6_savecontrol(struct in6pcb *in6p, struct mbuf **mp,
         struct in6pcb *in6p;          struct ip6_hdr *ip6, struct mbuf *m)
         struct mbuf **mp;  
         struct ip6_hdr *ip6;  
         struct mbuf *m;  
 {  {
 #ifdef RFC2292  #ifdef RFC2292
 #define IS2292(x, y)    ((in6p->in6p_flags & IN6P_RFC2292) ? (x) : (y))  #define IS2292(x, y)    ((in6p->in6p_flags & IN6P_RFC2292) ? (x) : (y))
Line 1351  ip6_notify_pmtu(struct in6pcb *in6p, con
Line 1337  ip6_notify_pmtu(struct in6pcb *in6p, con
  * contains the result, or NULL on error.   * contains the result, or NULL on error.
  */   */
 static struct mbuf *  static struct mbuf *
 ip6_pullexthdr(m, off, nxt)  ip6_pullexthdr(struct mbuf *m, size_t off, int nxt)
         struct mbuf *m;  
         size_t off;  
         int nxt;  
 {  {
         struct ip6_ext ip6e;          struct ip6_ext ip6e;
         size_t elen;          size_t elen;
Line 1413  ip6_pullexthdr(m, off, nxt)
Line 1396  ip6_pullexthdr(m, off, nxt)
  * we develop `neater' mechanism to process extension headers.   * we develop `neater' mechanism to process extension headers.
  */   */
 u_int8_t *  u_int8_t *
 ip6_get_prevhdr(m, off)  ip6_get_prevhdr(struct mbuf *m, int off)
         struct mbuf *m;  
         int off;  
 {  {
         struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *);          struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *);
   
Line 1454  ip6_get_prevhdr(m, off)
Line 1435  ip6_get_prevhdr(m, off)
  * get next header offset.  m will be retained.   * get next header offset.  m will be retained.
  */   */
 int  int
 ip6_nexthdr(m, off, proto, nxtp)  ip6_nexthdr(struct mbuf *m, int off, int proto, int *nxtp)
         struct mbuf *m;  
         int off;  
         int proto;  
         int *nxtp;  
 {  {
         struct ip6_hdr ip6;          struct ip6_hdr ip6;
         struct ip6_ext ip6e;          struct ip6_ext ip6e;
Line 1537  ip6_nexthdr(m, off, proto, nxtp)
Line 1514  ip6_nexthdr(m, off, proto, nxtp)
  * get offset for the last header in the chain.  m will be kept untainted.   * get offset for the last header in the chain.  m will be kept untainted.
  */   */
 int  int
 ip6_lasthdr(m, off, proto, nxtp)  ip6_lasthdr(struct mbuf *m, int off, int proto, int *nxtp)
         struct mbuf *m;  
         int off;  
         int proto;  
         int *nxtp;  
 {  {
         int newoff;          int newoff;
         int nxt;          int nxt;
Line 1565  ip6_lasthdr(m, off, proto, nxtp)
Line 1538  ip6_lasthdr(m, off, proto, nxtp)
 }  }
   
 struct m_tag *  struct m_tag *
 ip6_addaux(m)  ip6_addaux(struct mbuf *m)
         struct mbuf *m;  
 {  {
         struct m_tag *mtag;          struct m_tag *mtag;
   
Line 1583  ip6_addaux(m)
Line 1555  ip6_addaux(m)
 }  }
   
 struct m_tag *  struct m_tag *
 ip6_findaux(m)  ip6_findaux(struct mbuf *m)
         struct mbuf *m;  
 {  {
         struct m_tag *mtag;          struct m_tag *mtag;
   
Line 1593  ip6_findaux(m)
Line 1564  ip6_findaux(m)
 }  }
   
 void  void
 ip6_delaux(m)  ip6_delaux(struct mbuf *m)
         struct mbuf *m;  
 {  {
         struct m_tag *mtag;          struct m_tag *mtag;
   

Legend:
Removed from v.1.106  
changed lines
  Added in v.1.107

CVSweb <webmaster@jp.NetBSD.org>