- More improvements. Current drawbacks: Intruder choice still not clear.
This commit is contained in:
parent
f3d4e8c350
commit
ac87af60c1
11
src/dotout.c
11
src/dotout.c
@ -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)
|
||||||
@ -816,10 +816,13 @@ drawAllBindings (const System sys)
|
|||||||
drawBinding (sys, b);
|
drawBinding (sys, b);
|
||||||
// from intruder?
|
// from intruder?
|
||||||
if (sys->runs[b->run_from].protocol == INTRUDER)
|
if (sys->runs[b->run_from].protocol == INTRUDER)
|
||||||
|
{
|
||||||
|
if (sys->runs[b->run_from].role == I_M)
|
||||||
{
|
{
|
||||||
fromintr++;
|
fromintr++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
drawClass (sys, b);
|
drawClass (sys, b);
|
||||||
|
Loading…
Reference in New Issue
Block a user