diff options
| -rw-r--r-- | gatchat/ppp_cp.c | 4 | ||||
| -rw-r--r-- | gatchat/ppp_cp.h | 4 | ||||
| -rw-r--r-- | gatchat/ppp_ipcp.c | 3 | ||||
| -rw-r--r-- | gatchat/ppp_lcp.c | 3 |
4 files changed, 8 insertions, 6 deletions
diff --git a/gatchat/ppp_cp.c b/gatchat/ppp_cp.c index 9d3d18bb..5ade8769 100644 --- a/gatchat/ppp_cp.c +++ b/gatchat/ppp_cp.c @@ -895,7 +895,7 @@ static guint8 pppcp_process_configure_request(struct pppcp_data *data, i += option->length; if (action->option_scan) - rval = action->option_scan(option, data); + rval = action->option_scan(data, option); else rval = OPTION_ERR; @@ -1039,7 +1039,7 @@ static guint8 pppcp_process_configure_nak(struct pppcp_data *data, i += naked_option->length; if (action->option_scan) - rval = action->option_scan(naked_option, data); + rval = action->option_scan(data, naked_option); else rval = OPTION_ERR; diff --git a/gatchat/ppp_cp.h b/gatchat/ppp_cp.h index 2cbda54b..71d40806 100644 --- a/gatchat/ppp_cp.h +++ b/gatchat/ppp_cp.h @@ -40,8 +40,8 @@ struct pppcp_action { void (*this_layer_down)(struct pppcp_data *data); void (*this_layer_started)(struct pppcp_data *data); void (*this_layer_finished)(struct pppcp_data *data); - enum option_rval (*option_scan)(struct ppp_option *option, - gpointer user_data); + enum option_rval (*option_scan)(struct pppcp_data *pppcp, + struct ppp_option *option); void (*option_process)(struct pppcp_data *data, struct ppp_option *option); }; diff --git a/gatchat/ppp_ipcp.c b/gatchat/ppp_ipcp.c index 2a59b840..f5f738ba 100644 --- a/gatchat/ppp_ipcp.c +++ b/gatchat/ppp_ipcp.c @@ -104,7 +104,8 @@ static void ipcp_finished(struct pppcp_data *data) /* * Scan the option to see if it is acceptable, unacceptable, or rejected */ -static guint ipcp_option_scan(struct ppp_option *option, gpointer user) +static guint ipcp_option_scan(struct pppcp_data *pppcp, + struct ppp_option *option) { switch (option->type) { case IP_ADDRESS: diff --git a/gatchat/ppp_lcp.c b/gatchat/ppp_lcp.c index 7dab019b..aba52864 100644 --- a/gatchat/ppp_lcp.c +++ b/gatchat/ppp_lcp.c @@ -86,7 +86,8 @@ static void lcp_finished(struct pppcp_data *pppcp) * We need to use a default case here because this option type value * could be anything. */ -static guint lcp_option_scan(struct ppp_option *option, gpointer user) +static guint lcp_option_scan(struct pppcp_data *pppcp, + struct ppp_option *option) { switch (option->type) { case ACCM: |