?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
remove redundant prerequisite
[buildroot.git] / package / argus / argus-3.0.0.rc.34-00-susv3-legacy.patch
bloba439050a1325e61fdab8c8fb8631c0b63748355b
1 diff -rup argus-3.0.0.rc.34.orig/argus/ArgusApp.c argus-3.0.0.rc.34/argus/ArgusApp.c
2 --- argus-3.0.0.rc.34.orig/argus/ArgusApp.c 2006-08-18 19:15:14.000000000 +0200
3 +++ argus-3.0.0.rc.34/argus/ArgusApp.c 2006-12-20 16:21:04.000000000 +0100
4 @@ -196,9 +196,9 @@ ArgusUpdateAppState (struct ArgusModeler
5 net->hdr.argus_dsrvl8.qual = 0;
6 net->hdr.argus_dsrvl8.len = ((sizeof(struct ArgusRTCPObject) + 3)/4) + 1;
7 if (model->ArgusThisDir) {
8 - bcopy ((char *) rtcp, (char *)&rtcpObject->src, sizeof(*rtcp));
9 + memmove ((char *)&rtcpObject->src, (char *) rtcp, sizeof(*rtcp));
10 } else {
11 - bcopy ((char *) rtcp, (char *)&rtcpObject->dst, sizeof(*rtcp));
12 + memmove ((char *)&rtcpObject->dst, (char *) rtcp, sizeof(*rtcp));
13 }
14
15 } else {
16 @@ -215,9 +215,9 @@ ArgusUpdateAppState (struct ArgusModeler
17 rtp->rh_ssrc = ntohl(rtp->rh_ssrc);
18
19 if (model->ArgusThisDir) {
20 - bcopy ((char *) rtp, (char *)&rtpObject->src, sizeof(*rtp));
21 + memmove ((char *)&rtpObject->src, (char *) rtp, sizeof(*rtp));
22 } else {
23 - bcopy ((char *) rtp, (char *)&rtpObject->dst, sizeof(*rtp));
24 + memmove ((char *)&rtpObject->dst, (char *) rtp, sizeof(*rtp));
25 }
26 }
27 }
28 @@ -301,7 +301,7 @@ ArgusUpdateAppState (struct ArgusModeler
29
30 if ((bytes = model->ArgusThisSnapEnd - model->ArgusThisUpHdr) > 0) {
31 thislen = (thislen > bytes) ? bytes : thislen;
32 - bcopy (model->ArgusThisUpHdr, &((char *)&user->array)[user->count], thislen);
33 + memmove (&((char *)&user->array)[user->count], model->ArgusThisUpHdr, thislen);
34 user->count += thislen;
35 }
36 }
37 @@ -358,7 +358,7 @@ ArgusUpdateRTPState (struct ArgusModeler
38 ArgusThisRtpHdr = &rtpObject->dst;
39
40 if (!(ArgusThisRtpHdr->rh_seq)) {
41 - bcopy ((char *) rtp, (char *)ArgusThisRtpHdr, sizeof(*rtp));
42 + memmove ((char *)ArgusThisRtpHdr, (char *) rtp, sizeof(*rtp));
43 } else {
44 if (!(rtp->rh_ssrc) || (ArgusThisRtpHdr->rh_ssrc != rtp->rh_ssrc))
45 flowstr->dsrs[ARGUS_NETWORK_INDEX] = NULL;
46 @@ -404,7 +404,7 @@ ArgusUpdateRTPState (struct ArgusModeler
47 }
48 }
49
50 - bcopy ((char *) rtp, (char *) ArgusThisRtpHdr, sizeof(*rtp));
51 + memmove ((char *) ArgusThisRtpHdr, (char *) rtp, sizeof(*rtp));
52
53 model->ArgusThisUpHdr = (unsigned char *)(rtp + 1) + offset;
54 model->ArgusThisLength -= (sizeof(struct rtphdr) + offset);
55 diff -rup argus-3.0.0.rc.34.orig/argus/ArgusArp.c argus-3.0.0.rc.34/argus/ArgusArp.c
56 --- argus-3.0.0.rc.34.orig/argus/ArgusArp.c 2006-08-18 19:15:14.000000000 +0200
57 +++ argus-3.0.0.rc.34/argus/ArgusArp.c 2006-12-20 16:12:05.000000000 +0100
58 @@ -81,8 +81,8 @@ ArgusCreateArpFlow (struct ArgusModelerS
59 case ARPOP_REQUEST:
60 retn->hdr.argus_dsrvl8.qual = ARGUS_TYPE_ARP;
61 srcehost = (unsigned char *) &model->ArgusThisEpHdr->ether_shost;
62 - bcopy ((char *)&arp->arp_tpa, &arp_tpa, sizeof(arp_tpa));
63 - bcopy ((char *)&arp->arp_spa, &arp_spa, sizeof(arp_spa));
64 + memmove (&arp_tpa, (char *)&arp->arp_tpa, sizeof(arp_tpa));
65 + memmove (&arp_spa, (char *)&arp->arp_spa, sizeof(arp_spa));
66 #ifdef _LITTLE_ENDIAN
67 arp_spa = ntohl(arp_spa);
68 arp_tpa = ntohl(arp_tpa);
69 @@ -90,7 +90,7 @@ ArgusCreateArpFlow (struct ArgusModelerS
70 if (arp_spa > arp_tpa)
71 model->state |= ARGUS_DIRECTION;
72
73 - bcopy (srcehost, retn->arp_flow.etheraddr, sizeof (retn->arp_flow.etheraddr));
74 + memmove (retn->arp_flow.etheraddr, srcehost, sizeof (retn->arp_flow.etheraddr));
75
76 retn->arp_flow.arp_tpa = arp_tpa;
77 retn->arp_flow.arp_spa = arp_spa;
78 @@ -101,8 +101,8 @@ ArgusCreateArpFlow (struct ArgusModelerS
79 retn->hdr.argus_dsrvl8.qual = ARGUS_TYPE_ARP;
80 srcehost = (unsigned char *) &model->ArgusThisEpHdr->ether_dhost;
81
82 - bcopy ((char *)&arp->arp_spa, &arp_spa, sizeof(arp_tpa));
83 - bcopy ((char *)&arp->arp_tpa, &arp_tpa, sizeof(arp_spa));
84 + memmove (&arp_spa, (char *)&arp->arp_spa, sizeof(arp_tpa));
85 + memmove (&arp_tpa, (char *)&arp->arp_tpa, sizeof(arp_spa));
86 #ifdef _LITTLE_ENDIAN
87 arp_spa = ntohl(arp_spa);
88 arp_tpa = ntohl(arp_tpa);
89 @@ -111,7 +111,7 @@ ArgusCreateArpFlow (struct ArgusModelerS
90 if (arp_tpa > arp_spa)
91 model->state |= ARGUS_DIRECTION;
92
93 - bcopy (srcehost, retn->arp_flow.etheraddr, sizeof (retn->arp_flow.etheraddr));
94 + memmove (retn->arp_flow.etheraddr, srcehost, sizeof (retn->arp_flow.etheraddr));
95
96 retn->arp_flow.arp_tpa = arp_tpa;
97 retn->arp_flow.arp_spa = arp_spa;
98 @@ -120,29 +120,29 @@ ArgusCreateArpFlow (struct ArgusModelerS
99
100 case REVARP_REQUEST:
101 retn->hdr.argus_dsrvl8.qual = ARGUS_TYPE_RARP;
102 - bcopy ((char *)&arp->arp_tpa, &arp_tpa, sizeof(arp_tpa));
103 + memmove (&arp_tpa, (char *)&arp->arp_tpa, sizeof(arp_tpa));
104 #ifdef _LITTLE_ENDIAN
105 arp_tpa = ntohl(arp_tpa);
106 #endif
107
108 srcehost = (unsigned char *)&THA(arp);
109 tarehost = (unsigned char *)&SHA(arp);
110 - bcopy ((char *)&arp->arp_tpa, &retn->rarp_flow.arp_tpa, sizeof(arp_tpa));
111 - bcopy (srcehost, retn->rarp_flow.srceaddr, sizeof (retn->rarp_flow.srceaddr));
112 - bcopy (tarehost, retn->rarp_flow.tareaddr, sizeof (retn->rarp_flow.tareaddr));
113 + memmove (&retn->rarp_flow.arp_tpa, (char *)&arp->arp_tpa, sizeof(arp_tpa));
114 + memmove (retn->rarp_flow.srceaddr, srcehost, sizeof (retn->rarp_flow.srceaddr));
115 + memmove (retn->rarp_flow.tareaddr, tarehost, sizeof (retn->rarp_flow.tareaddr));
116 break;
117
118 case REVARP_REPLY:
119 retn->hdr.argus_dsrvl8.qual = ARGUS_TYPE_RARP;
120 - bcopy ((char *)&arp->arp_tpa, &arp_tpa, sizeof(arp_tpa));
121 + memmove (&arp_tpa, (char *)&arp->arp_tpa, sizeof(arp_tpa));
122 #ifdef _LITTLE_ENDIAN
123 arp_tpa = ntohl(arp_tpa);
124 #endif
125 srcehost = (unsigned char *)&SHA(arp);
126 tarehost = (unsigned char *)&THA(arp);
127 - bcopy ((char *)&arp->arp_tpa, &retn->rarp_flow.arp_tpa, sizeof(arp_tpa));
128 - bcopy (srcehost, retn->rarp_flow.srceaddr, sizeof (retn->rarp_flow.srceaddr));
129 - bcopy (tarehost, retn->rarp_flow.tareaddr, sizeof (retn->rarp_flow.tareaddr));
130 + memmove (&retn->rarp_flow.arp_tpa, (char *)&arp->arp_tpa, sizeof(arp_tpa));
131 + memmove (retn->rarp_flow.srceaddr, srcehost, sizeof (retn->rarp_flow.srceaddr));
132 + memmove (retn->rarp_flow.tareaddr, tarehost, sizeof (retn->rarp_flow.tareaddr));
133 break;
134 }
135 }
136 @@ -177,7 +177,7 @@ ArgusUpdateArpState (struct ArgusModeler
137 break;
138
139 case ARPOP_REPLY:
140 - bcopy ((unsigned char *)&SHA(arp), arpobj->respaddr, 6);
141 + memmove (arpobj->respaddr, (unsigned char *)&SHA(arp), 6);
142 break;
143 }
144 }
145 diff -rup argus-3.0.0.rc.34.orig/argus/ArgusEsp.c argus-3.0.0.rc.34/argus/ArgusEsp.c
146 --- argus-3.0.0.rc.34.orig/argus/ArgusEsp.c 2006-08-18 19:15:14.000000000 +0200
147 +++ argus-3.0.0.rc.34/argus/ArgusEsp.c 2006-12-20 15:57:17.000000000 +0100
148 @@ -123,7 +123,7 @@ ArgusUpdateESPState (struct ArgusModeler
149
150 flowstr->dsrs[ARGUS_NETWORK_INDEX] = (void *) net;
151
152 - bzero ((char *)espObj, sizeof(*espObj));
153 + memset ((char *)espObj, 0, sizeof(*espObj));
154 flowstr->timeout = ARGUS_IPTIMEOUT;
155
156 espObj->spi = esp->spi;
157 diff -rup argus-3.0.0.rc.34.orig/argus/ArgusFrag.c argus-3.0.0.rc.34/argus/ArgusFrag.c
158 --- argus-3.0.0.rc.34.orig/argus/ArgusFrag.c 2006-08-18 19:15:14.000000000 +0200
159 +++ argus-3.0.0.rc.34/argus/ArgusFrag.c 2006-12-20 16:18:25.000000000 +0100
160 @@ -232,7 +232,7 @@ ArgusUpdateFRAGState (struct ArgusModele
161 if (prvfragOffset != NULL) {
162 prvfragOffset->nxt = fragOffset->nxt;
163 } else {
164 - bcopy((char *) fragOffset->nxt , (char *)&frag->offsets, sizeof(frag->offsets));
165 + memmove((char *)&frag->offsets, (char *) fragOffset->nxt, sizeof(frag->offsets));
166 }
167 /* else just update the prv fragments pointer to toss this one */
168 } else {
169 diff -rup argus-3.0.0.rc.34.orig/argus/ArgusIcmp.c argus-3.0.0.rc.34/argus/ArgusIcmp.c
170 --- argus-3.0.0.rc.34.orig/argus/ArgusIcmp.c 2006-10-30 19:26:51.000000000 +0100
171 +++ argus-3.0.0.rc.34/argus/ArgusIcmp.c 2006-12-20 16:07:09.000000000 +0100
172 @@ -159,8 +159,9 @@ ArgusCreateICMPFlow (struct ArgusModeler
173
174 case ICMP_UNREACH_NET:
175 case ICMP_UNREACH_HOST:
176 - bcopy ((char *) &icmp->icmp_ip.ip_dst.s_addr,
177 - (char *)&icmpFlow->id, sizeof (int));
178 + memmove ((char *)&icmpFlow->id,
179 + (char*) &icmp->icmp_ip.ip_dst.s_addr,
180 + sizeof (int));
181 break;
182 }
183 break;
184 @@ -174,7 +175,7 @@ ArgusCreateICMPFlow (struct ArgusModeler
185
186 case ICMP_REDIRECT_NET:
187 case ICMP_REDIRECT_HOST:
188 - bcopy ((char *) &icmp->icmp_ip.ip_dst.s_addr, (char *)&icmpFlow->id, sizeof (int));
189 + memmove ((char *)&icmpFlow->id, (char *) &icmp->icmp_ip.ip_dst.s_addr, sizeof (int));
190 break;
191 }
192 break;
193 @@ -220,7 +221,7 @@ ArgusUpdateICMPState (struct ArgusModele
194 net->hdr.subtype = ARGUS_ICMP_DSR;
195 net->hdr.argus_dsrvl8.qual = 0;
196 net->hdr.argus_dsrvl8.len = ((sizeof(struct ArgusICMPObject)+3))/4 + 1;
197 - bzero ((char *)icmpObj, sizeof(*icmpObj));
198 + memset ((char *)icmpObj, 0, sizeof(*icmpObj));
199
200 icmpObj->icmp_type = icmp->icmp_type;
201 icmpObj->icmp_code = icmp->icmp_code;
202 @@ -314,7 +315,7 @@ ArgusUpdateICMPState (struct ArgusModele
203 }
204
205 dsr->argus_dsrvl8.len = (sizeof (struct ArgusIcmpStruct) + 3)/4 + 1;
206 - bcopy ((char *) icmpObj, (char *) (dsr + 1), sizeof (*icmpObj));
207 + memmove ((char *) (dsr + 1), (char *) icmpObj, sizeof (*icmpObj));
208 flow->dsrs[ARGUS_ICMP_INDEX] = dsr;
209 flow->dsrindex |= 1 << ARGUS_ICMP_INDEX;
210
211 @@ -361,7 +362,7 @@ ArgusUpdateICMPv6State (struct ArgusMode
212 net->hdr.subtype = ARGUS_ICMP_DSR;
213 net->hdr.argus_dsrvl8.qual = 0;
214 net->hdr.argus_dsrvl8.len = ((sizeof(struct ArgusICMPObject)+3))/4 + 1;
215 - bzero ((char *)icmpObj, sizeof(*icmpObj));
216 + memset ((char *)icmpObj, 0, sizeof(*icmpObj));
217
218 icmpObj->icmp_type = icmpv6->icmp6_type;
219 icmpObj->icmp_code = icmpv6->icmp6_code;
220 diff -rup argus-3.0.0.rc.34.orig/argus/ArgusMac.c argus-3.0.0.rc.34/argus/ArgusMac.c
221 --- argus-3.0.0.rc.34.orig/argus/ArgusMac.c 2006-08-18 19:15:14.000000000 +0200
222 +++ argus-3.0.0.rc.34/argus/ArgusMac.c 2006-12-20 16:18:44.000000000 +0100
223 @@ -44,7 +44,7 @@ ArgusMacFlowRecord (struct ArgusFlowStru
224 struct ArgusMacStruct *mac = (struct ArgusMacStruct *) flowstr->MacDSRBuffer;
225
226 if (mac && ((length = argus->ahdr.length) > 0)) {
227 - bcopy ((char *)mac, &((char *)argus)[argus->ahdr.length], sizeof(*mac));
228 + memmove (&((char *)argus)[argus->ahdr.length], (char *)mac, sizeof(*mac));
229 argus->ahdr.length += sizeof(*mac);
230 }
231 }
232 diff -rup argus-3.0.0.rc.34.orig/argus/ArgusModeler.c argus-3.0.0.rc.34/argus/ArgusModeler.c
233 --- argus-3.0.0.rc.34.orig/argus/ArgusModeler.c 2006-09-26 06:28:16.000000000 +0200
234 +++ argus-3.0.0.rc.34/argus/ArgusModeler.c 2006-12-20 16:17:19.000000000 +0100
235 @@ -112,7 +112,7 @@ void *ArgusQueueManager(void *);
236 void
237 ArgusInitModeler(struct ArgusModelerStruct *model)
238 {
239 - bzero (model->ArgusTimeOutQueues, sizeof(model->ArgusTimeOutQueues));
240 + memset (model->ArgusTimeOutQueues, 0, sizeof(model->ArgusTimeOutQueues));
241 model->ArgusInProtocol = 1;
242 model->ArgusUpdateInterval.tv_usec = 200000;
243 model->ArgusMajorVersion = VERSION_MAJOR;
244 @@ -525,7 +525,7 @@ ArgusProcessPacketHdrs (struct ArgusMode
245 model->ArgusThisEncaps |= ARGUS_ENCAPS_LLC;
246
247 llc = model->ArgusThisLLC;
248 - bcopy((char *) ptr, (char *) llc, sizeof (struct llc));
249 + memmove((char *) llc, (char *) ptr, sizeof (struct llc));
250
251 #define ARGUS_IPX_TAG 100
252
253 @@ -772,7 +772,7 @@ ArgusProcessEtherHdr (struct ArgusModele
254 model->ArgusThisEncaps |= ARGUS_ENCAPS_LLC;
255
256 llc = model->ArgusThisLLC;
257 - bcopy((char *) ptr, (char *) llc, sizeof (struct llc));
258 + memmove((char *) llc, (char *) ptr, sizeof (struct llc));
259
260 #define ARGUS_IPX_TAG 100
261
262 @@ -1314,11 +1314,11 @@ ArgusCreateFlow (struct ArgusModelerStru
263 }
264
265 if (dstgteq) {
266 - bcopy ((char *) ep, (char *)&model->ArgusThisFlow->mac_flow.ehdr, sizeof (struct ether_header));
267 + memmove ((char *)&model->ArgusThisFlow->mac_flow.ehdr, (char *) ep, sizeof (struct ether_header));
268 } else {
269 model->state |= ARGUS_DIRECTION;
270 - bcopy ((char *)&ep->ether_shost, (char *)&model->ArgusThisFlow->mac_flow.ehdr.ether_dhost, ETH_ALEN);
271 - bcopy ((char *)&ep->ether_dhost, (char *)&model->ArgusThisFlow->mac_flow.ehdr.ether_shost, ETH_ALEN);
272 + memmove ((char *)&model->ArgusThisFlow->mac_flow.ehdr.ether_dhost, (char *)&ep->ether_shost, ETH_ALEN);
273 + memmove ((char *)&model->ArgusThisFlow->mac_flow.ehdr.ether_shost, (char *)&ep->ether_dhost, ETH_ALEN);
274 model->ArgusThisFlow->mac_flow.ehdr.ether_type = ep->ether_type;
275 }
276
277 @@ -1418,7 +1418,7 @@ ArgusNewFlow (struct ArgusModelerStruct
278 retn->qhdr.qtime.tv_sec = 0;
279 retn->qhdr.qtime.tv_usec = 0;
280
281 - bzero ((char *)retn->dsrs, sizeof(retn->dsrs));
282 + memset ((char *)retn->dsrs, 0, sizeof(retn->dsrs));
283
284 retn->dsrs[ARGUS_TRANSPORT_INDEX] = &retn->canon.trans.hdr;
285 trans = (struct ArgusTransportStruct *) retn->dsrs[ARGUS_TRANSPORT_INDEX];
286 @@ -1429,7 +1429,7 @@ ArgusNewFlow (struct ArgusModelerStruct
287
288 retn->dsrs[ARGUS_TIME_INDEX] = (struct ArgusDSRHeader *) &retn->canon.time.hdr;
289 dtime = (struct ArgusTimeObject *) retn->dsrs[ARGUS_TIME_INDEX];
290 - bzero((char *)dtime, sizeof(*dtime));
291 + memset((char *)dtime, 0, sizeof(*dtime));
292 dtime->hdr.type = ARGUS_TIME_DSR;
293 dtime->hdr.subtype = ARGUS_TIME_ABSOLUTE_TIMESTAMP;
294 dtime->hdr.argus_dsrvl8.qual = ARGUS_TYPE_UTC_MICROSECONDS;
295 @@ -1446,10 +1446,10 @@ ArgusNewFlow (struct ArgusModelerStruct
296 retn->dsrs[ARGUS_FLOW_INDEX] = (struct ArgusDSRHeader *) &retn->canon.flow.hdr;
297 retn->canon.flow.hdr = flow->hdr;
298
299 - bcopy ((char *)&flow->flow_un, (char *)&retn->canon.flow.flow_un, (flow->hdr.argus_dsrvl8.len - 1) * 4);
300 + memmove ((char *)&retn->canon.flow.flow_un, (char *)&flow->flow_un, (flow->hdr.argus_dsrvl8.len - 1) * 4);
301 retn->dsrindex |= 1 << ARGUS_FLOW_INDEX;
302
303 - bzero ((char *)&retn->canon.metric, sizeof(retn->canon.metric));
304 + memset ((char *)&retn->canon.metric, 0, sizeof(retn->canon.metric));
305 /*
306 if (retn->status & ARGUS_DIRECTION)
307 retn->dsrs[ARGUS_FLOW_INDEX]->subtype |= ARGUS_REVERSE;
308 @@ -1573,7 +1573,7 @@ ArgusUpdateBasicFlow (struct ArgusModele
309 mac->hdr.argus_dsrvl8.len = 5;
310
311 if (model->ArgusThisEpHdr != NULL)
312 - bcopy ((char *)model->ArgusThisEpHdr, (char *)&mac->mac_union.ether, sizeof(struct ether_header));
313 + memmove ((char *)&mac->mac_union.ether, (char *)model->ArgusThisEpHdr, sizeof(struct ether_header));
314
315 flow->dsrindex |= 1 << ARGUS_MAC_INDEX;
316
317 @@ -1652,8 +1652,8 @@ ArgusUpdateBasicFlow (struct ArgusModele
318 jitter->hdr.argus_dsrvl8.len = 1;
319 flow->dsrindex |= 1 << ARGUS_JITTER_INDEX;
320
321 - bzero((char *)&jitter->act, sizeof(struct ArgusJitterObject));
322 - bzero((char *)&jitter->idle, sizeof(struct ArgusJitterObject));
323 + memset((char *)&jitter->act, 0, sizeof(struct ArgusJitterObject));
324 + memset((char *)&jitter->idle, 0, sizeof(struct ArgusJitterObject));
325
326 memset(&flow->stime.act, 0, sizeof(flow->stime.act));
327 memset(&flow->stime.idle, 0, sizeof(flow->stime.idle));
328 @@ -2094,7 +2094,7 @@ ArgusGenerateRecord (struct ArgusModeler
329 int i, x, len = 0, type = 0, dsrlen = 1;
330 struct ArgusDSRHeader *dsr;
331
332 - bcopy ((char *)&rec->hdr, (char *)&retn->hdr, sizeof(retn->hdr));
333 + memmove ((char *)&retn->hdr, (char *)&rec->hdr, sizeof(retn->hdr));
334 dsrptr = (unsigned int *)&retn->ar_un.mar;
335
336 if ((rec->canon.trans.seqnum = model->ArgusSeqNum++) == 0xFFFFFFFF)
337 @@ -2441,7 +2441,7 @@ ArgusGenerateRecord (struct ArgusModeler
338 retn->hdr.len = dsrlen;
339
340 } else {
341 - bcopy ((char *)&rec->canon, (char *) retn, rec->hdr.len * 4);
342 + memmove ((char *) retn, (char *)&rec->canon, rec->hdr.len * 4);
343 retn->hdr = rec->hdr;
344 }
345
346 @@ -2470,8 +2470,8 @@ ArgusCopyRecordStruct (struct ArgusRecor
347
348 if (rec) {
349 if ((retn = (struct ArgusRecordStruct *) ArgusMallocListRecord (sizeof(*retn))) != NULL) {
350 - bcopy ((char *)&rec->hdr, (char *)&retn->hdr, sizeof (rec->hdr));
351 - bcopy ((char *)&rec->canon, (char *)&retn->canon, sizeof (rec->canon));
352 + memmove ((char *)&retn->hdr, (char *)&rec->hdr, sizeof (rec->hdr));
353 + memmove ((char *)&retn->canon, (char *)&rec->canon, sizeof (rec->canon));
354
355 if ((retn->dsrindex = rec->dsrindex)) {
356 for (i = 0; i < ARGUSMAXFLOWTYPE; i++) {
357 @@ -2494,7 +2494,7 @@ ArgusCopyRecordStruct (struct ArgusRecor
358 struct ArgusDataStruct *user = (struct ArgusDataStruct *) rec->dsrs[i];
359 if (user->count > 0) {
360 if ((retn->dsrs[i] = (void *) ArgusCalloc(1, (8 + user->size))) != NULL) {
361 - bcopy ((char *)rec->dsrs[i], (char *)retn->dsrs[i], 8 + user->size);
362 + memmove ((char *)retn->dsrs[i], (char *)rec->dsrs[i], 8 + user->size);
363 } else {
364 retn->dsrindex &= ~(0x01 << i);
365 }
366 @@ -2541,7 +2541,7 @@ ArgusGenerateListRecord (struct ArgusMod
367
368 if ((retn = (struct ArgusRecordStruct *) ArgusMallocListRecord (sizeof(*retn))) != NULL) {
369 if (flow) {
370 - bcopy ((char *)&flow->canon, (char *)&retn->canon, sizeof (flow->canon));
371 + memmove ((char *)&retn->canon, (char *)&flow->canon, sizeof (flow->canon));
372 if ((retn->dsrindex = flow->dsrindex) != 0) {
373 for (i = 0; i < ARGUSMAXFLOWTYPE; i++) {
374 if (flow->dsrs[i] != NULL) {
375 @@ -2691,8 +2691,8 @@ ArgusGenerateListRecord (struct ArgusMod
376
377 } else {
378 retn->dsrindex = 0;
379 - bzero ((char *)&retn->canon, sizeof(retn->canon));
380 - bzero ((char *)retn->dsrs, sizeof(retn->dsrs));
381 + memset ((char *)&retn->canon, 0, sizeof(retn->canon));
382 + memset ((char *)retn->dsrs, 0, sizeof(retn->dsrs));
383 }
384
385 if (!(flow) && ((state == ARGUS_STOP) || (state == ARGUS_ERROR))) {
386 @@ -3017,7 +3017,7 @@ ArgusCreateIPv4Flow (struct ArgusModeler
387 model->ArgusSnapLength -= hlen;
388
389 if (model->ArgusFlowKey & ARGUS_FLOW_KEY_CLASSIC5TUPLE) {
390 - bzero ((char *)model->ArgusThisFlow, sizeof(*model->ArgusThisFlow));
391 + memset ((char *)model->ArgusThisFlow, 0, sizeof(*model->ArgusThisFlow));
392 model->ArgusThisFlow->hdr.type = ARGUS_FLOW_DSR;
393 model->ArgusThisFlow->hdr.subtype = ARGUS_FLOW_CLASSIC5TUPLE;
394 model->ArgusThisFlow->hdr.argus_dsrvl8.qual = ARGUS_TYPE_IPV4;
395 diff -rup argus-3.0.0.rc.34.orig/argus/ArgusOutput.c argus-3.0.0.rc.34/argus/ArgusOutput.c
396 --- argus-3.0.0.rc.34.orig/argus/ArgusOutput.c 2006-10-16 21:57:15.000000000 +0200
397 +++ argus-3.0.0.rc.34/argus/ArgusOutput.c 2006-12-20 16:21:26.000000000 +0100
398 @@ -530,7 +530,7 @@ ArgusEstablishListen (struct ArgusOutput
399 #endif
400 if ((host = gethostbyname (bindIP)) != NULL) {
401 if ((host->h_addrtype == AF_INET) && (host->h_length == 4)) {
402 - bcopy ((char *) *host->h_addr_list, (char *)&sin.sin_addr.s_addr, host->h_length);
403 + memmove ((char *)&sin.sin_addr.s_addr, (char *) *host->h_addr_list, host->h_length);
404 } else
405 ArgusLog (LOG_ERR, "ArgusEstablishListen() unsupported bind address %s", bindIP);
406 } else
407 @@ -600,7 +600,7 @@ ArgusCheckClientStatus (struct ArgusOutp
408 if (output->clientnum < ARGUS_MAXLISTEN) {
409 int i = output->clientnum++;
410
411 - bzero(&output->clients[i], sizeof(output->clients[i]));
412 + memset(&output->clients[i], 0, sizeof(output->clients[i]));
413 output->clients[i].fd = fd;
414 #ifdef ARGUSDEBUG
415 ArgusDebug (2, "ArgusCheckClientStatus() new client %d\n", i);
416 @@ -754,7 +754,7 @@ ArgusCheckClientMessage (struct ArgusOut
417 ArgusLog (LOG_ERR, "ArgusCheckClientMessage(0x%x, %d) sasl_getprop %s\n", client, fd, strerror(errno));
418 #endif /* ARGUS_SASL */
419
420 - bzero(buf, MAXSTRLEN);
421 + memset(buf, 0, MAXSTRLEN);
422
423 if (value == 0)
424 value = MAXSTRLEN;
425 @@ -791,8 +791,8 @@ ArgusCheckClientMessage (struct ArgusOut
426 #endif
427 if (outputlen > 0) {
428 if (outputlen < MAXSTRLEN) {
429 - bzero (buf, MAXSTRLEN);
430 - bcopy (outputbuf, buf, outputlen);
431 + memset (buf, 0, MAXSTRLEN);
432 + memmove (buf, outputbuf, outputlen);
433 cnt = outputlen;
434 } else
435 ArgusLog (LOG_ERR, "ArgusCheckClientMessage(0x%x, %d) sasl_decode returned %d bytes\n", client, fd, outputlen);
436 diff -rup argus-3.0.0.rc.34.orig/argus/ArgusSource.c argus-3.0.0.rc.34/argus/ArgusSource.c
437 --- argus-3.0.0.rc.34.orig/argus/ArgusSource.c 2006-10-30 19:53:29.000000000 +0100
438 +++ argus-3.0.0.rc.34/argus/ArgusSource.c 2006-12-20 16:05:50.000000000 +0100
439 @@ -92,11 +92,11 @@ ArgusInitSource (struct ArgusSourceStruc
440
441 src->ArgusInterfaces = 0;
442 for (i = 0; i < ARGUS_MAXINTERFACE; i++)
443 - bzero ((char *)&src->ArgusInterface[i], sizeof(struct ArgusInterfaceStruct));
444 + memset ((char *)&src->ArgusInterface[i], 0, sizeof(struct ArgusInterfaceStruct));
445
446 if (src->ArgusRfileList != NULL) {
447 setuid(getuid());
448 - bzero(errbuf, sizeof(errbuf));
449 + memset(errbuf, 0, sizeof(errbuf));
450
451 if (ArgusOpenInputPacketFile(src, errbuf) == 0) {
452 }
453 @@ -156,7 +156,7 @@ ArgusInitSource (struct ArgusSourceStruc
454 src->ArgusInputFilter = cmdbuf;
455 }
456
457 - bzero ((char *) &src->ArgusInterface[0].ArgusFilter, sizeof (struct bpf_program));
458 + memset ((char *) &src->ArgusInterface[0].ArgusFilter, 0, sizeof (struct bpf_program));
459
460 if (pcap_compile (src->ArgusInterface[0].ArgusPd, &src->ArgusInterface[0].ArgusFilter, src->ArgusInputFilter, getArgusOflag(src), src->ArgusInterface[0].ArgusNetMask) < 0)
461 ArgusLog (LOG_ERR, "%s\n", pcap_geterr (src->ArgusInterface[0].ArgusPd));
462 @@ -421,7 +421,7 @@ ArgusMoatTshRead (struct ArgusSourceStru
463 int retn = 0, length = 0;
464 struct ip *iphdr = NULL;
465
466 - bzero (ArgusMoatPktHdr, sizeof(MoatTshBuffer));
467 + memset (ArgusMoatPktHdr, 0, sizeof(MoatTshBuffer));
468
469 if ((retn = read(pcap_fileno(src->ArgusInterface[0].ArgusPd), ArgusMoatPktHdr, ARGUSMOATLEN)) == ARGUSMOATLEN) {
470 ArgusMoatPktHdr->interface = 0;
471 @@ -666,7 +666,7 @@ ArgusArcnetPacket (u_char *user, const s
472 caplen -= archdrlen;
473 p += archdrlen;
474
475 - bcopy (p, (char *)ep, caplen);
476 + memmove ((char *)ep, p, caplen);
477
478 src->ArgusModel->ArgusThisLength = length;
479 src->ArgusModel->ArgusSnapLength = caplen;
480 @@ -973,8 +973,8 @@ Argusextract_fddi_addrs(const struct fdd
481 fsrc[i] = fddi_bit_swap[fp->fddi_shost[i]];
482 }
483 else {
484 - bcopy ((char *) fp->fddi_dhost, fdst, 6);
485 - bcopy ((char *) fp->fddi_shost, fsrc, 6);
486 + memmove (fdst, (char *) fp->fddi_dhost, 6);
487 + memmove (fsrc, (char *) fp->fddi_shost, 6);
488 }
489 }
490
491 @@ -994,7 +994,7 @@ ArgusCreatePktFromFddi(const struct fddi
492 ((struct ether_header *) ep)->ether_type = EXTRACT_16BITS(&llc->ethertype[0]);
493 ptr = (unsigned char *)(llc + 1);
494 length -= (sizeof(struct fddi_header) + sizeof(struct llc));
495 - bcopy ((char *)ptr, (char *)(ep + 1), length);
496 + memmove ((char *)(ep + 1), (char *)ptr, length);
497 retn = length + sizeof(struct ether_header);
498 }
499 }
500 @@ -1099,7 +1099,7 @@ ArgusATMPacket(u_char *user, const struc
501 caplen -= ARGUS_ATM_HDR_OFFSET;
502 p += ARGUS_ATM_HDR_OFFSET;
503
504 - bcopy (p, (char *)(ep + 1), caplen);
505 + memmove ((char *)(ep + 1), p, caplen);
506
507 length += sizeof(*ep);
508 caplen += sizeof(*ep);
509 @@ -1752,7 +1752,7 @@ ArgusGetInterfaceStatus (struct ArgusSou
510 if (strstr(device->name, "dag")) {
511 for (i = 0; i < src->ArgusInterfaces; i++) {
512 if (src->ArgusInterface[i].ArgusPd && (pcap_fileno(src->ArgusInterface[i].ArgusPd) > 0))
513 - bzero ((char *)&src->ArgusInterface[i].ifr, sizeof(ifr));
514 + memset ((char *)&src->ArgusInterface[i].ifr, 0, sizeof(ifr));
515
516 src->ArgusInterface[i].ifr.ifr_flags |= IFF_UP;
517 setArgusInterfaceStatus(src, 1);
518 diff -rup argus-3.0.0.rc.34.orig/argus/ArgusTcp.c argus-3.0.0.rc.34/argus/ArgusTcp.c
519 --- argus-3.0.0.rc.34.orig/argus/ArgusTcp.c 2006-10-30 19:07:13.000000000 +0100
520 +++ argus-3.0.0.rc.34/argus/ArgusTcp.c 2006-12-20 16:17:49.000000000 +0100
521 @@ -89,7 +89,7 @@ ArgusUpdateTCPState (struct ArgusModeler
522 net->hdr.argus_dsrvl8.len = ((sizeof(struct ArgusTCPObject)+3))/4 + 1;
523 flowstr->dsrs[ARGUS_NETWORK_INDEX] = (struct ArgusDSRHeader *) net;
524 tcpExt = &net->net_union.tcp;
525 - bzero ((char *)tcpExt, sizeof(*tcpExt));
526 + memset ((char *)tcpExt, 0, sizeof(*tcpExt));
527
528 model->ArgusSnapLength -= tcphlen;
529 model->ArgusThisLength = tcpdatalen;
530 @@ -287,7 +287,7 @@ ArgusInitializeTCP (struct ArgusModelerS
531 {
532 struct ArgusTCPObject *tcpExt = (struct ArgusTCPObject *)&flow->canon.net.net_union.tcp;
533
534 - bzero ((char *)tcpExt, sizeof(*tcpExt));
535 + memset ((char *)tcpExt, 0, sizeof(*tcpExt));
536
537 flow->qhdr.lasttime.tv_sec = 0;
538 flow->qhdr.lasttime.tv_usec = 0;
539 @@ -684,7 +684,7 @@ ArgusTCPFlowRecord (struct ArgusNetworkS
540 tcpExt->dst.ackbytes++;
541
542 if (tcp && ((length = argus->hdr.len) > 0)) {
543 - bcopy ((char *)tcp, &((char *)argus)[length], sizeof(*tcp));
544 + memmove (&((char *)argus)[length], (char *)tcp, sizeof(*tcp));
545 argus->hdr.len += sizeof(*tcp);
546 }
547
548 diff -rup argus-3.0.0.rc.34.orig/argus/ArgusUtil.c argus-3.0.0.rc.34/argus/ArgusUtil.c
549 --- argus-3.0.0.rc.34.orig/argus/ArgusUtil.c 2006-11-03 18:44:23.000000000 +0100
550 +++ argus-3.0.0.rc.34/argus/ArgusUtil.c 2006-12-20 16:19:14.000000000 +0100
551 @@ -854,8 +854,8 @@ ArgusZeroRecord (struct ArgusFlowStruct
552
553 case ARGUS_JITTER_INDEX: {
554 struct ArgusJitterStruct *jit = (void *)flow->dsrs[i];
555 - bzero ((char *)&jit->act, sizeof(struct ArgusJitterObject));
556 - bzero ((char *)&jit->idle, sizeof(struct ArgusJitterObject));
557 + memset ((char *)&jit->act, 0, sizeof(struct ArgusJitterObject));
558 + memset ((char *)&jit->idle, 0, sizeof(struct ArgusJitterObject));
559 jit->act.src.minval = 0xffffffff;
560 jit->idle.src.minval = 0xffffffff;
561 jit->act.dst.minval = 0xffffffff;
562 @@ -1105,7 +1105,7 @@ ArgusWriteSocket (struct ArgusOutputStru
563 ArgusDebug (3, "ArgusHandleClientData: sasl_encode returned %d bytes\n", outputlen);
564 #endif
565 if (outputlen < ARGUS_MAXRECORD) {
566 - bcopy(output, asock->buf, outputlen);
567 + memmove(asock->buf, output, outputlen);
568 cnt = outputlen;
569 } else
570 ArgusLog (LOG_ERR, "sasl_encode: returned too many bytes %d\n", outputlen);
571 @@ -1282,7 +1282,7 @@ ArgusWriteOutSocket (struct ArgusOutputS
572 ArgusDebug (3, "ArgusHandleClientData: sasl_encode returned %d bytes\n", outputlen);
573 #endif
574 if (outputlen < ARGUS_MAXRECORD) {
575 - bcopy(output, asock->buf, outputlen);
576 + memmove(asock->buf, output, outputlen);
577 cnt = outputlen;
578
579 } else
580 diff -rup argus-3.0.0.rc.34.orig/argus/argus.c argus-3.0.0.rc.34/argus/argus.c
581 --- argus-3.0.0.rc.34.orig/argus/argus.c 2006-11-03 19:54:13.000000000 +0100
582 +++ argus-3.0.0.rc.34/argus/argus.c 2006-12-20 16:12:47.000000000 +0100
583 @@ -303,7 +303,7 @@ main (int argc, char *argv[])
584 if ((host = gethostbyname(optarg)) != NULL) {
585 if ((host->h_addrtype == 2) && (host->h_length == 4)) {
586 unsigned int addr;
587 - bcopy ((char *) *host->h_addr_list, (char *)&addr, host->h_length);
588 + memmove ((char *)&addr, (char *) *host->h_addr_list, host->h_length);
589 #if defined(_LITTLE_ENDIAN)
590 setArgusID (ArgusModel, ntohl(addr));
591 #else
592 @@ -499,7 +499,7 @@ ArgusComplete ()
593 if (ArgusSourceTask->ArgusStartTime.tv_sec == 0)
594 ArgusSourceTask->ArgusStartTime = ArgusSourceTask->ArgusEndTime;
595
596 - bzero(buf, sizeof(buf));
597 + memset(buf, 0, sizeof(buf));
598
599 timediff.tv_sec = ArgusSourceTask->ArgusEndTime.tv_sec - ArgusSourceTask->ArgusStartTime.tv_sec;
600 timediff.tv_usec = ArgusSourceTask->ArgusEndTime.tv_usec - ArgusSourceTask->ArgusStartTime.tv_usec;
601 @@ -784,7 +784,7 @@ ArgusParseResourceFile (struct ArgusMode
602 if ((host = gethostbyname(optarg)) != NULL) {
603 if ((host->h_addrtype == 2) && (host->h_length == 4)) {
604 unsigned int addr;
605 - bcopy ((char *) *host->h_addr_list, (char *)&addr, host->h_length);
606 + memmove ((char *)&addr, (char *) *host->h_addr_list, host->h_length);
607 #if defined(_LITTLE_ENDIAN)
608 setArgusID (model, ntohl(addr));
609 #else
610 diff -rup argus-3.0.0.rc.34.orig/common/argus_auth.c argus-3.0.0.rc.34/common/argus_auth.c
611 --- argus-3.0.0.rc.34.orig/common/argus_auth.c 2006-08-18 19:15:14.000000000 +0200
612 +++ argus-3.0.0.rc.34/common/argus_auth.c 2006-12-20 16:56:47.000000000 +0100
613 @@ -473,12 +473,12 @@ RaSendSaslString (FILE *f, const char *s
614 char saslbuf[MAXSTRLEN];
615 int len, al = 0;
616
617 - bzero (saslbuf, MAXSTRLEN);
618 + memset (saslbuf, 0, MAXSTRLEN);
619
620 snprintf(saslbuf, MAXSTRLEN, "{%d}\r\n", l);
621 len = strlen(saslbuf);
622
623 - bcopy (s, &saslbuf[len], l);
624 + memmove (&saslbuf[len], s, l);
625 len += l;
626
627 al = fwrite(saslbuf, 1, len, f);
628 diff -rup argus-3.0.0.rc.34.orig/common/argus_parse.c argus-3.0.0.rc.34/common/argus_parse.c
629 --- argus-3.0.0.rc.34.orig/common/argus_parse.c 2006-08-18 19:15:14.000000000 +0200
630 +++ argus-3.0.0.rc.34/common/argus_parse.c 2006-12-20 16:56:34.000000000 +0100
631 @@ -80,7 +80,7 @@ argus_parse_init (struct ARGUS_INPUT *in
632 if (input != NULL)
633 fd = input->fd;
634
635 - bzero((char *)&ArgusOutputFile, sizeof(ArgusOutputFile));
636 + memset((char *)&ArgusOutputFile, 0, sizeof(ArgusOutputFile));
637
638 if (initCon) {
639 if (initCon->ahdr.status & ARGUS_DETAIL) detail++;
640 @@ -496,8 +496,8 @@ main (int argc, char **argv)
641 *RaInputFilter = cmdbuf;
642 }
643
644 - bzero ((char *) &ArgusFilterCode, sizeof (ArgusFilterCode));
645 - bzero ((char *) &pbuf, sizeof (pbuf));
646 + memset ((char *) &ArgusFilterCode, 0, sizeof (ArgusFilterCode));
647 + memset ((char *) &pbuf, 0, sizeof (pbuf));
648
649 if (ArgusFilterCompile (&pbuf, &ArgusFilterCode, *RaInputFilter, 1, ArgusNetMask) < 0) {
650 if (pbuf.errbuf[0] != '\0') {
651 @@ -574,7 +574,7 @@ main (int argc, char **argv)
652 } else {
653 struct ARGUS_INPUT addrbuf, *addr = &addrbuf;
654
655 - bzero ((char *) addr, sizeof (*addr));
656 + memset ((char *) addr, 0, sizeof (*addr));
657 addr->fd = 0;
658
659 if (((ArgusReadConnection (addr, NULL)) >= 0)) {
660 @@ -628,8 +628,8 @@ ArgusHandleDatum (struct ArgusRecord *pt
661 u_char buf[MAXSTRLEN];
662
663 totalrecords++;
664 - bcopy ((char *)ptr, (char *)ArgusOriginal, len);
665 - bcopy ((char *)ptr, (char *)&buf, len);
666 + memmove ((char *)ArgusOriginal, (char *)ptr, len);
667 + memmove ((char *)&buf, (char *)ptr, len);
668
669 switch (ptr->ahdr.type) {
670 case ARGUS_MAR:
671 @@ -736,68 +736,68 @@ ArgusGenerateCanonicalRecord (struct Arg
672
673 hdrs = ArgusThisFarHdrs;
674
675 - bzero ((char *)canon, sizeof(*canon));
676 + memset ((char *)canon, 0, sizeof(*canon));
677
678 if (ptr->ahdr.type & ARGUS_MAR) {
679 - bcopy ((char *)ptr, (char *)canon, sizeof(*ptr));
680 + memmove ((char *)canon, (char *)ptr, sizeof(*ptr));
681
682 } else {
683 - bcopy ((char *)&ptr->ahdr, (char *)&canon->ahdr, sizeof(canon->ahdr));
684 + memmove ((char *)&canon->ahdr, (char *)&ptr->ahdr, sizeof(canon->ahdr));
685
686 for (i = 1; i < 33; i++) {
687 index = 1 << (i - 1);
688 switch (index) {
689 case ARGUS_FAR_DSR_STATUS:
690 if (ArgusThisFarStatus & ARGUS_FAR_DSR_STATUS)
691 - bcopy((char *) hdrs[ARGUS_FAR_DSR_INDEX], (char *)&ar->argus_far, sizeof (ar->argus_far));
692 + memmove((char *)&ar->argus_far, (char *) hdrs[ARGUS_FAR_DSR_INDEX], sizeof (ar->argus_far));
693 break;
694 case ARGUS_MAC_DSR_STATUS:
695 if (ArgusThisFarStatus & ARGUS_MAC_DSR_STATUS)
696 - bcopy((char *) hdrs[ARGUS_MAC_DSR_INDEX], (char *)&canon->mac, sizeof(canon->mac));
697 + memmove((char *)&canon->mac, (char *) hdrs[ARGUS_MAC_DSR_INDEX], sizeof(canon->mac));
698 break;
699 case ARGUS_VLAN_DSR_STATUS:
700 if (ArgusThisFarStatus & ARGUS_VLAN_DSR_STATUS)
701 - bcopy((char *) hdrs[ARGUS_VLAN_DSR_INDEX], (char *)&canon->vlan, sizeof(canon->vlan));
702 + memmove((char *)&canon->vlan, (char *) hdrs[ARGUS_VLAN_DSR_INDEX], sizeof(canon->vlan));
703 break;
704 case ARGUS_MPLS_DSR_STATUS:
705 if (ArgusThisFarStatus & ARGUS_MPLS_DSR_STATUS)
706 - bcopy((char *) hdrs[ARGUS_MPLS_DSR_INDEX], (char *)&canon->mpls, sizeof(canon->mpls));
707 + memmove((char *)&canon->mpls, (char *) hdrs[ARGUS_MPLS_DSR_INDEX], sizeof(canon->mpls));
708 break;
709 case ARGUS_AGR_DSR_STATUS:
710 if (ArgusThisFarStatus & ARGUS_AGR_DSR_STATUS)
711 - bcopy((char *) hdrs[ARGUS_AGR_DSR_INDEX], (char *)&canon->agr, sizeof(canon->agr));
712 + memmove((char *)&canon->agr, (char *) hdrs[ARGUS_AGR_DSR_INDEX], sizeof(canon->agr));
713 break;
714 case ARGUS_TIME_DSR_STATUS:
715 if (ArgusThisFarStatus & ARGUS_TIME_DSR_STATUS)
716 - bcopy((char *) hdrs[ARGUS_TIME_DSR_INDEX], (char *)&canon->time, sizeof(canon->time));
717 + memmove((char *)&canon->time, (char *) hdrs[ARGUS_TIME_DSR_INDEX], sizeof(canon->time));
718 break;
719 case ARGUS_TCP_DSR_STATUS:
720 if (ArgusThisFarStatus & ARGUS_TCP_DSR_STATUS)
721 - bcopy((char *) hdrs[ARGUS_TCP_DSR_INDEX], (char *)&canon->acr_tcp, sizeof(canon->acr_tcp));
722 + memmove((char *)&canon->acr_tcp, (char *) hdrs[ARGUS_TCP_DSR_INDEX], sizeof(canon->acr_tcp));
723 break;
724 case ARGUS_ICMP_DSR_STATUS:
725 if (ArgusThisFarStatus & ARGUS_ICMP_DSR_STATUS)
726 - bcopy((char *) hdrs[ARGUS_ICMP_DSR_INDEX], (char *)&canon->acr_icmp, sizeof(canon->acr_icmp));
727 + memmove((char *)&canon->acr_icmp, (char *) hdrs[ARGUS_ICMP_DSR_INDEX], sizeof(canon->acr_icmp));
728 break;
729 case ARGUS_RTP_DSR_STATUS:
730 if (ArgusThisFarStatus & ARGUS_RTP_DSR_STATUS)
731 - bcopy((char *) hdrs[ARGUS_RTP_DSR_INDEX], (char *)&canon->acr_rtp, sizeof(canon->acr_rtp));
732 + memmove((char *)&canon->acr_rtp, (char *) hdrs[ARGUS_RTP_DSR_INDEX], sizeof(canon->acr_rtp));
733 break;
734 case ARGUS_IGMP_DSR_STATUS:
735 if (ArgusThisFarStatus & ARGUS_IGMP_DSR_STATUS)
736 - bcopy((char *) hdrs[ARGUS_IGMP_DSR_INDEX], (char *)&canon->acr_igmp, sizeof(canon->acr_igmp));
737 + memmove((char *)&canon->acr_igmp, (char *) hdrs[ARGUS_IGMP_DSR_INDEX], sizeof(canon->acr_igmp));
738 break;
739 case ARGUS_ARP_DSR_STATUS:
740 if (ArgusThisFarStatus & ARGUS_ARP_DSR_STATUS)
741 - bcopy((char *) hdrs[ARGUS_ARP_DSR_INDEX], (char *)&canon->acr_arp, sizeof(canon->acr_arp));
742 + memmove((char *)&canon->acr_arp, (char *) hdrs[ARGUS_ARP_DSR_INDEX], sizeof(canon->acr_arp));
743 break;
744 case ARGUS_FRG_DSR_STATUS:
745 if (ArgusThisFarStatus & ARGUS_FRG_DSR_STATUS)
746 - bcopy((char *) hdrs[ARGUS_FRG_DSR_INDEX], (char *)&canon->acr_frag, sizeof(canon->acr_frag));
747 + memmove((char *)&canon->acr_frag, (char *) hdrs[ARGUS_FRG_DSR_INDEX], sizeof(canon->acr_frag));
748 break;
749 case ARGUS_ESP_DSR_STATUS:
750 if (ArgusThisFarStatus & ARGUS_ESP_DSR_STATUS)
751 - bcopy((char *) hdrs[ARGUS_ESP_DSR_INDEX], (char *)&canon->acr_esp, sizeof(canon->acr_esp));
752 + memmove((char *)&canon->acr_esp, (char *) hdrs[ARGUS_ESP_DSR_INDEX], sizeof(canon->acr_esp));
753 break;
754 }
755 }
756 @@ -829,7 +829,7 @@ ArgusParseCiscoRecordV1 (u_char **ptr)
757 struct ArgusRecord *argus = ArgusNetFlowArgusRecord;
758 struct ArgusMacStruct mac;
759
760 - bzero ((char *) argus, sizeof (*argus));
761 + memset ((char *) argus, 0, sizeof (*argus));
762 argus->ahdr.type = ARGUS_FAR | ARGUS_CISCO_NETFLOW;
763 argus->ahdr.cause = ARGUS_STATUS;
764 argus->ahdr.length = sizeof(argus->ahdr) + sizeof(argus->argus_far);
765 @@ -868,7 +868,7 @@ ArgusParseCiscoRecordV1 (u_char **ptr)
766 case IPPROTO_TCP: {
767 struct ArgusTCPObject tcpbuf, *tcp = &tcpbuf;
768
769 - bzero ((char *) tcp, sizeof(*tcp));
770 + memset ((char *) tcp, 0, sizeof(*tcp));
771 tcp->type = ARGUS_TCP_DSR;
772 tcp->length = sizeof(struct ArgusTCPObject);
773 tcp->src.flags = entryPtrV1->flags;
774 @@ -888,7 +888,7 @@ ArgusParseCiscoRecordV1 (u_char **ptr)
775 break;
776 }
777
778 - bcopy ((char *)tcp, &((char *)argus)[argus->ahdr.length], sizeof(*tcp));
779 + memmove (&((char *)argus)[argus->ahdr.length], (char *)tcp, sizeof(*tcp));
780 argus->ahdr.length += sizeof(*tcp);
781 }
782
783 @@ -906,17 +906,17 @@ ArgusParseCiscoRecordV1 (u_char **ptr)
784 break;
785 }
786
787 - bzero ((char *)&mac, sizeof (mac));
788 + memset ((char *)&mac, 0, sizeof (mac));
789 mac.type = ARGUS_MAC_DSR;
790 mac.length = sizeof(mac);
791 mac.status = 0;
792 entryPtrV1->input = ntohs(entryPtrV1->input);
793 entryPtrV1->output = ntohs(entryPtrV1->output);
794
795 - bcopy((char *)&entryPtrV1->input, (char *)&mac.phys_union.ether.ethersrc[4], 2);
796 - bcopy((char *)&entryPtrV1->output,(char *)&mac.phys_union.ether.etherdst[4], 2);
797 + memmove((char *)&mac.phys_union.ether.ethersrc[4], (char *)&entryPtrV1->input, 2);
798 + memmove((char *)&mac.phys_union.ether.etherdst[4], (char *)&entryPtrV1->output, 2);
799
800 - bcopy ((char *)&mac, &((char *)argus)[argus->ahdr.length], sizeof(mac));
801 + memmove (&((char *)argus)[argus->ahdr.length], (char *)&mac, sizeof(mac));
802 argus->ahdr.length += sizeof(mac);
803
804 #ifdef _LITTLE_ENDIAN
805 @@ -939,7 +939,7 @@ ArgusParseCiscoRecordV5 (u_char **ptr)
806 struct ArgusRecord *argus = ArgusNetFlowArgusRecord;
807 struct ArgusMacStruct mac;
808
809 - bzero ((char *) argus, sizeof (*argus));
810 + memset ((char *) argus, 0, sizeof (*argus));
811 argus->ahdr.type = ARGUS_FAR | ARGUS_CISCO_NETFLOW;
812 argus->ahdr.cause = ARGUS_STATUS;
813 argus->ahdr.length = sizeof(argus->ahdr) + sizeof(argus->argus_far);
814 @@ -980,7 +980,7 @@ ArgusParseCiscoRecordV5 (u_char **ptr)
815 case IPPROTO_TCP: {
816 struct ArgusTCPObject tcpbuf, *tcp = &tcpbuf;
817
818 - bzero ((char *) tcp, sizeof(*tcp));
819 + memset ((char *) tcp, 0, sizeof(*tcp));
820 tcp->type = ARGUS_TCP_DSR;
821 tcp->length = sizeof(struct ArgusTCPObject);
822 tcp->src.flags = entryPtrV5->tcp_flags;
823 @@ -1000,23 +1000,23 @@ ArgusParseCiscoRecordV5 (u_char **ptr)
824 break;
825 }
826
827 - bcopy ((char *)tcp, &((char *)argus)[argus->ahdr.length], sizeof(*tcp));
828 + memmove (&((char *)argus)[argus->ahdr.length], (char *)tcp, sizeof(*tcp));
829 argus->ahdr.length += sizeof(*tcp);
830 }
831 break;
832 }
833
834 - bzero ((char *)&mac, sizeof (mac));
835 + memset ((char *)&mac, 0, sizeof (mac));
836 mac.type = ARGUS_MAC_DSR;
837 mac.length = sizeof(mac);
838 mac.status = 0;
839 entryPtrV5->input = ntohs(entryPtrV5->input);
840 entryPtrV5->output = ntohs(entryPtrV5->output);
841
842 - bcopy((char *)&entryPtrV5->input, (char *)&mac.phys_union.ether.ethersrc[4], 2);
843 - bcopy((char *)&entryPtrV5->output,(char *)&mac.phys_union.ether.etherdst[4], 2);
844 + memmve((char *)&mac.phys_union.ether.ethersrc[4], (char *)&entryPtrV5->input, 2);
845 + memmove((char *)&mac.phys_union.ether.etherdst[4], (char *)&entryPtrV5->output, 2);
846
847 - bcopy ((char *)&mac, &((char *)argus)[argus->ahdr.length], sizeof(mac));
848 + memmove (&((char *)argus)[argus->ahdr.length], (char *)&mac, sizeof(mac));
849 argus->ahdr.length += sizeof(mac);
850
851 #ifdef _LITTLE_ENDIAN
852 @@ -1039,7 +1039,7 @@ ArgusParseCiscoRecordV6 (u_char **ptr)
853 struct ArgusRecord *argus = ArgusNetFlowArgusRecord;
854 struct ArgusMacStruct mac;
855
856 - bzero ((char *) argus, sizeof (*argus));
857 + memset ((char *) argus, 0, sizeof (*argus));
858 argus->ahdr.type = ARGUS_FAR | ARGUS_CISCO_NETFLOW;
859 argus->ahdr.cause = ARGUS_STATUS;
860 argus->ahdr.length = sizeof(argus->ahdr) + sizeof(argus->argus_far);
861 @@ -1080,7 +1080,7 @@ ArgusParseCiscoRecordV6 (u_char **ptr)
862 case IPPROTO_TCP: {
863 struct ArgusTCPObject tcpbuf, *tcp = &tcpbuf;
864
865 - bzero ((char *) tcp, sizeof(*tcp));
866 + memset ((char *) tcp, 0, sizeof(*tcp));
867 tcp->type = ARGUS_TCP_DSR;
868 tcp->length = sizeof(struct ArgusTCPObject);
869 tcp->src.flags = entryPtrV6->tcp_flags;
870 @@ -1100,23 +1100,23 @@ ArgusParseCiscoRecordV6 (u_char **ptr)
871 break;
872 }
873
874 - bcopy ((char *)tcp, &((char *)argus)[argus->ahdr.length], sizeof(*tcp));
875 + memmve (&((char *)argus)[argus->ahdr.length], (char *)tcp, sizeof(*tcp));
876 argus->ahdr.length += sizeof(*tcp);
877 }
878 break;
879 }
880
881 - bzero ((char *)&mac, sizeof (mac));
882 + memset ((char *)&mac, 0, sizeof (mac));
883 mac.type = ARGUS_MAC_DSR;
884 mac.length = sizeof(mac);
885 mac.status = 0;
886 entryPtrV6->input = ntohs(entryPtrV6->input);
887 entryPtrV6->output = ntohs(entryPtrV6->output);
888
889 - bcopy((char *)&entryPtrV6->input, (char *)&mac.phys_union.ether.ethersrc[4], 2);
890 - bcopy((char *)&entryPtrV6->output,(char *)&mac.phys_union.ether.etherdst[4], 2);
891 + memmove((char *)&mac.phys_union.ether.ethersrc[4], (char *)&entryPtrV6->input, 2);
892 + memmove((char *)&mac.phys_union.ether.etherdst[4], (char *)&entryPtrV6->output, 2);
893
894 - bcopy ((char *)&mac, &((char *)argus)[argus->ahdr.length], sizeof(mac));
895 + memmove (&((char *)argus)[argus->ahdr.length], (char *)&mac, sizeof(mac));
896 argus->ahdr.length += sizeof(mac);
897
898 #ifdef _LITTLE_ENDIAN
899 @@ -1145,7 +1145,7 @@ ArgusParseCiscoRecord (u_char **ptr)
900 CiscoFlowHeaderV1_t *hdrPtrV1 = (CiscoFlowHeaderV1_t *) *ptr;
901 CiscoFlowEntryV1_t *entryPtrV1 = (CiscoFlowEntryV1_t *) (hdrPtrV1 + 1);
902
903 - bzero ((char *) argus, sizeof (*argus));
904 + memset ((char *) argus, 0, sizeof (*argus));
905 argus->ahdr.type = ARGUS_FAR | ARGUS_CISCO_NETFLOW;
906 argus->ahdr.cause = ARGUS_STATUS;
907 argus->ahdr.length = sizeof(argus->ahdr) + sizeof(argus->argus_far);
908 @@ -1191,7 +1191,7 @@ ArgusParseCiscoRecord (u_char **ptr)
909 CiscoFlowHeaderV5_t *hdrPtrV5 = (CiscoFlowHeaderV5_t *) ptr;
910 CiscoFlowEntryV5_t *entryPtrV5 = (CiscoFlowEntryV5_t *) (hdrPtrV5 + 1);
911
912 - bzero ((char *) argus, sizeof (*argus));
913 + memset ((char *) argus, 0, sizeof (*argus));
914 argus->ahdr.type = ARGUS_FAR | ARGUS_CISCO_NETFLOW;
915 argus->ahdr.cause = ARGUS_STATUS;
916 argus->ahdr.length = sizeof(argus->ahdr) + sizeof(argus->argus_far);
917 @@ -1238,7 +1238,7 @@ ArgusParseCiscoRecord (u_char **ptr)
918 CiscoFlowHeaderV6_t *hdrPtrV6 = (CiscoFlowHeaderV6_t *) ptr;
919 CiscoFlowEntryV6_t *entryPtrV6 = (CiscoFlowEntryV6_t *) (hdrPtrV6 + 1);
920
921 - bzero ((char *) argus, sizeof (*argus));
922 + memset ((char *) argus, 0, sizeof (*argus));
923 argus->ahdr.type = ARGUS_FAR | ARGUS_CISCO_NETFLOW;
924 argus->ahdr.cause = ARGUS_STATUS;
925 argus->ahdr.length = sizeof(argus->ahdr) + sizeof(argus->argus_far);
926 @@ -1301,7 +1301,7 @@ ArgusNetFlowCallRecord (u_char **ptr)
927 BinaryRecord_CallRecord_V1 *call = (BinaryRecord_CallRecord_V1 *) *ptr;
928
929 if (*ptr) {
930 - bzero ((char *) argus, sizeof (*argus));
931 + memset ((char *) argus, 0, sizeof (*argus));
932 argus->ahdr.type = ARGUS_FAR | ARGUS_CISCO_NETFLOW;
933 argus->ahdr.cause = ARGUS_STATUS;
934 argus->ahdr.length = sizeof(argus->ahdr) + sizeof(argus->argus_far);
935 @@ -1348,7 +1348,7 @@ ArgusNetFlowDetailInt (u_char **ptr)
936
937 if (*ptr) {
938 dint = NULL;
939 - bzero ((char *) argus, sizeof (*argus));
940 + memset ((char *) argus, 0, sizeof (*argus));
941 }
942
943
944 @@ -1438,7 +1438,7 @@ ArgusReadConnection (struct ARGUS_INPUT
945
946 if (fd >= 0) {
947 if (!(Cflag)) {
948 - bzero ((char *) &argus, sizeof(argus));
949 + memset ((char *) &argus, 0, sizeof(argus));
950 if ((cnt = read (fd, &argus, sizeof(argus.ahdr))) == sizeof(argus.ahdr)) {
951 #ifdef ARGUSDEBUG
952 ArgusDebug (5, "ArgusReadConnection() read %d bytes\n", cnt);
953 @@ -1447,7 +1447,7 @@ ArgusReadConnection (struct ARGUS_INPUT
954 if (((ptr[0] == 0x1F) && ((ptr[1] == 0x8B) || (ptr[1] == 0x9D))) ||
955 ((ptr[0] == 'B') && (ptr[1] == 'Z') && (ptr[2] == 'h'))) {
956 char cmd[256];
957 - bzero(cmd, 256);
958 + memset(cmd, 0, 256);
959 close(fd);
960 if (ptr[0] == 'B')
961 strcpy(cmd, "bzip2 -dc ");
962 @@ -1514,8 +1514,8 @@ ArgusReadConnection (struct ARGUS_INPUT
963 return (-1);
964 }
965
966 - bcopy ((char *) &argus, (char *)&input->ArgusInitCon, sizeof (argus));
967 - bcopy ((char *) &argus, (char *) ArgusOriginal, length);
968 + memmove ((char *)&input->ArgusInitCon, (char *) &argus, sizeof (argus));
969 + memmove ((char *) ArgusOriginal, (char *) &argus, length);
970 ArgusInput = input;
971
972 ArgusHandleDatum ((struct ArgusRecord *)&argus, &ArgusFilterCode);
973 @@ -1524,7 +1524,7 @@ ArgusReadConnection (struct ARGUS_INPUT
974 ArgusNtoH(&argus);
975 #endif
976
977 - bcopy ((char *) &argus, (char *)&input->ArgusManStart, sizeof (argus));
978 + memmove ((char *)&input->ArgusManStart, (char *) &argus, sizeof (argus));
979 input->major_version = MAJOR_VERSION_2;
980 input->minor_version = MINOR_VERSION_0;
981 input->ArgusReadSize = argus.argus_mar.record_len;
982 @@ -1543,7 +1543,7 @@ ArgusReadConnection (struct ARGUS_INPUT
983 if ((ArgusRemoteFilter != NULL) && (filename == NULL) && (fd != 0)) {
984 int len;
985
986 - bzero(buf, MAXSTRLEN);
987 + memset(buf, 0, MAXSTRLEN);
988 snprintf ((char *) buf, MAXSTRLEN-1, "FILTER: man or %s", (char *) ArgusRemoteFilter);
989 len = strlen((char *) buf);
990 if (ArgusWriteConnection (input, buf, len) < 0) {
991 @@ -1564,7 +1564,7 @@ ArgusReadConnection (struct ARGUS_INPUT
992 char *ptr;
993 int size;
994
995 - bcopy ((char *)&argus, buf, sizeof(argus.ahdr));
996 + memmove (buf, (char *)&argus, sizeof(argus.ahdr));
997
998 size = sizeof(*ws) - sizeof(argus.ahdr);
999
1000 @@ -1584,11 +1584,11 @@ ArgusReadConnection (struct ARGUS_INPUT
1001
1002 if (initCon == NULL) {
1003 if ((initCon = (struct ArgusRecord *) calloc (1, sizeof (argus))) != NULL)
1004 - bcopy ((char *) &argus, (char *) initCon, sizeof (argus));
1005 + memmove ((char *) initCon, (char *) &argus, sizeof (argus));
1006 }
1007
1008 - bcopy ((char *) &argus, (char *)&input->ArgusInitCon, sizeof (argus));
1009 - bcopy ((char *)&argus, (char *) ArgusOriginal, sizeof(argus));
1010 + memmove ((char *)&input->ArgusInitCon, (char *) &argus, sizeof (argus));
1011 + memmove ((char *) ArgusOriginal, (char *)&argus, sizeof(argus));
1012
1013 ArgusInput = input;
1014
1015 @@ -1617,7 +1617,7 @@ ArgusReadConnection (struct ARGUS_INPUT
1016 BinaryHeaderF2 *ArgusNetFlow = (BinaryHeaderF2 *) buf;
1017 int size;
1018
1019 - bcopy ((char *)&argus, buf, sizeof(argus.ahdr));
1020 + memmove (buf, (char *)&argus, sizeof(argus.ahdr));
1021 size = sizeof(*ArgusNetFlow) - sizeof(argus.ahdr);
1022
1023 if ((cnt = read (fd, &buf[sizeof(argus.ahdr)], size)) != size) {
1024 @@ -1633,7 +1633,7 @@ ArgusReadConnection (struct ARGUS_INPUT
1025 ArgusNetFlow->missed = ntohl(ArgusNetFlow->missed);
1026 ArgusNetFlow->records = ntohl(ArgusNetFlow->records);
1027 #endif
1028 - bzero ((char *)&argus, sizeof(argus));
1029 + memset ((char *)&argus, 0, sizeof(argus));
1030
1031 argus.ahdr.type = ARGUS_MAR | ARGUS_CISCO_NETFLOW;
1032 argus.ahdr.length = sizeof (argus);
1033 @@ -1657,11 +1657,11 @@ ArgusReadConnection (struct ARGUS_INPUT
1034 #endif
1035 if (initCon == NULL) {
1036 if ((initCon = (struct ArgusRecord *) calloc (1, sizeof (argus))) != NULL)
1037 - bcopy ((char *) &argus, (char *) initCon, sizeof (argus));
1038 + memmove ((char *) initCon, (char *) &argus, sizeof (argus));
1039 }
1040
1041 - bcopy ((char *) &argus, (char *)&input->ArgusInitCon, sizeof (argus));
1042 - bcopy ((char *) &argus, (char *) ArgusOriginal, sizeof(argus));
1043 + memmove ((char *)&input->ArgusInitCon, (char *) &argus, sizeof (argus));
1044 + memmove ((char *) ArgusOriginal, (char *) &argus, sizeof(argus));
1045 ArgusInput = input;
1046
1047 ArgusGenerateCanonicalRecord (&argus, canon);
1048 @@ -1702,7 +1702,7 @@ ArgusReadConnection (struct ARGUS_INPUT
1049 #ifdef ARGUSDEBUG
1050 ArgusDebug (2, "ArgusReadConnection(0x%x) reading from Cisco Router.\n", input);
1051 #endif
1052 - bzero ((char *)&argus, sizeof(argus));
1053 + memset ((char *)&argus, 0, sizeof(argus));
1054 argus_parse_init (input);
1055 }
1056 }
1057 @@ -1902,7 +1902,7 @@ ArgusReadSaslStreamSocket (struct ARGUS_
1058
1059 while ((char *)argus < end) {
1060 input->ArgusReadSocketCnt = ntohs(argus->ahdr.length);
1061 - bcopy (argus, input->ArgusReadBuffer, input->ArgusReadSocketCnt);
1062 + memmove (input->ArgusReadBuffer, argus, input->ArgusReadSocketCnt);
1063
1064 if (ArgusHandleDatum (argus, &ArgusFilterCode) == 1) {
1065 if (!input->filename)
1066 @@ -1970,7 +1970,7 @@ ArgusReadStreamSocket (struct ARGUS_INPU
1067 if (input->ArgusReadSocketState == ARGUS_READINGHDR) {
1068 input->ArgusReadSocketState = ARGUS_READINGBLOCK;
1069
1070 - bcopy ((char *) &((struct ArgusRecordHeader *)input->ArgusReadPtr)->length, (char *) &length, sizeof(length));
1071 + memmove ((char *) &length, (char *) &((struct ArgusRecordHeader *)input->ArgusReadPtr)->length, sizeof(length));
1072 input->ArgusReadSocketSize = ntohs(length) - sizeof(struct ArgusRecordHeader);
1073 if ((input->ArgusReadSocketSize > 0) && (input->ArgusReadSocketSize < MAXSTRLEN)) {
1074 input->ArgusReadPtr = &input->ArgusReadBuffer[input->ArgusReadSocketCnt];
1075 @@ -1986,7 +1986,7 @@ ArgusReadStreamSocket (struct ARGUS_INPU
1076 if (input->major_version < 2) {
1077 ArgusConvertWriteStruct ((struct WriteStruct *)input->ArgusReadBuffer,
1078 (struct ArgusRecord *)input->ArgusConvBuffer);
1079 - bcopy ((char *) input->ArgusConvBuffer, input->ArgusReadBuffer, MAXSTRLEN);
1080 + memmove (input->ArgusReadBuffer, (char *) input->ArgusConvBuffer, MAXSTRLEN);
1081 }
1082
1083 if (ArgusHandleDatum ((struct ArgusRecord *)input->ArgusReadBuffer, &ArgusFilterCode) == 1) {
1084 @@ -2002,7 +2002,7 @@ ArgusReadStreamSocket (struct ARGUS_INPU
1085 }
1086
1087 input->ArgusReadPtr = input->ArgusReadBuffer;
1088 - bzero (input->ArgusReadBuffer, MAXSTRLEN);
1089 + memset (input->ArgusReadBuffer, 0, MAXSTRLEN);
1090 input->ArgusReadSocketCnt = 0;
1091 }
1092 }
1093 @@ -2105,7 +2105,7 @@ ArgusReadCiscoStreamSocket (struct ARGUS
1094
1095 if (!(input->ArgusReadSocketNum--)) {
1096 input->ArgusReadPtr = input->ArgusReadBuffer;
1097 - bzero (input->ArgusReadBuffer, MAXSTRLEN);
1098 + memset (input->ArgusReadBuffer, 0, MAXSTRLEN);
1099
1100 } else {
1101 input->ArgusReadPtr = input->ArgusReadBlockPtr;
1102 @@ -2279,7 +2279,7 @@ ArgusReadStream ()
1103 return;
1104 }
1105
1106 - bzero ((char *)&timeoutValue, sizeof(timeoutValue));
1107 + memset ((char *)&timeoutValue, 0, sizeof(timeoutValue));
1108
1109 if (gettimeofday (&now, NULL) == 0) {
1110 ArgusAdjustGlobalTime(&ArgusGlobalTime, &ArgusNowTime);
1111 @@ -2535,7 +2535,7 @@ ArgusGetServerSocket (struct ARGUS_INPUT
1112 } else
1113 portnum = htons(input->portnum);
1114
1115 - bzero ((char *)&argus, sizeof(argus));
1116 + memset ((char *)&argus, 0, sizeof(argus));
1117 argus.ahdr.type = ARGUS_MAR | ARGUS_CISCO_NETFLOW;
1118 argus.ahdr.length = sizeof (argus);
1119 argus.ahdr.cause = ARGUS_START;
1120 @@ -2549,15 +2549,15 @@ ArgusGetServerSocket (struct ARGUS_INPUT
1121 input->major_version = argus.argus_mar.major_version;
1122 input->minor_version = argus.argus_mar.minor_version;
1123
1124 - bcopy ((char *) &argus, (char *)&input->ArgusInitCon, sizeof (argus));
1125 - bcopy ((char *) &argus, (char *) ArgusOriginal, sizeof(argus));
1126 + memmove ((char *)&input->ArgusInitCon, (char *) &argus, sizeof (argus));
1127 + memmove ((char *) ArgusOriginal, (char *) &argus, sizeof(argus));
1128 ArgusInput = input;
1129
1130 } else
1131 ArgusLog (LOG_ERR, "ArgusGetServerSocket(0x%x) unknown type\n", input);
1132 }
1133
1134 - bzero ((char *) &server, sizeof (server));
1135 + memset ((char *) &server, 0, sizeof (server));
1136
1137 if ((s = socket (AF_INET, type, 0)) >= 0) {
1138 if (type == SOCK_DGRAM) {
1139 @@ -2582,7 +2582,7 @@ ArgusGetServerSocket (struct ARGUS_INPUT
1140
1141 if ((hp = gethostbyaddr ((char *)&input->addr, sizeof (input->addr), AF_INET)) != NULL) {
1142 input->hostname = strdup(hp->h_name);
1143 - bcopy ((char *) hp->h_addr, (char *)&server.sin_addr, hp->h_length);
1144 + memmove ((char *)&server.sin_addr, (char *) hp->h_addr, hp->h_length);
1145 server.sin_family = hp->h_addrtype;
1146 server.sin_port = portnum;
1147 #ifdef ARGUSDEBUG
1148 @@ -2889,7 +2889,7 @@ check_time (struct ArgusRecord *ptr)
1149 if (!explicit_date) {
1150 tm = localtime_r((time_t *)&start->tv_sec, &tmbuf);
1151 if (tm->tm_yday != starTimeFilter.tm_yday) {
1152 - bcopy ((char *) tm, (char *) &tmbuf, sizeof (struct tm));
1153 + memmove ((char *) &tmbuf, (char *) tm, sizeof (struct tm));
1154 if (check_time_format (&tmbuf, timearg))
1155 ArgusLog (LOG_ERR, "time syntax error %s\n", timearg);
1156 }
1157 @@ -2926,7 +2926,7 @@ parseUserDataArg (char **arg, char *args
1158 int retn = -1;
1159 char buf[64], *ptr = buf;
1160
1161 - bzero (buf, 64);
1162 + memset (buf, 0, 64);
1163 strcpy (buf, *arg);
1164 ptr += strlen (buf);
1165
1166 @@ -2992,7 +2992,7 @@ parseTimeArg ( char **arg, char *args[],
1167 int retn = -1;
1168 char buf[64], *ptr = buf;
1169
1170 - bzero (buf, 64);
1171 + memset (buf, 0, 64);
1172 strcpy (buf, *arg);
1173 ptr += strlen (buf);
1174 if ((ptr = strchr(*arg, '-')) && (*(ptr + 1) != '\0')) {
1175 @@ -3054,7 +3054,7 @@ check_time_format (struct tm *tm, char *
1176
1177 } else {
1178 if ((retn = parseTime (&starTimeFilter, tm, buf)) > 0) {
1179 - bcopy ((char *)&starTimeFilter, (char *)&lastTimeFilter, sizeof(struct tm));
1180 + memmove ((char *)&lastTimeFilter, (char *)&starTimeFilter, sizeof(struct tm));
1181 switch (retn) {
1182 case ARGUS_YEAR: lastTimeFilter.tm_year++; break;
1183 case ARGUS_MONTH: lastTimeFilter.tm_mon++; break;
1184 @@ -3091,7 +3091,7 @@ parseTime (struct tm *tm, struct tm *ctm
1185
1186 /*[[[yyyy/]mm/]dd].]hh[:mm[:ss]]*/
1187
1188 - bcopy ((u_char *) ctm, (u_char *) tm, sizeof (struct tm));
1189 + memmove ((u_char *) tm, (u_char *) ctm, sizeof (struct tm));
1190
1191 if ((hptr = strchr (str, '.')) != NULL) {
1192 *hptr++ = '\0';
1193 diff -rup argus-3.0.0.rc.34.orig/common/argus_util.c argus-3.0.0.rc.34/common/argus_util.c
1194 --- argus-3.0.0.rc.34.orig/common/argus_util.c 2006-10-02 17:23:44.000000000 +0200
1195 +++ argus-3.0.0.rc.34/common/argus_util.c 2006-12-20 17:02:40.000000000 +0100
1196 @@ -540,12 +540,12 @@ ArgusNtoH (struct ArgusRecord *argus)
1197 u_int32_t value;
1198 stat->n = ntohl(stat->n);
1199 stat->minval = ntohl(stat->minval);
1200 - bcopy((char *)&stat->meanval, (char *)&value, sizeof(value));
1201 + memmove((char *)&value, (char *)&stat->meanval, sizeof(value));
1202 value = ntohl(value);
1203 - bcopy((char *)&value, (char *)&stat->meanval, sizeof(value));
1204 - bcopy((char *)&stat->stdev, (char *)&value, sizeof(value));
1205 + memmove((char *)&stat->meanval, (char *)&value, sizeof(value));
1206 + memmove((char *)&value, (char *)&stat->stdev, sizeof(value));
1207 value = ntohl(value);
1208 - bcopy((char *)&value, (char *)&stat->stdev, sizeof(value));
1209 + memmove((char *)&stat->stdev, (char *)&value, sizeof(value));
1210 stat->maxval = ntohl(stat->maxval);
1211
1212 stat++;
1213 @@ -946,12 +946,12 @@ ArgusHtoN (struct ArgusRecord *argus)
1214 u_int32_t value;
1215 stat->n = htonl(stat->n);
1216 stat->minval = htonl(stat->minval);
1217 - bcopy((char *)&stat->meanval, (char *)&value, sizeof(value));
1218 + memmove((char *)&value, (char *)&stat->meanval, sizeof(value));
1219 value = htonl(value);
1220 - bcopy((char *)&value, (char *)&stat->meanval, sizeof(value));
1221 - bcopy((char *)&stat->stdev, (char *)&value, sizeof(value));
1222 + memmove((char *)&stat->meanval, (char *)&value, sizeof(value));
1223 + memmove((char *)&value, (char *)&stat->stdev, sizeof(value));
1224 value = htonl(value);
1225 - bcopy((char *)&value, (char *)&stat->stdev, sizeof(value));
1226 + memmove((char *)&stat->stdev, (char *)&value, sizeof(value));
1227 stat->maxval = htonl(stat->maxval);
1228 stat++;
1229 len -= sizeof (*stat);
1230 @@ -1535,8 +1535,8 @@ print_time(struct timeval *tvp)
1231 char *retn = ArgusPrintTimeBuf, *ptr;
1232 struct tm *tm, tmbuf;
1233
1234 - bzero (timeZoneBuf, sizeof(timeZoneBuf));
1235 - bzero (ArgusPrintTimeBuf, sizeof(ArgusPrintTimeBuf));
1236 + memset (timeZoneBuf, 0, sizeof(timeZoneBuf));
1237 + memset (ArgusPrintTimeBuf, 0, sizeof(ArgusPrintTimeBuf));
1238
1239 if ((tm = localtime_r ((time_t *)&tvp->tv_sec, &tmbuf)) != NULL) {
1240 if (uflag)
1241 @@ -1614,8 +1614,8 @@ lookup_nsap(struct ArgusParserStruct *pa
1242 tp->e_addr1 == j &&
1243 tp->e_addr2 == k &&
1244 tp->e_nsap[0] == nlen &&
1245 - bcmp((char *)&(nsap[1]),
1246 - (char *)&(tp->e_nsap[1]), nlen) == 0)
1247 + ( nlen == 0 ? 0 : memcmp((char *)&(nsap[1]),
1248 + (char *)&(tp->e_nsap[1]), nlen) == 0))
1249 return tp;
1250 else
1251 tp = tp->e_nxt;
1252 @@ -1623,7 +1623,7 @@ lookup_nsap(struct ArgusParserStruct *pa
1253 tp->e_addr1 = j;
1254 tp->e_addr2 = k;
1255 tp->e_nsap = (u_char *) calloc(1, nlen + 1);
1256 - bcopy(nsap, tp->e_nsap, nlen + 1);
1257 + memmove(tp->e_nsap, nsap, nlen + 1);
1258 tp->e_nxt = (struct enamemem *)calloc(1, sizeof(*tp));
1259
1260 return tp;
1261 @@ -1696,7 +1696,7 @@ ArgusInitEprotoarray(struct ArgusParserS
1262 {
1263 struct ArgusEtherTypeStruct *p = argus_ethertype_names;
1264
1265 - bzero ((char *)parser->argus_eproto_db, sizeof (parser->argus_eproto_db));
1266 + memset ((char *)parser->argus_eproto_db, 0, sizeof (parser->argus_eproto_db));
1267
1268 while (p->range != NULL) {
1269 int i, start, end;
1270 @@ -2209,7 +2209,7 @@ etheraddr_string(u_char *ep)
1271 char *cp = etheraddrbuf;
1272 u_int i, j;
1273
1274 - bzero (cp, sizeof(etheraddrbuf));
1275 + memset (cp, 0, sizeof(etheraddrbuf));
1276 if ((j = *ep >> 4) != 0)
1277 *cp++ = hex[j];
1278 *cp++ = hex[*ep++ & 0xf];
uClibc cross-compilers and rootfs