diff -c freeipdb-0_1_2/CHANGES.TXT freeipdb-0_1_3/CHANGES.TXT *** freeipdb-0_1_2/CHANGES.TXT Mon Nov 19 13:57:43 2001 --- freeipdb-0_1_3/CHANGES.TXT Mon Dec 17 05:16:48 2001 *************** *** 4,10 **** # | _|| | | __/ __/| || __/ (_| | |_) | # |_| |_| \___|\___|___|_| \__,_|_.__/ # ! # FreeIPdb-0.1.2 11-19-2001 ###################################################################### --- 4,10 ---- # | _|| | | __/ __/| || __/ (_| | |_) | # |_| |_| \___|\___|___|_| \__,_|_.__/ # ! # FreeIPdb-0.1.3 12-16-2001 ###################################################################### *************** *** 19,21 **** --- 19,34 ---- -Started INSTALL.TXT,README.TXT and CHANGES.TXT -rev_gen_tool.pl now created reverse files (not just STDOUT) Ben April + 0_1_3 + -Made customer name and number options. + -Made name of "Customer Name" field an option. + -Made name of "Customer Number" field an option. + -Converted to DBI. + -rev_gen_tool.pl now creates real config values for config.file. + -Patch from James Raftery (HTML and moved some functions.) + -Patch from Dave Burke (HTML fixes. Moved some HTML values to config.) + -ipdb_ck.pl's main pass is now recursive. + -if no block are found the Search function becomes recursive. + -The Search function can now look for addresses that are not on bit-boundaries. + -The Admin page is more verbose. + -Fixed some bugs in search.cgi diff -c freeipdb-0_1_2/Data_Types.txt freeipdb-0_1_3/Data_Types.txt *** freeipdb-0_1_2/Data_Types.txt Mon Nov 19 13:57:51 2001 --- freeipdb-0_1_3/Data_Types.txt Mon Dec 17 05:17:14 2001 *************** *** 4,10 **** # | _|| | | __/ __/| || __/ (_| | |_) | # |_| |_| \___|\___|___|_| \__,_|_.__/ # ! # FreeIPdb-0.1.2 11-19-2001 ######################################################################; --- 4,10 ---- # | _|| | | __/ __/| || __/ (_| | |_) | # |_| |_| \___|\___|___|_| \__,_|_.__/ # ! # FreeIPdb-0.1.3 12-16-2001 ######################################################################; diff -c freeipdb-0_1_2/INSTALL.TXT freeipdb-0_1_3/INSTALL.TXT *** freeipdb-0_1_2/INSTALL.TXT Mon Nov 19 13:57:58 2001 --- freeipdb-0_1_3/INSTALL.TXT Mon Dec 17 05:17:20 2001 *************** *** 4,10 **** # | _|| | | __/ __/| || __/ (_| | |_) | # |_| |_| \___|\___|___|_| \__,_|_.__/ # ! # FreeIPdb-0.1.2 11-19-2001 ###################################################################### FreeIPdb Install --- 4,10 ---- # | _|| | | __/ __/| || __/ (_| | |_) | # |_| |_| \___|\___|___|_| \__,_|_.__/ # ! # FreeIPdb-0.1.3 12-16-2001 ###################################################################### FreeIPdb Install *************** *** 22,28 **** tar -xvf freeipdb-0_1_2.tar cd freeipdb-0_1_2 ! You may want to consider at this point a sym-link from freeipdb-0_1_2 to freeipdb so in the future you can just re-point the sym-link once testing on the new version is finished. --- 22,28 ---- tar -xvf freeipdb-0_1_2.tar cd freeipdb-0_1_2 ! You may want to consider at this point a sym-link from freeipdb- to freeipdb so in the future you can just re-point the sym-link once testing on the new version is finished. *************** *** 45,51 **** -Try it! ! point a browser @ http:////freeipdb_0_1_2/admin.cgi //freeipdb/admin.cgi ###################################################################### 1 What is FreeIPdb? --- 4,10 ---- # | _|| | | __/ __/| || __/ (_| | |_) | # |_| |_| \___|\___|___|_| \__,_|_.__/ # ! # FreeIPdb-0.1.3 12-16-2001 ###################################################################### 1 What is FreeIPdb? diff -c freeipdb-0_1_2/TODO.TXT freeipdb-0_1_3/TODO.TXT *** freeipdb-0_1_2/TODO.TXT Mon Nov 19 13:58:33 2001 --- freeipdb-0_1_3/TODO.TXT Mon Dec 17 05:17:36 2001 *************** *** 4,37 **** # | _|| | | __/ __/| || __/ (_| | |_) | # |_| |_| \___|\___|___|_| \__,_|_.__/ # ! # FreeIPdb-0.1.2 11-19-2001 ###################################################################### - 0.1-5- Write an API to get blocks for scripts. (serial IP's) 0.1-6- Reporting. - 0.1-7- Be sure we can have 2 regions with the same block. (e.g. 10.) - 0.1-8- Say something when a block is added to a region - prefreably go back to the admin Page. 0.1-11- Rwhoisd... 0.1-14- Add Forward DNS Functionality. 0.1-15- Add Sorts to the The Search Function ! 0.1-16- Add Toggle to the Search Function ! 0.1-23- DBI interface. 0.1-29- Make GetBlockIdNM V6 compliant. 0.1.2-31- rev_gen_tool.pl needs to create something more than a list of zones in the config.file file. ! ! [11-19-01 0.1-27- Reverse DNS ought to work with regions. [10-30-01] ! 0.1-21- Add a function to allow createion of a reverse DNS zone. 0.1.26- some interface to add reverse DNS for any IP. 0.1.30- Fix Search by Region. [10-24-01] 0.1.28- Can't have dupe reverse entries (can have dupe forwards. [10-23-01] 0.1.22- Objectify. [Scrapped for now.] ! 0.1.25- Option to "create reverse zone" when allocationg a block. [Not Needed] 0.1-1- Be sure holdtime is cleared anytime a block is allocated. [9-28-01] 0.1-20- Move the admin functions to a new page. --- 4,73 ---- # | _|| | | __/ __/| || __/ (_| | |_) | # |_| |_| \___|\___|___|_| \__,_|_.__/ # ! # FreeIPdb-0.1.3 12-16-2001 ###################################################################### 0.1-5- Write an API to get blocks for scripts. (serial IP's) 0.1-6- Reporting. 0.1-11- Rwhoisd... 0.1-14- Add Forward DNS Functionality. 0.1-15- Add Sorts to the The Search Function ! 0.1-32- Oracle port. ! 0.1-33- Mysql port. ! 0.1.2-37- Get report.pl ported over. ! 0.1.2-38- Check for correct BigNum-Int version. ! 0.1.2-41- Make admin functions report something useful. ! 0.1.2-44- in SearchResult if the result is free give option to assign it. ! 0.1.2-53- add a dns-admin page to admin.cgi turn-zones on and off. ! 0.1.2-54- DNS needs to understnd regions. ! 0.1.2-56- CheckBlockFree Unint Value error. ! 0.1.2-58- under admin.cgi putting a block in a region is not recurssive. ! ! ---======== 0.1.3 ========--- ! [12-16-01] ! 0.1-7- Be sure we can have 2 regions with the same block. (e.g. 10.) ! 0.1.2-51- Error trying to reclaim a block. (seems to work but errors.) ! [I can't reproduce my own issue...] ! 0.1.2-57- SetBlockP was not used as V6 ! 0.1.2-55- When editing a block from a search do not allow an edit that would ! put overlapping IP space in the new region. ! 0.1.2-50- Fix adding a block with no priority. ! [12-14-01] ! 0.1.2-49- Fixed bug in Search function(s) (not showing [edit] & [relcaim] button). ! 0.1.2-45- Monte Newcom's "---" fix in index and admin. ! 0.1.2-48- Monte Newcom's ip2deci() fix (Now uses IPDBError and not die) ! 0.1.2-47- $conn->disconnect; Now called before EVERY exit. ! 0.1.2-46- Renamed all $FORM{'FORM'} to $FORM{'ACTION'} ! [12-16-01] ! 0.1-34- Make ipdb_ck.pl recursive. ! 0.1.2-42- Search needs to be Fully recursive. ! 0.1.2-43- Search needs to find a block from an address that's in it. ! [12-08-01] 0.1-29- Make GetBlockIdNM V6 compliant. + [12-06-01] + 0.1-8- Say something when a block is added to a region + preferably go back to the admin Page. + 0.1-16- Add Toggle to the Search Function + 0.1.2-39- Fix search.cgi + 0.1.2-40- Fix drill-down in search.cgi + [12-05-01] + 0.1.2-35- Admin.cgi will install a block on a bad-bitmask after is says no. + 0.1.2-36- Add an error message when trying to add a block that's not on a boundary. + ---======== 0.1.2 ========--- + [11-24-01] 0.1.2-31- rev_gen_tool.pl needs to create something more than a list of zones in the config.file file. ! 0.1-23- DBI interface. ! [11-19-01] 0.1-27- Reverse DNS ought to work with regions. [10-30-01] ! 0.1-21- Add a function to allow creation of a reverse DNS zone. 0.1.26- some interface to add reverse DNS for any IP. 0.1.30- Fix Search by Region. [10-24-01] 0.1.28- Can't have dupe reverse entries (can have dupe forwards. [10-23-01] 0.1.22- Objectify. [Scrapped for now.] ! 0.1.25- Option to "create reverse zone" when allocating a block. [Not Needed] 0.1-1- Be sure holdtime is cleared anytime a block is allocated. [9-28-01] 0.1-20- Move the admin functions to a new page. *************** *** 40,47 **** 0.1-13- Serial IP Functionality. [9-24-01] 0.1-3- Give users a way to set reclaims. ! 0.1-2- Give users a way to define proirity 0.1-4- Give users a way to move an existing blocks into a new region. [9-14-01] 0.1-9- lookup.pl now works in reverse. Feed it int and get IP.(v4) 0.1-14- Create a config file. check in config.sample --- 76,104 ---- 0.1-13- Serial IP Functionality. [9-24-01] 0.1-3- Give users a way to set reclaims. ! 0.1-2- Give users a way to define priority 0.1-4- Give users a way to move an existing blocks into a new region. [9-14-01] 0.1-9- lookup.pl now works in reverse. Feed it int and get IP.(v4) 0.1-14- Create a config file. check in config.sample + + + =============== A note about the format of this file =============== + Each bug/feature-request is in the following format: + + [Version reported]-[Unique number]- [brief description of issue] + + The top portion is open issues. + in the lower part you will see version markers: + + ---======== 0.1.2 ========--- + + Everything under this marker and above the next one was fixed/added + to the 0.1.2 revision. + + You will also see date markers: + + [9-14-01] + + Everything under this marker and above the next one was added/changed (and committed) + on this date. diff -c freeipdb-0_1_2/admin.cgi freeipdb-0_1_3/admin.cgi *** freeipdb-0_1_2/admin.cgi Mon Nov 19 13:58:41 2001 --- freeipdb-0_1_3/admin.cgi Mon Dec 17 05:17:39 2001 *************** *** 5,11 **** # | _|| | | __/ __/| || __/ (_| | |_) | # |_| |_| \___|\___|___|_| \__,_|_.__/ # ! # FreeIPdb-0.1.2 11-19-2001 ###################################################################### require 'ipdb_httpcgi.pl'; --- 5,11 ---- # | _|| | | __/ __/| || __/ (_| | |_) | # |_| |_| \___|\___|___|_| \__,_|_.__/ # ! # FreeIPdb-0.1.3 12-16-2001 ###################################################################### require 'ipdb_httpcgi.pl'; *************** *** 17,35 **** print < ! EOF ! use Pg; my $script = get_cgi($0); ! my $conn = Pg::connectdb("host=$config{dbhost} user=$config{dbuser} dbname=$config{dbname} password=$config{dbpass}"); my $buffer; my @pairs; my $pair; --- 17,35 ---- print <

! ! $config{ver} !

! EOF ! use DBI; my $script = get_cgi($0); ! my $conn = DBI->connect("DBI:Pg:dbname=$config{dbname};host=$config{dbhost};port=$config{dbport}", "$config{dbuser}", "$config{dbpass}",); my $buffer; my @pairs; my $pair; *************** *** 57,74 **** print "Reclaim Block $FORM{'RECLAIM'}\n
"; } if($FORM{'FORM'} =~ /EDIT/){ ! &EditForm($conn,$conn,$FORM{'EDIT'}); printTail(); exit(); } if($FORM{'FORM'} =~ /UPDATE/){ - if($FORM{'CUSTDESC'} == ""){ - print "\n"; - $exit = 1; - } if($exit){ printTail(); exit(); } &UpdateBlock($conn,$FORM{'UPDATE'},$FORM{'REGION'},$FORM{'CUSTOMER'},$FORM{'CUSTDESC'}); --- 57,72 ---- print "Reclaim Block $FORM{'RECLAIM'}\n
"; } if($FORM{'FORM'} =~ /EDIT/){ ! &EditForm($conn,$FORM{'EDIT'},$script); printTail(); + $conn->disconnect; exit(); } if($FORM{'FORM'} =~ /UPDATE/){ if($exit){ printTail(); + $conn->disconnect; exit(); } &UpdateBlock($conn,$FORM{'UPDATE'},$FORM{'REGION'},$FORM{'CUSTOMER'},$FORM{'CUSTDESC'}); *************** *** 79,85 **** print < ! EOF --- 77,83 ---- print < ! EOF *************** *** 92,119 **** print "\n"; $exit = 1; } ! if(!$FORM{'CUSTDESC'}){ ! print "\n"; ! $exit = 1; ! } ! if($FORM{'SWIP'} =~ /---/){ ! print "\n"; ! $exit = 1; ! } ! if($FORM{'CUSTOMER'} < 0){ ! print "\n"; ! $exit = 1; ! } ! if($exit){ print "

! ! $config{ver} !

Please go back and set a Customer Name

Confirm New IP Block Assignment
Confirm New IP Block Assignment

Please go back and choose a Block Size

Please go back and set a Customer Name

Please go back and choose a Swip setting

Please go back and set a Customer Number

";&printTail();exit();} # Bail Missing some info. ! print ""; ! my $id = SetBlockP($conn,$FORM{'BLOCK'},$FORM{'REGION'},$FORM{'BITS'},$FORM{'CUSTDESC'},1,$FORM{'CUSTOMER'},4); &SetRegion($conn,$id,$FORM{'REGION'}); if($id){ print "

Success Your block id $id<\H1>\n"; } else { print "

For some reason this request failed<\H1>\n"; } ! print ""; } if($FORM{'FORM'} =~ /SUBMIT5/){ --- 90,111 ---- print "

Please go back and choose a Block Size\n"; $exit = 1; } ! if($exit){ ! print ""; ! &printTail(); ! $conn->disconnect; ! exit(); ! } # Bail Missing some info. ! print ""; ! $ver = &VersionFromRegion($conn,$FORM{'REGION'}); ! my $id = SetBlockP($conn,$FORM{'BLOCK'},$FORM{'REGION'},$FORM{'BITS'},$FORM{'CUSTDESC'},1,$FORM{'CUSTOMER'},$ver); &SetRegion($conn,$id,$FORM{'REGION'}); if($id){ print "

Success Your block id $id<\H1>\n"; } else { print "

For some reason this request failed<\H1>\n"; } ! print ""; } if($FORM{'FORM'} =~ /SUBMIT5/){ *************** *** 131,149 **** print "

Please go back and set Bits\n"; $exit = 1; } ! if($exit){ print "";&printTail();exit();} # Bail Missing some info. #my $blk_bits = ip2deci($FORM{'BLOCK'}); &AddBlock($conn,$FORM{'BLOCK'},$FORM{'BITS'},$FORM{'REGION'},$FORM{'PRIORITY'}); } - if($FORM{'FORM'} =~ /SUBMIT6/){ - print "Reclaim?"; - if($FORM{'ACCETP'}){ - print "Done!\n"; - } - if($FORM{'DENY'}){ - &ReclaimBlock($conn,$FORM{'BLOCK'}); - } - } if($FORM{'FORM'} =~ /SUBMIT7/){ if($FORM{'RANAME'}){ --- 123,137 ---- print "

Please go back and set Bits\n"; $exit = 1; } ! if($exit){ ! print ""; ! &printTail(); ! $conn->disconnect; ! exit(); ! } # Bail Missing some info. #my $blk_bits = ip2deci($FORM{'BLOCK'}); &AddBlock($conn,$FORM{'BLOCK'},$FORM{'BITS'},$FORM{'REGION'},$FORM{'PRIORITY'}); } if($FORM{'FORM'} =~ /SUBMIT7/){ if($FORM{'RANAME'}){ *************** *** 166,182 **** } if($FORM{'FORM'} =~ /SUBMIT9/){ ! $bblock = &ip2deci($FORM{'BLOCK'}); ! $newblock = &CheckBlockFree($conn,$bblock,$FORM{'BITS'},$FORM{'REGION'}); ! if($newblock == -1){ ! print "The block's parent must exist.\n"; ! exit(); ! } ! if($newblock == 0){ ! print "Parent\n"; ! $newblock = &MakeParent($conn,$bblock,$FORM{'BITS'},$FROM{'REGION'},$bblock,4); ! } ! &SetRegion($conn,$newblock,$FORM{'REGION'}); } if($FORM{'FORM'} =~ /SUBMITA/){ --- 154,189 ---- } if($FORM{'FORM'} =~ /SUBMIT9/){ ! $bblock = &ip2deci($FORM{'BLOCK'}); ! $id = &GetBlockId($conn,$bblock,$FORM{'BITS'},$FORM{'REGION_START'}); ! unless($id){ ! print "The block does not exist in the starting region"; ! $conn->disconnect; ! exit(); ! } ! $ver = &Version($conn,$id); ! my $added = &SetBlockP($conn,$FORM{'BLOCK'},$FORM{'REGION_END'},$FORM{'BITS'},1,1,1,$ver); ! if($added){ ! print "A parent of that block exists.
\n"; ! &reclaim($conn,$added); ! } else { ! $newblock = &CheckBlockFree($conn,$bblock,$FORM{'BITS'},$FORM{'REGION_START'}); ! if($newblock == -1){ ! print "The block's parent must exist.\n"; ! $conn->disconnect; ! exit(); ! } ! if($newblock == 0){ ! $ver = &VersionFromRegion($conn,$FORM{'REGION_START'}); ! $newblock = &MakeParent($conn,$bblock,$FORM{'BITS'},$FORM{'REGION_START'},$bblock,$ver); ! unless($newblock){print "Could not find parent block"; } ! } ! if(&SetRegion($conn,$newblock,$FORM{'REGION_END'})){ ! print "Success $newblock!\n"; ! } else { ! print "There was an error\n"; ! } ! } } if($FORM{'FORM'} =~ /SUBMITA/){ *************** *** 200,219 ****
Block: Region:
"; print <
! Customer Name:
! Customer Number:

WARNING: This function will override the 10 day holding period

! Block(10.0.0.1 or 2001:0450:0000:0000:0000:0000:0000:0000)
Bits(0-32 or 0-128)
Region Block: Region:
"; print <
! EOF ! if($config{custname}){ ! print "$config{custname_f}:
"; ! } ! if($config{custnum}){ ! print "$config{custnum_f}:
"; ! } ! print <

WARNING: This function will override the 10 day holding period

! Block(10.0.0.0 or 2001:0450:0000:0000:0000:0000:0000:0000)
Bits(0-32 or 0-128)
Region ! RA: ! RA:
Bits:
! Region:
Bits:
! Starting Region: !