diff options
| author | Dmitry Kozlov <xeb@mail.ru> | 2013-10-10 22:41:13 +0400 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2013-10-10 22:41:13 +0400 |
| commit | dc7f00931df32a905f7fa5aa72a028cf6e807c3a (patch) | |
| tree | 89ff8658c4b794debd62cc2105b2fd7dfbd84b22 /accel-pppd/ctrl/pppoe | |
| parent | 272dbf39f83240451d6a0c122ccdbe28eb892ad7 (diff) | |
| parent | 8c608ea9a5b6b73520c11e3974bb8cad3b7da914 (diff) | |
| download | accel-ppp-dc7f00931df32a905f7fa5aa72a028cf6e807c3a.tar.gz accel-ppp-dc7f00931df32a905f7fa5aa72a028cf6e807c3a.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/accel-ppp/code
Diffstat (limited to 'accel-pppd/ctrl/pppoe')
| -rw-r--r-- | accel-pppd/ctrl/pppoe/pppoe.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/accel-pppd/ctrl/pppoe/pppoe.c b/accel-pppd/ctrl/pppoe/pppoe.c index 21051ed3..c254c7aa 100644 --- a/accel-pppd/ctrl/pppoe/pppoe.c +++ b/accel-pppd/ctrl/pppoe/pppoe.c @@ -89,6 +89,7 @@ char *conf_pado_delay; int conf_tr101 = 1; int conf_padi_limit = 0; int conf_mppe = MPPE_UNSET; +static const char *conf_ip_pool; static mempool_t conn_pool; static mempool_t pado_pool; @@ -299,6 +300,9 @@ static struct pppoe_conn_t *allocate_channel(struct pppoe_serv_t *serv, const ui conn->ppp.ses.ctrl = &conn->ctrl; conn->ppp.ses.chan_name = conn->ctrl.calling_station_id; + + if (conf_ip_pool) + conn->ppp.ses.ipv4_pool_name = _strdup(conf_ip_pool); triton_context_register(&conn->ctx, &conn->ppp.ses); triton_context_wakeup(&conn->ctx); @@ -1489,6 +1493,8 @@ static void load_config(void) else if (strcmp(opt, "require") == 0) conf_mppe = MPPE_REQUIRE; } + + conf_ip_pool = conf_get_opt("pppoe", "ip-pool"); } static void pppoe_init(void) |