[BACK]Return to ip_input.c CVS log [TXT][DIR] 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.316 and 1.317

version 1.316, 2014/05/29 23:02:48 version 1.317, 2014/05/30 01:39:03
Line 522  ip_input(struct mbuf *m)
Line 522  ip_input(struct mbuf *m)
          * in the list may have previously cleared it.           * in the list may have previously cleared it.
          */           */
 #if defined(IPSEC)  #if defined(IPSEC)
         if (!ipsec_indone(m))          if (!ipsec_used || !ipsec_indone(m))
 #else  #else
         if (1)          if (1)
 #endif  #endif
Line 699  ip_input(struct mbuf *m)
Line 699  ip_input(struct mbuf *m)
                 }                  }
 #ifdef IPSEC  #ifdef IPSEC
                 /* Perform IPsec, if any. */                  /* Perform IPsec, if any. */
                 if (ipsec4_input(m, IP_FORWARDING | (ip_directedbcast ?                  if (ipsec_used &&
                       ipsec4_input(m, IP_FORWARDING | (ip_directedbcast ?
                     IP_ALLOWBROADCAST : 0)) != 0) {                      IP_ALLOWBROADCAST : 0)) != 0) {
                         goto bad;                          goto bad;
                 }                  }
Line 738  ours:
Line 739  ours:
          * Note that we do not visit this with protocols with PCB layer           * Note that we do not visit this with protocols with PCB layer
          * code - like UDP/TCP/raw IP.           * code - like UDP/TCP/raw IP.
          */           */
         if ((inetsw[ip_protox[ip->ip_p]].pr_flags & PR_LASTHDR) != 0) {          if (ipsec_used &&
               (inetsw[ip_protox[ip->ip_p]].pr_flags & PR_LASTHDR) != 0) {
                 if (ipsec4_input(m, 0) != 0) {                  if (ipsec4_input(m, 0) != 0) {
                         goto bad;                          goto bad;
                 }                  }
Line 1289  ip_forward(struct mbuf *m, int srcrt)
Line 1291  ip_forward(struct mbuf *m, int srcrt)
                 if ((rt = rtcache_validate(&ipforward_rt)) != NULL)                  if ((rt = rtcache_validate(&ipforward_rt)) != NULL)
                         destmtu = rt->rt_ifp->if_mtu;                          destmtu = rt->rt_ifp->if_mtu;
 #ifdef IPSEC  #ifdef IPSEC
                 (void)ipsec4_forward(mcopy, &destmtu);                  if (ipsec_used)
                           (void)ipsec4_forward(mcopy, &destmtu);
 #endif  #endif
                 IP_STATINC(IP_STAT_CANTFRAG);                  IP_STATINC(IP_STAT_CANTFRAG);
                 break;                  break;

Legend:
Removed from v.1.316  
changed lines
  Added in v.1.317

CVSweb <webmaster@jp.NetBSD.org>