Commit b3b66fb8 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

mrouted: fix bcopy patch oops 



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: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 2b66816c

package/mrouted/mrouted-3.9.4-bcopy.patch

+5 −10
Original line number Diff line number Diff line 
---

 mtrace.c |    4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)



Index: mrouted-3.9.4/mtrace.c

===================================================================

--- mrouted-3.9.4.orig/mtrace.c

+++ mrouted-3.9.4/mtrace.c

diff -Nura mrouted-3.9.4/mtrace.c mrouted-3.9.4-memmove/mtrace.c

--- mrouted-3.9.4/mtrace.c	2010-11-19 20:53:19.000000000 -0300

+++ mrouted-3.9.4-memmove/mtrace.c	2012-05-03 08:27:33.895422455 -0300

@@ -556,7 +556,7 @@

 		save->rtime = ((tr.tv_sec + JAN_1970) << 16) +

 		    (tr.tv_usec << 10) / 15625;

 		save->len = len;

-		bcopy((char *)igmp, (char *)&save->igmp, ipdatalen);

+		memmove((char *)igmp, (char *)&save->igmp, ipdatalen);

+		memmove((char *)&save->igmp, (char *)igmp, ipdatalen);

 	    }

 	    return recvlen;

 	}
@@ -20,7 +15,7 @@ Index: mrouted-3.9.4/mtrace.c 
 	    (tr.tv_usec << 10) / 15625;

 	base.len = len;

-	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,

 	 * only accept traces that correspond to the