NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mrouted: fix bcopy patch oops

Browse Source 
The bcopy patch just changes bcopy for memmove which is incorrect since
bcopy and memmove use reversed src and dest parameters between them.
Oops!

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Gustavo Zacarias 2012-05-03 01:46:49 +00:00 committed by Peter Korsgaard
parent 2b66816c71
commit b3b66fb8de
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package/mrouted/mrouted-3.9.4-bcopy.patch
View File

@ -1,17 +1,12 @@
--- diff -Nura mrouted-3.9.4/mtrace.c mrouted-3.9.4-memmove/mtrace.c
mtrace.c | 4 ++-- --- mrouted-3.9.4/mtrace.c 2010-11-19 20:53:19.000000000 -0300
1 file changed, 2 insertions(+), 2 deletions(-) +++ mrouted-3.9.4-memmove/mtrace.c 2012-05-03 08:27:33.895422455 -0300
Index: mrouted-3.9.4/mtrace.c
===================================================================
--- mrouted-3.9.4.orig/mtrace.c
+++ mrouted-3.9.4/mtrace.c
@@ -556,7 +556,7 @@ @@ -556,7 +556,7 @@
save->rtime = ((tr.tv_sec + JAN_1970) << 16) + save->rtime = ((tr.tv_sec + JAN_1970) << 16) +
(tr.tv_usec << 10) / 15625; (tr.tv_usec << 10) / 15625;
save->len = len; save->len = len;
- bcopy((char *)igmp, (char *)&save->igmp, ipdatalen); - bcopy((char *)igmp, (char *)&save->igmp, ipdatalen);
+ memmove((char *)igmp, (char *)&save->igmp, ipdatalen); + memmove((char *)&save->igmp, (char *)igmp, ipdatalen);
} }
return recvlen; return recvlen;
} }
@ -20,7 +15,7 @@ Index: mrouted-3.9.4/mtrace.c
(tr.tv_usec << 10) / 15625; (tr.tv_usec << 10) / 15625;
base.len = len; base.len = len;
- bcopy((char *)igmp, (char *)&base.igmp, ipdatalen); - bcopy((char *)igmp, (char *)&base.igmp, ipdatalen);
+ memmove((char *)igmp, (char *)&base.igmp, ipdatalen); + memmove((char *)&base.igmp, (char *)igmp, ipdatalen);
/* /*
* If the user specified which traces to monitor, * If the user specified which traces to monitor,
* only accept traces that correspond to the * only accept traces that correspond to the