Deleted Added
full compact
sync.c (50479) sync.c (54912)
1/*-
2 * Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 1999 Brian Somers <brian@Awfulhak.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/usr.sbin/ppp/sync.c 50479 1999-08-28 01:35:59Z peter $
26 * $FreeBSD: head/usr.sbin/ppp/sync.c 54912 1999-12-20 20:29:47Z brian $
27 */
28
29#include <sys/types.h>
30
31#include <stdio.h>
32#include <termios.h>
33
34#include "layer.h"

--- 13 unchanged lines hidden (view full) ---

48#include "descriptor.h"
49#include "physical.h"
50
51static struct mbuf *
52sync_LayerPush(struct bundle *bundle, struct link *l, struct mbuf *bp,
53 int pri, u_short *proto)
54{
55 log_DumpBp(LogSYNC, "Write", bp);
27 */
28
29#include <sys/types.h>
30
31#include <stdio.h>
32#include <termios.h>
33
34#include "layer.h"

--- 13 unchanged lines hidden (view full) ---

48#include "descriptor.h"
49#include "physical.h"
50
51static struct mbuf *
52sync_LayerPush(struct bundle *bundle, struct link *l, struct mbuf *bp,
53 int pri, u_short *proto)
54{
55 log_DumpBp(LogSYNC, "Write", bp);
56 mbuf_SetType(bp, MB_SYNCOUT);
56 m_settype(bp, MB_SYNCOUT);
57 return bp;
58}
59
60static struct mbuf *
61sync_LayerPull(struct bundle *b, struct link *l, struct mbuf *bp,
62 u_short *proto)
63{
64 struct physical *p = link2physical(l);
65
66 if (!p)
67 log_Printf(LogERROR, "Can't Pull a sync packet from a logical link\n");
68 else {
69 log_DumpBp(LogSYNC, "Read", bp);
70
71 /* Either done here or by the HDLC layer */
57 return bp;
58}
59
60static struct mbuf *
61sync_LayerPull(struct bundle *b, struct link *l, struct mbuf *bp,
62 u_short *proto)
63{
64 struct physical *p = link2physical(l);
65
66 if (!p)
67 log_Printf(LogERROR, "Can't Pull a sync packet from a logical link\n");
68 else {
69 log_DumpBp(LogSYNC, "Read", bp);
70
71 /* Either done here or by the HDLC layer */
72 p->hdlc.lqm.SaveInOctets += mbuf_Length(bp) + 1;
72 p->hdlc.lqm.SaveInOctets += m_length(bp) + 1;
73 p->hdlc.lqm.SaveInPackets++;
73 p->hdlc.lqm.SaveInPackets++;
74 mbuf_SetType(bp, MB_SYNCIN);
74 m_settype(bp, MB_SYNCIN);
75 }
76
77 return bp;
78}
79
80struct layer synclayer = { LAYER_SYNC, "sync", sync_LayerPush, sync_LayerPull };
75 }
76
77 return bp;
78}
79
80struct layer synclayer = { LAYER_SYNC, "sync", sync_LayerPush, sync_LayerPull };