protocol field compression and no compression, recognize
nasXXX and tapXXX as devices over which we can do PPPoE.
Patches sent by Marco d'Itri.
***********************************************************************/
static char const RCSID[] =
***********************************************************************/
static char const RCSID[] =
-"$Id: common.c,v 1.1 2001/12/14 02:55:20 mostrows Exp $";
+"$Id: common.c,v 1.2 2004/01/13 04:03:58 paulus Exp $";
/**********************************************************************
*%FUNCTION: computeTCPChecksum
*%ARGUMENTS:
/**********************************************************************
*%FUNCTION: computeTCPChecksum
*%ARGUMENTS:
unsigned char *mssopt = NULL;
UINT16_t csum;
unsigned char *mssopt = NULL;
UINT16_t csum;
- /* Is it IPv4? */
- if (packet->payload[0] != 0x00 ||
- packet->payload[1] != 0x21) {
- /* Nope, ignore it */
- return;
- }
+ /* check PPP protocol type */
+ if (packet->payload[0] & 0x01) {
+ /* 8 bit protocol type */
- ipHdr = packet->payload + 2;
+ /* Is it IPv4? */
+ if (packet->payload[0] != 0x21) {
+ /* Nope, ignore it */
+ return;
+ }
+
+ ipHdr = packet->payload + 1;
+ minlen = 41;
+ } else {
+ /* 16 bit protocol type */
+
+ /* Is it IPv4? */
+ if (packet->payload[0] != 0x00 ||
+ packet->payload[1] != 0x21) {
+ /* Nope, ignore it */
+ return;
+ }
+
+ ipHdr = packet->payload + 2;
+ minlen = 42;
+ }
/* Is it too short? */
len = (int) ntohs(packet->length);
/* Is it too short? */
len = (int) ntohs(packet->length);
- if (len < 42) {
- /* 20 byte IP header; 20 byte TCP header; 2 byte PPP protocol */
+ if (len < minlen) {
+ /* 20 byte IP header; 20 byte TCP header; at least 1 or 2 byte PPP protocol */
csum = computeTCPChecksum(ipHdr, tcpHdr);
(* (UINT16_t *) (tcpHdr+16)) = csum;
}
csum = computeTCPChecksum(ipHdr, tcpHdr);
(* (UINT16_t *) (tcpHdr+16)) = csum;
}
+#endif /* PPPOE_STANDALONE */
/***********************************************************************
*%FUNCTION: sendPADT
/***********************************************************************
*%FUNCTION: sendPADT
***********************************************************************/
static char const RCSID[] =
***********************************************************************/
static char const RCSID[] =
-"$Id: discovery.c,v 1.1 2001/12/14 02:55:20 mostrows Exp $";
+"$Id: discovery.c,v 1.2 2004/01/13 04:03:58 paulus Exp $";
do {
padiAttempts++;
if (padiAttempts > MAX_PADI_ATTEMPTS) {
do {
padiAttempts++;
if (padiAttempts > MAX_PADI_ATTEMPTS) {
- rp_fatal("Timeout waiting for PADO packets");
+ warn("Timeout waiting for PADO packets");
+ return;
}
sendPADI(conn);
conn->discoveryState = STATE_SENT_PADI;
}
sendPADI(conn);
conn->discoveryState = STATE_SENT_PADI;
do {
padrAttempts++;
if (padrAttempts > MAX_PADI_ATTEMPTS) {
do {
padrAttempts++;
if (padrAttempts > MAX_PADI_ATTEMPTS) {
- rp_fatal("Timeout waiting for PADS packets");
+ warn("Timeout waiting for PADS packets");
+ return;
}
sendPADR(conn);
conn->discoveryState = STATE_SENT_PADR;
}
sendPADR(conn);
conn->discoveryState = STATE_SENT_PADR;
***********************************************************************/
static char const RCSID[] =
***********************************************************************/
static char const RCSID[] =
-"$Id: plugin.c,v 1.9 2003/04/07 00:01:46 paulus Exp $";
+"$Id: plugin.c,v 1.10 2004/01/13 04:03:58 paulus Exp $";
#define _GNU_SOURCE 1
#include "pppoe.h"
#define _GNU_SOURCE 1
#include "pppoe.h"
} else {
discovery(conn);
if (conn->discoveryState != STATE_SESSION) {
} else {
discovery(conn);
if (conn->discoveryState != STATE_SESSION) {
- fatal("Unable to complete PPPoE Discovery");
+ error("Unable to complete PPPoE Discovery");
+ return -1;
int fd;
struct ifreq ifr;
int fd;
struct ifreq ifr;
- /* Only do it if name is "ethXXX" or "nic-XXXX. In latter case,
- strip off the "nic-" */
+ /* Only do it if name is "ethXXX", "nasXXX", "tapXXX" or "nic-XXXX.
+ In latter case strip off the "nic-" */
/* Thanks to Russ Couturier for this fix */
if (strlen(cmd) > 4 && !strncmp(cmd, "nic-", 4)) {
/* Strip off "nic-" */
cmd += 4;
/* Thanks to Russ Couturier for this fix */
if (strlen(cmd) > 4 && !strncmp(cmd, "nic-", 4)) {
/* Strip off "nic-" */
cmd += 4;
- } else if (strlen(cmd) < 4 || strncmp(cmd, "eth", 3)) {
+ } else if (strlen(cmd) < 4 || (strncmp(cmd, "eth", 3) &&
+ strncmp(cmd, "nas", 3) && strncmp(cmd, "tap", 3))) {
if (OldDevnameHook) return OldDevnameHook(cmd, argv, doit);
return 0;
}
if (OldDevnameHook) return OldDevnameHook(cmd, argv, doit);
return 0;
}