diff -ruN mrouted-3.9beta3+IOS12.orig/callout.c mrouted-3.9beta3+IOS12/callout.c --- mrouted-3.9beta3+IOS12.orig/callout.c 1998-01-05 17:58:45.000000000 -0800 +++ mrouted-3.9beta3+IOS12/callout.c 2008-10-10 18:26:44.000000000 -0700 @@ -73,7 +73,7 @@ elapsed_time -= ptr->time; Q = Q->next; IF_DEBUG(DEBUG_TIMEOUT) - log(LOG_DEBUG, 0, "about to call timeout %d (#%d)", ptr->id, i); + mrlog(LOG_DEBUG, 0, "about to call timeout %d (#%d)", ptr->id, i); if (ptr->func) ptr->func(ptr->data); free(ptr); @@ -90,7 +90,7 @@ { if (Q) { if (Q->time < 0) { - log(LOG_WARNING, 0, "timer_nextTimer top of queue says %d", + mrlog(LOG_WARNING, 0, "timer_nextTimer top of queue says %d", Q->time); return 0; } @@ -114,7 +114,7 @@ /* create a node */ node = (struct timeout_q *)malloc(sizeof(struct timeout_q)); if (node == 0) { - log(LOG_WARNING, 0, "Malloc Failed in timer_settimer\n"); + mrlog(LOG_WARNING, 0, "Malloc Failed in timer_settimer\n"); return -1; } node->func = action; @@ -145,7 +145,7 @@ ptr->time -= node->time; print_Q(); IF_DEBUG(DEBUG_TIMEOUT) - log(LOG_DEBUG, 0, "created timeout %d (#%d)", node->id, i); + mrlog(LOG_DEBUG, 0, "created timeout %d (#%d)", node->id, i); return node->id; } else { /* keep moving */ @@ -160,7 +160,7 @@ } print_Q(); IF_DEBUG(DEBUG_TIMEOUT) - log(LOG_DEBUG, 0, "created timeout %d (#%d)", node->id, i); + mrlog(LOG_DEBUG, 0, "created timeout %d (#%d)", node->id, i); return node->id; } @@ -219,7 +219,7 @@ if (ptr->data) free(ptr->data); IF_DEBUG(DEBUG_TIMEOUT) - log(LOG_DEBUG, 0, "deleted timer %d (#%d)", ptr->id, i); + mrlog(LOG_DEBUG, 0, "deleted timer %d (#%d)", ptr->id, i); free(ptr); print_Q(); return 1; @@ -229,7 +229,7 @@ i++; } IF_DEBUG(DEBUG_TIMEOUT) - log(LOG_DEBUG, 0, "failed to delete timer %d (#%d)", timer_id, i); + mrlog(LOG_DEBUG, 0, "failed to delete timer %d (#%d)", timer_id, i); print_Q(); return 0; } @@ -245,6 +245,6 @@ IF_DEBUG(DEBUG_TIMEOUT) for (ptr = Q; ptr; ptr = ptr->next) - log(LOG_DEBUG, 0, "(%d,%d) ", ptr->id, ptr->time); + mrlog(LOG_DEBUG, 0, "(%d,%d) ", ptr->id, ptr->time); } #endif /* IGMP_DEBUG */ diff -ruN mrouted-3.9beta3+IOS12.orig/cfparse.y mrouted-3.9beta3+IOS12/cfparse.y --- mrouted-3.9beta3+IOS12.orig/cfparse.y 1998-02-28 17:48:58.000000000 -0800 +++ mrouted-3.9beta3+IOS12/cfparse.y 2008-10-10 18:26:44.000000000 -0700 @@ -189,7 +189,7 @@ init_ipip_on_vif(v); } - log(LOG_INFO, 0, + mrlog(LOG_INFO, 0, "installing tunnel from %s to %s as vif #%u - rate=%d", inet_fmt($2, s1), inet_fmt($3, s2), numvifs, v->uv_rate_limit); @@ -673,7 +673,7 @@ vsprintf(buf, fmt, ap); va_end(ap); - log(LOG_ERR,0,"%s: %s near line %d", configfilename, buf, lineno); + mrlog(LOG_ERR,0,"%s: %s near line %d", configfilename, buf, lineno); } #ifdef __STDC__ @@ -699,14 +699,14 @@ vsprintf(buf, fmt, ap); va_end(ap); - log(LOG_WARNING,0,"%s: %s near line %d", configfilename, buf, lineno); + mrlog(LOG_WARNING,0,"%s: %s near line %d", configfilename, buf, lineno); } static void yyerror(s) char *s; { - log(LOG_ERR, 0, "%s: %s near line %d", configfilename, s, lineno); + mrlog(LOG_ERR, 0, "%s: %s near line %d", configfilename, s, lineno); } static char * @@ -879,7 +879,7 @@ if ((f = fopen(configfilename, "r")) == NULL) { if (errno != ENOENT) - log(LOG_ERR, errno, "can't open %s", configfilename); + mrlog(LOG_ERR, errno, "can't open %s", configfilename); return; } diff -ruN mrouted-3.9beta3+IOS12.orig/config.c mrouted-3.9beta3+IOS12/config.c --- mrouted-3.9beta3+IOS12.orig/config.c 1998-01-05 17:57:41.000000000 -0800 +++ mrouted-3.9beta3+IOS12/config.c 2008-10-10 18:26:44.000000000 -0700 @@ -39,7 +39,7 @@ ifc.ifc_buf = malloc(ifc.ifc_len); while (ifc.ifc_buf) { if (ioctl(udp_socket, SIOCGIFCONF, (char *)&ifc) < 0) - log(LOG_ERR, errno, "ioctl SIOCGIFCONF"); + mrlog(LOG_ERR, errno, "ioctl SIOCGIFCONF"); /* * If the buffer was large enough to hold all the addresses @@ -59,7 +59,7 @@ ifc.ifc_buf = realloc(ifc.ifc_buf, ifc.ifc_len); } if (ifc.ifc_buf == NULL) - log(LOG_ERR, 0, "config_vifs_from_kernel: ran out of memory"); + mrlog(LOG_ERR, 0, "config_vifs_from_kernel: ran out of memory"); ifrp = (struct ifreq *)ifc.ifc_buf; ifend = (struct ifreq *)(ifc.ifc_buf + ifc.ifc_len); @@ -96,7 +96,7 @@ * multicast. */ if (ioctl(udp_socket, SIOCGIFFLAGS, (char *)&ifr) < 0) - log(LOG_ERR, errno, "ioctl SIOCGIFFLAGS for %s", ifr.ifr_name); + mrlog(LOG_ERR, errno, "ioctl SIOCGIFFLAGS for %s", ifr.ifr_name); flags = ifr.ifr_flags; if ((flags & (IFF_LOOPBACK|IFF_MULTICAST)) != IFF_MULTICAST) continue; @@ -106,13 +106,13 @@ * or {subnet,-1}. */ if (ioctl(udp_socket, SIOCGIFNETMASK, (char *)&ifr) < 0) - log(LOG_ERR, errno, "ioctl SIOCGIFNETMASK for %s", ifr.ifr_name); + mrlog(LOG_ERR, errno, "ioctl SIOCGIFNETMASK for %s", ifr.ifr_name); mask = ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr; subnet = addr & mask; if (!inet_valid_subnet(subnet, mask) || addr == subnet || addr == (subnet | ~mask)) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "ignoring %s, has invalid address (%s) and/or mask (%s)", ifr.ifr_name, inet_fmt(addr, s1), inet_fmt(mask, s2)); continue; @@ -124,14 +124,14 @@ */ for (vifi = 0, v = uvifs; vifi < numvifs; ++vifi, ++v) { if (strcmp(v->uv_name, ifr.ifr_name) == 0) { - log(LOG_DEBUG, 0, "skipping %s (%s on subnet %s) (alias for vif#%u?)", + mrlog(LOG_DEBUG, 0, "skipping %s (%s on subnet %s) (alias for vif#%u?)", v->uv_name, inet_fmt(addr, s1), inet_fmts(subnet, mask, s2), vifi); break; } if ((addr & v->uv_subnetmask) == v->uv_subnet || (v->uv_subnet & mask) == subnet) { - log(LOG_WARNING, 0, "ignoring %s, same subnet as %s", + mrlog(LOG_WARNING, 0, "ignoring %s, same subnet as %s", ifr.ifr_name, v->uv_name); break; } @@ -142,7 +142,7 @@ * If there is room in the uvifs array, install this interface. */ if (numvifs == MAXVIFS) { - log(LOG_WARNING, 0, "too many vifs, ignoring %s", ifr.ifr_name); + mrlog(LOG_WARNING, 0, "too many vifs, ignoring %s", ifr.ifr_name); continue; } v = &uvifs[numvifs]; @@ -156,7 +156,7 @@ if (flags & IFF_POINTOPOINT) v->uv_flags |= VIFF_REXMIT_PRUNES; - log(LOG_INFO,0,"installing %s (%s on subnet %s) as vif #%u - rate=%d", + mrlog(LOG_INFO,0,"installing %s (%s on subnet %s) as vif #%u - rate=%d", v->uv_name, inet_fmt(addr, s1), inet_fmts(subnet, mask, s2), numvifs, v->uv_rate_limit); diff -ruN mrouted-3.9beta3+IOS12.orig/defs.h mrouted-3.9beta3+IOS12/defs.h --- mrouted-3.9beta3+IOS12.orig/defs.h 1998-02-28 18:51:42.000000000 -0800 +++ mrouted-3.9beta3+IOS12/defs.h 2008-10-10 18:26:44.000000000 -0700 @@ -232,7 +232,7 @@ /* main.c */ extern char * scaletime __P((u_long)); -extern void log __P((int, int, char *, ...)); +extern void mrlog __P((int, int, char *, ...)); extern int register_input_handler __P((int, ihfunc_t)); /* igmp.c */ diff -ruN mrouted-3.9beta3+IOS12.orig/icmp.c mrouted-3.9beta3+IOS12/icmp.c --- mrouted-3.9beta3+IOS12.orig/icmp.c 1998-01-05 17:57:42.000000000 -0800 +++ mrouted-3.9beta3+IOS12/icmp.c 2008-10-10 18:26:44.000000000 -0700 @@ -26,12 +26,12 @@ init_icmp() { if ((icmp_socket = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP)) < 0) - log(LOG_ERR, errno, "ICMP socket"); + mrlog(LOG_ERR, errno, "ICMP socket"); register_input_handler(icmp_socket, icmp_handler); IF_DEBUG(DEBUG_ICMP) - log(LOG_DEBUG, 0, "registering icmp socket fd %d\n", icmp_socket); + mrlog(LOG_DEBUG, 0, "registering icmp socket fd %d\n", icmp_socket); } static void @@ -53,7 +53,7 @@ (struct sockaddr *)&from, &fromlen); if (recvlen < 0) { if (errno != EINTR) - log(LOG_WARNING, errno, "icmp_socket recvfrom"); + mrlog(LOG_WARNING, errno, "icmp_socket recvfrom"); return; } ip = (struct ip *)icmp_buf; @@ -65,7 +65,7 @@ #endif if (iphdrlen + ipdatalen != recvlen) { IF_DEBUG(DEBUG_ICMP) - log(LOG_DEBUG, 0, "hdr %d data %d != rcv %d", iphdrlen, ipdatalen, recvlen); + mrlog(LOG_DEBUG, 0, "hdr %d data %d != rcv %d", iphdrlen, ipdatalen, recvlen); /* Malformed ICMP, just return. */ return; } @@ -76,7 +76,7 @@ src = ip->ip_src.s_addr; icmp = (struct icmp *)(icmp_buf + iphdrlen); IF_DEBUG(DEBUG_ICMP) - log(LOG_DEBUG, 0, "got ICMP type %d from %s", + mrlog(LOG_DEBUG, 0, "got ICMP type %d from %s", icmp->icmp_type, inet_fmt(src, s1)); /* * Eventually: @@ -104,7 +104,7 @@ while (n && !(n & 1)) n >>= 1; if (n == 1 && ((p = icmp_name(icmp)) != NULL)) - log(LOG_WARNING, 0, "Received ICMP %s from %s %s %s on vif %d", + mrlog(LOG_WARNING, 0, "Received ICMP %s from %s %s %s on vif %d", p, inet_fmt(src, s1), "for traffic sent to", inet_fmt(ip->ip_dst.s_addr, s2), i); diff -ruN mrouted-3.9beta3+IOS12.orig/igmp.c mrouted-3.9beta3+IOS12/igmp.c --- mrouted-3.9beta3+IOS12.orig/igmp.c 1998-01-05 17:57:43.000000000 -0800 +++ mrouted-3.9beta3+IOS12/igmp.c 2008-10-10 18:26:44.000000000 -0700 @@ -48,7 +48,7 @@ send_buf = malloc(RECV_BUF_SIZE); if ((igmp_socket = socket(AF_INET, SOCK_RAW, IPPROTO_IGMP)) < 0) - log(LOG_ERR, errno, "IGMP socket"); + mrlog(LOG_ERR, errno, "IGMP socket"); k_hdr_include(TRUE); /* include IP header when sending */ k_set_rcvbuf(256*1024,48*1024); /* lots of input buffering */ @@ -189,7 +189,7 @@ int ipdatalen, iphdrlen, igmpdatalen; if (recvlen < sizeof(struct ip)) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "received packet too short (%u bytes) for IP header", recvlen); return; } @@ -205,7 +205,7 @@ */ if (ip->ip_p == 0) { if (src == 0 || dst == 0) - log(LOG_WARNING, 0, "kernel request not accurate"); + mrlog(LOG_WARNING, 0, "kernel request not accurate"); else add_table_entry(src, dst); return; @@ -218,7 +218,7 @@ ipdatalen = ip->ip_len; #endif if (iphdrlen + ipdatalen != recvlen) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "received packet from %s shorter (%u bytes) than hdr+data length (%u+%u)", inet_fmt(src, s1), recvlen, iphdrlen, ipdatalen); return; @@ -228,14 +228,14 @@ group = igmp->igmp_group.s_addr; igmpdatalen = ipdatalen - IGMP_MINLEN; if (igmpdatalen < 0) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "received IP data field too short (%u bytes) for IGMP, from %s", ipdatalen, inet_fmt(src, s1)); return; } IF_DEBUG(DEBUG_PKT|igmp_debug_kind(igmp->igmp_type, igmp->igmp_code)) - log(LOG_DEBUG, 0, "RECV %s from %-15s to %s", + mrlog(LOG_DEBUG, 0, "RECV %s from %-15s to %s", igmp_packet_kind(igmp->igmp_type, igmp->igmp_code), inet_fmt(src, s1), inet_fmt(dst, s2)); @@ -308,7 +308,7 @@ return; default: - log(LOG_INFO, 0, + mrlog(LOG_INFO, 0, "ignoring unknown DVMRP message code %u from %s to %s", igmp->igmp_code, inet_fmt(src, s1), inet_fmt(dst, s2)); @@ -327,7 +327,7 @@ return; default: - log(LOG_INFO, 0, + mrlog(LOG_INFO, 0, "ignoring unknown IGMP message type %x from %s to %s", igmp->igmp_type, inet_fmt(src, s1), inet_fmt(dst, s2)); @@ -337,7 +337,7 @@ /* * Some IGMP messages are more important than others. This routine - * determines the logging level at which to log a send error (often + * determines the logging level at which to mrlog a send error (often * "No route to host"). This is important when there is asymmetric * reachability and someone is trying to, i.e., mrinfo me periodically. */ @@ -433,7 +433,7 @@ if (errno == ENETDOWN) check_vif_state(); else - log(igmp_log_level(type, code), errno, + mrlog(igmp_log_level(type, code), errno, "sendto to %s on %s", inet_fmt(dst, s1), inet_fmt(src, s2)); } @@ -442,7 +442,7 @@ k_set_loop(FALSE); IF_DEBUG(DEBUG_PKT|igmp_debug_kind(type, code)) - log(LOG_DEBUG, 0, "SENT %s from %-15s to %s", + mrlog(LOG_DEBUG, 0, "SENT %s from %-15s to %s", igmp_packet_kind(type, code), src == INADDR_ANY ? "INADDR_ANY" : inet_fmt(src, s1), inet_fmt(dst, s2)); } diff -ruN mrouted-3.9beta3+IOS12.orig/ipip.c mrouted-3.9beta3+IOS12/ipip.c --- mrouted-3.9beta3+IOS12.orig/ipip.c 1998-01-05 17:57:45.000000000 -0800 +++ mrouted-3.9beta3+IOS12/ipip.c 2008-10-10 18:26:44.000000000 -0700 @@ -45,7 +45,7 @@ { #ifdef notyet if ((raw_socket = socket(AF_INET, SOCK_RAW, IPPROTO_RAW)) < 0) - log(LOG_ERR, errno, "Raw IP socket"); + mrlog(LOG_ERR, errno, "Raw IP socket"); #endif } @@ -60,7 +60,7 @@ ip = v->uv_encap_hdr = (struct ip *)malloc(sizeof(struct ip)); if (ip == NULL) - log(LOG_ERR, 0, "out of memory"); + mrlog(LOG_ERR, 0, "out of memory"); bzero(ip, sizeof(struct ip)); /* * Fields zeroed that aren't filled in later: @@ -132,13 +132,13 @@ if (errno == ENETDOWN) check_vif_state(); else - log(LOG_WARNING, errno, + mrlog(LOG_WARNING, errno, "sendmsg to %s on %s", inet_fmt(sdst.sin_addr.s_addr, s1), inet_fmt(src, s2)); } IF_DEBUG(DEBUG_PKT|igmp_debug_kind(type, code)) - log(LOG_DEBUG, 0, "SENT %s from %-15s to %s encaped to %s", + mrlog(LOG_DEBUG, 0, "SENT %s from %-15s to %s encaped to %s", igmp_packet_kind(type, code), src == INADDR_ANY ? "INADDR_ANY" : inet_fmt(src, s1), inet_fmt(dst, s2), inet_fmt(sdst.sin_addr.s_addr, s3)); diff -ruN mrouted-3.9beta3+IOS12.orig/kern.c mrouted-3.9beta3+IOS12/kern.c --- mrouted-3.9beta3+IOS12.orig/kern.c 1998-01-05 18:00:51.000000000 -0800 +++ mrouted-3.9beta3+IOS12/kern.c 2008-10-10 18:26:44.000000000 -0700 @@ -51,13 +51,13 @@ } } if (bufsize < minsize) { - log(LOG_ERR, 0, "OS-allowed buffer size %u < app min %u", + mrlog(LOG_ERR, 0, "OS-allowed buffer size %u < app min %u", bufsize, minsize); /*NOTREACHED*/ } } IF_DEBUG(DEBUG_KERN) - log(LOG_DEBUG, 0, "Got %d byte buffer size in %d iterations", + mrlog(LOG_DEBUG, 0, "Got %d byte buffer size in %d iterations", bufsize, iter); } @@ -68,7 +68,7 @@ #ifdef IP_HDRINCL if (setsockopt(igmp_socket, IPPROTO_IP, IP_HDRINCL, (char *)&bool, sizeof(bool)) < 0) - log(LOG_ERR, errno, "setsockopt IP_HDRINCL %u", bool); + mrlog(LOG_ERR, errno, "setsockopt IP_HDRINCL %u", bool); #endif } @@ -82,7 +82,7 @@ ttl = t; if (setsockopt(igmp_socket, IPPROTO_IP, IP_MULTICAST_TTL, (char *)&ttl, sizeof(ttl)) < 0) - log(LOG_ERR, errno, "setsockopt IP_MULTICAST_TTL %u", ttl); + mrlog(LOG_ERR, errno, "setsockopt IP_MULTICAST_TTL %u", ttl); #endif curttl = t; } @@ -96,7 +96,7 @@ loop = l; if (setsockopt(igmp_socket, IPPROTO_IP, IP_MULTICAST_LOOP, (char *)&loop, sizeof(loop)) < 0) - log(LOG_ERR, errno, "setsockopt IP_MULTICAST_LOOP %u", loop); + mrlog(LOG_ERR, errno, "setsockopt IP_MULTICAST_LOOP %u", loop); } @@ -108,7 +108,7 @@ adr.s_addr = ifa; if (setsockopt(igmp_socket, IPPROTO_IP, IP_MULTICAST_IF, (char *)&adr, sizeof(adr)) < 0) - log(LOG_ERR, errno, "setsockopt IP_MULTICAST_IF %s", + mrlog(LOG_ERR, errno, "setsockopt IP_MULTICAST_IF %s", inet_fmt(ifa, s1)); } @@ -124,7 +124,7 @@ if (setsockopt(igmp_socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char *)&mreq, sizeof(mreq)) < 0) - log(LOG_WARNING, errno, "can't join group %s on interface %s", + mrlog(LOG_WARNING, errno, "can't join group %s on interface %s", inet_fmt(grp, s1), inet_fmt(ifa, s2)); } @@ -140,7 +140,7 @@ if (setsockopt(igmp_socket, IPPROTO_IP, IP_DROP_MEMBERSHIP, (char *)&mreq, sizeof(mreq)) < 0) - log(LOG_WARNING, errno, "can't leave group %s on interface %s", + mrlog(LOG_WARNING, errno, "can't leave group %s on interface %s", inet_fmt(grp, s1), inet_fmt(ifa, s2)); } @@ -156,7 +156,7 @@ if (setsockopt(igmp_socket, IPPROTO_IP, MRT_INIT, (char *)&v, sizeof(int)) < 0) #endif - log(LOG_ERR, errno, "can't enable Multicast routing in kernel"); + mrlog(LOG_ERR, errno, "can't enable Multicast routing in kernel"); } @@ -164,7 +164,7 @@ { if (setsockopt(igmp_socket, IPPROTO_IP, MRT_DONE, (char *)NULL, 0) < 0) - log(LOG_WARNING, errno, "can't disable Multicast routing in kernel"); + mrlog(LOG_WARNING, errno, "can't disable Multicast routing in kernel"); } @@ -183,7 +183,7 @@ if (setsockopt(igmp_socket, IPPROTO_IP, MRT_ADD_VIF, (char *)&vc, sizeof(vc)) < 0) - log(LOG_ERR, errno, "setsockopt MRT_ADD_VIF on vif %d", vifi); + mrlog(LOG_ERR, errno, "setsockopt MRT_ADD_VIF on vif %d", vifi); } @@ -192,7 +192,7 @@ { if (setsockopt(igmp_socket, IPPROTO_IP, MRT_DEL_VIF, (char *)&vifi, sizeof(vifi)) < 0) - log(LOG_ERR, errno, "setsockopt MRT_DEL_VIF on vif %d", vifi); + mrlog(LOG_ERR, errno, "setsockopt MRT_DEL_VIF on vif %d", vifi); } @@ -225,7 +225,7 @@ #ifdef DEBUG_MFC md_log(MD_ADD_FAIL, origin, g->gt_mcastgrp); #endif - log(LOG_WARNING, errno, "setsockopt MRT_ADD_MFC", + mrlog(LOG_WARNING, errno, "setsockopt MRT_ADD_MFC", inet_fmt(origin, s1), inet_fmt(g->gt_mcastgrp, s2)); } } @@ -257,7 +257,7 @@ #ifdef DEBUG_MFC md_log(MD_DEL_FAIL, origin, g->gt_mcastgrp); #endif - log(LOG_WARNING, errno, "setsockopt MRT_DEL_MFC of (%s %s)", + mrlog(LOG_WARNING, errno, "setsockopt MRT_DEL_MFC of (%s %s)", inet_fmt(origin, s1), inet_fmt(g->gt_mcastgrp, s2)); } @@ -277,7 +277,7 @@ if (getsockopt(igmp_socket, IPPROTO_IP, MRT_VERSION, (char *)&vers, &len) < 0) - log(LOG_ERR, errno, + mrlog(LOG_ERR, errno, "getsockopt MRT_VERSION: perhaps your kernel is too old"); return vers; @@ -298,7 +298,7 @@ vreq.vifi = vifi; if (ioctl(udp_socket, SIOCGETVIFCNT, (char *)&vreq) < 0) { - log(LOG_WARNING, errno, "SIOCGETVIFCNT on vif %d", vifi); + mrlog(LOG_WARNING, errno, "SIOCGETVIFCNT on vif %d", vifi); vreq.icount = vreq.ocount = vreq.ibytes = vreq.obytes = 0xffffffff; retval = 1; @@ -329,7 +329,7 @@ sgreq.src.s_addr = src; sgreq.grp.s_addr = grp; if (ioctl(udp_socket, SIOCGETSGCNT, (char *)&sgreq) < 0) { - log(LOG_WARNING, errno, "SIOCGETSGCNT on (%s %s)", + mrlog(LOG_WARNING, errno, "SIOCGETSGCNT on (%s %s)", inet_fmt(src, s1), inet_fmt(grp, s2)); sgreq.pktcnt = sgreq.bytecnt = sgreq.wrong_if = 0xffffffff; return 1; diff -ruN mrouted-3.9beta3+IOS12.orig/main.c mrouted-3.9beta3+IOS12/main.c --- mrouted-3.9beta3+IOS12.orig/main.c 1998-02-28 17:49:00.000000000 -0800 +++ mrouted-3.9beta3+IOS12/main.c 2008-10-10 18:26:44.000000000 -0700 @@ -219,7 +219,7 @@ } else goto usage; } else if (strcmp(*argv, "-p") == 0) { - log(LOG_WARNING, 0, "disabling pruning is no longer supported"); + mrlog(LOG_WARNING, 0, "disabling pruning is no longer supported"); #ifdef SNMP } else if (strcmp(*argv, "-P") == 0) { if (argc > 1 && isdigit(*(argv + 1)[0])) { @@ -265,7 +265,7 @@ #endif sprintf(versionstring, "mrouted version %s", todaysversion); - log(LOG_DEBUG, 0, "%s starting", versionstring); + mrlog(LOG_DEBUG, 0, "%s starting", versionstring); #ifdef SYSV srand48(time(NULL)); @@ -293,7 +293,7 @@ (void) fclose(fp); } - /* Start up the log rate-limiter */ + /* Start up the mrlog rate-limiter */ resetlogging(NULL); callout_init(); @@ -319,7 +319,7 @@ */ if ((((vers >> 8) & 0xff) != 3) || ((vers & 0xff) != 5)) - log(LOG_ERR, 0, "kernel (v%d.%d)/mrouted (v%d.%d) version mismatch", + mrlog(LOG_ERR, 0, "kernel (v%d.%d)/mrouted (v%d.%d) version mismatch", (vers >> 8) & 0xff, vers & 0xff, PROTOCOL_VERSION, MROUTED_VERSION); #endif @@ -481,7 +481,7 @@ } if ((n = select(nfds, &rfds, NULL, NULL, timeout)) < 0) { if (errno != EINTR) - log(LOG_WARNING, errno, "select failed"); + mrlog(LOG_WARNING, errno, "select failed"); continue; } @@ -490,7 +490,7 @@ recvlen = recvfrom(igmp_socket, recv_buf, RECV_BUF_SIZE, 0, NULL, &dummy); if (recvlen < 0) { - if (errno != EINTR) log(LOG_ERR, errno, "recvfrom"); + if (errno != EINTR) mrlog(LOG_ERR, errno, "recvfrom"); continue; } accept_igmp(recvlen); @@ -549,7 +549,7 @@ secs = -1; } while (difftime.tv_sec > 0); } - log(LOG_NOTICE, 0, "%s exiting", versionstring); + mrlog(LOG_NOTICE, 0, "%s exiting", versionstring); cleanup(); exit(0); } @@ -560,7 +560,7 @@ { char *s = (char *)i; - log(LOG_NOTICE, 0, "%s%s", versionstring, s ? s : ""); + mrlog(LOG_NOTICE, 0, "%s%s", versionstring, s ? s : ""); if (s) free(s); @@ -811,7 +811,7 @@ s = (char *)malloc(sizeof(" restart")); if (s == NULL) - log(LOG_ERR, 0, "out of memory"); + mrlog(LOG_ERR, 0, "out of memory"); strcpy(s, " restart"); /* @@ -900,9 +900,9 @@ FILE *f; int i; - f = fopen("/var/tmp/mrouted.log", "a"); + f = fopen("/var/tmp/mrouted.mrlog", "a"); if (f == NULL) { - log(LOG_ERR, errno, "can't open /var/tmp/mrouted.log"); + mrlog(LOG_ERR, errno, "can't open /var/tmp/mrouted.mrlog"); /*NOTREACHED*/ } fprintf(f, "--------------------------------------------\n"); @@ -922,13 +922,13 @@ #endif /* - * Log errors and other messages to the system log daemon and to stderr, + * Log errors and other messages to the system mrlog daemon and to stderr, * according to the severity of the message and the current debug level. * For errors of severity LOG_ERR or worse, terminate the program. */ #ifdef __STDC__ void -log(int severity, int syserr, char *format, ...) +mrlog(int severity, int syserr, char *format, ...) { va_list ap; static char fmt[211] = "warning - "; @@ -943,7 +943,7 @@ #else /*VARARGS3*/ void -log(severity, syserr, format, va_alist) +mrlog(severity, syserr, format, va_alist) int severity, syserr; char *format; va_dcl @@ -1006,11 +1006,11 @@ } /* - * Always log things that are worse than warnings, no matter what + * Always mrlog things that are worse than warnings, no matter what * the log_nmsgs rate limiter says. * Only count things worse than debugging in the rate limiter * (since if you put daemon.debug in syslog.conf you probably - * actually want to log the debugging messages so they shouldn't + * actually want to mrlog the debugging messages so they shouldn't * be rate-limited) */ if ((severity < LOG_WARNING) || (log_nmsgs < LOG_MAX_MSGS)) { @@ -1038,7 +1038,7 @@ if (!f) { if ((f = fopen("/tmp/mrouted.clog", "w")) == NULL) { - log(LOG_ERR, errno, "open /tmp/mrouted.clog"); + mrlog(LOG_ERR, errno, "open /tmp/mrouted.clog"); } } diff -ruN mrouted-3.9beta3+IOS12.orig/mapper.c mrouted-3.9beta3+IOS12/mapper.c --- mrouted-3.9beta3+IOS12.orig/mapper.c 1998-01-05 17:57:47.000000000 -0800 +++ mrouted-3.9beta3+IOS12/mapper.c 2008-10-10 18:26:44.000000000 -0700 @@ -165,7 +165,7 @@ */ #ifdef __STDC__ void -log(int severity, int syserr, char *format, ...) +mrlog(int severity, int syserr, char *format, ...) { va_list ap; char fmt[100]; @@ -174,7 +174,7 @@ #else /*VARARGS3*/ void -log(severity, syserr, format, va_alist) +mrlog(severity, syserr, format, va_alist) int severity, syserr; char *format; va_dcl @@ -233,7 +233,7 @@ u_int32 src, dst, group; int r_type; { - log(LOG_INFO, 0, "ignoring IGMP group membership report from %s to %s", + mrlog(LOG_INFO, 0, "ignoring IGMP group membership report from %s to %s", inet_fmt(src, s1), inet_fmt(dst, s2)); } @@ -246,7 +246,7 @@ char *p; int datalen; { - log(LOG_INFO, 0, "ignoring DVMRP probe from %s to %s", + mrlog(LOG_INFO, 0, "ignoring DVMRP probe from %s to %s", inet_fmt(src, s1), inet_fmt(dst, s2)); } @@ -259,7 +259,7 @@ char *p; int datalen; { - log(LOG_INFO, 0, "ignoring DVMRP routing report from %s to %s", + mrlog(LOG_INFO, 0, "ignoring DVMRP routing report from %s to %s", inet_fmt(src, s1), inet_fmt(dst, s2)); } @@ -271,7 +271,7 @@ u_int32 src, dst; { if (src != our_addr) - log(LOG_INFO, 0, + mrlog(LOG_INFO, 0, "ignoring spurious DVMRP neighbor request from %s to %s", inet_fmt(src, s1), inet_fmt(dst, s2)); } @@ -280,7 +280,7 @@ u_int32 src, dst; { if (src != our_addr) - log(LOG_INFO, 0, + mrlog(LOG_INFO, 0, "ignoring spurious DVMRP neighbor request2 from %s to %s", inet_fmt(src, s1), inet_fmt(dst, s2)); } @@ -335,7 +335,7 @@ Neighbor *old_neighbors; if (datalen < 4 + 3) { - log(LOG_WARNING, 0, "received truncated interface record from %s", + mrlog(LOG_WARNING, 0, "received truncated interface record from %s", inet_fmt(src, s1)); return; } @@ -380,7 +380,7 @@ if (nb_i->addr == nb_n->addr) { if (nb_i->metric != nb_n->metric || nb_i->threshold != nb_n->threshold) - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "inconsistent %s for neighbor %s of %s", "metric/threshold", inet_fmt(nb_i->addr, s1), @@ -412,7 +412,7 @@ Node *n_node; if (datalen < 4) { - log(LOG_WARNING, 0, "received truncated neighbor list from %s", + mrlog(LOG_WARNING, 0, "received truncated neighbor list from %s", inet_fmt(src, s1)); return; } @@ -424,7 +424,7 @@ for (nb = old_neighbors; nb; nb = nb->next) if (nb->addr == neighbor) { if (metric != nb->metric || threshold != nb->threshold) - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "inconsistent %s for neighbor %s of %s", "metric/threshold", inet_fmt(nb->addr, s1), inet_fmt(node->addr, s2)); @@ -472,7 +472,7 @@ Neighbor *old_neighbors; if (datalen < 4 + 4) { - log(LOG_WARNING, 0, "received truncated interface record from %s", + mrlog(LOG_WARNING, 0, "received truncated interface record from %s", inet_fmt(src, s1)); return; } @@ -523,7 +523,7 @@ if (nb_i->addr == nb_n->addr) { if (nb_i->metric != nb_n->metric || nb_i->threshold != nb_i->threshold) - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "inconsistent %s for neighbor %s of %s", "metric/threshold", inet_fmt(nb_i->addr, s1), @@ -555,7 +555,7 @@ Node *n_node; if (datalen < 4) { - log(LOG_WARNING, 0, "received truncated neighbor list from %s", + mrlog(LOG_WARNING, 0, "received truncated neighbor list from %s", inet_fmt(src, s1)); return; } @@ -570,7 +570,7 @@ for (nb = old_neighbors; nb; nb = nb->next) if (nb->addr == neighbor) { if (metric != nb->metric || threshold != nb->threshold) - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "inconsistent %s for neighbor %s of %s", "metric/threshold", inet_fmt(nb->addr, s1), inet_fmt(node->addr, s2)); @@ -599,7 +599,7 @@ void check_vif_state() { - log(LOG_NOTICE, 0, "network marked down..."); + mrlog(LOG_NOTICE, 0, "network marked down..."); } @@ -959,7 +959,7 @@ perror("select"); continue; } else if (count == 0) { - log(LOG_DEBUG, 0, "Timed out receiving neighbor lists"); + mrlog(LOG_DEBUG, 0, "Timed out receiving neighbor lists"); if (retry_requests(routers)) continue; else diff -ruN mrouted-3.9beta3+IOS12.orig/mrinfo.c mrouted-3.9beta3+IOS12/mrinfo.c --- mrouted-3.9beta3+IOS12.orig/mrinfo.c 1998-02-28 19:05:20.000000000 -0800 +++ mrouted-3.9beta3+IOS12/mrinfo.c 2008-10-10 18:26:44.000000000 -0700 @@ -123,7 +123,7 @@ */ #ifdef __STDC__ void -log(int severity, int syserr, char *format, ...) +mrlog(int severity, int syserr, char *format, ...) { va_list ap; char fmt[100]; @@ -131,7 +131,7 @@ va_start(ap, format); #else void -log(severity, syserr, format, va_alist) +mrlog(severity, syserr, format, va_alist) int severity, syserr; char *format; va_dcl @@ -456,7 +456,7 @@ perror("select"); continue; } else if (count == 0) { - log(LOG_DEBUG, 0, "Timed out receiving neighbor lists"); + mrlog(LOG_DEBUG, 0, "Timed out receiving neighbor lists"); if (++tries > retries) break; /* If we've tried ASK_NEIGHBORS2 twice with @@ -481,7 +481,7 @@ } if (recvlen < sizeof(struct ip)) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "packet too short (%u bytes) for IP header", recvlen); continue; @@ -498,7 +498,7 @@ ipdatalen = ip->ip_len; #endif if (iphdrlen + ipdatalen != recvlen) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "packet shorter (%u bytes) than hdr+data length (%u+%u)", recvlen, iphdrlen, ipdatalen); continue; @@ -507,7 +507,7 @@ group = igmp->igmp_group.s_addr; igmpdatalen = ipdatalen - IGMP_MINLEN; if (igmpdatalen < 0) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "IP data field too short (%u bytes) for IGMP, from %s", ipdatalen, inet_fmt(src, s1)); continue; diff -ruN mrouted-3.9beta3+IOS12.orig/prune.c mrouted-3.9beta3+IOS12/prune.c --- mrouted-3.9beta3+IOS12.orig/prune.c 1998-02-28 18:06:32.000000000 -0800 +++ mrouted-3.9beta3+IOS12/prune.c 2008-10-10 18:26:44.000000000 -0700 @@ -292,7 +292,7 @@ if (st->st_ctime == 0) continue; IF_DEBUG(DEBUG_PRUNE) - log(LOG_DEBUG, 0, "rexmit_prune deleting (%s %s) (next is %d sec)", + mrlog(LOG_DEBUG, 0, "rexmit_prune deleting (%s %s) (next is %d sec)", inet_fmt(st->st_origin, s1), inet_fmt(gt->gt_mcastgrp, s2), gt->gt_prune_rexmit); @@ -327,7 +327,7 @@ /* Make sure we're still not forwarding traffic */ if (!VIFM_ISEMPTY(gt->gt_grpmems)) { IF_DEBUG(DEBUG_PRUNE) - log(LOG_DEBUG, 0, "rexmit_prune (%s %s): gm:%x", + mrlog(LOG_DEBUG, 0, "rexmit_prune (%s %s): gm:%x", RT_FMT(gt->gt_route, s1), inet_fmt(gt->gt_mcastgrp, s2), gt->gt_grpmems); return; @@ -397,7 +397,7 @@ gt->gt_prsent_timer = pt->pt_timer; } else if (gt->gt_prsent_timer < 0) { IF_DEBUG(DEBUG_PRUNE) - log(LOG_DEBUG, 0, "asked to rexmit? (%s,%s)/%d on vif %d to %s with negative time", + mrlog(LOG_DEBUG, 0, "asked to rexmit? (%s,%s)/%d on vif %d to %s with negative time", RT_FMT(gt->gt_route, s1), inet_fmt(gt->gt_mcastgrp, s2), gt->gt_prsent_timer, gt->gt_route->rt_parent, inet_fmt(gt->gt_route->rt_gateway, s3)); @@ -407,7 +407,7 @@ if (rexmitting && !(v->uv_flags & VIFF_REXMIT_PRUNES)) { IF_DEBUG(DEBUG_PRUNE) - log(LOG_DEBUG, 0, "not rexmitting prune for (%s %s)/%d on vif %d to %s", + mrlog(LOG_DEBUG, 0, "not rexmitting prune for (%s %s)/%d on vif %d to %s", RT_FMT(gt->gt_route, s1), inet_fmt(gt->gt_mcastgrp, s2), gt->gt_prsent_timer, gt->gt_route->rt_parent, inet_fmt(gt->gt_route->rt_gateway, s3)); @@ -415,7 +415,7 @@ } if (gt->gt_prsent_timer <= MIN_PRUNE_LIFE) { IF_DEBUG(DEBUG_PRUNE) - log(LOG_DEBUG, 0, "not bothering to send prune for (%s,%s)/%d on vif %d to %s because it's too short", + mrlog(LOG_DEBUG, 0, "not bothering to send prune for (%s,%s)/%d on vif %d to %s because it's too short", RT_FMT(gt->gt_route, s1), inet_fmt(gt->gt_mcastgrp, s2), gt->gt_prsent_timer, gt->gt_route->rt_parent, inet_fmt(gt->gt_route->rt_gateway, s3)); @@ -439,7 +439,7 @@ send_on_vif(v, dst, DVMRP_PRUNE, datalen); IF_DEBUG(DEBUG_PRUNE) - log(LOG_DEBUG, 0, "%s prune for (%s %s)/%d on vif %d to %s", + mrlog(LOG_DEBUG, 0, "%s prune for (%s %s)/%d on vif %d to %s", rexmitting ? "rexmitted" : "sent", RT_FMT(gt->gt_route, s1), inet_fmt(gt->gt_mcastgrp, s2), gt->gt_prsent_timer, gt->gt_route->rt_parent, @@ -506,7 +506,7 @@ send_on_vif(&uvifs[gt->gt_route->rt_parent], dst, DVMRP_GRAFT, datalen); IF_DEBUG(DEBUG_PRUNE) - log(LOG_DEBUG, 0, "sent graft for (%s %s) to %s on vif %d", + mrlog(LOG_DEBUG, 0, "sent graft for (%s %s) to %s on vif %d", RT_FMT(gt->gt_route, s1), inet_fmt(gt->gt_mcastgrp, s2), inet_fmt(gt->gt_route->rt_gateway, s3), gt->gt_route->rt_parent); } @@ -548,10 +548,10 @@ IF_DEBUG(DEBUG_PRUNE) if (vifi == NO_VIF) - log(LOG_DEBUG, 0, "sent graft ack for (%s, %s) to %s", + mrlog(LOG_DEBUG, 0, "sent graft ack for (%s, %s) to %s", inet_fmt(origin, s1), inet_fmt(grp, s2), inet_fmt(dst, s3)); else - log(LOG_DEBUG, 0, "sent graft ack for (%s, %s) to %s on vif %d", + mrlog(LOG_DEBUG, 0, "sent graft ack for (%s, %s) to %s on vif %d", inet_fmt(origin, s1), inet_fmt(grp, s2), inet_fmt(dst, s3), vifi); } @@ -780,7 +780,7 @@ if (gt == NULL || gt->gt_mcastgrp != mcastgrp) { gt = (struct gtable *)malloc(sizeof(struct gtable)); if (gt == NULL) - log(LOG_ERR, 0, "ran out of memory"); + mrlog(LOG_ERR, 0, "ran out of memory"); gt->gt_mcastgrp = mcastgrp; gt->gt_timer = CACHE_LIFETIME(cache_lifetime); @@ -814,7 +814,7 @@ struct gtable *g; g = gtp ? gtp->gt_gnext : kernel_table; - log(LOG_WARNING, 0, "Entry for (%s %s) (rt:%x) exists (rt:%x)", + mrlog(LOG_WARNING, 0, "Entry for (%s %s) (rt:%x) exists (rt:%x)", RT_FMT(r, s1), inet_fmt(g->gt_mcastgrp, s2), r, g->gt_route); } else { @@ -845,7 +845,7 @@ if (st == NULL || st->st_origin != origin) { st = (struct stable *)malloc(sizeof(struct stable)); if (st == NULL) - log(LOG_ERR, 0, "ran out of memory"); + mrlog(LOG_ERR, 0, "ran out of memory"); st->st_origin = origin; st->st_pktcnt = 0; @@ -863,7 +863,7 @@ #endif /* Ignore kernel->mrouted retransmissions */ if (time(0) - st->st_ctime > 5) - log(LOG_WARNING, 0, "kernel entry already exists for (%s %s)", + mrlog(LOG_WARNING, 0, "kernel entry already exists for (%s %s)", inet_fmt(origin, s1), inet_fmt(mcastgrp, s2)); k_add_rg(origin, gt); return; @@ -874,7 +874,7 @@ k_add_rg(origin, gt); IF_DEBUG(DEBUG_CACHE) - log(LOG_DEBUG, 0, "add cache entry (%s %s) gm:%x, parent-vif:%d", + mrlog(LOG_DEBUG, 0, "add cache entry (%s %s) gm:%x, parent-vif:%d", inet_fmt(origin, s1), inet_fmt(mcastgrp, s2), gt->gt_grpmems, r ? r->rt_parent : -1); @@ -911,7 +911,7 @@ if (vifi == r->rt_parent) { if (addr == r->rt_gateway) { IF_DEBUG(DEBUG_PEER) - log(LOG_DEBUG, 0, "reset_neighbor_state parent reset (%s %s)", + mrlog(LOG_DEBUG, 0, "reset_neighbor_state parent reset (%s %s)", RT_FMT(r, s1), inet_fmt(g->gt_mcastgrp, s2)); g->gt_prsent_timer = 0; @@ -963,7 +963,7 @@ send_graft(g); IF_DEBUG(DEBUG_PEER) - log(LOG_DEBUG, 0, "reset neighbor state (%s %s) gm:%x", + mrlog(LOG_DEBUG, 0, "reset neighbor state (%s %s) gm:%x", RT_FMT(r, s1), inet_fmt(g->gt_mcastgrp, s2), g->gt_grpmems); } @@ -989,13 +989,13 @@ g = r->rt_groups; while (g) { IF_DEBUG(DEBUG_CACHE) - log(LOG_DEBUG, 0, "del_table_entry deleting (%s %s)", + mrlog(LOG_DEBUG, 0, "del_table_entry deleting (%s %s)", RT_FMT(r, s1), inet_fmt(g->gt_mcastgrp, s2)); st = g->gt_srctbl; while (st) { if (st->st_ctime != 0) { if (k_del_rg(st->st_origin, g) < 0) { - log(LOG_WARNING, errno, + mrlog(LOG_WARNING, errno, "del_table_entry trying to delete (%s, %s)", inet_fmt(st->st_origin, s1), inet_fmt(g->gt_mcastgrp, s2)); @@ -1046,13 +1046,13 @@ for (g = r->rt_groups; g; g = g->gt_next) { if (g->gt_mcastgrp == mcastgrp) { IF_DEBUG(DEBUG_CACHE) - log(LOG_DEBUG, 0, "del_table_entry deleting (%s %s)", + mrlog(LOG_DEBUG, 0, "del_table_entry deleting (%s %s)", RT_FMT(r, s1), inet_fmt(g->gt_mcastgrp, s2)); st = g->gt_srctbl; while (st) { if (st->st_ctime != 0) { if (k_del_rg(st->st_origin, g) < 0) { - log(LOG_WARNING, errno, + mrlog(LOG_WARNING, errno, "del_table_entry trying to delete (%s, %s)", inet_fmt(st->st_origin, s1), inet_fmt(g->gt_mcastgrp, s2)); @@ -1123,14 +1123,14 @@ !NBRM_ISSET(pt->pt_index, r->rt_subordinates)) { IF_DEBUG(DEBUG_PRUNE) - log(LOG_DEBUG, 0, "update_table_entry deleting prune for (%s %s) from %s on vif %d -%s%s", + mrlog(LOG_DEBUG, 0, "update_table_entry deleting prune for (%s %s) from %s on vif %d -%s%s", RT_FMT(r, s1), inet_fmt(g->gt_mcastgrp, s2), inet_fmt(pt->pt_router, s3), pt->pt_vifi, VIFM_ISSET(pt->pt_vifi, r->rt_children) ? "" : " not a child", NBRM_ISSET(pt->pt_index, r->rt_subordinates) ? "" : " not a subordinate"); if (!NBRM_ISSET(pt->pt_index, g->gt_prunes)) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "gt_prunes lost track of (%s %s) from %s on vif %d", RT_FMT(r, s1), inet_fmt(g->gt_mcastgrp, s2), inet_fmt(pt->pt_router, s3), pt->pt_vifi); @@ -1145,7 +1145,7 @@ } IF_DEBUG(DEBUG_CACHE) - log(LOG_DEBUG, 0, "updating cache entries (%s %s) old gm:%x", + mrlog(LOG_DEBUG, 0, "updating cache entries (%s %s) old gm:%x", RT_FMT(r, s1), inet_fmt(g->gt_mcastgrp, s2), g->gt_grpmems); @@ -1166,7 +1166,7 @@ send_prune_or_graft(g); IF_DEBUG(DEBUG_CACHE) - log(LOG_DEBUG, 0, "updating cache entries (%s %s) new gm:%x", + mrlog(LOG_DEBUG, 0, "updating cache entries (%s %s) new gm:%x", RT_FMT(r, s1), inet_fmt(g->gt_mcastgrp, s2), g->gt_grpmems); @@ -1192,7 +1192,7 @@ struct gtable *g; IF_DEBUG(DEBUG_MEMBER) - log(LOG_DEBUG, 0, "group %s joined on vif %d", + mrlog(LOG_DEBUG, 0, "group %s joined on vif %d", inet_fmt(mcastgrp, s1), vifi); for (g = kernel_table; g; g = g->gt_gnext) { @@ -1210,7 +1210,7 @@ prun_add_ttls(g); IF_DEBUG(DEBUG_CACHE) - log(LOG_DEBUG, 0, "update lclgrp (%s %s) gm:%x", + mrlog(LOG_DEBUG, 0, "update lclgrp (%s %s) gm:%x", RT_FMT(r, s1), inet_fmt(g->gt_mcastgrp, s2), g->gt_grpmems); @@ -1234,7 +1234,7 @@ struct gtable *g; IF_DEBUG(DEBUG_MEMBER) - log(LOG_DEBUG, 0, "group %s left on vif %d", + mrlog(LOG_DEBUG, 0, "group %s left on vif %d", inet_fmt(mcastgrp, s1), vifi); for (g = kernel_table; g; g = g->gt_gnext) { @@ -1247,7 +1247,7 @@ uvifs[vifi].uv_nbrmap, g->gt_prunes)) { VIFM_CLR(vifi, g->gt_grpmems); IF_DEBUG(DEBUG_CACHE) - log(LOG_DEBUG, 0, "delete lclgrp (%s %s) gm:%x", + mrlog(LOG_DEBUG, 0, "delete lclgrp (%s %s) gm:%x", RT_FMT(g->gt_route, s1), inet_fmt(g->gt_mcastgrp, s2), g->gt_grpmems); @@ -1296,7 +1296,7 @@ struct ptable *pt; if ((vifi = find_vif(src, dst)) == NO_VIF) { - log(LOG_INFO, 0, + mrlog(LOG_INFO, 0, "ignoring prune report from non-neighbor %s", inet_fmt(src, s1)); return; @@ -1305,7 +1305,7 @@ /* Check if enough data is present */ if (datalen < 12) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "non-decipherable prune from %s", inet_fmt(src, s1)); return; @@ -1321,14 +1321,14 @@ if (prun_tmr <= MIN_PRUNE_LIFE) { IF_DEBUG(DEBUG_PRUNE) - log(LOG_DEBUG, 0, "ignoring prune from %s on vif %d for (%s %s)/%d because its lifetime is too short", + mrlog(LOG_DEBUG, 0, "ignoring prune from %s on vif %d for (%s %s)/%d because its lifetime is too short", inet_fmt(src, s1), vifi, inet_fmt(prun_src, s2), inet_fmt(prun_grp, s3), prun_tmr); return; } IF_DEBUG(DEBUG_PRUNE) - log(LOG_DEBUG, 0, "%s on vif %d prunes (%s %s)/%d", + mrlog(LOG_DEBUG, 0, "%s on vif %d prunes (%s %s)/%d", inet_fmt(src, s1), vifi, inet_fmt(prun_src, s2), inet_fmt(prun_grp, s3), prun_tmr); @@ -1340,12 +1340,12 @@ r = g->gt_route; IF_DEBUG(DEBUG_PRUNE) - log(LOG_DEBUG, 0, "found grp state, (%s %s), metric is %d, children are %x, subords are %08x%08x", + mrlog(LOG_DEBUG, 0, "found grp state, (%s %s), metric is %d, children are %x, subords are %08x%08x", RT_FMT(r, s1), inet_fmt(g->gt_mcastgrp, s2), r->rt_metric, r->rt_children, r->rt_subordinates.hi, r->rt_subordinates.lo); if (!VIFM_ISSET(vifi, r->rt_children)) { IF_DEBUG(DEBUG_PRUNE) - log(LOG_WARNING, 0, "prune received from non-child %s for (%s %s) (dominant on vif %d is %s)", + mrlog(LOG_WARNING, 0, "prune received from non-child %s for (%s %s) (dominant on vif %d is %s)", inet_fmt(src, s1), inet_fmt(prun_src, s2), inet_fmt(prun_grp, s3), vifi, inet_fmt(r->rt_dominants[vifi], s4)); @@ -1355,14 +1355,14 @@ return; } if (VIFM_ISSET(vifi, g->gt_scope)) { - log(LOG_WARNING, 0, "prune received from %s on scoped grp (%s %s)", + mrlog(LOG_WARNING, 0, "prune received from %s on scoped grp (%s %s)", inet_fmt(src, s1), inet_fmt(prun_src, s2), inet_fmt(prun_grp, s3)); return; } if ((pt = find_prune_entry(src, g->gt_pruntbl)) != NULL) { IF_DEBUG(DEBUG_PRUNE) - log(LOG_DEBUG, 0, "%s %d from %s for (%s %s)/%d %s %d %s %x", + mrlog(LOG_DEBUG, 0, "%s %d from %s for (%s %s)/%d %s %d %s %x", "duplicate prune received on vif", vifi, inet_fmt(src, s1), inet_fmt(prun_src, s2), inet_fmt(prun_grp, s3), prun_tmr, @@ -1372,7 +1372,7 @@ struct listaddr *n = neighbor_info(vifi, src); if (!n) { - log(LOG_WARNING, 0, "Prune from non-neighbor %s on vif %d!?", + mrlog(LOG_WARNING, 0, "Prune from non-neighbor %s on vif %d!?", inet_fmt(src, s1), vifi); return; } @@ -1380,7 +1380,7 @@ /* allocate space for the prune structure */ pt = (struct ptable *)(malloc(sizeof(struct ptable))); if (pt == NULL) - log(LOG_ERR, 0, "pt: ran out of memory"); + mrlog(LOG_ERR, 0, "pt: ran out of memory"); pt->pt_vifi = vifi; pt->pt_router = src; @@ -1406,7 +1406,7 @@ VIFM_CLR(vifi, g->gt_grpmems); IF_DEBUG(DEBUG_PRUNE) - log(LOG_DEBUG, 0, "vifnbrs=0x%08x%08x, subord=0x%08x%08x prunes=0x%08x%08x", + mrlog(LOG_DEBUG, 0, "vifnbrs=0x%08x%08x, subord=0x%08x%08x prunes=0x%08x%08x", uvifs[vifi].uv_nbrmap.hi,uvifs[vifi].uv_nbrmap.lo, r->rt_subordinates.hi, r->rt_subordinates.lo, g->gt_prunes.hi, g->gt_prunes.lo); @@ -1414,10 +1414,10 @@ NBRM_COPY(r->rt_subordinates, tmp); NBRM_MASK(tmp, uvifs[vifi].uv_nbrmap); if (!NBRM_ISSETALLMASK(g->gt_prunes, tmp)) - log(LOG_WARNING, 0, "subordinate error"); + mrlog(LOG_WARNING, 0, "subordinate error"); /* XXX end debugging */ IF_DEBUG(DEBUG_PRUNE|DEBUG_CACHE) - log(LOG_DEBUG, 0, "prune (%s %s), stop sending on vif %d, gm:%x", + mrlog(LOG_DEBUG, 0, "prune (%s %s), stop sending on vif %d, gm:%x", RT_FMT(r, s1), inet_fmt(g->gt_mcastgrp, s2), vifi, g->gt_grpmems); @@ -1445,7 +1445,7 @@ * downstream. */ IF_DEBUG(DEBUG_PRUNE|DEBUG_CACHE) - log(LOG_DEBUG, 0, "%s (%s %s)/%d from %s", + mrlog(LOG_DEBUG, 0, "%s (%s %s)/%d from %s", "prune message received with no kernel entry for", inet_fmt(prun_src, s1), inet_fmt(prun_grp, s2), prun_tmr, inet_fmt(src, s3)); @@ -1489,7 +1489,7 @@ g->gt_timer = CACHE_LIFETIME(cache_lifetime); IF_DEBUG(DEBUG_PRUNE|DEBUG_CACHE) - log(LOG_DEBUG, 0, "chkgrp graft (%s %s) gm:%x", + mrlog(LOG_DEBUG, 0, "chkgrp graft (%s %s) gm:%x", RT_FMT(r, s1), inet_fmt(g->gt_mcastgrp, s2), g->gt_grpmems); @@ -1531,7 +1531,7 @@ struct ptable *pt, **ptnp; if (datalen < 8) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "received non-decipherable graft from %s", inet_fmt(src, s1)); return; @@ -1546,7 +1546,7 @@ send_graft_ack(dst, src, graft_src, graft_grp, vifi); if (vifi == NO_VIF) { - log(LOG_INFO, 0, + mrlog(LOG_INFO, 0, "ignoring graft for (%s %s) from non-neighbor %s", inet_fmt(graft_src, s2), inet_fmt(graft_grp, s3), inet_fmt(src, s1)); @@ -1554,7 +1554,7 @@ } IF_DEBUG(DEBUG_PRUNE) - log(LOG_DEBUG, 0, "%s on vif %d grafts (%s %s)", + mrlog(LOG_DEBUG, 0, "%s on vif %d grafts (%s %s)", inet_fmt(src, s1), vifi, inet_fmt(graft_src, s2), inet_fmt(graft_grp, s3)); @@ -1566,7 +1566,7 @@ r = g->gt_route; if (VIFM_ISSET(vifi, g->gt_scope)) { - log(LOG_WARNING, 0, "graft received from %s on scoped grp (%s %s)", + mrlog(LOG_WARNING, 0, "graft received from %s on scoped grp (%s %s)", inet_fmt(src, s1), inet_fmt(graft_src, s2), inet_fmt(graft_grp, s3)); return; @@ -1581,7 +1581,7 @@ VIFM_SET(vifi, g->gt_grpmems); IF_DEBUG(DEBUG_PRUNE|DEBUG_CACHE) - log(LOG_DEBUG, 0, "accept graft (%s %s) gm:%x", + mrlog(LOG_DEBUG, 0, "accept graft (%s %s) gm:%x", RT_FMT(r, s1), inet_fmt(g->gt_mcastgrp, s2), g->gt_grpmems); @@ -1609,7 +1609,7 @@ * grafts are requests to remove prune state. */ IF_DEBUG(DEBUG_PRUNE) - log(LOG_DEBUG, 0, "%s (%s %s) from %s", + mrlog(LOG_DEBUG, 0, "%s (%s %s) from %s", "graft received with no kernel entry for", inet_fmt(graft_src, s1), inet_fmt(graft_grp, s2), inet_fmt(src, s3)); @@ -1639,14 +1639,14 @@ int i; if ((vifi = find_vif(src, dst)) == NO_VIF) { - log(LOG_INFO, 0, + mrlog(LOG_INFO, 0, "ignoring graft ack from non-neighbor %s", inet_fmt(src, s1)); return; } if (datalen < 0 || datalen > 8) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "received non-decipherable graft ack from %s", inet_fmt(src, s1)); return; @@ -1658,7 +1658,7 @@ ((char *)&grft_grp)[i] = *p++; IF_DEBUG(DEBUG_PRUNE) - log(LOG_DEBUG, 0, "%s on vif %d acks graft (%s, %s)", + mrlog(LOG_DEBUG, 0, "%s on vif %d acks graft (%s, %s)", inet_fmt(src, s1), vifi, inet_fmt(grft_src, s2), inet_fmt(grft_grp, s3)); @@ -1669,7 +1669,7 @@ g = gtp ? gtp->gt_gnext : kernel_table; g->gt_grftsnt = 0; } else { - log(LOG_WARNING, 0, "%s (%s, %s) from %s", + mrlog(LOG_WARNING, 0, "%s (%s, %s) from %s", "rcvd graft ack with no kernel entry for", inet_fmt(grft_src, s1), inet_fmt(grft_grp, s2), inet_fmt(src, s3)); @@ -1758,21 +1758,21 @@ continue; if ((rt->rt_origin & rp->rt_originmask) == rp->rt_origin) { IF_DEBUG(DEBUG_ROUTE) - log(LOG_DEBUG, 0, "Route for %s stealing sources from %s", + mrlog(LOG_DEBUG, 0, "Route for %s stealing sources from %s", RT_FMT(rt, s1), RT_FMT(rp, s2)); for (gt = rp->rt_groups; gt; gt = gt->gt_next) { stnp = >->gt_srctbl; while ((st = *stnp) != NULL) { if ((st->st_origin & rt->rt_originmask) == rt->rt_origin) { IF_DEBUG(DEBUG_ROUTE) - log(LOG_DEBUG, 0, "%s stealing (%s %s) from %s", + mrlog(LOG_DEBUG, 0, "%s stealing (%s %s) from %s", RT_FMT(rt, s1), inet_fmt(st->st_origin, s3), inet_fmt(gt->gt_mcastgrp, s4), RT_FMT(rp, s2)); if (st->st_ctime != 0) { if (k_del_rg(st->st_origin, gt) < 0) { - log(LOG_WARNING, errno, "%s (%s, %s)", + mrlog(LOG_WARNING, errno, "%s (%s, %s)", "steal_sources trying to delete", inet_fmt(st->st_origin, s1), inet_fmt(gt->gt_mcastgrp, s2)); @@ -1794,14 +1794,14 @@ if (gt->gt_srctbl && ((gt->gt_srctbl->st_origin & rt->rt_originmask) == rt->rt_origin)) { IF_DEBUG(DEBUG_ROUTE) - log(LOG_DEBUG, 0, "%s stealing (%s %s) from %s", + mrlog(LOG_DEBUG, 0, "%s stealing (%s %s) from %s", RT_FMT(rt, s1), inet_fmt(gt->gt_srctbl->st_origin, s3), inet_fmt(gt->gt_mcastgrp, s4), "no_route table"); if (gt->gt_srctbl->st_ctime != 0) { if (k_del_rg(gt->gt_srctbl->st_origin, gt) < 0) { - log(LOG_WARNING, errno, "%s (%s %s)", + mrlog(LOG_WARNING, errno, "%s (%s %s)", "steal_sources trying to delete", inet_fmt(gt->gt_srctbl->st_origin, s1), inet_fmt(gt->gt_mcastgrp, s2)); @@ -1836,7 +1836,7 @@ struct sioc_sg_req sg_req; IF_DEBUG(DEBUG_PRUNE|DEBUG_CACHE) - log(LOG_DEBUG, 0, "aging forwarding cache entries"); + mrlog(LOG_DEBUG, 0, "aging forwarding cache entries"); gtnptr = &kernel_table; while ((gt = *gtnptr) != NULL) { @@ -1861,17 +1861,17 @@ VIFM_ISSET(i, r->rt_children) && NBRM_ISSETMASK(uvifs[i].uv_nbrmap, r->rt_subordinates) && !SUBS_ARE_PRUNED(r->rt_subordinates, uvifs[i].uv_nbrmap, gt->gt_prunes)) { - log(LOG_WARNING, 0, "(%s %s) is blackholing on vif %d", + mrlog(LOG_WARNING, 0, "(%s %s) is blackholing on vif %d", RT_FMT(r, s1), inet_fmt(gt->gt_mcastgrp, s2), i); fixit = 1; } } if (fixit) { - log(LOG_WARNING, 0, "fixing membership for (%s %s) gm:%x", + mrlog(LOG_WARNING, 0, "fixing membership for (%s %s) gm:%x", RT_FMT(r, s1), inet_fmt(gt->gt_mcastgrp, s2), gt->gt_grpmems); determine_forwvifs(gt); send_prune_or_graft(gt); - log(LOG_WARNING, 0, "fixed membership for (%s %s) gm:%x", + mrlog(LOG_WARNING, 0, "fixed membership for (%s %s) gm:%x", RT_FMT(r, s1), inet_fmt(gt->gt_mcastgrp, s2), gt->gt_grpmems); #ifdef RINGBUFFER printringbuf(); @@ -1893,7 +1893,7 @@ if (st->st_ctime != 0) break; if (st != NULL) { - log(LOG_WARNING, 0, "grpmems for (%s %s) is empty but no prune state!", RT_FMT(r, s1), inet_fmt(gt->gt_mcastgrp, s2)); + mrlog(LOG_WARNING, 0, "grpmems for (%s %s) is empty but no prune state!", RT_FMT(r, s1), inet_fmt(gt->gt_mcastgrp, s2)); send_prune_or_graft(gt); #ifdef RINGBUFFER printringbuf(); @@ -1910,7 +1910,7 @@ gt->gt_prsent_timer -= TIMER_INTERVAL; if (gt->gt_prsent_timer <= 0) { IF_DEBUG(DEBUG_PRUNE) - log(LOG_DEBUG, 0, "upstream prune tmo (%s %s)", + mrlog(LOG_DEBUG, 0, "upstream prune tmo (%s %s)", RT_FMT(r, s1), inet_fmt(gt->gt_mcastgrp, s2)); gt->gt_prsent_timer = -1; @@ -1939,13 +1939,13 @@ while ((pt = *ptnp) != NULL) { if ((pt->pt_timer -= TIMER_INTERVAL) <= 0) { IF_DEBUG(DEBUG_PRUNE) - log(LOG_DEBUG, 0, "expire prune (%s %s) from %s on vif %d", + mrlog(LOG_DEBUG, 0, "expire prune (%s %s) from %s on vif %d", RT_FMT(r, s1), inet_fmt(gt->gt_mcastgrp, s2), inet_fmt(pt->pt_router, s3), pt->pt_vifi); if (gt->gt_prsent_timer > 0) { - log(LOG_WARNING, 0, "prune (%s %s) from %s on vif %d expires with %d left on prsent timer", + mrlog(LOG_WARNING, 0, "prune (%s %s) from %s on vif %d expires with %d left on prsent timer", RT_FMT(r, s1), inet_fmt(gt->gt_mcastgrp, s2), inet_fmt(pt->pt_router, s3), @@ -1973,7 +1973,7 @@ */ if (gt->gt_timer <= 0) { IF_DEBUG(DEBUG_CACHE) - log(LOG_DEBUG, 0, "(%s %s) timed out, checking for traffic", + mrlog(LOG_DEBUG, 0, "(%s %s) timed out, checking for traffic", RT_FMT(gt->gt_route, s1), inet_fmt(gt->gt_mcastgrp, s2)); /* Check for traffic before deleting source entries */ @@ -1988,7 +1988,7 @@ if (st->st_ctime) { sg_req.src.s_addr = st->st_origin; if (ioctl(udp_socket, SIOCGETSGCNT, (char *)&sg_req) < 0) { - log(LOG_WARNING, errno, "%s (%s %s)", + mrlog(LOG_WARNING, errno, "%s (%s %s)", "age_table_entry: SIOCGETSGCNT failing for", inet_fmt(st->st_origin, s1), inet_fmt(gt->gt_mcastgrp, s2)); @@ -2001,12 +2001,12 @@ if (sg_req.pktcnt == st->st_pktcnt) { *stnp = st->st_next; IF_DEBUG(DEBUG_CACHE) - log(LOG_DEBUG, 0, "age_table_entry deleting (%s %s)", + mrlog(LOG_DEBUG, 0, "age_table_entry deleting (%s %s)", inet_fmt(st->st_origin, s1), inet_fmt(gt->gt_mcastgrp, s2)); if (st->st_ctime != 0) { if (k_del_rg(st->st_origin, gt) < 0) { - log(LOG_WARNING, errno, + mrlog(LOG_WARNING, errno, "age_table_entry trying to delete (%s %s)", inet_fmt(st->st_origin, s1), inet_fmt(gt->gt_mcastgrp, s2)); @@ -2029,7 +2029,7 @@ if (gt->gt_pruntbl != NULL || gt->gt_srctbl != NULL || gt->gt_prsent_timer > 0 || gt->gt_grftsnt > 0) { IF_DEBUG(DEBUG_CACHE) - log(LOG_DEBUG, 0, "refresh lifetim of cache entry %s%s%s%s(%s, %s)", + mrlog(LOG_DEBUG, 0, "refresh lifetim of cache entry %s%s%s%s(%s, %s)", gt->gt_pruntbl ? "(dstrm prunes) " : "", gt->gt_srctbl ? "(trfc flow) " : "", gt->gt_prsent_timer > 0 ? "(upstrm prune) " : "", @@ -2044,7 +2044,7 @@ */ gt->gt_prsent_timer = 0; if (gt->gt_pruntbl) { - log(LOG_WARNING, 0, "upstream prune for (%s %s) expires with downstream prunes active", + mrlog(LOG_WARNING, 0, "upstream prune for (%s %s) expires with downstream prunes active", RT_FMT(r, s1), inet_fmt(gt->gt_mcastgrp, s2)); } remove_sources(gt); @@ -2054,7 +2054,7 @@ } IF_DEBUG(DEBUG_CACHE) - log(LOG_DEBUG, 0, "timeout cache entry (%s, %s)", + mrlog(LOG_DEBUG, 0, "timeout cache entry (%s, %s)", RT_FMT(r, s1), inet_fmt(gt->gt_mcastgrp, s2)); @@ -2092,7 +2092,7 @@ */ gt->gt_prsent_timer = 0; if (gt->gt_pruntbl) { - log(LOG_WARNING, 0, "upstream prune for (%s %s) expires with downstream prunes active", + mrlog(LOG_WARNING, 0, "upstream prune for (%s %s) expires with downstream prunes active", RT_FMT(r, s1), inet_fmt(gt->gt_mcastgrp, s2)); } remove_sources(gt); @@ -2114,7 +2114,7 @@ if (gt->gt_srctbl) { if (gt->gt_srctbl->st_ctime != 0) { if (k_del_rg(gt->gt_srctbl->st_origin, gt) < 0) { - log(LOG_WARNING, errno, "%s (%s %s)", + mrlog(LOG_WARNING, errno, "%s (%s %s)", "age_table_entry trying to delete no-route", inet_fmt(gt->gt_srctbl->st_origin, s1), inet_fmt(gt->gt_mcastgrp, s2)); @@ -2155,7 +2155,7 @@ */ if (gt->gt_prsent_timer >= MIN_PRUNE_LIFE) { IF_DEBUG(DEBUG_PRUNE) - log(LOG_DEBUG, 0, "prune expired with %d left on %s", + mrlog(LOG_DEBUG, 0, "prune expired with %d left on %s", gt->gt_prsent_timer, "prsent_timer"); gt->gt_prsent_timer = 0; send_graft(gt); @@ -2166,7 +2166,7 @@ struct rtentry *rt = gt->gt_route; VIFM_SET(vifi, gt->gt_grpmems); IF_DEBUG(DEBUG_CACHE) - log(LOG_DEBUG, 0, "forw again (%s %s) gm:%x vif:%d", + mrlog(LOG_DEBUG, 0, "forw again (%s %s) gm:%x vif:%d", RT_FMT(rt, s1), inet_fmt(gt->gt_mcastgrp, s2), gt->gt_grpmems, vifi); @@ -2277,7 +2277,7 @@ sg_req.src.s_addr = st->st_origin; sg_req.grp.s_addr = gt->gt_mcastgrp; if (ioctl(udp_socket, SIOCGETSGCNT, (char *)&sg_req) < 0) { - log(LOG_WARNING, errno, "SIOCGETSGCNT on (%s %s)", + mrlog(LOG_WARNING, errno, "SIOCGETSGCNT on (%s %s)", inet_fmt(st->st_origin, s1), inet_fmt(gt->gt_mcastgrp, s2)); } else { @@ -2329,22 +2329,22 @@ if (datalen == QLEN) { type = QUERY; IF_DEBUG(DEBUG_TRACE) - log(LOG_DEBUG, 0, "Initial traceroute query rcvd from %s to %s", + mrlog(LOG_DEBUG, 0, "Initial traceroute query rcvd from %s to %s", inet_fmt(src, s1), inet_fmt(dst, s2)); } else if ((datalen - QLEN) % RLEN == 0) { type = RESP; IF_DEBUG(DEBUG_TRACE) - log(LOG_DEBUG, 0, "In-transit traceroute query rcvd from %s to %s", + mrlog(LOG_DEBUG, 0, "In-transit traceroute query rcvd from %s to %s", inet_fmt(src, s1), inet_fmt(dst, s2)); if (IN_MULTICAST(ntohl(dst))) { IF_DEBUG(DEBUG_TRACE) - log(LOG_DEBUG, 0, "Dropping multicast response"); + mrlog(LOG_DEBUG, 0, "Dropping multicast response"); return; } } else { - log(LOG_WARNING, 0, "%s from %s to %s", + mrlog(LOG_WARNING, 0, "%s from %s to %s", "Non decipherable traceroute request recieved", inet_fmt(src, s1), inet_fmt(dst, s2)); return; @@ -2357,28 +2357,28 @@ */ if ((rcount = (datalen - QLEN)/RLEN) == no) { IF_DEBUG(DEBUG_TRACE) - log(LOG_DEBUG, 0, "packet with all reports filled in"); + mrlog(LOG_DEBUG, 0, "packet with all reports filled in"); return; } IF_DEBUG(DEBUG_TRACE) { - log(LOG_DEBUG, 0, "s: %s g: %s d: %s ", inet_fmt(qry->tr_src, s1), + mrlog(LOG_DEBUG, 0, "s: %s g: %s d: %s ", inet_fmt(qry->tr_src, s1), inet_fmt(group, s2), inet_fmt(qry->tr_dst, s3)); - log(LOG_DEBUG, 0, "rttl: %d rd: %s", qry->tr_rttl, + mrlog(LOG_DEBUG, 0, "rttl: %d rd: %s", qry->tr_rttl, inet_fmt(qry->tr_raddr, s1)); - log(LOG_DEBUG, 0, "rcount:%d, qid:%06x", rcount, qry->tr_qid); + mrlog(LOG_DEBUG, 0, "rcount:%d, qid:%06x", rcount, qry->tr_qid); } /* determine the routing table entry for this traceroute */ rt = determine_route(qry->tr_src); IF_DEBUG(DEBUG_TRACE) if (rt) { - log(LOG_DEBUG, 0, "rt parent vif: %d rtr: %s metric: %d", + mrlog(LOG_DEBUG, 0, "rt parent vif: %d rtr: %s metric: %d", rt->rt_parent, inet_fmt(rt->rt_gateway, s1), rt->rt_metric); - log(LOG_DEBUG, 0, "rt origin %s", + mrlog(LOG_DEBUG, 0, "rt origin %s", RT_FMT(rt, s1)); } else - log(LOG_DEBUG, 0, "...no route"); + mrlog(LOG_DEBUG, 0, "...no route"); /* * Query type packet - check if rte exists @@ -2398,13 +2398,13 @@ * it is not fatal. */ IF_DEBUG(DEBUG_TRACE) - log(LOG_DEBUG, 0, "ignoring duplicate traceroute packet"); + mrlog(LOG_DEBUG, 0, "ignoring duplicate traceroute packet"); return; } if (rt == NULL) { IF_DEBUG(DEBUG_TRACE) - log(LOG_DEBUG, 0, "Mcast traceroute: no route entry %s", + mrlog(LOG_DEBUG, 0, "Mcast traceroute: no route entry %s", inet_fmt(qry->tr_src, s1)); if (IN_MULTICAST(ntohl(dst))) return; @@ -2414,14 +2414,14 @@ if (vifi == NO_VIF) { /* The traceroute destination is not on one of my subnet vifs. */ IF_DEBUG(DEBUG_TRACE) - log(LOG_DEBUG, 0, "Destination %s not an interface", + mrlog(LOG_DEBUG, 0, "Destination %s not an interface", inet_fmt(qry->tr_dst, s1)); if (IN_MULTICAST(ntohl(dst))) return; errcode = TR_WRONG_IF; } else if (rt != NULL && !VIFM_ISSET(vifi, rt->rt_children)) { IF_DEBUG(DEBUG_TRACE) - log(LOG_DEBUG, 0, "Destination %s not on forwarding tree for src %s", + mrlog(LOG_DEBUG, 0, "Destination %s not on forwarding tree for src %s", inet_fmt(qry->tr_dst, s1), inet_fmt(qry->tr_src, s2)); if (IN_MULTICAST(ntohl(dst))) return; @@ -2436,7 +2436,7 @@ */ if ((vifi = find_vif(src, dst)) == NO_VIF) { IF_DEBUG(DEBUG_TRACE) - log(LOG_DEBUG, 0, "Wrong interface for packet"); + mrlog(LOG_DEBUG, 0, "Wrong interface for packet"); errcode = TR_WRONG_IF; } } @@ -2445,7 +2445,7 @@ oqid = qry->tr_qid; IF_DEBUG(DEBUG_TRACE) - log(LOG_DEBUG, 0, "Sending traceroute response"); + mrlog(LOG_DEBUG, 0, "Sending traceroute response"); /* copy the packet to the sending buffer */ p = send_buf + MIN_IP_HEADER_LEN + IGMP_MINLEN; @@ -2556,7 +2556,7 @@ resp->tr_rmtaddr = rt->rt_gateway; if (!VIFM_ISSET(vifi, rt->rt_children)) { IF_DEBUG(DEBUG_TRACE) - log(LOG_DEBUG, 0, "Destination %s not on forwarding tree for src %s", + mrlog(LOG_DEBUG, 0, "Destination %s not on forwarding tree for src %s", inet_fmt(qry->tr_dst, s1), inet_fmt(qry->tr_src, s2)); resp->tr_rflags = TR_WRONG_IF; } @@ -2574,7 +2574,7 @@ * mtrace, set an error code and send to requestor anyway. */ IF_DEBUG(DEBUG_TRACE) - log(LOG_DEBUG, 0, "rcount:%d, no:%d", rcount, no); + mrlog(LOG_DEBUG, 0, "rcount:%d, no:%d", rcount, no); if ((rcount + 1 == no) || (rt == NULL) || (rt->rt_metric == 1)) { resptype = IGMP_MTRACE_RESP; @@ -2596,7 +2596,7 @@ */ if (phys_vif != -1) { IF_DEBUG(DEBUG_TRACE) - log(LOG_DEBUG, 0, "Sending reply to %s from %s", + mrlog(LOG_DEBUG, 0, "Sending reply to %s from %s", inet_fmt(dst, s1), inet_fmt(uvifs[phys_vif].uv_lcl_addr, s2)); k_set_ttl(qry->tr_rttl); send_igmp(uvifs[phys_vif].uv_lcl_addr, dst, @@ -2604,11 +2604,11 @@ datalen); k_set_ttl(1); } else - log(LOG_INFO, 0, "No enabled phyints -- %s", + mrlog(LOG_INFO, 0, "No enabled phyints -- %s", "dropping traceroute reply"); } else { IF_DEBUG(DEBUG_TRACE) - log(LOG_DEBUG, 0, "Sending %s to %s from %s", + mrlog(LOG_DEBUG, 0, "Sending %s to %s from %s", resptype == IGMP_MTRACE_RESP ? "reply" : "request on", inet_fmt(dst, s1), inet_fmt(src, s2)); diff -ruN mrouted-3.9beta3+IOS12.orig/route.c mrouted-3.9beta3+IOS12/route.c --- mrouted-3.9beta3+IOS12.orig/route.c 1998-01-14 16:08:34.000000000 -0800 +++ mrouted-3.9beta3+IOS12/route.c 2008-10-10 18:26:44.000000000 -0700 @@ -378,7 +378,7 @@ if ((r = (struct rtentry *) malloc(sizeof(struct rtentry) + (numvifs * sizeof(u_int32)))) == NULL) { - log(LOG_ERR, 0, "ran out of memory"); /* fatal */ + mrlog(LOG_ERR, 0, "ran out of memory"); /* fatal */ } r->rt_origin = origin; r->rt_originmask = mask; @@ -451,7 +451,7 @@ * all unreachable/poisoned metrics into a single value. */ if (src != 0 && (metric < 1 || metric >= 2*UNREACHABLE)) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "%s reports out-of-range metric %u for origin %s", inet_fmt(src, s1), metric, inet_fmts(origin, mask, s2)); return; @@ -472,14 +472,14 @@ return; } if (src != 0 && !inet_valid_subnet(origin, mask)) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "%s reports an invalid origin (%s) and/or mask (%08x)", inet_fmt(src, s1), inet_fmt(origin, s2), ntohl(mask)); return; } IF_DEBUG(DEBUG_RTDETAIL) - log(LOG_DEBUG, 0, "%s advertises new route %s", + mrlog(LOG_DEBUG, 0, "%s advertises new route %s", inet_fmt(src, s1), inet_fmts(origin, mask, s2)); /* @@ -507,7 +507,7 @@ return; IF_DEBUG(DEBUG_RTDETAIL) - log(LOG_DEBUG, 0, "%s advertises %s with adj_metric %d (ours was %d)", + mrlog(LOG_DEBUG, 0, "%s advertises %s with adj_metric %d (ours was %d)", inet_fmt(src, s1), inet_fmts(origin, mask, s2), adj_metric, r->rt_metric); @@ -545,7 +545,7 @@ r->rt_timer = 0; IF_DEBUG(DEBUG_RTDETAIL) - log(LOG_DEBUG, 0, "%s (current parent) advertises %s with adj_metric %d (ours was %d)", + mrlog(LOG_DEBUG, 0, "%s (current parent) advertises %s with adj_metric %d (ours was %d)", inet_fmt(src, s1), inet_fmts(origin, mask, s2), adj_metric, r->rt_metric); @@ -589,7 +589,7 @@ r->rt_parent = vifi; IF_DEBUG(DEBUG_RTDETAIL) - log(LOG_DEBUG, 0, "%s (new parent) on vif %d advertises %s with adj_metric %d (old parent was %s on vif %d, metric %d)", + mrlog(LOG_DEBUG, 0, "%s (new parent) on vif %d advertises %s with adj_metric %d (old parent was %s on vif %d, metric %d)", inet_fmt(src, s1), vifi, inet_fmts(origin, mask, s2), adj_metric, inet_fmt(old_gateway, s3), old_parent, r->rt_metric); @@ -620,7 +620,7 @@ * to transit onto this vif. Simply ignore the update. */ IF_DEBUG(DEBUG_RTDETAIL) - log(LOG_DEBUG, 0, "%s on vif %d advertises %s with metric %d (ignored due to NOTRANSIT)", + mrlog(LOG_DEBUG, 0, "%s on vif %d advertises %s with metric %d (ignored due to NOTRANSIT)", inet_fmt(src, s1), vifi, inet_fmts(origin, mask, s2), metric); } else if (VIFM_ISSET(vifi, r->rt_children)) { @@ -645,7 +645,7 @@ NBRM_CLRMASK(r->rt_subordinates, uvifs[vifi].uv_nbrmap); update_table_entry(r, r->rt_gateway); IF_DEBUG(DEBUG_RTDETAIL) - log(LOG_DEBUG, 0, "%s on vif %d becomes dominant for %s with metric %d", + mrlog(LOG_DEBUG, 0, "%s on vif %d becomes dominant for %s with metric %d", inet_fmt(src, s1), vifi, inet_fmts(origin, mask, s2), metric); } @@ -656,14 +656,14 @@ */ if (!NBRM_ISSET(n->al_index, r->rt_subordinates)) { IF_DEBUG(DEBUG_RTDETAIL) - log(LOG_DEBUG, 0, "%s on vif %d becomes subordinate for %s with poison-reverse metric %d", + mrlog(LOG_DEBUG, 0, "%s on vif %d becomes subordinate for %s with poison-reverse metric %d", inet_fmt(src, s1), vifi, inet_fmts(origin, mask, s2), metric - UNREACHABLE); NBRM_SET(n->al_index, r->rt_subordinates); update_table_entry(r, r->rt_gateway); } else { IF_DEBUG(DEBUG_RTDETAIL) - log(LOG_DEBUG, 0, "%s on vif %d confirms subordinateness for %s with poison-reverse metric %d", + mrlog(LOG_DEBUG, 0, "%s on vif %d confirms subordinateness for %s with poison-reverse metric %d", inet_fmt(src, s1), vifi, inet_fmts(origin, mask, s2), metric - UNREACHABLE); } @@ -676,7 +676,7 @@ * router. */ IF_DEBUG(DEBUG_RTDETAIL) - log(LOG_DEBUG, 0, "%s on vif %d is no longer a subordinate for %s with metric %d", + mrlog(LOG_DEBUG, 0, "%s on vif %d is no longer a subordinate for %s with metric %d", inet_fmt(src, s1), vifi, inet_fmts(origin, mask, s2), metric); NBRM_CLR(n->al_index, r->rt_subordinates); @@ -694,7 +694,7 @@ * as our own child. */ IF_DEBUG(DEBUG_RTDETAIL) - log(LOG_DEBUG, 0, "%s (current dominant) on vif %d is no longer dominant for %s with metric %d", + mrlog(LOG_DEBUG, 0, "%s (current dominant) on vif %d is no longer dominant for %s with metric %d", inet_fmt(src, s1), vifi, inet_fmts(origin, mask, s2), metric); VIFM_SET(vifi, r->rt_children); @@ -710,7 +710,7 @@ update_table_entry(r, r->rt_gateway); } else { IF_DEBUG(DEBUG_RTDETAIL) - log(LOG_DEBUG, 0, "%s on vif %d advertises %s with metric %d (ignored)", + mrlog(LOG_DEBUG, 0, "%s on vif %d advertises %s with metric %d (ignored)", inet_fmt(src, s1), vifi, inet_fmts(origin, mask, s2), metric); } @@ -765,7 +765,7 @@ */ if (!NBRM_SAME(r->rt_subordinates, r->rt_subordadv)) { IF_DEBUG(DEBUG_ROUTE) - log(LOG_DEBUG, 0, "rt %s sub 0x%08x%08x subadv 0x%08x%08x metric %d", + mrlog(LOG_DEBUG, 0, "rt %s sub 0x%08x%08x subadv 0x%08x%08x metric %d", RT_FMT(r, s1), r->rt_subordinates.hi, r->rt_subordinates.lo, r->rt_subordadv.hi, r->rt_subordadv.lo, r->rt_metric); @@ -853,13 +853,13 @@ } if (match->al_ctime + match->al_timer <= now) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "ignoring probe from non-neighbor %s, check for misconfigured tunnel or routing on %s", inet_fmt(src, s1), s1); match->al_timer *= 2; } else IF_DEBUG(DEBUG_PEER) - log(LOG_DEBUG, 0, + mrlog(LOG_DEBUG, 0, "ignoring probe from non-neighbor %s (%d seconds until next warning)", inet_fmt(src, s1), match->al_ctime + match->al_timer - now); return; } @@ -949,12 +949,12 @@ v->uv_blasterlen *= 2; IF_DEBUG(DEBUG_IF) - log(LOG_DEBUG, 0, "increasing blasterbuf to %d bytes", + mrlog(LOG_DEBUG, 0, "increasing blasterbuf to %d bytes", v->uv_blasterlen); v->uv_blasterbuf = realloc(v->uv_blasterbuf, v->uv_blasterlen); if (v->uv_blasterbuf == NULL) { - log(LOG_WARNING, ENOMEM, "turning off blaster on vif %d", vifi); + mrlog(LOG_WARNING, ENOMEM, "turning off blaster on vif %d", vifi); v->uv_blasterlen = 0; v->uv_blasterend = v->uv_blastercur = NULL; v->uv_flags &= ~VIFF_BLASTER; @@ -975,7 +975,7 @@ int *i = (int *)malloc(sizeof(int *)); if (i == NULL) - log(LOG_ERR, 0, "out of memory"); + mrlog(LOG_ERR, 0, "out of memory"); *i = vifi; @@ -999,7 +999,7 @@ int i; IF_DEBUG(DEBUG_ROUTE) - log(LOG_DEBUG, 0, "processing vif %d blasted routes", vifi); + mrlog(LOG_DEBUG, 0, "processing vif %d blasted routes", vifi); v = &uvifs[vifi]; for (i = 0; i < 5; i++) { if (v->uv_blastercur >= v->uv_blasterend) @@ -1016,10 +1016,10 @@ v->uv_blastertimer = 0; free(vifip); IF_DEBUG(DEBUG_ROUTE) - log(LOG_DEBUG, 0, "finish processing vif %d blaster", vifi); + mrlog(LOG_DEBUG, 0, "finish processing vif %d blaster", vifi); } else { IF_DEBUG(DEBUG_ROUTE) - log(LOG_DEBUG, 0, "more blasted routes to come on vif %d", vifi); + mrlog(LOG_DEBUG, 0, "more blasted routes to come on vif %d", vifi); v->uv_blastertimer = timer_setTimer(1, process_blaster_report, vifip); } @@ -1047,7 +1047,7 @@ struct listaddr *nbr; if ((vifi = find_vif(src, dst)) == NO_VIF) { - log(LOG_INFO, 0, + mrlog(LOG_INFO, 0, "ignoring route report from non-neighbor %s", inet_fmt(src, s1)); return; } @@ -1064,7 +1064,7 @@ return; if (datalen > 2*4096) { - log(LOG_INFO, 0, + mrlog(LOG_INFO, 0, "ignoring oversize (%d bytes) route report from %s", datalen, inet_fmt(src, s1)); return; @@ -1073,7 +1073,7 @@ while (datalen > 0) { /* Loop through per-mask lists. */ if (datalen < 3) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "received truncated route report from %s", inet_fmt(src, s1)); return; @@ -1083,7 +1083,7 @@ if ((((u_char *)&mask)[2] = *p++) != 0) width = 3; if ((((u_char *)&mask)[3] = *p++) != 0) width = 4; if (!inet_valid_mask(ntohl(mask))) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "%s reports bogus netmask 0x%08x (%s)", inet_fmt(src, s1), ntohl(mask), inet_fmt(mask, s2)); return; @@ -1092,7 +1092,7 @@ do { /* Loop through (origin, metric) pairs */ if (datalen < width + 1) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "received truncated route report from %s", inet_fmt(src, s1)); return; @@ -1118,12 +1118,12 @@ rt[nrt-1].mask = 0; IF_DEBUG(DEBUG_ROUTE) - log(LOG_DEBUG, 0, "Updating %d routes from %s to %s", nrt, + mrlog(LOG_DEBUG, 0, "Updating %d routes from %s to %s", nrt, inet_fmt(src, s1), inet_fmt(dst, s2)); for (i = 0; i < nrt; ++i) { if (i != 0 && rt[i].origin == rt[i-1].origin && rt[i].mask == rt[i-1].mask) { - log(LOG_WARNING, 0, "%s reports duplicate route for %s", + mrlog(LOG_WARNING, 0, "%s reports duplicate route for %s", inet_fmt(src, s1), inet_fmts(rt[i].origin, rt[i].mask, s2)); continue; } @@ -1149,7 +1149,7 @@ if ((uvifs[vifi].uv_filter->vf_type == VFT_ACCEPT && match == 0) || (uvifs[vifi].uv_filter->vf_type == VFT_DENY && match == 1)) { IF_DEBUG(DEBUG_ROUTE) - log(LOG_DEBUG, 0, "%s skipped on vif %d because it %s %s", + mrlog(LOG_DEBUG, 0, "%s skipped on vif %d because it %s %s", inet_fmts(rt[i].origin, rt[i].mask, s1), vifi, match ? "matches" : "doesn't match", @@ -1303,7 +1303,7 @@ if ((v->uv_filter->vf_type == VFT_ACCEPT && match == 0) || (v->uv_filter->vf_type == VFT_DENY && match == 1)) { IF_DEBUG(DEBUG_ROUTE) - log(LOG_DEBUG, 0, "%s not reported on vif %d because it %s %s", + mrlog(LOG_DEBUG, 0, "%s not reported on vif %d because it %s %s", RT_FMT(r, s1), vifi, match ? "matches" : "doesn't match", match ? inet_fmts(vfe->vfe_addr, vfe->vfe_mask, s2) : @@ -1396,7 +1396,7 @@ n = min; IF_DEBUG(DEBUG_ROUTE) - log(LOG_INFO, 0, "update %d starting at %d of %d", + mrlog(LOG_INFO, 0, "update %d starting at %d of %d", n, (nroutes - start_rt), nroutes); start_rt = (start_rt + n) % nroutes; diff -ruN mrouted-3.9beta3+IOS12.orig/rsrr.c mrouted-3.9beta3+IOS12/rsrr.c --- mrouted-3.9beta3+IOS12.orig/rsrr.c 1998-01-05 17:57:58.000000000 -0800 +++ mrouted-3.9beta3+IOS12/rsrr.c 2008-10-10 18:26:44.000000000 -0700 @@ -78,7 +78,7 @@ struct sockaddr_un serv_addr; if ((rsrr_socket = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0) - log(LOG_ERR, errno, "Can't create RSRR socket"); + mrlog(LOG_ERR, errno, "Can't create RSRR socket"); unlink(RSRR_SERV_PATH); bzero((char *) &serv_addr, sizeof(serv_addr)); @@ -93,10 +93,10 @@ #endif if (bind(rsrr_socket, (struct sockaddr *) &serv_addr, servlen) < 0) - log(LOG_ERR, errno, "Can't bind RSRR socket"); + mrlog(LOG_ERR, errno, "Can't bind RSRR socket"); if (register_input_handler(rsrr_socket, rsrr_read) < 0) - log(LOG_WARNING, 0, "Couldn't register RSRR as an input handler"); + mrlog(LOG_WARNING, 0, "Couldn't register RSRR as an input handler"); } /* Read a message from the RSRR socket */ @@ -112,7 +112,7 @@ 0, (struct sockaddr *)&client_addr, &client_length); if (rsrr_recvlen < 0) { if (errno != EINTR) - log(LOG_ERR, errno, "RSRR recvfrom"); + mrlog(LOG_ERR, errno, "RSRR recvfrom"); return; } rsrr_accept(rsrr_recvlen); @@ -129,7 +129,7 @@ struct rsrr_rq *route_query; if (recvlen < RSRR_HEADER_LEN) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "Received RSRR packet of %d bytes, which is less than min size", recvlen); return; @@ -138,7 +138,7 @@ rsrr = (struct rsrr_header *) rsrr_recv_buf; if (rsrr->version > RSRR_MAX_VERSION) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "Received RSRR packet version %d, which I don't understand", rsrr->version); return; @@ -150,13 +150,13 @@ case RSRR_INITIAL_QUERY: /* Send Initial Reply to client */ IF_DEBUG(DEBUG_RSRR) - log(LOG_DEBUG, 0, "Received Initial Query\n"); + mrlog(LOG_DEBUG, 0, "Received Initial Query\n"); rsrr_accept_iq(); break; case RSRR_ROUTE_QUERY: /* Check size */ if (recvlen < RSRR_RQ_LEN) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "Received Route Query of %d bytes, which is too small", recvlen); break; @@ -164,7 +164,7 @@ /* Get the query */ route_query = (struct rsrr_rq *) (rsrr_recv_buf + RSRR_HEADER_LEN); IF_DEBUG(DEBUG_RSRR) - log(LOG_DEBUG, 0, + mrlog(LOG_DEBUG, 0, "Received Route Query for src %s grp %s notification %d", inet_fmt(route_query->source_addr.s_addr, s1), inet_fmt(route_query->dest_addr.s_addr,s2), @@ -173,7 +173,7 @@ rsrr_accept_rq(route_query,rsrr->flags,NULL); break; default: - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "Received RSRR packet type %d, which I don't handle", rsrr->type); break; @@ -181,7 +181,7 @@ break; default: - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "Received RSRR packet version %d, which I don't understand", rsrr->version); break; @@ -201,7 +201,7 @@ * but we should check anyway. */ if (numvifs > RSRR_MAX_VIFS) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "Can't send RSRR Route Reply because %d is too many vifs %d", numvifs); return; @@ -231,7 +231,7 @@ /* Send it. */ IF_DEBUG(DEBUG_RSRR) - log(LOG_DEBUG, 0, "Send RSRR Initial Reply"); + mrlog(LOG_DEBUG, 0, "Send RSRR Initial Reply"); rsrr_send(sendlen); } @@ -339,7 +339,7 @@ } IF_DEBUG(DEBUG_RSRR) - log(LOG_DEBUG, 0, "%sSend RSRR Route Reply for src %s dst %s in vif %d out vif %d\n", + mrlog(LOG_DEBUG, 0, "%sSend RSRR Route Reply for src %s dst %s in vif %d out vif %d\n", gt_notify ? "Route Change: " : "", inet_fmt(route_reply->source_addr.s_addr,s1), inet_fmt(route_reply->dest_addr.s_addr,s2), @@ -362,9 +362,9 @@ /* Check for errors. */ if (error < 0) { - log(LOG_WARNING, errno, "Failed send on RSRR socket"); + mrlog(LOG_WARNING, errno, "Failed send on RSRR socket"); } else if (error != sendlen) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "Sent only %d out of %d bytes on RSRR socket\n", error, sendlen); } return error; @@ -401,7 +401,7 @@ /* Update */ rc->route_query.query_id = route_query->query_id; IF_DEBUG(DEBUG_RSRR) - log(LOG_DEBUG, 0, + mrlog(LOG_DEBUG, 0, "Update cached query id %ld from client %s\n", rc->route_query.query_id, rc->client_addr.sun_path); } @@ -415,7 +415,7 @@ */ rc = (struct rsrr_cache *) malloc(sizeof(struct rsrr_cache)); if (rc == NULL) - log(LOG_ERR, 0, "ran out of memory"); + mrlog(LOG_ERR, 0, "ran out of memory"); rc->route_query.source_addr.s_addr = route_query->source_addr.s_addr; rc->route_query.dest_addr.s_addr = route_query->dest_addr.s_addr; rc->route_query.query_id = route_query->query_id; @@ -424,7 +424,7 @@ rc->next = gt->gt_rsrr_cache; gt->gt_rsrr_cache = rc; IF_DEBUG(DEBUG_RSRR) - log(LOG_DEBUG, 0, "Cached query id %ld from client %s\n", + mrlog(LOG_DEBUG, 0, "Cached query id %ld from client %s\n", rc->route_query.query_id,rc->client_addr.sun_path); } @@ -446,7 +446,7 @@ while ((rc = *rcnp) != NULL) { if (rsrr_accept_rq(&rc->route_query,flags,gt) < 0) { IF_DEBUG(DEBUG_RSRR) - log(LOG_DEBUG, 0, "Deleting cached query id %ld from client %s\n", + mrlog(LOG_DEBUG, 0, "Deleting cached query id %ld from client %s\n", rc->route_query.query_id,rc->client_addr.sun_path); /* Delete cache entry. */ *rcnp = rc->next; @@ -465,7 +465,7 @@ struct rsrr_cache *rc,*rc_next; IF_DEBUG(DEBUG_RSRR) - log(LOG_DEBUG, 0, "cleaning cache for group %s\n", + mrlog(LOG_DEBUG, 0, "cleaning cache for group %s\n", inet_fmt(gt->gt_mcastgrp, s1)); rc = gt->gt_rsrr_cache; while (rc) { diff -ruN mrouted-3.9beta3+IOS12.orig/vif.c mrouted-3.9beta3+IOS12/vif.c --- mrouted-3.9beta3+IOS12.orig/vif.c 1999-01-19 21:18:50.000000000 -0800 +++ mrouted-3.9beta3+IOS12/vif.c 2008-10-10 18:26:44.000000000 -0700 @@ -88,11 +88,11 @@ udp_socket = igmp_socket; #else if ((udp_socket = socket(AF_INET, SOCK_DGRAM, 0)) < 0) - log(LOG_ERR, errno, "UDP socket"); + mrlog(LOG_ERR, errno, "UDP socket"); #endif - log(LOG_INFO,0,"Getting vifs from kernel interfaces"); + mrlog(LOG_INFO,0,"Getting vifs from kernel interfaces"); config_vifs_from_kernel(); - log(LOG_INFO,0,"Getting vifs from %s",configfilename); + mrlog(LOG_INFO,0,"Getting vifs from %s",configfilename); config_vifs_from_file(); /* @@ -112,26 +112,26 @@ } } if (enabled_vifs < 2) - log(LOG_ERR, 0, "can't forward: %s", + mrlog(LOG_ERR, 0, "can't forward: %s", enabled_vifs == 0 ? "no enabled vifs" : "only one enabled vif"); if (enabled_phyints == 0) - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "no enabled interfaces, forwarding via tunnels only"); - log(LOG_INFO, 0, "Installing vifs in mrouted..."); + mrlog(LOG_INFO, 0, "Installing vifs in mrouted..."); for (vifi = 0, v = uvifs; vifi < numvifs; ++vifi, ++v) { if (!(v->uv_flags & VIFF_DISABLED)) { if (!(v->uv_flags & VIFF_DOWN)) { if (v->uv_flags & VIFF_TUNNEL) - log(LOG_INFO, 0, "vif #%d, tunnel %s -> %s", vifi, + mrlog(LOG_INFO, 0, "vif #%d, tunnel %s -> %s", vifi, inet_fmt(v->uv_lcl_addr, s1), inet_fmt(v->uv_rmt_addr, s2)); else - log(LOG_INFO, 0, "vif #%d, phyint %s", vifi, + mrlog(LOG_INFO, 0, "vif #%d, phyint %s", vifi, inet_fmt(v->uv_lcl_addr, s1)); start_vif2(vifi); - } else log(LOG_INFO, 0, + } else mrlog(LOG_INFO, 0, "%s is not yet up; vif #%u not in service", v->uv_name, vifi); } @@ -189,19 +189,19 @@ vifi_t vifi; struct uvif *v; - log(LOG_INFO, 0, "Installing vifs in kernel..."); + mrlog(LOG_INFO, 0, "Installing vifs in kernel..."); for (vifi = 0, v = uvifs; vifi < numvifs; ++vifi, ++v) { if (!(v->uv_flags & VIFF_DISABLED)) { if (!(v->uv_flags & VIFF_DOWN)) { if (v->uv_flags & VIFF_TUNNEL) - log(LOG_INFO, 0, "vif #%d, tunnel %s -> %s", vifi, + mrlog(LOG_INFO, 0, "vif #%d, tunnel %s -> %s", vifi, inet_fmt(v->uv_lcl_addr, s1), inet_fmt(v->uv_rmt_addr, s2)); else - log(LOG_INFO, 0, "vif #%d, phyint %s", vifi, + mrlog(LOG_INFO, 0, "vif #%d, phyint %s", vifi, inet_fmt(v->uv_lcl_addr, s1)); k_add_vif(vifi, &uvifs[vifi]); - } else log(LOG_INFO, 0, + } else mrlog(LOG_INFO, 0, "%s is not yet up; vif #%u not in service", v->uv_name, vifi); } @@ -238,12 +238,12 @@ strncpy(ifr.ifr_name, v->uv_name, IFNAMSIZ); if (ioctl(udp_socket, SIOCGIFFLAGS, (char *)&ifr) < 0) - log(LOG_ERR, errno, + mrlog(LOG_ERR, errno, "ioctl SIOCGIFFLAGS for %s", ifr.ifr_name); if (v->uv_flags & VIFF_DOWN) { if (ifr.ifr_flags & IFF_UP) { - log(LOG_NOTICE, 0, + mrlog(LOG_NOTICE, 0, "%s has come up; vif #%u now in service", v->uv_name, vifi); v->uv_flags &= ~VIFF_DOWN; @@ -253,7 +253,7 @@ } else { if (!(ifr.ifr_flags & IFF_UP)) { - log(LOG_NOTICE, 0, + mrlog(LOG_NOTICE, 0, "%s has gone down; vif #%u taken out of service", v->uv_name, vifi); stop_vif(vifi); @@ -338,7 +338,7 @@ register struct uvif *v; { IF_DEBUG(DEBUG_IGMP) - log(LOG_DEBUG, 0, "sending %squery on vif %d", + mrlog(LOG_DEBUG, 0, "sending %squery on vif %d", (v->uv_flags & VIFF_IGMPV1) ? "v1 " : "", v - uvifs); send_igmp(v->uv_lcl_addr, allhosts_group, @@ -417,7 +417,7 @@ */ v->uv_flags |= VIFF_QUERIER; IF_DEBUG(DEBUG_IGMP) - log(LOG_DEBUG, 0, "assuming querier duties on vif %d", vifi); + mrlog(LOG_DEBUG, 0, "assuming querier duties on vif %d", vifi); send_query(v); } @@ -476,7 +476,7 @@ } IF_DEBUG(DEBUG_IGMP) - log(LOG_DEBUG, 0, "releasing querier duties on vif %d", vifi); + mrlog(LOG_DEBUG, 0, "releasing querier duties on vif %d", vifi); v->uv_flags &= ~VIFF_QUERIER; } @@ -632,7 +632,7 @@ if ((vifi = find_vif(src, dst)) == NO_VIF || (uvifs[vifi].uv_flags & VIFF_TUNNEL)) { - log(LOG_INFO, 0, + mrlog(LOG_INFO, 0, "ignoring group membership query from non-adjacent host %s", inet_fmt(src, s1)); return; @@ -651,7 +651,7 @@ while (i && !(i & 1)) i >>= 1; if (i == 1) - log(LOG_WARNING, 0, "%s %s on vif %d, %s", + mrlog(LOG_WARNING, 0, "%s %s on vif %d, %s", tmo == 0 ? "Received IGMPv1 report from" : "Received IGMPv2 report from", inet_fmt(src, s1), @@ -671,7 +671,7 @@ if (ntohl(src) < (v->uv_querier ? ntohl(v->uv_querier->al_addr) : ntohl(v->uv_lcl_addr))) { IF_DEBUG(DEBUG_IGMP) - log(LOG_DEBUG, 0, "new querier %s (was %s) on vif %d", + mrlog(LOG_DEBUG, 0, "new querier %s (was %s) on vif %d", inet_fmt(src, s1), v->uv_querier ? inet_fmt(v->uv_querier->al_addr, s2) : "me", vifi); @@ -684,7 +684,7 @@ v->uv_querier->al_addr = src; } else { IF_DEBUG(DEBUG_IGMP) - log(LOG_DEBUG, 0, "ignoring query from %s; querier on vif %d is still %s", + mrlog(LOG_DEBUG, 0, "ignoring query from %s; querier on vif %d is still %s", inet_fmt(src, s1), vifi, v->uv_querier ? inet_fmt(v->uv_querier->al_addr, s2) : "me"); @@ -709,7 +709,7 @@ register struct listaddr *g; IF_DEBUG(DEBUG_IGMP) - log(LOG_DEBUG, 0, + mrlog(LOG_DEBUG, 0, "%s for %s from %s on vif %d, timer %d", "Group-specific membership query", inet_fmt(group, s2), inet_fmt(src, s1), vifi, tmo); @@ -725,7 +725,7 @@ g->al_query = -1; g->al_timerid = SetTimer(vifi, g); IF_DEBUG(DEBUG_IGMP) - log(LOG_DEBUG, 0, + mrlog(LOG_DEBUG, 0, "timer for grp %s on vif %d set to %d", inet_fmt(group, s2), vifi, g->al_timer); break; @@ -748,7 +748,7 @@ if ((vifi = find_vif(src, dst)) == NO_VIF || (uvifs[vifi].uv_flags & VIFF_TUNNEL)) { - log(LOG_INFO, 0, + mrlog(LOG_INFO, 0, "ignoring group membership report from non-adjacent host %s", inet_fmt(src, s1)); return; @@ -783,7 +783,7 @@ if (g == NULL) { g = (struct listaddr *)malloc(sizeof(struct listaddr)); if (g == NULL) - log(LOG_ERR, 0, "ran out of memory"); /* fatal */ + mrlog(LOG_ERR, 0, "ran out of memory"); /* fatal */ g->al_addr = group; if (r_type == IGMP_V1_MEMBERSHIP_REPORT) @@ -822,7 +822,7 @@ if ((vifi = find_vif(src, dst)) == NO_VIF || (uvifs[vifi].uv_flags & VIFF_TUNNEL)) { - log(LOG_INFO, 0, + mrlog(LOG_INFO, 0, "ignoring group leave report from non-adjacent host %s", inet_fmt(src, s1)); return; @@ -840,7 +840,7 @@ for (g = v->uv_groups; g != NULL; g = g->al_next) { if (group == g->al_addr) { IF_DEBUG(DEBUG_IGMP) - log(LOG_DEBUG, 0, + mrlog(LOG_DEBUG, 0, "[vif.c, _accept_leave_message] %d %d \n", g->al_old, g->al_query); @@ -1085,7 +1085,7 @@ case DVMRP_INFO_NEIGHBORS: default: - log(LOG_INFO, 0, "ignoring unknown info type %d", *p); + mrlog(LOG_INFO, 0, "ignoring unknown info type %d", *p); break; } *(q+1) = len++; @@ -1130,7 +1130,7 @@ u_char *p; int datalen; { - log(LOG_INFO, 0, "ignoring spurious DVMRP neighbor list from %s to %s", + mrlog(LOG_INFO, 0, "ignoring spurious DVMRP neighbor list from %s to %s", inet_fmt(src, s1), inet_fmt(dst, s2)); } @@ -1145,7 +1145,7 @@ int datalen; { IF_DEBUG(DEBUG_PKT) - log(LOG_DEBUG, 0, "ignoring spurious DVMRP neighbor list2 from %s to %s", + mrlog(LOG_DEBUG, 0, "ignoring spurious DVMRP neighbor list2 from %s to %s", inet_fmt(src, s1), inet_fmt(dst, s2)); } @@ -1159,7 +1159,7 @@ int datalen; { IF_DEBUG(DEBUG_PKT) - log(LOG_DEBUG, 0, "ignoring spurious DVMRP info reply from %s to %s", + mrlog(LOG_DEBUG, 0, "ignoring spurious DVMRP info reply from %s to %s", inet_fmt(src, s1), inet_fmt(dst, s2)); } @@ -1206,7 +1206,7 @@ if (!(v->uv_flags & VIFF_TUNNEL) && (addr == v->uv_lcl_addr || addr == v->uv_subnet )) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "received DVMRP message from %s: %s", (addr == v->uv_lcl_addr) ? "self (check device loopback)" : "'the unknown host'", @@ -1230,11 +1230,11 @@ u_int32 router; IF_DEBUG(DEBUG_PEER) - log(LOG_DEBUG, 0, "checking probe from %s (%d.%d) on vif %d", + mrlog(LOG_DEBUG, 0, "checking probe from %s (%d.%d) on vif %d", inet_fmt(addr, s1), pv, mv, vifi); if (datalen < 4) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "received truncated probe message from %s (len %d)", inet_fmt(addr, s1), datalen); return NULL; @@ -1248,7 +1248,7 @@ while (datalen > 0) { if (datalen < 4) { - log(LOG_WARNING, 0, + mrlog(LOG_WARNING, 0, "received truncated probe message from %s (len %d)", inet_fmt(addr, s1), datalen); return NULL; @@ -1294,7 +1294,7 @@ if (i == MAXNBRS) { /* XXX This is a severe new restriction. */ /* XXX want extensible bitmaps! */ - log(LOG_ERR, 0, "Can't handle %dth neighbor %s on vif %d!", + mrlog(LOG_ERR, 0, "Can't handle %dth neighbor %s on vif %d!", MAXNBRS, inet_fmt(addr, s1), vifi); /*NOTREACHED*/ } @@ -1303,13 +1303,13 @@ * Add it to our list of neighbors. */ IF_DEBUG(DEBUG_PEER) - log(LOG_DEBUG, 0, "New neighbor %s on vif %d v%d.%d nf 0x%02x idx %d", + mrlog(LOG_DEBUG, 0, "New neighbor %s on vif %d v%d.%d nf 0x%02x idx %d", inet_fmt(addr, s1), vifi, level & 0xff, (level >> 8) & 0xff, (level >> 16) & 0xff, i); n = (struct listaddr *)malloc(sizeof(struct listaddr)); if (n == NULL) - log(LOG_ERR, 0, "ran out of memory"); /* fatal */ + mrlog(LOG_ERR, 0, "ran out of memory"); /* fatal */ n->al_addr = addr; n->al_pv = pv; @@ -1342,7 +1342,7 @@ if (dvmrpspec) { if (!in_router_list) { IF_DEBUG(DEBUG_PEER) - log(LOG_DEBUG, 0, "waiting for probe from %s with my addr", + mrlog(LOG_DEBUG, 0, "waiting for probe from %s with my addr", inet_fmt(addr, s1)); n->al_flags |= NBRF_WAITING; return NULL; @@ -1351,7 +1351,7 @@ if (n->al_flags & NBRF_DONTPEER) { IF_DEBUG(DEBUG_PEER) - log(LOG_DEBUG, 0, "not peering with %s on vif %d because %x", + mrlog(LOG_DEBUG, 0, "not peering with %s on vif %d because %x", inet_fmt(addr, s1), vifi, n->al_flags & NBRF_DONTPEER); return NULL; } @@ -1380,7 +1380,7 @@ if (n->al_flags & NBRF_WAITING && msgtype == DVMRP_PROBE) { n->al_flags &= ~NBRF_WAITING; if (!in_router_list) { - log(LOG_WARNING, 0, "possible one-way peering with %s on vif %d", + mrlog(LOG_WARNING, 0, "possible one-way peering with %s on vif %d", inet_fmt(addr, s1), vifi); n->al_flags |= NBRF_ONEWAY; return NULL; @@ -1394,7 +1394,7 @@ NBRM_SET(n->al_index, v->uv_nbrmap); add_neighbor_to_routes(vifi, n->al_index); IF_DEBUG(DEBUG_PEER) - log(LOG_DEBUG, 0, "%s on vif %d exits WAITING", + mrlog(LOG_DEBUG, 0, "%s on vif %d exits WAITING", inet_fmt(addr, s1), vifi); } } @@ -1405,13 +1405,13 @@ vifs_with_neighbors++; NBRM_SET(n->al_index, v->uv_nbrmap); add_neighbor_to_routes(vifi, n->al_index); - log(LOG_NOTICE, 0, "peering with %s on vif %d is no longer one-way", + mrlog(LOG_NOTICE, 0, "peering with %s on vif %d is no longer one-way", inet_fmt(addr, s1), vifi); n->al_flags &= ~NBRF_ONEWAY; } else { /* XXX rate-limited warning message? */ IF_DEBUG(DEBUG_PEER) - log(LOG_DEBUG, 0, "%s on vif %d is still ONEWAY", + mrlog(LOG_DEBUG, 0, "%s on vif %d is still ONEWAY", inet_fmt(addr, s1), vifi); } } @@ -1438,7 +1438,7 @@ do_reset = TRUE; IF_DEBUG(DEBUG_PEER) - log(LOG_DEBUG, 0, + mrlog(LOG_DEBUG, 0, "version/genid change neighbor %s [old:%d.%d/%8x, new:%d.%d/%8x]", inet_fmt(addr, s1), n->al_pv, n->al_mv, n->al_genid, pv, mv, genid); @@ -1459,7 +1459,7 @@ } delete_neighbor_from_routes(addr, vifi, n->al_index); reset_neighbor_state(vifi, addr); - log(LOG_WARNING, 0, "peering with %s on vif %d is one-way", + mrlog(LOG_WARNING, 0, "peering with %s on vif %d is one-way", inet_fmt(addr, s1), vifi); n->al_flags |= NBRF_ONEWAY; } @@ -1467,7 +1467,7 @@ if (n->al_flags & NBRF_DONTPEER) { IF_DEBUG(DEBUG_PEER) - log(LOG_DEBUG, 0, "not peering with %s on vif %d because %x", + mrlog(LOG_DEBUG, 0, "not peering with %s on vif %d because %x", inet_fmt(addr, s1), vifi, n->al_flags & NBRF_DONTPEER); return NULL; } @@ -1524,7 +1524,7 @@ continue; IF_DEBUG(DEBUG_PEER) - log(LOG_DEBUG, 0, "Neighbor %s (%d.%d) expired after %d seconds", + mrlog(LOG_DEBUG, 0, "Neighbor %s (%d.%d) expired after %d seconds", inet_fmt(a->al_addr, s1), a->al_pv, a->al_mv, exp_time); /* @@ -1557,7 +1557,7 @@ * querier. */ IF_DEBUG(DEBUG_IGMP) - log(LOG_DEBUG, 0, "querier %s timed out", + mrlog(LOG_DEBUG, 0, "querier %s timed out", inet_fmt(v->uv_querier->al_addr, s1)); free(v->uv_querier); v->uv_querier = NULL; @@ -1751,7 +1751,7 @@ v_req.vifi = vifi; if (did_final_init) if (ioctl(udp_socket, SIOCGETVIFCNT, (char *)&v_req) < 0) { - log(LOG_WARNING, errno, + mrlog(LOG_WARNING, errno, "SIOCGETVIFCNT fails on vif %d", vifi); } else { fprintf(fp, " pkts/bytes in : %lu/%lu\n",