argus-3.0.0.rc.9

[Carter Bullard]

Hey Peter,
     Does this patch work for the first problem?

==== //depot/argus/argus/argus/ArgusModeler.c#2 - /home/carter/argus/ 
argus/argus/ArgusModeler.c ====
***************
*** 1751,1758 ****

                  } else {
                     struct ArgusNetworkStruct *net = (struct  
ArgusNetworkStruct *)frag->dsrs[ARGUS_FRAG_INDEX];
                     net->hdr.argus_dsrvl8.qual |=  
ARGUS_FRAG_OUT_OF_ORDER;
-                   struct ArgusFragObject *ofrag = &net- 
 >net_union.frag;
                     if (ofrag->parent == NULL) {
                        ofrag->parent = flow;
                        if (frag->qhdr.queue != &flow->frag)
--- 1751,1759 ----

                  } else {
                     struct ArgusNetworkStruct *net = (struct  
ArgusNetworkStruct *)frag->dsrs[ARGUS_FRAG_INDEX];
+                   struct ArgusFragObject *ofrag = &net- 
 >net_union.frag;
+
                     net->hdr.argus_dsrvl8.qual |=  
ARGUS_FRAG_OUT_OF_ORDER;
                     if (ofrag->parent == NULL) {
                        ofrag->parent = flow;
                        if (frag->qhdr.queue != &flow->frag)

Carter

On Jun 16, 2006, at 12:56 AM, Peter Van Epp wrote:

> On Thu, Jun 15, 2006 at 06:05:06PM -0400, Carter Bullard wrote:
>> Fresh clean new code on the server.    I believe that it addresses
>> all the outstanding issues, and fixes a bunch of unreported problems.
>> Especially regarding 2.0 -> 3.0 record upconversion on little-endian
>> machines.
>>
>> I added a change to ./include/compat.h to solve this problem Peter
>> reported.  I think I've got all the patches in, but I'm sure I missed
>> something. Hopefully we're much closer.
>>
>> Carter
>>
> 	We are indeed (despite what it seems :-)) much closer. This worked  
> out
> of the box on everything but NetBSD, MacOS 10.3 and FreeBSD 4.10.  
> With the
> following patches against argus-3.0.0.rc.9 it works on all of them:
>
> *** argus/ArgusModeler.c.orig	Thu Jun 15 20:03:21 2006
> --- argus/ArgusModeler.c	Thu Jun 15 20:08:14 2006
> ***************
> *** 1661,1666 ****
> --- 1661,1667 ----
>   {
>      struct ArgusFlowStruct *retn = flow;
>      struct ArgusMetricStruct *metric = NULL;
> +    struct ArgusFragObject *ofrag;
>
>      ArgusUpdateBasicFlow (model, flow, state);
>
> ***************
> *** 1752,1758 ****
>                  } else {
>                     struct ArgusNetworkStruct *net = (struct  
> ArgusNetworkStruct *)frag->dsrs[ARGUS_FRAG_INDEX];
>                     net->hdr.argus_dsrvl8.qual |=  
> ARGUS_FRAG_OUT_OF_ORDER;
> !                   struct ArgusFragObject *ofrag = &net- 
> >net_union.frag;
>                     if (ofrag->parent == NULL) {
>                        ofrag->parent = flow;
>                        if (frag->qhdr.queue != &flow->frag)
> --- 1753,1759 ----
>                  } else {
>                     struct ArgusNetworkStruct *net = (struct  
> ArgusNetworkStruct *)frag->dsrs[ARGUS_FRAG_INDEX];
>                     net->hdr.argus_dsrvl8.qual |=  
> ARGUS_FRAG_OUT_OF_ORDER;
> !                   ofrag = &net->net_union.frag;
>                     if (ofrag->parent == NULL) {
>                        ofrag->parent = flow;
>                        if (frag->qhdr.queue != &flow->frag)
>
>