[Xorp-hackers] Some patches for various things.

Atanu Ghosh atanu at ICSI.Berkeley.EDU
Thu Oct 4 12:06:12 PDT 2007


>>>>> "Ben" == Ben Greear <greearb at candelatech.com> writes:

    Ben> Here are some more small patches.  At some time during the last
    Ben> few weeks I added these to try to work around problems related to
    Ben> dynamically adding/deleting interfaces & ospf configuration.  It's
    Ben> possible subsequent fixes from Xorp developers have made these un-needed.
    Ben> This fixed an error in ospf.  I don't know if this is still needed,
    Ben> or even if it was ever the right thing to do.   Perhaps the OSPF
    Ben> folks could take a look and this...

    Ben> RCS file: /cvs/xorp/ospf/peer_manager.cc,v
    Ben> retrieving revision 1.146
    Ben> diff -u -r1.146 peer_manager.cc
    Ben> --- ospf/peer_manager.cc	3 Oct 2007 21:23:53 -0000	1.146
    Ben> +++ ospf/peer_manager.cc	3 Oct 2007 23:08:16 -0000
    Ben> @@ -369,9 +369,12 @@
    Ben>       debug_msg("Interface %s Vif %s\n", interface.c_str(), vif.c_str());
    Ben>       string concat = interface + "/" + vif;

    Ben> -    if (0 != _pmap.count(concat))
    Ben> -	xorp_throw(BadPeer,
    Ben> -		   c_format("Mapping for %s already exists", concat.c_str()));
    Ben> +    if (0 != _pmap.count(concat)) {
    Ben> +	// Don't think we really need to error here, just return what we already have. --Ben
    Ben> +	//xorp_throw(BadPeer,
    Ben> +	//		   c_format("Mapping for %s already exists", concat.c_str()));
    Ben> +	return _pmap[concat];
    Ben> +    }
  			
    Ben>       OspfTypes::PeerID peerid = _next_peerid++;
    Ben>       _pmap[concat] = peerid;

If you see this BadPeer message then there is a problem somewhere
else. If you can provide me with a simple way of reproducing the problem
I will take a look.

	Atanu.
p.s.
Sorry about the previous empty email.



More information about the Xorp-hackers mailing list