***********************************************************************/
static char const RCSID[] =
-"$Id: plugin.c,v 1.8 2003/03/04 05:21:38 fcusack Exp $";
+"$Id: plugin.c,v 1.13 2005/07/09 09:12:48 paulus Exp $";
#define _GNU_SOURCE 1
#include "pppoe.h"
"Be verbose about discovered access concentrators"},
{ NULL }
};
-int (*OldDevnameHook)(char *cmd, char **argv, int doit) = NULL;
+
static PPPoEConnection *conn = NULL;
/**********************************************************************
} else {
discovery(conn);
if (conn->discoveryState != STATE_SESSION) {
- fatal("Unable to complete PPPoE Discovery");
+ error("Unable to complete PPPoE Discovery");
+ return -1;
}
}
return conn->sessionSocket;
}
-static int
-PPPOESendConfig(int mtu,
- u_int32_t asyncmap,
- int pcomp,
- int accomp)
-{
- int sock;
- struct ifreq ifr;
-
- if (mtu > MAX_PPPOE_MTU) {
- warn("Couldn't increase MTU to %d", mtu);
- mtu = MAX_PPPOE_MTU;
- }
- sock = socket(AF_INET, SOCK_DGRAM, 0);
- if (sock < 0) {
- error("Couldn't create IP socket: %m");
- return -1;
- }
- strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
- ifr.ifr_mtu = mtu;
- if (ioctl(sock, SIOCSIFMTU, &ifr) < 0) {
- error("ioctl(SIOCSIFMTU): %m");
- return -1;
- }
- (void) close (sock);
- return 0;
-}
-
-
-static int
+static void
PPPOERecvConfig(int mru,
u_int32_t asyncmap,
int pcomp,
int accomp)
{
- if (mru > MAX_PPPOE_MTU) {
- error("Couldn't increase MRU to %d", mru);
- return -1;
- }
- return 0;
+ if (mru > MAX_PPPOE_MTU)
+ warn("Couldn't increase MRU to %d", mru);
}
/**********************************************************************
return;
}
close(conn->sessionSocket);
+ /* don't send PADT?? */
+ close(conn->discoverySocket);
}
static void
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;
- } else if (strlen(cmd) < 4 || strncmp(cmd, "eth", 3)) {
- if (OldDevnameHook) return OldDevnameHook(cmd, argv, doit);
+ } else if (strlen(cmd) < 4
+ || (strncmp(cmd, "eth", 3) && strncmp(cmd, "nas", 3)
+ && strncmp(cmd, "tap", 3) && strncmp(cmd, "br", 2))) {
return 0;
}
lcp_allowoptions[0].neg_pcompression = 0;
lcp_wantoptions[0].neg_pcompression = 0;
+ lcp_allowoptions[0].mru = MAX_PPPOE_MTU;
+ lcp_wantoptions[0].mru = MAX_PPPOE_MTU;
+
ccp_allowoptions[0].deflate = 0 ;
ccp_wantoptions[0].deflate = 0 ;
return 1;
}
- if (OldDevnameHook) r = OldDevnameHook(cmd, argv, doit);
return r;
}
disconnect: &PPPOEDisconnectDevice,
establish_ppp: &generic_establish_ppp,
disestablish_ppp: &generic_disestablish_ppp,
- send_config: &PPPOESendConfig,
+ send_config: NULL,
recv_config: &PPPOERecvConfig,
close: NULL,
cleanup: NULL