20c20
< * $FreeBSD: head/usr.sbin/ppp/ip.c 50479 1999-08-28 01:35:59Z peter $
---
> * $FreeBSD: head/usr.sbin/ppp/ip.c 50867 1999-09-04 00:00:21Z brian $
71,77d70
< static const u_short interactive_ports[32] = {
< 544, 513, 514, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
< 80, 81, 0, 0, 0, 21, 22, 23, 0, 0, 0, 0, 0, 0, 0, 543,
< };
<
< #define INTERACTIVE(p) (interactive_ports[(p) & 0x1F] == (p))
<
322c315
< int pri = PRI_NORMAL;
---
> int pri = 0;
397,401c390,395
< pri = PRI_FAST;
< else if ((ntohs(pip->ip_off) & IP_OFFMASK) == 0) {
< if (INTERACTIVE(ntohs(th->th_sport)) || INTERACTIVE(ntohs(th->th_dport)))
< pri = PRI_FAST;
< }
---
> pri++;
> else if ((ntohs(pip->ip_off) & IP_OFFMASK) == 0 &&
> ipcp_IsUrgentPort(&bundle->ncp.ipcp, ntohs(th->th_sport),
> ntohs(th->th_dport)))
> pri++;
>
508c502
< if (pri < 0 || pri > sizeof ipcp->Queue / sizeof ipcp->Queue[0])
---
> if (pri < 0 || pri >= IPCP_QUEUES(ipcp))
521c515
< mbuf_Enqueue(&ipcp->Queue[pri], bp);
---
> mbuf_Enqueue(ipcp->Queue + pri, bp);
530c524
< for (queue = ipcp->Queue; queue < ipcp->Queue + PRI_MAX; queue++)
---
> for (queue = ipcp->Queue; queue < ipcp->Queue + IPCP_QUEUES(ipcp); queue++)
541c535
< for (queue = ipcp->Queue; queue < ipcp->Queue + PRI_MAX; queue++)
---
> for (queue = ipcp->Queue; queue < ipcp->Queue + IPCP_QUEUES(ipcp); queue++)
559c553,554
< for (queue = &ipcp->Queue[PRI_FAST]; queue >= ipcp->Queue; queue--)
---
> queue = ipcp->Queue + IPCP_QUEUES(ipcp) - 1;
> do {
566c561
< link_PushPacket(l, bp, bundle, PRI_NORMAL, PROTO_IP);
---
> link_PushPacket(l, bp, bundle, 0, PROTO_IP);
569a565
> } while (queue-- != ipcp->Queue);