***********************************************************************/
static char const RCSID[] =
-"$Id: plugin.c,v 1.1 2001/12/14 02:55:20 mostrows Exp $";
+"$Id: plugin.c,v 1.7 2002/04/02 13:11:00 dfs Exp $";
#define _GNU_SOURCE 1
#include "pppoe.h"
#define _PATH_ETHOPT _ROOT_PATH "/etc/ppp/options."
+char pppd_version[] = VERSION;
+
/* 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;
+int (*OldDevnameHook)(char *cmd, char **argv, int doit) = 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;
}
}
}
-#ifdef HAVE_LICENSE
/* Set PPPoE session-number for further consumption */
- pppd_pppoe_session = ntohs(conn->session);
-#endif
+ ppp_session_number = ntohs(conn->session);
/* Make the session socket */
conn->sessionSocket = socket(AF_PPPOX, SOCK_STREAM, PX_PROTO_OE);
sp.sa_addr.pppoe.sid = conn->session;
memcpy(sp.sa_addr.pppoe.dev, conn->ifName, IFNAMSIZ);
memcpy(sp.sa_addr.pppoe.remote, conn->peerEth, ETH_ALEN);
-#ifdef HAVE_LICENSE
+
/* Set remote_number for ServPoET */
sprintf(remote_number, "%02X:%02X:%02X:%02X:%02X:%02X",
(unsigned) conn->peerEth[0],
(unsigned) conn->peerEth[3],
(unsigned) conn->peerEth[4],
(unsigned) conn->peerEth[5]);
-#endif
if (connect(conn->sessionSocket, (struct sockaddr *) &sp,
sizeof(struct sockaddr_pppox)) < 0) {
/**********************************************************************
* %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" 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);
+ 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;
return 1;
}
- if (OldDevnameHook) r = OldDevnameHook(name);
+ if (OldDevnameHook) r = OldDevnameHook(cmd, argv, doit);
return r;
}