andr3/scyther
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fixed bug in attack output.

Browse Source 
- Re-enabled the noreport switch.
This commit is contained in:
ccremers 2004-07-13 09:36:30 +00:00
parent 981f0a92b4
commit 410a35f4f4
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/modelchecker.c
View File

@ -105,7 +105,6 @@ traverse (const System sys)
int int
executeStep (const System sys, const int run) executeStep (const System sys, const int run)
{ {
unsigned long int parentBuffer;
Roledef runPoint; Roledef runPoint;
runPoint = runPointerGet (sys, run); runPoint = runPointerGet (sys, run);
#ifdef DEBUG #ifdef DEBUG

5
src/output.c
View File

@ -481,6 +481,9 @@ attackDisplayAscii (System sys)
void void
attackDisplay (System sys) attackDisplay (System sys)
{ {
if (!sys->report)
return;
if (sys->latex) if (sys->latex)
{ {
attackDisplayLatex (sys); attackDisplayLatex (sys);
@ -575,7 +578,7 @@ void graphPath (const System sys, const char* params)
i = 0; i = 0;
while (i < sys->step) while (i < sys->step)
{ {
printf ("\tn%i [%s]\n", sys->traceNode[i], params); printf ("\tn%li [%s];\n", sys->traceNode[i], params);
i++; i++;
} }
} }

1
src/runs.c
View File

@ -109,7 +109,6 @@ systemReset (const System sys)
/* some initial counters */ /* some initial counters */
sys->statesLow = 0; // number of explored states sys->statesLow = 0; // number of explored states
sys->statesHigh = 0; // this is not as ridiculous as it might seem sys->statesHigh = 0; // this is not as ridiculous as it might seem
sys->parentState = 0;
sys->explore = 1; // do explore the space sys->explore = 1; // do explore the space
sys->claims = 0; // number of claims encountered sys->claims = 0; // number of claims encountered
sys->failed = 0; // number of failed claims sys->failed = 0; // number of failed claims

4
src/runs.h
View File

@ -229,8 +229,6 @@ struct system
unsigned long int claims; //!< Number of claims encountered. unsigned long int claims; //!< Number of claims encountered.
unsigned long int failed; //!< Number of claims failed. unsigned long int failed; //!< Number of claims failed.
unsigned long int parentState; //!< Parent state number
/* matching */ /* matching */
int match; //!< Matching type. int match; //!< Matching type.
int clp; //!< Do we use clp? int clp; //!< Do we use clp?
@ -250,7 +248,7 @@ struct system
Roledef *traceEvent; //!< Trace roledefs: MaxRuns * maxRoledef Roledef *traceEvent; //!< Trace roledefs: MaxRuns * maxRoledef
int *traceRun; //!< Trace run ids: MaxRuns * maxRoledef int *traceRun; //!< Trace run ids: MaxRuns * maxRoledef
Knowledge *traceKnow; //!< Trace intruder knowledge: Maxruns * maxRoledef Knowledge *traceKnow; //!< Trace intruder knowledge: Maxruns * maxRoledef
unsigned long int *traceNode; //!< Trace node traversal unsigned long int *traceNode; //!< Trace node traversal: Maxruns * maxRoledef
/* POR reduction assistance */ /* POR reduction assistance */
int PORphase; //!< -1: init (all sends), 0...: recurse reads int PORphase; //!< -1: init (all sends), 0...: recurse reads