buildroot

diff -rup argus-3.0.0.rc.34.orig/argus/ArgusApp.c argus-3.0.0.rc.34/argus/ArgusApp.c

--- argus-3.0.0.rc.34.orig/argus/ArgusApp.c 2006-08-18 19:15:14.000000000 +0200

+++ argus-3.0.0.rc.34/argus/ArgusApp.c  2006-12-20 16:21:04.000000000 +0100

@@ -196,9 +196,9 @@ ArgusUpdateAppState (struct ArgusModeler

                                     net->hdr.argus_dsrvl8.qual = 0;

                                     net->hdr.argus_dsrvl8.len  = ((sizeof(struct ArgusRTCPObject) + 3)/4) + 1;

                                     if (model->ArgusThisDir) {

-                                       bcopy ((char *) rtcp, (char *)&rtcpObject->src, sizeof(*rtcp));

+                                       memmove ((char *)&rtcpObject->src, (char *) rtcp, sizeof(*rtcp));

                                     } else {

-                                       bcopy ((char *) rtcp, (char *)&rtcpObject->dst, sizeof(*rtcp));

+                                       memmove ((char *)&rtcpObject->dst, (char *) rtcp, sizeof(*rtcp));

                                     }

                                  } else {

@@ -215,9 +215,9 @@ ArgusUpdateAppState (struct ArgusModeler

                                        rtp->rh_ssrc = ntohl(rtp->rh_ssrc);

                                        if (model->ArgusThisDir) {

-                                          bcopy ((char *) rtp, (char *)&rtpObject->src, sizeof(*rtp));

+                                          memmove ((char *)&rtpObject->src, (char *) rtp, sizeof(*rtp));

                                        } else {

-                                          bcopy ((char *) rtp, (char *)&rtpObject->dst, sizeof(*rtp));

+                                          memmove ((char *)&rtpObject->dst, (char *) rtp, sizeof(*rtp));

                                        }

                                     }

                                  }

@@ -301,7 +301,7 @@ ArgusUpdateAppState (struct ArgusModeler

                   if ((bytes = model->ArgusThisSnapEnd - model->ArgusThisUpHdr) > 0) {

                      thislen = (thislen > bytes) ? bytes : thislen;

-                     bcopy (model->ArgusThisUpHdr, &((char *)&user->array)[user->count], thislen);

+                     memmove (&((char *)&user->array)[user->count], model->ArgusThisUpHdr, thislen);

                      user->count += thislen;

                   }

                }

@@ -358,7 +358,7 @@ ArgusUpdateRTPState (struct ArgusModeler

                ArgusThisRtpHdr = &rtpObject->dst;

             if (!(ArgusThisRtpHdr->rh_seq)) {

-               bcopy ((char *) rtp, (char *)ArgusThisRtpHdr, sizeof(*rtp));

+               memmove ((char *)ArgusThisRtpHdr, (char *) rtp, sizeof(*rtp));

             } else {

                if (!(rtp->rh_ssrc) || (ArgusThisRtpHdr->rh_ssrc != rtp->rh_ssrc))

                   flowstr->dsrs[ARGUS_NETWORK_INDEX] = NULL;

@@ -404,7 +404,7 @@ ArgusUpdateRTPState (struct ArgusModeler

                }

             }

-            bcopy ((char *) rtp, (char *) ArgusThisRtpHdr, sizeof(*rtp));

+            memmove ((char *) ArgusThisRtpHdr, (char *) rtp, sizeof(*rtp));

             model->ArgusThisUpHdr = (unsigned char *)(rtp + 1) + offset;

             model->ArgusThisLength -= (sizeof(struct rtphdr) + offset);

diff -rup argus-3.0.0.rc.34.orig/argus/ArgusArp.c argus-3.0.0.rc.34/argus/ArgusArp.c

--- argus-3.0.0.rc.34.orig/argus/ArgusArp.c 2006-08-18 19:15:14.000000000 +0200

+++ argus-3.0.0.rc.34/argus/ArgusArp.c  2006-12-20 16:12:05.000000000 +0100

@@ -81,8 +81,8 @@ ArgusCreateArpFlow (struct ArgusModelerS

          case ARPOP_REQUEST:

             retn->hdr.argus_dsrvl8.qual = ARGUS_TYPE_ARP;

             srcehost = (unsigned char *) &model->ArgusThisEpHdr->ether_shost;

-            bcopy ((char *)&arp->arp_tpa, &arp_tpa, sizeof(arp_tpa));

-            bcopy ((char *)&arp->arp_spa, &arp_spa, sizeof(arp_spa));

+            memmove (&arp_tpa, (char *)&arp->arp_tpa, sizeof(arp_tpa));

+            memmove (&arp_spa, (char *)&arp->arp_spa, sizeof(arp_spa));

 #ifdef _LITTLE_ENDIAN

             arp_spa = ntohl(arp_spa);

             arp_tpa = ntohl(arp_tpa);

@@ -90,7 +90,7 @@ ArgusCreateArpFlow (struct ArgusModelerS

             if (arp_spa > arp_tpa)

                model->state |= ARGUS_DIRECTION;

-            bcopy (srcehost, retn->arp_flow.etheraddr, sizeof (retn->arp_flow.etheraddr));

+            memmove (retn->arp_flow.etheraddr, srcehost, sizeof (retn->arp_flow.etheraddr));

             retn->arp_flow.arp_tpa = arp_tpa;

             retn->arp_flow.arp_spa = arp_spa;

@@ -101,8 +101,8 @@ ArgusCreateArpFlow (struct ArgusModelerS

             retn->hdr.argus_dsrvl8.qual = ARGUS_TYPE_ARP;

             srcehost = (unsigned char *) &model->ArgusThisEpHdr->ether_dhost;

-            bcopy ((char *)&arp->arp_spa, &arp_spa, sizeof(arp_tpa));

-            bcopy ((char *)&arp->arp_tpa, &arp_tpa, sizeof(arp_spa));

+            memmove (&arp_spa, (char *)&arp->arp_spa, sizeof(arp_tpa));

+            memmove (&arp_tpa, (char *)&arp->arp_tpa, sizeof(arp_spa));

 #ifdef _LITTLE_ENDIAN

             arp_spa = ntohl(arp_spa);

             arp_tpa = ntohl(arp_tpa);

@@ -111,7 +111,7 @@ ArgusCreateArpFlow (struct ArgusModelerS

             if (arp_tpa > arp_spa)

                model->state |= ARGUS_DIRECTION;