1c1
< /* $FreeBSD: head/sys/netinet6/ip6_mroute.c 160981 2006-08-04 21:27:40Z brooks $ */
---
> /* $FreeBSD: head/sys/netinet6/ip6_mroute.c 165118 2006-12-12 12:17:58Z bz $ */
727a728
> char ip6bufo[INET6_ADDRSTRLEN], ip6bufg[INET6_ADDRSTRLEN];
735,740c736,742
< if (mrt6debug & DEBUG_MFC)
< log(LOG_DEBUG,
< "add_m6fc no upcall h %d o %s g %s p %x\n",
< ip6_sprintf(&mfccp->mf6cc_origin.sin6_addr),
< ip6_sprintf(&mfccp->mf6cc_mcastgrp.sin6_addr),
< mfccp->mf6cc_parent);
---
> if (mrt6debug & DEBUG_MFC) {
> log(LOG_DEBUG,
> "add_m6fc no upcall h %d o %s g %s p %x\n",
> ip6_sprintf(ip6bufo, &mfccp->mf6cc_origin.sin6_addr),
> ip6_sprintf(ip6bufg, &mfccp->mf6cc_mcastgrp.sin6_addr),
> mfccp->mf6cc_parent);
> }
767,768c769,772
< ip6_sprintf(&mfccp->mf6cc_origin.sin6_addr),
< ip6_sprintf(&mfccp->mf6cc_mcastgrp.sin6_addr),
---
> ip6_sprintf(ip6bufo,
> &mfccp->mf6cc_origin.sin6_addr),
> ip6_sprintf(ip6bufg,
> &mfccp->mf6cc_mcastgrp.sin6_addr),
775,776c779,782
< ip6_sprintf(&mfccp->mf6cc_origin.sin6_addr),
< ip6_sprintf(&mfccp->mf6cc_mcastgrp.sin6_addr),
---
> ip6_sprintf(ip6bufo,
> &mfccp->mf6cc_origin.sin6_addr),
> ip6_sprintf(ip6bufg,
> &mfccp->mf6cc_mcastgrp.sin6_addr),
813,818c819,824
< log(LOG_DEBUG,
< "add_mfc no upcall h %d o %s g %s p %x\n",
< hash,
< ip6_sprintf(&mfccp->mf6cc_origin.sin6_addr),
< ip6_sprintf(&mfccp->mf6cc_mcastgrp.sin6_addr),
< mfccp->mf6cc_parent);
---
> log(LOG_DEBUG,
> "add_mfc no upcall h %d o %s g %s p %x\n",
> hash,
> ip6_sprintf(ip6bufo, &mfccp->mf6cc_origin.sin6_addr),
> ip6_sprintf(ip6bufg, &mfccp->mf6cc_mcastgrp.sin6_addr),
> mfccp->mf6cc_parent);
918c924,925
< if (mrt6debug & DEBUG_MFC)
---
> if (mrt6debug & DEBUG_MFC) {
> char ip6bufo[INET6_ADDRSTRLEN], ip6bufg[INET6_ADDRSTRLEN];
920,921c927,929
< ip6_sprintf(&origin.sin6_addr),
< ip6_sprintf(&mcastgrp.sin6_addr));
---
> ip6_sprintf(ip6bufo, &origin.sin6_addr),
> ip6_sprintf(ip6bufg, &mcastgrp.sin6_addr));
> }
997a1006
> char ip6bufs[INET6_ADDRSTRLEN], ip6bufd[INET6_ADDRSTRLEN];
1002c1011,1012
< ip6_sprintf(&ip6->ip6_src), ip6_sprintf(&ip6->ip6_dst),
---
> ip6_sprintf(ip6bufs, &ip6->ip6_src),
> ip6_sprintf(ip6bufd, &ip6->ip6_dst),
1029,1030c1039,1040
< ip6_sprintf(&ip6->ip6_src),
< ip6_sprintf(&ip6->ip6_dst),
---
> ip6_sprintf(ip6bufs, &ip6->ip6_src),
> ip6_sprintf(ip6bufd, &ip6->ip6_dst),
1068,1069c1078,1079
< ip6_sprintf(&ip6->ip6_src),
< ip6_sprintf(&ip6->ip6_dst));
---
> ip6_sprintf(ip6bufs, &ip6->ip6_src),
> ip6_sprintf(ip6bufd, &ip6->ip6_dst));
1278c1288,1290
< if (mrt6debug & DEBUG_EXPIRE)
---
> if (mrt6debug & DEBUG_EXPIRE) {
> char ip6bufo[INET6_ADDRSTRLEN];
> char ip6bufg[INET6_ADDRSTRLEN];
1280,1281c1292,1294
< ip6_sprintf(&mfc->mf6c_origin.sin6_addr),
< ip6_sprintf(&mfc->mf6c_mcastgrp.sin6_addr));
---
> ip6_sprintf(ip6bufo, &mfc->mf6c_origin.sin6_addr),
> ip6_sprintf(ip6bufg, &mfc->mf6c_mcastgrp.sin6_addr));
> }
1591c1604,1606
< if (mrt6debug & DEBUG_XMIT)
---
> if (mrt6debug & DEBUG_XMIT) {
> char ip6bufs[INET6_ADDRSTRLEN];
> char ip6bufd[INET6_ADDRSTRLEN];
1596,1597c1611,1612
< ip6_sprintf(&ip6->ip6_src),
< ip6_sprintf(&ip6->ip6_dst),
---
> ip6_sprintf(ip6bufs, &ip6->ip6_src),
> ip6_sprintf(ip6bufd, &ip6->ip6_dst),
1598a1614
> }
1619c1635,1636
< if (mrt6debug)
---
> if (mrt6debug) {
> char ip6bufs[INET6_ADDRSTRLEN], ip6bufd[INET6_ADDRSTRLEN];
1621c1638,1640
< ip6_sprintf(&ip6->ip6_src), ip6_sprintf(&ip6->ip6_dst));
---
> ip6_sprintf(ip6bufs, &ip6->ip6_src),
> ip6_sprintf(ip6bufd, &ip6->ip6_dst));
> }
1788a1808,1810
> #ifdef MRT6DEBUG
> char ip6bufs[INET6_ADDRSTRLEN], ip6bufd[INET6_ADDRSTRLEN];
> #endif
1818c1840
< pimlen, ip6_sprintf(&ip6->ip6_src));
---
> pimlen, ip6_sprintf(ip6bufs, &ip6->ip6_src));
1830,1831c1852,1853
< ip6_sprintf(&eip6->ip6_src),
< ip6_sprintf(&eip6->ip6_dst),
---
> ip6_sprintf(ip6bufs, &eip6->ip6_src),
> ip6_sprintf(ip6bufd, &eip6->ip6_dst),
1855c1877
< ip6_sprintf(&eip6->ip6_dst));
---
> ip6_sprintf(ip6bufd, &eip6->ip6_dst));
1884,1885c1906,1907
< ip6_sprintf(&eip6->ip6_src),
< ip6_sprintf(&eip6->ip6_dst),
---
> ip6_sprintf(ip6bufs, &eip6->ip6_src),
> ip6_sprintf(ip6bufd, &eip6->ip6_dst),