***********************************************************************/
static char const RCSID[] =
-"$Id: plugin.c,v 1.6 2002/03/14 21:54:06 dfs Exp $";
+"$Id: plugin.c,v 1.11 2004/10/24 23:06:31 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;
}
}
}
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);
}
/**********************************************************************
int fd;
struct ifreq ifr;
- /* Only do it if name is "ethXXX" */
+ /* 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, "eth", 3)) {
- if (OldDevnameHook) return OldDevnameHook(cmd, argv, doit);
+ 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;
}
return 1;
}
- if (OldDevnameHook) r = OldDevnameHook(cmd, argv, doit);
return r;
}