diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2010-04-02 11:43:20 -0700 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2010-04-02 11:43:20 -0700 |
| commit | 0e8b2815a8778af199a202eabee60881912175b5 (patch) | |
| tree | 2aa281d03fec360589c30a0342d2fd0d796356d7 /gatchat/ppp_cp.c | |
| parent | 843d3bd2a3a6adabeaeff9b76065f52bc2735a74 (diff) | |
| download | ofono-0e8b2815a8778af199a202eabee60881912175b5.tar.bz2 | |
Always reset option_rval for every option
Diffstat (limited to 'gatchat/ppp_cp.c')
| -rw-r--r-- | gatchat/ppp_cp.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gatchat/ppp_cp.c b/gatchat/ppp_cp.c index 16c06038..34a9cfcd 100644 --- a/gatchat/ppp_cp.c +++ b/gatchat/ppp_cp.c @@ -1158,7 +1158,7 @@ static guint8 pppcp_process_configure_request(struct pppcp_data *data, gint len; int i = 0; struct ppp_option *option; - enum option_rval rval = OPTION_ERR; + enum option_rval rval; struct pppcp_action *action = data->action; pppcp_trace(data); @@ -1178,6 +1178,9 @@ static guint8 pppcp_process_configure_request(struct pppcp_data *data, if (action->option_scan) rval = action->option_scan(option, data); + else + rval = OPTION_ERR; + switch (rval) { case OPTION_ACCEPT: data->acceptable_options = @@ -1290,7 +1293,7 @@ static guint8 pppcp_process_configure_nak(struct pppcp_data *data, struct ppp_option *naked_option; struct ppp_option *config_option; guint i = 0; - enum option_rval rval = OPTION_ERR; + enum option_rval rval; struct pppcp_action *action = data->action; pppcp_trace(data); @@ -1317,6 +1320,9 @@ static guint8 pppcp_process_configure_nak(struct pppcp_data *data, if (action->option_scan) rval = action->option_scan(naked_option, data); + else + rval = OPTION_ERR; + if (rval == OPTION_ACCEPT) { /* * check the current config options to see if they |