| ip.c (78189) | ip.c (78411) |
|---|---|
| 1/*- 2 * Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org> 3 * based on work by Toshiharu OHNO <tony-o@iij.ad.jp> 4 * Internet Initiative Japan, Inc (IIJ) 5 * All rights reserved. 6 * 7 * Redistribution and use in source and binary forms, with or without 8 * modification, are permitted provided that the following conditions --- 11 unchanged lines hidden (view full) --- 20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * SUCH DAMAGE. 27 * | 1/*- 2 * Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org> 3 * based on work by Toshiharu OHNO <tony-o@iij.ad.jp> 4 * Internet Initiative Japan, Inc (IIJ) 5 * All rights reserved. 6 * 7 * Redistribution and use in source and binary forms, with or without 8 * modification, are permitted provided that the following conditions --- 11 unchanged lines hidden (view full) --- 20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * SUCH DAMAGE. 27 * |
| 28 * $FreeBSD: head/usr.sbin/ppp/ip.c 78189 2001-06-13 21:52:19Z brian $ | 28 * $FreeBSD: head/usr.sbin/ppp/ip.c 78411 2001-06-18 15:00:22Z brian $ |
| 29 */ 30 31#include <sys/param.h> 32#include <sys/socket.h> 33#include <netinet/in.h> 34#include <netinet/in_systm.h> 35#include <netinet/ip.h> 36#include <netinet/ip_icmp.h> --- 864 unchanged lines hidden (view full) --- 901 struct ip *pip; 902 int m_len; 903 u_int32_t secs = 0; 904 unsigned alivesecs = 0; 905 906 if (ipcp->fsm.state != ST_OPENED) 907 return 0; 908 | 29 */ 30 31#include <sys/param.h> 32#include <sys/socket.h> 33#include <netinet/in.h> 34#include <netinet/in_systm.h> 35#include <netinet/ip.h> 36#include <netinet/ip_icmp.h> --- 864 unchanged lines hidden (view full) --- 901 struct ip *pip; 902 int m_len; 903 u_int32_t secs = 0; 904 unsigned alivesecs = 0; 905 906 if (ipcp->fsm.state != ST_OPENED) 907 return 0; 908 |
| 909 /* 910 * If ccp is not open but is required, do nothing. 911 */ 912 if (l->ccp.fsm.state != ST_OPENED && ccp_Required(&l->ccp)) { 913 log_Printf(LogPHASE, "%s: Not transmitting... waiting for CCP\n", l->name); 914 return 0; 915 } 916 |
|
| 909 queue = ipcp->Queue + IPCP_QUEUES(ipcp) - 1; 910 do { 911 if (queue->top) { 912 bp = m_dequeue(queue); 913 bp = mbuf_Read(bp, &secs, sizeof secs); 914 bp = m_pullup(bp); 915 m_len = m_length(bp); 916 pip = (struct ip *)MBUF_CTOP(bp); --- 13 unchanged lines hidden --- | 917 queue = ipcp->Queue + IPCP_QUEUES(ipcp) - 1; 918 do { 919 if (queue->top) { 920 bp = m_dequeue(queue); 921 bp = mbuf_Read(bp, &secs, sizeof secs); 922 bp = m_pullup(bp); 923 m_len = m_length(bp); 924 pip = (struct ip *)MBUF_CTOP(bp); --- 13 unchanged lines hidden --- |