***********************************************************************/
static char const RCSID[] =
-"$Id: plugin.c,v 1.2 2002/01/22 16:03:05 dfs Exp $";
+"$Id: plugin.c,v 1.13 2005/07/09 09:12:48 paulus Exp $";
#define _GNU_SOURCE 1
#include "pppoe.h"
/* From sys-linux.c in pppd -- MUST FIX THIS! */
extern int new_style_driver;
-static char *service = NULL;
+char *pppd_pppoe_service = NULL;
static char *acName = NULL;
static char *existingSession = NULL;
+static int printACNames = 0;
-static int PPPoEDevnameHook(const char *name);
+static int PPPoEDevnameHook(char *cmd, char **argv, int doit);
static option_t Options[] = {
{ "device name", o_wild, (void *) &PPPoEDevnameHook,
"PPPoE device name",
OPT_DEVNAM | OPT_PRIVFIX | OPT_NOARG | OPT_A2STRVAL | OPT_STATIC,
devnam},
- { "rp_pppoe_service", o_string, &service,
+ { "rp_pppoe_service", o_string, &pppd_pppoe_service,
"Desired PPPoE service name" },
{ "rp_pppoe_ac", o_string, &acName,
"Desired PPPoE access concentrator name" },
{ "rp_pppoe_sess", o_string, &existingSession,
"Attach to existing session (sessid:macaddr)" },
+ { "rp_pppoe_verbose", o_int, &printACNames,
+ "Be verbose about discovered access concentrators"},
{ NULL }
};
-int (*OldDevnameHook)(const char *name) = NULL;
+
static PPPoEConnection *conn = NULL;
/**********************************************************************
if (acName) {
SET_STRING(conn->acName, acName);
}
- if (service) {
- SET_STRING(conn->serviceName, acName);
+ if (pppd_pppoe_service) {
+ SET_STRING(conn->serviceName, pppd_pppoe_service);
}
SET_STRING(conn->ifName, devnam);
conn->discoverySocket = -1;
conn->sessionSocket = -1;
conn->useHostUniq = 1;
+ conn->printACNames = printACNames;
return 1;
}
} 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 void
-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) {
- fatal("Couldn't create IP socket: %m");
- }
- strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
- ifr.ifr_mtu = mtu;
- if (ioctl(sock, SIOCSIFMTU, &ifr) < 0) {
- fatal("ioctl(SIOCSIFMTU): %m");
- }
- (void) close (sock);
-}
-
-
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);
- }
+ 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
/**********************************************************************
* %FUNCTION: PPPoEDevnameHook
* %ARGUMENTS:
- * name -- name of device
+ * cmd -- the command (actually, the device name
+ * argv -- argument vector
+ * doit -- if non-zero, set device name. Otherwise, just check if possible
* %RETURNS:
* 1 if we will handle this device; 0 otherwise.
* %DESCRIPTION:
* sets up devnam (string representation of device).
***********************************************************************/
static int
-PPPoEDevnameHook(const char *name)
+PPPoEDevnameHook(char *cmd, char **argv, int doit)
{
int r = 1;
int fd;
struct ifreq ifr;
+ /* 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) && strncmp(cmd, "nas", 3)
+ && strncmp(cmd, "tap", 3) && strncmp(cmd, "br", 2))) {
+ return 0;
+ }
+
/* Open a socket */
if ((fd = socket(PF_PACKET, SOCK_RAW, 0)) < 0) {
r = 0;
/* Try getting interface index */
if (r) {
- strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
+ strncpy(ifr.ifr_name, cmd, sizeof(ifr.ifr_name));
if (ioctl(fd, SIOCGIFINDEX, &ifr) < 0) {
r = 0;
} else {
r = 0;
} else {
if (ifr.ifr_hwaddr.sa_family != ARPHRD_ETHER) {
- error("Interface %s not Ethernet", name);
+ error("Interface %s not Ethernet", cmd);
r=0;
}
}
/* Close socket */
close(fd);
if (r) {
- strncpy(devnam, name, sizeof(devnam));
+ strncpy(devnam, cmd, sizeof(devnam));
if (the_channel != &pppoe_channel) {
the_channel = &pppoe_channel;
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(name);
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