Two more patches against argus-clients-3.0.0.rc.21

[Peter Van Epp]

	A fix for the ether_type problem that was misclassifying non IP 
traffic (it was hiding in a bcopy which is why the first try didn't work) and
a minor comment typo in a header file. In addition I managed to find and fix
the seg fault on rarp in ra 2.0.6 so now it doesn't seg fault before finishing
the comparison. There look to still be a few bugs floating around, but some 
of them are probably due to aggregation differences between 2 and 3.

Peter Van Epp / Operations and Technical Support 
Simon Fraser University, Burnaby, B.C. Canada


*** include/argus_def.h.orig	Wed Jul 26 19:24:28 2006
--- include/argus_def.h	Wed Jul 26 19:26:22 2006
***************
*** 772,783 ****
     |0|   0x02      |1|D|    0x01   |      0x02     |      0x0B     |
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     |                                                               |
!    |                       Source IPv4 Address                     |
     |                                                               |
     |                                                               |
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     |                                                               |
!    |                    Destination IPv4 Address                   |
     |                                                               |
     |                                                               |
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
--- 772,783 ----
     |0|   0x02      |1|D|    0x01   |      0x02     |      0x0B     |
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     |                                                               |
!    |                       Source IPv6 Address                     |
     |                                                               |
     |                                                               |
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     |                                                               |
!    |                    Destination IPv6 Address                   |
     |                                                               |
     |                                                               |
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+


*** common/argus_util.c.orig	Sat Jul 22 14:08:55 2006
--- common/argus_util.c	Thu Jul 27 19:25:03 2006
***************
*** 13014,13019 ****
--- 13014,13020 ----
                                break;
                             default:
                                flow->hdr.argus_dsrvl8.qual = ARGUS_TYPE_ETHER;
+ 			      far->flow.flow_union.mac.ehdr.ether_type = argus2->ahdr.status & 0xFFFF;
                                break;
                          }
                          flow->hdr.argus_dsrvl8.len    = 5;