Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
P
PPSi
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
47
Issues
47
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
PPSi
Commits
91c672a7
Commit
91c672a7
authored
Mar 09, 2012
by
Aurelio Colosimo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
st_com_execute_slave check DELAYREQ and PDELAYREQ only in slave state
parent
1f3ec181
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
6 deletions
+9
-6
common-fun.c
proto-standard/common-fun.c
+4
-1
common-fun.h
proto-standard/common-fun.h
+1
-1
state-listening.c
proto-standard/state-listening.c
+1
-1
state-passive.c
proto-standard/state-passive.c
+1
-1
state-slave.c
proto-standard/state-slave.c
+1
-1
state-uncalibrated.c
proto-standard/state-uncalibrated.c
+1
-1
No files found.
proto-standard/common-fun.c
View file @
91c672a7
...
...
@@ -7,7 +7,7 @@
#include <pptp/diag.h>
#include "common-fun.h"
int
st_com_execute_slave
(
struct
pp_instance
*
ppi
)
int
st_com_execute_slave
(
struct
pp_instance
*
ppi
,
int
check_delayreq
)
{
if
(
pp_timer_expired
(
ppi
->
timers
[
PP_TIMER_ANN_RECEIPT
]))
{
PP_VPRINTF
(
"event ANNOUNCE_RECEIPT_TIMEOUT_EXPIRES
\n
"
);
...
...
@@ -23,6 +23,9 @@ int st_com_execute_slave(struct pp_instance *ppi)
}
}
if
(
!
check_delayreq
)
return
0
;
if
(
OPTS
(
ppi
)
->
e2e_mode
)
{
if
(
pp_timer_expired
(
ppi
->
timers
[
PP_TIMER_DELAYREQ
]))
{
PP_VPRINTF
(
"event DELAYREQ_INTERVAL_TIMEOUT_EXPIRES
\n
"
);
...
...
proto-standard/common-fun.h
View file @
91c672a7
...
...
@@ -8,7 +8,7 @@
/* Contains all functions common to more than one state */
/* returns -1 in case of error, see below */
int
st_com_execute_slave
(
struct
pp_instance
*
ppi
);
int
st_com_execute_slave
(
struct
pp_instance
*
ppi
,
int
check_delayreq
);
void
st_com_restart_annrec_timer
(
struct
pp_instance
*
ppi
);
...
...
proto-standard/state-listening.c
View file @
91c672a7
...
...
@@ -37,7 +37,7 @@ int pp_listening(struct pp_instance *ppi, unsigned char *pkt, int plen)
no_incoming_msg:
if
(
e
==
0
)
e
=
st_com_execute_slave
(
ppi
);
e
=
st_com_execute_slave
(
ppi
,
0
);
if
(
e
!=
0
)
ppi
->
next_state
=
PPS_FAULTY
;
...
...
proto-standard/state-passive.c
View file @
91c672a7
...
...
@@ -45,7 +45,7 @@ int pp_passive(struct pp_instance *ppi, unsigned char *pkt, int plen)
no_incoming_msg:
if
(
e
==
0
)
e
=
st_com_execute_slave
(
ppi
);
e
=
st_com_execute_slave
(
ppi
,
0
);
if
(
e
!=
0
)
ppi
->
next_state
=
PPS_FAULTY
;
...
...
proto-standard/state-slave.c
View file @
91c672a7
...
...
@@ -243,7 +243,7 @@ int pp_slave(struct pp_instance *ppi, unsigned char *pkt, int plen)
no_incoming_msg:
if
(
e
==
0
)
e
=
st_com_execute_slave
(
ppi
);
e
=
st_com_execute_slave
(
ppi
,
1
);
if
(
e
!=
0
)
ppi
->
next_state
=
PPS_FAULTY
;
...
...
proto-standard/state-uncalibrated.c
View file @
91c672a7
...
...
@@ -34,7 +34,7 @@ int pp_uncalibrated(struct pp_instance *ppi, unsigned char *pkt, int plen)
no_incoming_msg:
if
(
e
==
0
)
e
=
st_com_execute_slave
(
ppi
);
e
=
st_com_execute_slave
(
ppi
,
0
);
if
(
e
!=
0
)
ppi
->
next_state
=
PPS_FAULTY
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment