From a04cc1eba9bdf614eea9d7858db4581fc22474d7 Mon Sep 17 00:00:00 2001 From: Dmitry Kozlov Date: Tue, 8 Feb 2011 21:46:57 +0300 Subject: snapshot --- accel-pppd/extra/chap-secrets.c | 6 +++--- accel-pppd/extra/ippool.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'accel-pppd/extra') diff --git a/accel-pppd/extra/chap-secrets.c b/accel-pppd/extra/chap-secrets.c index a42ab23..3a299cc 100644 --- a/accel-pppd/extra/chap-secrets.c +++ b/accel-pppd/extra/chap-secrets.c @@ -24,7 +24,7 @@ static struct ipdb_t ipdb; struct cs_pd_t { struct ppp_pd_t pd; - struct ipdb_item_t ip; + struct ipv4db_item_t ip; char *passwd; char *rate; }; @@ -212,7 +212,7 @@ static void ev_ppp_pre_up(struct ppp_t *ppp) } } -static struct ipdb_item_t *get_ip(struct ppp_t *ppp) +static struct ipv4db_item_t *get_ip(struct ppp_t *ppp) { struct cs_pd_t *pd; @@ -244,7 +244,7 @@ static char* get_passwd(struct pwdb_t *pwdb, struct ppp_t *ppp, const char *user } static struct ipdb_t ipdb = { - .get = get_ip, + .get_ipv4 = get_ip, }; static struct pwdb_t pwdb = { diff --git a/accel-pppd/extra/ippool.c b/accel-pppd/extra/ippool.c index 20da17c..2637c6a 100644 --- a/accel-pppd/extra/ippool.c +++ b/accel-pppd/extra/ippool.c @@ -14,7 +14,7 @@ struct ippool_item_t { struct list_head entry; - struct ipdb_item_t it; + struct ipv4db_item_t it; }; struct ipaddr_t @@ -153,7 +153,7 @@ static void generate_pool(void) } } -static struct ipdb_item_t *get_ip(struct ppp_t *ppp) +static struct ipv4db_item_t *get_ip(struct ppp_t *ppp) { struct ippool_item_t *it; @@ -168,7 +168,7 @@ static struct ipdb_item_t *get_ip(struct ppp_t *ppp) return it ? &it->it : NULL; } -static void put_ip(struct ppp_t *ppp, struct ipdb_item_t *it) +static void put_ip(struct ppp_t *ppp, struct ipv4db_item_t *it) { struct ippool_item_t *pit = container_of(it, typeof(*pit), it); @@ -178,8 +178,8 @@ static void put_ip(struct ppp_t *ppp, struct ipdb_item_t *it) } static struct ipdb_t ipdb = { - .get = get_ip, - .put = put_ip, + .get_ipv4 = get_ip, + .put_ipv4 = put_ip, }; static void __init ipool_init(void) -- cgit v1.2.3