On Tuesday 04 December 2007, Alexandre Biancalana wrote: > On Oct 27, 2007 7:11 PM, Max Laier <[EMAIL PROTECTED]> wrote: > > ... the neverending story continues :-\ > > > > I am making progress ... really, really slowly as I'm not at the top > > of my health (inflammation in my front teeth) and 7.0 got in the way, > > too. > > > > Anyways, here is something for *BETA* testing. Nobody put this in > > production (or you deserve whatever goes wrong). But if you have > > spare time and lab machines, please test and report back! Details > > welcome ;) > > Have someone tested this patch ? I'm about to put this in a > production, not intessive or high traffic, but production environment. > > Any hints ?
The attached removes a debugging printf I left in by accident. There is an additional printf in if_ether.c in line 684 that should be shut up in the carp case, but I have the logic screwed up that should set carp_match. You can shut it up for everything by setting sysctl net.link.ether.inet.log_arp_wrong_iface=0, but that's only bandaid. Other than that I'm not aware of any problems, panic or the like. Please let me know how things go for you! Oh ... IPv6 is not working with this patchset! The attachment is relative to the patched source! -- /"\ Best regards, | [EMAIL PROTECTED] \ / Max Laier | ICQ #67774661 X http://pf4freebsd.love2party.net/ | [EMAIL PROTECTED] / \ ASCII Ribbon Campaign | Against HTML Mail and News
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index 7bb9404..aea3518 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1213,17 +1213,9 @@ carp_iamatch(void *v, struct in_ifaddr *ia,
struct carp_softc *vh;
int index, count = 0;
struct ifaddr *ifa;
- char iastr[INET_ADDRSTRLEN];
- char isstr[INET_ADDRSTRLEN];
-
CARP_LOCK(cif);
- inet_ntoa_r(ia->ia_addr.sin_addr, iastr);
- inet_ntoa_r(*isaddr, isstr);
- printf("carp_iamatch(%s, %s, %s, ...)\n", cif->vhif_ifp->if_xname,
- iastr, isstr);
-
if (carp_opts[CARPCTL_ARPBALANCE]) {
/*
* XXX proof of concept implementation.
@@ -1275,11 +1267,8 @@ carp_iamatch(void *v, struct in_ifaddr *ia,
ia->ia_ifp == SC2IFP(vh) &&
vh->sc_state == MASTER) {
*enaddr = IF_LLADDR(vh->sc_ifp);
- printf("found: %s\n", vh->sc_ifp->if_xname);
CARP_UNLOCK(cif);
return (1);
- } else {
- printf("not: %s\n", vh->sc_ifp->if_xname);
}
}
}
signature.asc
Description: This is a digitally signed message part.
