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

- Removed some redundant code.

Browse Source 
- Sends and reads now to intruder run.
- Intruder learn event on intruder run branch.
This commit is contained in:
ccremers 2004-05-12 14:56:45 +00:00
parent fb803473ab
commit bcbaff93dd
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/latex.c
View File

@ -338,16 +338,16 @@ latexMessagePrint (struct tracebuf *tb, int from, int to)
if (from == -1 && to != -1) if (from == -1 && to != -1)
{ {
/* message from intruder into system */ /* message from intruder into system */
printf ("\\found{$"); printf ("\\mess{$");
termPrint (readTerm); termPrint (readTerm);
printf ("$}{}{run%d}\n", tb->run[to]); printf ("$}{eve}{run%d}\n", tb->run[to]);
} }
else if (from != -1 && to == -1) else if (from != -1 && to == -1)
{ {
/* message from system to intruder */ /* message from system to intruder */
printf ("\\lost{$"); printf ("\\mess{$");
termPrint (sendTerm); termPrint (sendTerm);
printf ("$}{}{run%d}\n", tb->run[from]); printf ("$}{run%d}{eve}\n", tb->run[from]);
} }
else if (from != -1 && to != -1) else if (from != -1 && to != -1)
{ {
@ -372,7 +372,8 @@ latexMessagePrint (struct tracebuf *tb, int from, int to)
} }
/* /*
* hmm? TODO * hmm? TODO apparently, some other variant used, with duplicate handling of
* lost and found ??? But only using lost... weirdness.
*/ */
void void
@ -403,9 +404,9 @@ latexMessagePrintHighlight (struct tracebuf *tb, int from, int to,
} }
else if (from != -1 && to == -1) else if (from != -1 && to == -1)
{ {
printf ("\\lost{$"); printf ("\\mess{$");
latexTermPrint (sendTerm, highlight); latexTermPrint (sendTerm, highlight);
printf ("$}{}{run%d}\n", tb->run[from]); printf ("$}{run%d}{eve}\n", tb->run[from]);
} }
else if (from != -1 && to != -1) else if (from != -1 && to != -1)
{ {
@ -428,19 +429,6 @@ latexMessagePrintHighlight (struct tracebuf *tb, int from, int to,
} }
} }
/*
* Display the fact that an intruder learns some facts.
*/
void
latexLearnComment (struct tracebuf *tb, int index, Termlist tl)
{
/* currently implemented as a comment */
printf ("\\msccomment[4ex]{$I_%d=I_%d\\oplus ", index + 1, index);
termlistPrint (tl);
printf ("$}{envright}\n");
}
/* /*
* ?? TODO * ?? TODO
*/ */
@ -927,7 +915,7 @@ attackDisplayLatex (System sys)
latexDeclInst (sys, i); latexDeclInst (sys, i);
} }
/* Add the intruder instance */ /* Add the intruder instance */
printf("\\declinst{eve}{Intruder}{Eve}\n"); printf("\\declinst{eve}{Eve}{Intruder}\n");
printf("\n\n"); printf("\n\n");
/* print the events in the attack */ /* print the events in the attack */
@ -962,11 +950,14 @@ attackDisplayLatex (System sys)
} }
tl = tl->next; tl = tl->next;
} }
printf ("\\msccomment[4ex]{$I_%d=I_%d\\oplus ",
cKnowledge + 1, cKnowledge); /* print what was learned */
printf ("\\action{learns $");
cKnowledge++; cKnowledge++;
latexTermlistPrint (newtl, highlights); latexTermlistPrint (newtl, highlights);
printf ("$}{envright}\n"); printf ("$}{eve}\n");
printf ("\\nextlevel[2]\n");
} }
if (tb->link[i] != -1 && i < tb->length) if (tb->link[i] != -1 && i < tb->length)