[Accel-ppp-users] [PATCH 2/2] auth: remove .recv_conf_req from struct ppp_auth_handler_t
Status: Beta
Brought to you by:
xebd
From: Guillaume N. <g....@al...> - 2018-11-19 16:44:51
|
This callback isn't used anymore. Let's remove it from all authentication backends. Signed-off-by: Guillaume Nault <g....@al...> --- accel-pppd/auth/auth_chap_md5.c | 8 -------- accel-pppd/auth/auth_mschap_v1.c | 8 -------- accel-pppd/auth/auth_mschap_v2.c | 8 -------- accel-pppd/auth/auth_pap.c | 7 ------- accel-pppd/ppp/ppp_auth.h | 1 - 5 files changed, 32 deletions(-) diff --git a/accel-pppd/auth/auth_chap_md5.c b/accel-pppd/auth/auth_chap_md5.c index ae062f53..de7f7418 100644 --- a/accel-pppd/auth/auth_chap_md5.c +++ b/accel-pppd/auth/auth_chap_md5.c @@ -185,13 +185,6 @@ static int lcp_send_conf_req(struct ppp_t *ppp, struct auth_data_t *d, uint8_t * return 1; } -static int lcp_recv_conf_req(struct ppp_t *ppp, struct auth_data_t *d, uint8_t *ptr) -{ - if (*ptr == CHAP_MD5) - return LCP_OPT_ACK; - return LCP_OPT_NAK; -} - static void chap_send_failure(struct chap_auth_data *ad) { struct chap_failure msg = { @@ -441,7 +434,6 @@ static struct ppp_auth_handler_t chap= .init = auth_data_init, .free = auth_data_free, .send_conf_req = lcp_send_conf_req, - .recv_conf_req = lcp_recv_conf_req, .start = chap_start, .finish = chap_finish, .check = chap_check, diff --git a/accel-pppd/auth/auth_mschap_v1.c b/accel-pppd/auth/auth_mschap_v1.c index 67f941c6..23b0f0e9 100644 --- a/accel-pppd/auth/auth_mschap_v1.c +++ b/accel-pppd/auth/auth_mschap_v1.c @@ -186,13 +186,6 @@ static int lcp_send_conf_req(struct ppp_t *ppp, struct auth_data_t *d, uint8_t * return 1; } -static int lcp_recv_conf_req(struct ppp_t *ppp, struct auth_data_t *d, uint8_t *ptr) -{ - if (*ptr == MSCHAP_V1) - return LCP_OPT_ACK; - return LCP_OPT_NAK; -} - static void chap_send_failure(struct chap_auth_data *ad, char *mschap_error) { struct chap_hdr *hdr = _malloc(sizeof(*hdr) + strlen(mschap_error) + 1); @@ -514,7 +507,6 @@ static struct ppp_auth_handler_t chap = { .init = auth_data_init, .free = auth_data_free, .send_conf_req = lcp_send_conf_req, - .recv_conf_req = lcp_recv_conf_req, .start = chap_start, .finish = chap_finish, .check = chap_check, diff --git a/accel-pppd/auth/auth_mschap_v2.c b/accel-pppd/auth/auth_mschap_v2.c index 5c82413c..66e17f24 100644 --- a/accel-pppd/auth/auth_mschap_v2.c +++ b/accel-pppd/auth/auth_mschap_v2.c @@ -187,13 +187,6 @@ static int lcp_send_conf_req(struct ppp_t *ppp, struct auth_data_t *d, uint8_t * return 1; } -static int lcp_recv_conf_req(struct ppp_t *ppp, struct auth_data_t *d, uint8_t *ptr) -{ - if (*ptr == MSCHAP_V2) - return LCP_OPT_ACK; - return LCP_OPT_NAK; -} - static void chap_send_failure(struct chap_auth_data *ad, char *mschap_error, char *reply_msg) { struct chap_hdr *hdr = _malloc(sizeof(*hdr) + strlen(mschap_error) + strlen(reply_msg) + 4); @@ -662,7 +655,6 @@ static struct ppp_auth_handler_t chap= .init = auth_data_init, .free = auth_data_free, .send_conf_req = lcp_send_conf_req, - .recv_conf_req = lcp_recv_conf_req, .start = chap_start, .finish = chap_finish, .check = chap_check, diff --git a/accel-pppd/auth/auth_pap.c b/accel-pppd/auth/auth_pap.c index a290123e..a2303d12 100644 --- a/accel-pppd/auth/auth_pap.c +++ b/accel-pppd/auth/auth_pap.c @@ -29,7 +29,6 @@ static int conf_any_login = 0; static struct auth_data_t* auth_data_init(struct ppp_t *ppp); static void auth_data_free(struct ppp_t*, struct auth_data_t*); static int lcp_send_conf_req(struct ppp_t*, struct auth_data_t*, uint8_t*); -static int lcp_recv_conf_req(struct ppp_t*, struct auth_data_t*, uint8_t*); static int pap_start(struct ppp_t*, struct auth_data_t*); static int pap_finish(struct ppp_t*, struct auth_data_t*); static void pap_recv(struct ppp_handler_t*h); @@ -64,7 +63,6 @@ static struct ppp_auth_handler_t pap= { .init = auth_data_init, .free = auth_data_free, .send_conf_req = lcp_send_conf_req, - .recv_conf_req = lcp_recv_conf_req, .start = pap_start, .finish = pap_finish, }; @@ -132,11 +130,6 @@ static int lcp_send_conf_req(struct ppp_t *ppp, struct auth_data_t *d, uint8_t * return 0; } -static int lcp_recv_conf_req(struct ppp_t *ppp, struct auth_data_t *d, uint8_t *ptr) -{ - return LCP_OPT_ACK; -} - static void pap_send_ack(struct pap_auth_data *p, int id) { uint8_t buf[128]; diff --git a/accel-pppd/ppp/ppp_auth.h b/accel-pppd/ppp/ppp_auth.h index c8df9fc6..e9398c29 100644 --- a/accel-pppd/ppp/ppp_auth.h +++ b/accel-pppd/ppp/ppp_auth.h @@ -22,7 +22,6 @@ struct ppp_auth_handler_t const char *name; struct auth_data_t* (*init)(struct ppp_t*); int (*send_conf_req)(struct ppp_t*, struct auth_data_t*, uint8_t*); - int (*recv_conf_req)(struct ppp_t*, struct auth_data_t*, uint8_t*); int (*start)(struct ppp_t*, struct auth_data_t*); int (*finish)(struct ppp_t*, struct auth_data_t*); void (*free)(struct ppp_t*,struct auth_data_t*); -- 2.19.1 |