README0100644000113700116340000000237507470745362011410 0ustar katiedatabaseThis is README file for IRRToolSet-4.7.2-RtConfig.patch.tgz You will find in this file: RtConfig.cc.patch RtConfig.hh.patch f_cisco.cc.patch f_junos.cc.patch f_bcc.cc.patch f_rsd.cc.patch f_gated.cc.patch there are two bugfixes intended in these patches. 1. If import/export policy cannot be located, you can see more detailed warning describing the peer for which policy is missing 2. Non-existent inet-rtr object was giving SEGV for 'configureRouter' command. Now additional check is made. prpath.cc.patch this is to fix the handling of in prpath. When is an IP address, prpath queries for route object for /32. If the object is non-existent (and therefore we can't determine originating destination AS), the error is issued. Previously it exited silently. mpatch* shell script for applying the pathes To apply the patches, you may want to use shell script: 1. cp IRRToolSet-4.7.2-RtConfig.patch.tgz 2. tar -zxf IRRToolSet-4.7.2-RtConfig.patch.tgz 3. ./mpatch 4. rm *.patch 5. rm mpatch 6. recompile IRRToolSet (make clean; make; make install) Please contact irrtoolset@ripe.net or katie@ripe.net if you experience any problems with it. RtConfig.cc.patch0100644000113700116340000000300207470742636013635 0ustar katiedatabase1c1 < // $Id: RtConfig.cc,v 4.9 2002/04/09 11:48:45 katie Exp $ --- > // $Id: RtConfig.cc,v 4.10 2002/05/16 13:42:29 katie Exp $ 283c283,286 < const AttrProtocol *bgp = schema.searchProtocol("BGP4"); --- > if (!rtr) { > cerr << "Error: no object for router: " << name << endl; > return; > } 285,286c288 < AttrIterator itr1(rtr, "ifaddr"); < IPAddr myIP(itr1()->ifaddr.get_ipaddr()); --- > const AttrProtocol *bgp = schema.searchProtocol("BGP4"); 289a292,294 > > // fixed for multiple "ifaddr" attribute > AttrIterator itr1(rtr, "ifaddr"); 294,298c299,307 < if (peer->protocol == bgp) { < ASt peerAS = ((ItemASNO *) peer->searchOption("asno")->args->head())->asno; < importP(myAS, &myIP, peerAS, peer->peer); < exportP(myAS, &myIP, peerAS, peer->peer); < } --- > for (const AttrIfAddr *ifaddr = itr1.first(); ifaddr; ifaddr = itr1.next()) > { > IPAddr myIP(ifaddr->ifaddr.get_ipaddr()); > if (peer->protocol == bgp) { > ASt peerAS = ((ItemASNO *) peer->searchOption("asno")->args->head())->asno; > importP(myAS, &myIP, peerAS, peer->peer); > exportP(myAS, &myIP, peerAS, peer->peer); > } > } 620a630,636 > void RtConfig::printPolicyWarning(ASt as, IPAddr* addr, ASt peerAS, IPAddr* peerAddr, const char* policy) > { > cerr << "Warning: AS" << as; > cerr << " has no " << policy << " policy for AS" << peerAS; > cerr << " " << peerAddr->get_text(); > cerr << " at " << addr->get_text() << endl; > } RtConfig.hh.patch0100644000113700116340000000036107470742620013645 0ustar katiedatabase1c1 < // $Id: RtConfig.hh,v 4.9 2002/04/09 11:48:46 katie Exp $ --- > // $Id: RtConfig.hh,v 4.10 2002/05/16 13:42:08 katie Exp $ 102a103 > void printPolicyWarning(ASt as, IPAddr* addr, ASt peerAS, IPAddr* peerAddr, const char* policy); f_bcc.cc.patch0100644000113700116340000000171007470742676013166 0ustar katiedatabase1c1 < // $Id: f_bcc.cc,v 4.9 2002/04/09 11:48:46 katie Exp $ --- > // $Id: f_bcc.cc,v 4.10 2002/05/16 13:42:49 katie Exp $ 469,470c469 < cerr << "Warning: AS" << asno < << " has no export policy for AS" << peerAS << endl; --- > printPolicyWarning(asno, addr, peerAS, peer_addr, "export"); 480,481c479,480 < cout << " peer local " << addr->get_text() << " remote " < << peer_addr->get_text() --- > cout << " peer local " << addr->get_text() << " remote "; > cout << peer_addr->get_text() 489a489 > 520c520 < --- > 535,536c535 < cerr << "Warning: AS" << asno < << " has no import policy for AS" << peerAS << endl; --- > printPolicyWarning(asno, addr, peerAS, peer_addr, "import"); 545,546c544,545 < cout << " peer local " << addr->get_text() << " remote " < << peer_addr->get_text() --- > cout << " peer local " << addr->get_text() << " remote "; > cout << peer_addr->get_text() f_cisco.cc.patch0100644000113700116340000000121007470742661013524 0ustar katiedatabase1c1 < // $Id: f_cisco.cc,v 4.9 2002/04/09 11:48:46 katie Exp $ --- > // $Id: f_cisco.cc,v 4.10 2002/05/16 13:43:00 katie Exp $ 986,989c986,990 < if (! fa) < cerr << "Warning: AS" << asno < << " has no export policy for AS" << peerAS << endl; < --- > if (! fa) { > printPolicyWarning(asno, addr, peerAS, peer_addr, "export"); > return; > } > 1032a1034 > 1037,1040c1039,1043 < if (! fa) < cerr << "Warning: AS" << asno < << " has no import policy for AS" << peerAS << endl; < --- > if (! fa) { > printPolicyWarning(asno, addr, peerAS, peer_addr, "import"); > return; > } > f_gated.cc.patch0100644000113700116340000000075707470742764013533 0ustar katiedatabase1c1 < // $Id: f_gated.cc,v 4.9 2002/04/09 11:48:46 katie Exp $ --- > // $Id: f_gated.cc,v 4.10 2002/05/16 13:43:13 katie Exp $ 308,309c308 < cerr << "Warning: AS" << asno < << " has no import policy for AS" << peerAS << endl; --- > printPolicyWarning(asno, addr, peerAS, peer_addr, "import"); 386,387c385 < cerr << "Warning: AS" << asno < << " has no import policy for AS" << peerAS << endl; --- > printPolicyWarning(asno, addr, peerAS, peer_addr, "export"); f_junos.cc.patch0100644000113700116340000000113207470742741013564 0ustar katiedatabase1c1 < // $Id: f_junos.cc,v 4.9 2002/04/09 11:48:46 katie Exp $ --- > // $Id: f_junos.cc,v 4.10 2002/05/16 13:43:24 katie Exp $ 851,853c851,854 < if (! fa) < cerr << "Warning: AS" << asno < << " has no export policy for AS" << peerAS << endl; --- > if (! fa) { > printPolicyWarning(asno, addr, peerAS, peer_addr, "export"); > return; > } 904,906c905,908 < if (! fa) < cerr << "Warning: AS" << asno < << " has no import policy for AS" << peerAS << endl; --- > if (! fa) { > printPolicyWarning(asno, addr, peerAS, peer_addr, "import"); > return; > } f_rsd.cc.patch0100644000113700116340000000075307470742716013230 0ustar katiedatabase1c1 < // $Id: f_rsd.cc,v 4.9 2002/04/09 11:48:46 katie Exp $ --- > // $Id: f_rsd.cc,v 4.10 2002/05/16 13:43:37 katie Exp $ 218,219c218 < cerr << "Warning: AS" << asno < << " has no import policy for AS" << peerAS << endl; --- > printPolicyWarning(asno, addr, peerAS, peer_addr, "import"); 227,228c226 < cerr << "Warning: AS" << peerAS < << " has no import policy for AS" << asno << endl; --- > printPolicyWarning(peerAS, peer_addr, asno, addr, "export"); mpatch0100755000113700116340000000045507470743316011724 0ustar katiedatabase#!/bin/sh FILES="src/prpath/prpath.cc src/RtConfig/f_cisco.cc src/RtConfig/RtConfig.cc src/RtConfig/RtConfig.hh src/RtConfig/f_junos.cc src/RtConfig/f_rsd.cc src/RtConfig/f_bcc.cc src/RtConfig/f_gated.cc " for i in $FILES; do p=`echo $i".patch" | sed 's/^.*\///g'` patch $i $p done prpath.cc.patch0100644000113700116340000000044707470743144013425 0ustar katiedatabase1c1 < // $Id: prpath.cc,v 4.9 2002/04/09 11:48:47 katie Exp $ --- > // $Id: prpath.cc,v 4.10 2002/05/16 13:41:05 katie Exp $ 405a406,409 > > // by katie@ripe.net - if route is non-existent > if (bgproute->origin->list.head() == NULL) > cout << "Unable to lookup destination AS" << endl;