<font><font face="arial,helvetica,sans-serif">Hi, Robin,</font></font><div><font><font face="arial,helvetica,sans-serif"><br></font></font></div><div><font><font face="arial,helvetica,sans-serif">I think your TODO-hui is included in the branch </font></font><span style="font-family:arial,helvetica,sans-serif">topic/robin/dnp3-merge. But w</span><span style="font-family:arial,helvetica,sans-serif">hen I checkout the branch, git gives me this errors:</span></div>
<div><font><font face="arial,helvetica,sans-serif"><br></font></font></div><div><font><font face="arial,helvetica,sans-serif"><div><div>"error: Entry 'aux/broctl' would be overwritten by merge. Cannot merge."</div>
</div><div><br></div><div>Seems not safe. Any opinion what should I do.</div><div><br></div><div>Hui</div></font></font><br><div class="gmail_quote">On Wed, Aug 29, 2012 at 7:48 PM, Bro Tracker <span dir="ltr"><<a href="mailto:bro@tracker.bro-ids.org" target="_blank">bro@tracker.bro-ids.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="im">#861: Merging DNP3 Analyzer<br>
----------------------------+------------------------<br>
Reporter: hui | Owner:<br>
Type: Merge Request | Status: new<br>
Priority: Normal | Milestone: Bro2.2<br>
Component: Bro | Version: git/master<br>
Resolution: | Keywords: dnp3<br>
----------------------------+------------------------<br>
<br>
Comment (by robin):<br>
<br>
</div> I've merged this with master into the temporary branch<br>
{{topic/topic/robin/dnp3-merge}}.<br>
<br>
Hui, a number of points/questions:<br>
<br>
- I've added a set of {{{TODO-Hui}}} throughout the new code. Please take<br>
a look and address (just grep for it).<br>
<br>
- I moved the global variables in {{{DNP3.cc}{} into the analyzer class.<br>
I'm actually surprised that this has ever worked: it looks like you kept<br>
state across flows with a single variable; am I missing something?<br>
<br>
- Please take a look at the new test<br>
{{{scripts.base.protocols.dnp3.events}}} and check the output if it<br>
matches with what you would expect.<br>
<br>
- Which of the many events did you have data for to test with? I've added<br>
the DNP3 traces from Dina, they trigger 11 of the 51 events. Do we have<br>
more we can add to the test suite?<br>
<br>
- Please document the events in {{{src/events.bif}}}, similar to how other<br>
events are documented.<br>
<br>
- Does DNP3 have cases similar to Modbus where it would make sense to pass<br>
arrays of integers (or other elements)? If so, that would be good to do<br>
(but I don't know the protocol enough to say more).<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
Ticket URL: <<a href="http://tracker.bro-ids.org/bro/ticket/861#comment:3" target="_blank">http://tracker.bro-ids.org/bro/ticket/861#comment:3</a>><br>
</font></span><div class="HOEnZb"><div class="h5">Bro Tracker <<a href="http://tracker.bro-ids.org/bro" target="_blank">http://tracker.bro-ids.org/bro</a>><br>
Bro Issue Tracker<br>
</div></div></blockquote></div><br></div><br clear="all"><div><br></div>-- <br>Hui Lin<div>PhD Candidate, Research Assistant<br>Electrical and Computer Engineering Department<br>University of Illinois at Urbana-Champaign</div>
<br>