*/
#ifndef lint
-static char rcsid[] = "$Id: demand.c,v 1.1 1996/01/01 23:10:09 paulus Exp $";
+static char rcsid[] = "$Id: demand.c,v 1.3 1996/05/28 00:37:53 paulus Exp $";
#endif
#include <stdio.h>
#include <sys/stat.h>
#include <sys/socket.h>
#include <net/if.h>
+#include <net/bpf.h>
#include "pppd.h"
#include "fsm.h"
struct packet *pend_q;
struct packet *pend_qtail;
+static int active_packet __P((unsigned char *, int));
+
/*
* demand_conf - configure the interface for doing dial-on-demand.
*/
ppp_send_config(0, PPP_MRU, (u_int32_t) 0, 0, 0);
ppp_recv_config(0, PPP_MRU, (u_int32_t) 0, 0, 0);
+#if 0
+ set_filters(&pass_filter, &active_filter);
+#endif
+
/*
* Call the demand_conf procedure for each protocol that's got one.
*/
for (i = 0; (protp = protocols[i]) != NULL; ++i)
if (protp->enabled_flag && protp->demand_conf != NULL)
- sifnpmode(0, protp->protocol, NPMODE_QUEUE);
+ sifnpmode(0, protp->protocol & ~0x8000, NPMODE_QUEUE);
get_loop_output();
}
for (i = 0; (protp = protocols[i]) != NULL; ++i)
if (protp->enabled_flag && protp->demand_conf != NULL)
- sifnpmode(0, protp->protocol, NPMODE_ERROR);
+ sifnpmode(0, protp->protocol & ~0x8000, NPMODE_ERROR);
get_loop_output();
/* discard all saved packets */
for (i = 0; (protp = protocols[i]) != NULL; ++i)
if (protp->enabled_flag && protp->demand_conf != NULL)
- sifnpmode(0, protp->protocol, NPMODE_PASS);
+ sifnpmode(0, protp->protocol & ~0x8000, NPMODE_PASS);
}
/*
* decide whether to bring up the link or not, and, if we want
* to transmit this frame later, put it on the pending queue.
* Return value is 1 if we need to bring up the link, 0 otherwise.
+ * We assume that the kernel driver has already applied the
+ * pass_filter, so we won't get packets it rejected.
+ * We apply the active_filter to see if we want this packet to
+ * bring up the link.
*/
int
loop_frame(frame, len)
if (len < PPP_HDRLEN)
return 0;
- if (PPP_PROTOCOL(frame) != PPP_IP)
+ if ((PPP_PROTOCOL(frame) & 0x8000) != 0)
+ return 0; /* shouldn't get any of these anyway */
+ if (!active_packet(frame, len))
return 0;
+
pkt = (struct packet *) malloc(sizeof(struct packet) + len);
if (pkt != NULL) {
pkt->length = len;
pkt = pend_q;
pend_q = NULL;
for (; pkt != NULL; pkt = nextpkt) {
+ nextpkt = pkt->next;
if (PPP_PROTOCOL(pkt->data) == proto) {
output(0, pkt->data, pkt->length);
- nextpkt = pkt->next;
free(pkt);
} else {
if (prev == NULL)
}
}
pend_qtail = prev;
+ if (prev != NULL)
+ prev->next = NULL;
+}
+
+/*
+ * Scan a packet to decide whether it is an "active" packet,
+ * that is, whether it is worth bringing up the link for.
+ */
+static int
+active_packet(p, len)
+ unsigned char *p;
+ int len;
+{
+ return 1; /* for now */
}