diff options
| author | Vladislav Grishenko <themiron@mail.ru> | 2013-12-24 11:45:48 +0600 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2013-12-24 10:00:28 +0400 |
| commit | c4ddc0fe1f402f84b1bb01b9568e2294569d0d15 (patch) | |
| tree | 78a845ddba89d63651105abe94b9b1efd9552c14 /accel-pppd/ctrl/pppoe | |
| parent | 52da76e41200bb2f9f09cf54960e3fcd1d771b82 (diff) | |
| download | accel-ppp-xebd-c4ddc0fe1f402f84b1bb01b9568e2294569d0d15.tar.gz accel-ppp-xebd-c4ddc0fe1f402f84b1bb01b9568e2294569d0d15.zip | |
ppp: don't unconditionaly load pppoe/pptp/l2tp modules, fixes false start warning if they're running already
Signed-off-by: Vladislav Grishenko <themiron@mail.ru>
Diffstat (limited to 'accel-pppd/ctrl/pppoe')
| -rw-r--r-- | accel-pppd/ctrl/pppoe/pppoe.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/accel-pppd/ctrl/pppoe/pppoe.c b/accel-pppd/ctrl/pppoe/pppoe.c index 9a43181..9d30c62 100644 --- a/accel-pppd/ctrl/pppoe/pppoe.c +++ b/accel-pppd/ctrl/pppoe/pppoe.c @@ -1504,8 +1504,12 @@ static void pppoe_init(void) { struct conf_sect_t *s = conf_get_section("pppoe"); struct conf_option_t *opt; + int fd; - if (system("modprobe -q pppoe")) + fd = socket(AF_PPPOX, SOCK_DGRAM, PX_PROTO_OE); + if (fd >= 0) + close(fd); + else if (system("modprobe -q pppoe")) log_warn("failed to load pppoe kernel module\n"); conn_pool = mempool_create(sizeof(struct pppoe_conn_t)); |