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

- More improvements. Current drawbacks: Intruder choice still not clear.

Browse Source
This commit is contained in:
ccremers 2006-03-20 09:54:45 +00:00
parent f3d4e8c350
commit ac87af60c1
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/dotout.c
View File

@ -666,7 +666,7 @@ regularModifiedLabel (Binding b)
{ {
// Interm: simple select // Interm: simple select
eprintf ("select "); eprintf ("select ");
termPrint (b->term); termPrintRemap (b->term);
eprintf ("\\n"); eprintf ("\\n");
} }
else else
@ -680,13 +680,13 @@ regularModifiedLabel (Binding b)
if (!isTermEqual (rdfrom->from, rdto->from)) if (!isTermEqual (rdfrom->from, rdto->from))
{ {
eprintf ("fake sender "); eprintf ("fake sender ");
termPrint (rdto->from); termPrintRemap (rdto->from);
eprintf ("\\n"); eprintf ("\\n");
} }
if (!isTermEqual (rdfrom->to, rdto->to)) if (!isTermEqual (rdfrom->to, rdto->to))
{ {
eprintf ("redirect to "); eprintf ("redirect to ");
termPrint (rdto->to); termPrintRemap (rdto->to);
eprintf ("\\n"); eprintf ("\\n");
} }
} }
@ -792,7 +792,7 @@ drawBinding (const System sys, Binding b)
//! Draw dependecies (including intruder!) //! Draw dependecies (including intruder!)
/** /**
* Returns from_intruder_count * Returns from_intruder_count (from M_0)
*/ */
int int
drawAllBindings (const System sys) drawAllBindings (const System sys)
@ -817,7 +817,10 @@ drawAllBindings (const System sys)
// from intruder? // from intruder?
if (sys->runs[b->run_from].protocol == INTRUDER) if (sys->runs[b->run_from].protocol == INTRUDER)
{ {
fromintr++; if (sys->runs[b->run_from].role == I_M)
{
fromintr++;
}
} }
} }
else else
@ -1119,7 +1122,7 @@ drawRegularRuns (const System sys)
showLocals (sys->runs[run].role-> showLocals (sys->runs[run].role->
declaredconsts, declaredconsts,
sys->runs[run].constants, NULL, sys->runs[run].constants, NULL,
","); ", ");
eprintf ("\\l"); eprintf ("\\l");
} }
if (sys->runs[run].sigma != NULL) if (sys->runs[run].sigma != NULL)