| ip6_output.c (100629) | ip6_output.c (102291) |
|---|---|
| 1/* $FreeBSD: head/sys/netinet6/ip6_output.c 100629 2002-07-24 19:19:53Z ume $ */ | 1/* $FreeBSD: head/sys/netinet6/ip6_output.c 102291 2002-08-22 21:24:01Z archie $ */ |
| 2/* $KAME: ip6_output.c,v 1.279 2002/01/26 06:12:30 jinmei Exp $ */ 3 4/* 5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. 6 * All rights reserved. 7 * 8 * Redistribution and use in source and binary forms, with or without 9 * modification, are permitted provided that the following conditions --- 1281 unchanged lines hidden (view full) --- 1291 1292 case SOPT_SET: 1293 switch (optname) { 1294 case IPV6_PKTOPTIONS: 1295 { 1296 struct mbuf *m; 1297 1298 error = soopt_getm(sopt, &m); /* XXX */ | 2/* $KAME: ip6_output.c,v 1.279 2002/01/26 06:12:30 jinmei Exp $ */ 3 4/* 5 * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. 6 * All rights reserved. 7 * 8 * Redistribution and use in source and binary forms, with or without 9 * modification, are permitted provided that the following conditions --- 1281 unchanged lines hidden (view full) --- 1291 1292 case SOPT_SET: 1293 switch (optname) { 1294 case IPV6_PKTOPTIONS: 1295 { 1296 struct mbuf *m; 1297 1298 error = soopt_getm(sopt, &m); /* XXX */ |
| 1299 if (error != NULL) | 1299 if (error != 0) |
| 1300 break; 1301 error = soopt_mcopyin(sopt, m); /* XXX */ | 1300 break; 1301 error = soopt_mcopyin(sopt, m); /* XXX */ |
| 1302 if (error != NULL) | 1302 if (error != 0) |
| 1303 break; 1304 error = ip6_pcbopts(&in6p->in6p_outputopts, 1305 m, so, sopt); 1306 m_freem(m); /* XXX */ 1307 break; 1308 } 1309 1310 /* --- 330 unchanged lines hidden (view full) --- 1641 case IPV6_IPSEC_POLICY: 1642 { 1643 caddr_t req = NULL; 1644 size_t len = 0; 1645 struct mbuf *m = NULL; 1646 struct mbuf **mp = &m; 1647 1648 error = soopt_getm(sopt, &m); /* XXX */ | 1303 break; 1304 error = ip6_pcbopts(&in6p->in6p_outputopts, 1305 m, so, sopt); 1306 m_freem(m); /* XXX */ 1307 break; 1308 } 1309 1310 /* --- 330 unchanged lines hidden (view full) --- 1641 case IPV6_IPSEC_POLICY: 1642 { 1643 caddr_t req = NULL; 1644 size_t len = 0; 1645 struct mbuf *m = NULL; 1646 struct mbuf **mp = &m; 1647 1648 error = soopt_getm(sopt, &m); /* XXX */ |
| 1649 if (error != NULL) | 1649 if (error != 0) |
| 1650 break; 1651 error = soopt_mcopyin(sopt, m); /* XXX */ | 1650 break; 1651 error = soopt_mcopyin(sopt, m); /* XXX */ |
| 1652 if (error != NULL) | 1652 if (error != 0) |
| 1653 break; 1654 if (m) { 1655 req = mtod(m, caddr_t); 1656 len = m->m_len; 1657 } 1658 error = ipsec6_get_policy(in6p, req, len, mp); 1659 if (error == 0) 1660 error = soopt_mcopyout(sopt, m); /*XXX*/ --- 830 unchanged lines hidden (view full) --- 2491 /* 2492 * clear embedded scope identifiers if necessary. 2493 * in6_clearscope will touch the addresses only when necessary. 2494 */ 2495 in6_clearscope(&ip6->ip6_src); 2496 in6_clearscope(&ip6->ip6_dst); 2497#endif 2498 | 1653 break; 1654 if (m) { 1655 req = mtod(m, caddr_t); 1656 len = m->m_len; 1657 } 1658 error = ipsec6_get_policy(in6p, req, len, mp); 1659 if (error == 0) 1660 error = soopt_mcopyout(sopt, m); /*XXX*/ --- 830 unchanged lines hidden (view full) --- 2491 /* 2492 * clear embedded scope identifiers if necessary. 2493 * in6_clearscope will touch the addresses only when necessary. 2494 */ 2495 in6_clearscope(&ip6->ip6_src); 2496 in6_clearscope(&ip6->ip6_dst); 2497#endif 2498 |
| 2499 (void)if_simloop(ifp, copym, dst->sin6_family, NULL); | 2499 (void)if_simloop(ifp, copym, dst->sin6_family, 0); |
| 2500} 2501 2502/* 2503 * Chop IPv6 header off from the payload. 2504 */ 2505static int 2506ip6_splithdr(m, exthdrs) 2507 struct mbuf *m; --- 51 unchanged lines hidden --- | 2500} 2501 2502/* 2503 * Chop IPv6 header off from the payload. 2504 */ 2505static int 2506ip6_splithdr(m, exthdrs) 2507 struct mbuf *m; --- 51 unchanged lines hidden --- |