***********************************************************************/
static char const RCSID[] =
-"$Id: plugin.c,v 1.4 2002/02/27 16:00:30 dfs Exp $";
+"$Id: plugin.c,v 1.9 2003/04/07 00:01:46 paulus Exp $";
#define _GNU_SOURCE 1
#include "pppoe.h"
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",
"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;
/**********************************************************************
}
sock = socket(AF_INET, SOCK_DGRAM, 0);
if (sock < 0) {
- fatal("Couldn't create IP socket: %m");
+ error("Couldn't create IP socket: %m");
+ return;
}
strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
ifr.ifr_mtu = mtu;
if (ioctl(sock, SIOCSIFMTU, &ifr) < 0) {
- fatal("ioctl(SIOCSIFMTU): %m");
+ error("Couldn't set interface MTU to %d: %m", mtu);
+ return;
}
(void) close (sock);
}
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);
}
/**********************************************************************
/**********************************************************************
* %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;
}