summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
c9d9dbf)
Add new options pppoe-padi-timeout and pppoe-padi-attempts.
These modifications are the similar to the ones done on
pppoe-discovery in commit
70a8ad3d ("pppoe-discovery: add options to
tune discovery timeout and attempts", 2017-12-07).
Signed-off-by: Alexis Cellier <alexis.cellier@smile.fr>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
- if (padiAttempts > MAX_PADI_ATTEMPTS) {
+ if (padiAttempts > conn->discoveryAttempts) {
warn("Timeout waiting for PADO packets");
close(conn->discoverySocket);
conn->discoverySocket = -1;
warn("Timeout waiting for PADO packets");
close(conn->discoverySocket);
conn->discoverySocket = -1;
timeout = conn->discoveryTimeout;
do {
padrAttempts++;
timeout = conn->discoveryTimeout;
do {
padrAttempts++;
- if (padrAttempts > MAX_PADI_ATTEMPTS) {
+ if (padrAttempts > conn->discoveryAttempts) {
warn("Timeout waiting for PADS packets");
close(conn->discoverySocket);
conn->discoverySocket = -1;
warn("Timeout waiting for PADS packets");
close(conn->discoverySocket);
conn->discoverySocket = -1;
static char *pppoe_reqd_mac = NULL;
unsigned char pppoe_reqd_mac_addr[6];
static char *host_uniq;
static char *pppoe_reqd_mac = NULL;
unsigned char pppoe_reqd_mac_addr[6];
static char *host_uniq;
+static int pppoe_padi_timeout = PADI_TIMEOUT;
+static int pppoe_padi_attempts = MAX_PADI_ATTEMPTS;
static int PPPoEDevnameHook(char *cmd, char **argv, int doit);
static option_t Options[] = {
static int PPPoEDevnameHook(char *cmd, char **argv, int doit);
static option_t Options[] = {
"Only connect to specified MAC address" },
{ "host-uniq", o_string, &host_uniq,
"Set the Host-Uniq to the supplied hex string" },
"Only connect to specified MAC address" },
{ "host-uniq", o_string, &host_uniq,
"Set the Host-Uniq to the supplied hex string" },
+ { "pppoe-padi-timeout", o_int, &pppoe_padi_timeout,
+ "Initial timeout for discovery packets in seconds" },
+ { "pppoe-padi-attempts", o_int, &pppoe_padi_attempts,
+ "Number of discovery attempts" },
{ NULL }
};
int (*OldDevnameHook)(char *cmd, char **argv, int doit) = NULL;
{ NULL }
};
int (*OldDevnameHook)(char *cmd, char **argv, int doit) = NULL;
conn->discoverySocket = -1;
conn->sessionSocket = -1;
conn->printACNames = printACNames;
conn->discoverySocket = -1;
conn->sessionSocket = -1;
conn->printACNames = printACNames;
- conn->discoveryTimeout = PADI_TIMEOUT;
+ conn->discoveryTimeout = pppoe_padi_timeout;
+ conn->discoveryAttempts = pppoe_padi_attempts;