sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Always reset option_rval for every option

This commit is contained in:
Marcel Holtmann 2010-04-02 11:43:20 -07:00
parent 843d3bd2a3
commit 0e8b2815a8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gatchat/ppp_cp.c
View File

@ -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