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/pptp | |
| 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/pptp')
| -rw-r--r-- | accel-pppd/ctrl/pptp/pptp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/accel-pppd/ctrl/pptp/pptp.c b/accel-pppd/ctrl/pptp/pptp.c index d5b96c1e..31ffd007 100644 --- a/accel-pppd/ctrl/pptp/pptp.c +++ b/accel-pppd/ctrl/pptp/pptp.c @@ -60,6 +60,7 @@ static int conf_echo_interval = 0; static int conf_echo_failure = 3; static int conf_verbose = 0; static int conf_mppe = MPPE_UNSET; +static const char *conf_ip_pool; static mempool_t conn_pool; @@ -685,6 +686,9 @@ static int pptp_connect(struct triton_md_handler_t *h) ppp_init(&conn->ppp); conn->ppp.ses.ctrl = &conn->ctrl; + if (conf_ip_pool) + conn->ppp.ses.ipv4_pool_name = _strdup(conf_ip_pool); + triton_context_register(&conn->ctx, &conn->ppp.ses); triton_md_register_handler(&conn->ctx, &conn->hnd); triton_md_enable_handler(&conn->hnd,MD_MODE_READ); @@ -759,6 +763,8 @@ static void load_config(void) else if (strcmp(opt, "require") == 0) conf_mppe = MPPE_REQUIRE; } + + conf_ip_pool = conf_get_opt("pptp", "ip-pool"); } static void pptp_init(void) |