diff -c freeipdb-0_1/Data_Types.txt freeipdb-0_1_1/Data_Types.txt
*** freeipdb-0_1/Data_Types.txt	Tue Nov 13 15:39:40 2001
--- freeipdb-0_1_1/Data_Types.txt	Tue Nov 13 21:17:55 2001
***************
*** 4,10 ****
  #               |  _|| | |  __/  __/| ||  __/ (_| | |_) |
  #               |_|  |_|  \___|\___|___|_|   \__,_|_.__/
  #
! #       FreeIPdb-0.1 11-13-2001 <ben@freeipdb.org>
  ######################################################################
  
  
--- 4,10 ----
  #               |  _|| | |  __/  __/| ||  __/ (_| | |_) |
  #               |_|  |_|  \___|\___|___|_|   \__,_|_.__/
  #
! #       FreeIPdb-0.1.1 11-13-2001 <ben@freeipdb.org>
  ######################################################################
  
  
***************
*** 12,18 ****
  	ID 	SERIAL,
  	NAME	VARCHAR(20) UNIQUE NOT NULL,
  	DESCR	VARCHAR(30) NOT NULL,
! 	RA	INT NOTNULL,
  	V6	BOOL,
  	COUNTRY	VARCHAR(6)
  );
--- 12,18 ----
  	ID 	SERIAL,
  	NAME	VARCHAR(20) UNIQUE NOT NULL,
  	DESCR	VARCHAR(30) NOT NULL,
! 	RA	INT NOT NULL,
  	V6	BOOL,
  	COUNTRY	VARCHAR(6)
  );
***************
*** 36,42 ****
  	BLOCK		NUMERIC(40,0) NOT NULL,
  	BITS		INT NOT NULL,
  	REGION		INT NOT NULL,
! 	PARENT		INT NOT NOLL,
  	CHILDL		INT,
  	CHILDR		INT,
  	ALLOCATED	INT,
--- 36,42 ----
  	BLOCK		NUMERIC(40,0) NOT NULL,
  	BITS		INT NOT NULL,
  	REGION		INT NOT NULL,
! 	PARENT		INT NOT NULL,
  	CHILDL		INT,
  	CHILDR		INT,
  	ALLOCATED	INT,
***************
*** 67,77 ****
  	PARENT		INT NOT NULL,
  	OWN		BOOL,
  	REVERSE_BLOCK	INT,
! 	SERIAL		INT NOT NULL,
! 	RETRY		INT NOT NULL,
! 	REFRESH		INT NOT NULL,
! 	EXPIRE		INT NOT NULL,
! 	TTL		INT NOT NULL
  );
  GRANT ALL ON ZONE_TABLE TO freeipdb;
  
--- 67,77 ----
  	PARENT		INT NOT NULL,
  	OWN		BOOL,
  	REVERSE_BLOCK	INT,
! 	SERIAL		INT, 
! 	RETRY		INT, 
! 	REFRESH		INT,
! 	EXPIRE		INT,
! 	TTL		INT
  );
  GRANT ALL ON ZONE_TABLE TO freeipdb;
  
Only in freeipdb-0_1_1: INSTALL.TXT
Only in freeipdb-0_1_1: README.TXT
diff -c freeipdb-0_1/admin.cgi freeipdb-0_1_1/admin.cgi
*** freeipdb-0_1/admin.cgi	Tue Nov 13 15:39:34 2001
--- freeipdb-0_1_1/admin.cgi	Tue Nov 13 21:37:17 2001
***************
*** 5,18 ****
  #               |  _|| | |  __/  __/| ||  __/ (_| | |_) |
  #               |_|  |_|  \___|\___|___|_|   \__,_|_.__/
  #
! #       FreeIPdb-0.1 11-13-2001 <ben@freeipdb.org>
  ######################################################################
  
  require 'ipdb_httpcgi.pl';
  use config;
  %config = config::config();
  
! printHead("IP Allocation Database");
  
  print <<EOF;
  <center><table BORDER COLS=2>
--- 5,18 ----
  #               |  _|| | |  __/  __/| ||  __/ (_| | |_) |
  #               |_|  |_|  \___|\___|___|_|   \__,_|_.__/
  #
! #       FreeIPdb-0.1.1 11-13-2001 <ben@freeipdb.org>
  ######################################################################
  
  require 'ipdb_httpcgi.pl';
  use config;
  %config = config::config();
  
! printHead("FreeIPdb 0.1.1");
  
  print <<EOF;
  <center><table BORDER COLS=2>
***************
*** 21,27 ****
  <center>
  <h1>
  <b><font face="Arial,Helvetica"><font color="#000000">
! <font size=+2>FreeIPdb v1.0</font>
  </font></font></b></h1></center>
  </td>
  </tr>
--- 21,27 ----
  <center>
  <h1>
  <b><font face="Arial,Helvetica"><font color="#000000">
! <font size=+2>FreeIPdb v0.1.1</font>
  </font></font></b></h1></center>
  </td>
  </tr>
***************
*** 73,79 ****
  		printTail();
  		exit();
  	}
! 	&UpdateBlock($conn,$FORM{'UPDATE'},$FORM{'REGION'},$FORM{'CUSTOMER'},$FORM{'SITECODE'},$FORM{'CUSTDESC'});
  	print "Updated\n";
  }
  
--- 73,79 ----
  		printTail();
  		exit();
  	}
! 	&UpdateBlock($conn,$FORM{'UPDATE'},$FORM{'REGION'},$FORM{'CUSTOMER'},$FORM{'CUSTDESC'});
  	print "Updated\n";
  }
  
***************
*** 98,107 ****
  		print "<TR><TD><H1>Please go back and set a Customer Name</TD></TR>\n";
  		$exit = 1;
  	}
- 	if($FORM{'SITECODE'} =~ /---/){
- 		print "<TR><TD><H1>Please go back and choose a City</TD></TR>\n";
- 		$exit = 1;
- 	}
  	if($FORM{'SWIP'} =~ /---/){
  		print "<TR><TD><H1>Please go back and choose a Swip setting</TD></TR>\n";
  		$exit = 1;
--- 98,103 ----
***************
*** 112,121 ****
  	}
  	if($exit){ print "</TABLE>";&printTail();exit();} # Bail Missing some info.
  	print "<TR><TD>";
! 	my $id = SetBlockP($conn,$FORM{'BLOCK'},$FORM{'REGION'},$FORM{'BITS'},$FORM{'CUSTDESC'},1,$FORM{'CUSTOMER'},$FORM{'SITECODE'},4);
  	&SetRegion($conn,$id,$FORM{'REGION'});
  	if($id){
! 		print "<H1>Sucess Your block id $id<\H1>\n";
  	} else {
  		print "<H1>For some reason this request failed<\H1>\n";
  	}
--- 108,117 ----
  	}
  	if($exit){ print "</TABLE>";&printTail();exit();} # Bail Missing some info.
  	print "<TR><TD>";
! 	my $id = SetBlockP($conn,$FORM{'BLOCK'},$FORM{'REGION'},$FORM{'BITS'},$FORM{'CUSTDESC'},1,$FORM{'CUSTOMER'},4);
  	&SetRegion($conn,$id,$FORM{'REGION'});
  	if($id){
! 		print "<H1>Success Your block id $id<\H1>\n";
  	} else {
  		print "<H1>For some reason this request failed<\H1>\n";
  	}
***************
*** 173,193 ****
  
  if($FORM{'FORM'} =~ /SUBMIT9/){
          $bblock = &ip2deci($FORM{'BLOCK'});
!         $newblock = &CheckBlockFree($conn,$bblock,$FORM{'BITS'});
          if($newblock == -1){
  		print "The block's parent must exist.\n";
                  exit();
          }
          if($newblock == 0){
                  print "Parent\n";
!                 $newblock = &MakeParent($conn,$bblock,$FORM{'BITS'},$region,$bblock,4);
          }
  	&SetRegion($conn,$newblock,$FORM{'REGION'});
  }
  
  if($FORM{'FORM'} =~ /SUBMITA/){
          $bblock = &ip2deci($FORM{'BLOCK'});
!         $id = &CheckBlockFree($conn,$bblock,$FORM{'BITS'});
  	if($id == -1){
  		print "Block's parent must exist\n";
  		return(0);
--- 169,189 ----
  
  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/){
          $bblock = &ip2deci($FORM{'BLOCK'});
!         $id = &CheckBlockFree($conn,$bblock,$FORM{'BITS'},$FORM{'REGION'});
  	if($id == -1){
  		print "Block's parent must exist\n";
  		return(0);
***************
*** 209,221 ****
  <option value="" selected>--- Please Choose ---
  EOF
  ListRegions($conn);
! print " </SELECT><BR> City: <select NAME=SITECODE> <option value=\"\" selected>";
! print "--- Please Choose ---\n";
! CityListV($conn);
  print <<EOF;
-  </select>
  Bits: <INPUT NAME=BITS SIZE=4><BR>
! Suctomer Name: <INPUT NAME=CUSTDESC><BR>
  Customer Number:<INPUT NAME=CUSTOMER><BR>
  <input TYPE=SUBMIT VALUE=Add Block></FORM>
  <H2><FONT COLOR=RED>WARNING: This function will override the 10 day holding period</FONT></H2>
--- 205,214 ----
  <option value="" selected>--- Please Choose ---
  EOF
  ListRegions($conn);
! print " </SELECT><BR>";
  print <<EOF;
  Bits: <INPUT NAME=BITS SIZE=4><BR>
! Customer Name: <INPUT NAME=CUSTDESC><BR>
  Customer Number:<INPUT NAME=CUSTOMER><BR>
  <input TYPE=SUBMIT VALUE=Add Block></FORM>
  <H2><FONT COLOR=RED>WARNING: This function will override the 10 day holding period</FONT></H2>
***************
*** 229,235 ****
  ListRegions($conn);
  print <<EOF;
  </SELECT><BR>
! Priotity: <INPUT NAME=PRIORITY><BR>
  <INPUT TYPE=SUBMIT VALUE=Add Block>
  </TD></TR></FORM>
  <tr>
--- 222,228 ----
  ListRegions($conn);
  print <<EOF;
  </SELECT><BR>
! Priority: <INPUT NAME=PRIORITY><BR>
  <INPUT TYPE=SUBMIT VALUE=Add Block>
  </TD></TR></FORM>
  <tr>
diff -c freeipdb-0_1/auto.cgi freeipdb-0_1_1/auto.cgi
*** freeipdb-0_1/auto.cgi	Tue Nov 13 15:39:26 2001
--- freeipdb-0_1_1/auto.cgi	Tue Nov 13 21:21:16 2001
***************
*** 5,11 ****
  #               |  _|| | |  __/  __/| ||  __/ (_| | |_) |
  #               |_|  |_|  \___|\___|___|_|   \__,_|_.__/
  #
! #       FreeIPdb-0.1 11-13-2001 <ben@freeipdb.org>
  ######################################################################
  
  require 'ipdb_httpcgi.pl';
--- 5,11 ----
  #               |  _|| | |  __/  __/| ||  __/ (_| | |_) |
  #               |_|  |_|  \___|\___|___|_|   \__,_|_.__/
  #
! #       FreeIPdb-0.1.1 11-13-2001 <ben@freeipdb.org>
  ######################################################################
  
  require 'ipdb_httpcgi.pl';
***************
*** 17,24 ****
  my $dbhost = "127.0.0.1";
  #my $dbhost = "64.210.27.11";
  my $script = get_cgi($0);
! my $conn = Pg::connectdb("host=$dbhost user=api dbname=apidoc");
! my $conn1 = Pg::connectdb("host=$config{dbhost} user=$config{dbuser} dbname=$config{dbname}");
  my $buffer;
  my @pairs;
  my $pair;
--- 17,23 ----
  my $dbhost = "127.0.0.1";
  #my $dbhost = "64.210.27.11";
  my $script = get_cgi($0);
! my $conn = Pg::connectdb("host=$config{dbhost} user=$config{dbuser} dbname=$config{dbname}");
  my $buffer;
  my @pairs;
  my $pair;
***************
*** 40,55 ****
  $FORM{NULL} = "NULL";
  
  if($FORM{'TYPE'} eq "SERIALREQ"){
! 	my $site;
! 	if(!$FORM{'SITE'}){print "ERROR: NO SITE SET<BR>\n"; exit();}
! 	if($site = &CityLookup($conn,$FORM{'SITE'})){
! 	#	Get /30 from a serial region
! 		my $id = &GetNewBlock($conn1,$conn,$FORM{'REGION'},30,'SERIAL-REQ',0,1,$site);
! 		IncReverseSerial($conn1,$id);
! 		&SetSerialDNS($conn1,$id,$FORM{'CUST'},$FORM{'PORT'},$FORM{'ROUTER'},$FORM{'SITE'});
! 	} else {
! 		print "ERROR: Could not look up site<BR>\n";
! 	}
  }
  
  if($FORM{'TYPE'} eq "SERIALRECLAIM"){
--- 39,48 ----
  $FORM{NULL} = "NULL";
  
  if($FORM{'TYPE'} eq "SERIALREQ"){
! 	#Get /30 from a serial region
! 	my $id = &GetNewBlock($conn,$FORM{'REGION'},30,'SERIAL-REQ',0,1);
! 	IncReverseSerial($conn1,$id);
! 	&SetSerialDNS($conn1,$id,$FORM{'CUST'},$FORM{'PORT'},$FORM{'ROUTER'});
  }
  
  if($FORM{'TYPE'} eq "SERIALRECLAIM"){
diff -c freeipdb-0_1/config.pm.sample freeipdb-0_1_1/config.pm.sample
*** freeipdb-0_1/config.pm.sample	Tue Nov 13 15:40:06 2001
--- freeipdb-0_1_1/config.pm.sample	Tue Nov 13 21:31:17 2001
***************
*** 4,10 ****
  #               |  _|| | |  __/  __/| ||  __/ (_| | |_) |
  #               |_|  |_|  \___|\___|___|_|   \__,_|_.__/
  #
! #       FreeIPdb-0.1 11-13-2001 <ben@freeipdb.org>
  ######################################################################
  
  
--- 4,10 ----
  #               |  _|| | |  __/  __/| ||  __/ (_| | |_) |
  #               |_|  |_|  \___|\___|___|_|   \__,_|_.__/
  #
! #       FreeIPdb-0.1.1 11-13-2001 <ben@freeipdb.org>
  ######################################################################
  
  
diff -c freeipdb-0_1/index.cgi freeipdb-0_1_1/index.cgi
*** freeipdb-0_1/index.cgi	Tue Nov 13 15:40:11 2001
--- freeipdb-0_1_1/index.cgi	Tue Nov 13 21:34:06 2001
***************
*** 5,18 ****
  #               |  _|| | |  __/  __/| ||  __/ (_| | |_) |
  #               |_|  |_|  \___|\___|___|_|   \__,_|_.__/
  #
! #       FreeIPdb-0.1 11-13-2001 <ben@freeipdb.org>
  ######################################################################
  
  require 'ipdb_httpcgi.pl';
  use config;
  %config = config::config();
  
! printHead("FreeIPdb 1.0");
  use Pg;
  my $dbhost = "127.0.0.1";
  #my $dbhost = "64.210.27.11";
--- 5,18 ----
  #               |  _|| | |  __/  __/| ||  __/ (_| | |_) |
  #               |_|  |_|  \___|\___|___|_|   \__,_|_.__/
  #
! #       FreeIPdb-0.1.1 11-13-2001 <ben@freeipdb.org>
  ######################################################################
  
  require 'ipdb_httpcgi.pl';
  use config;
  %config = config::config();
  
! printHead("FreeIPdb 0.1.1");
  use Pg;
  my $dbhost = "127.0.0.1";
  #my $dbhost = "64.210.27.11";
***************
*** 51,57 ****
  }
  
  if($FORM{'FORM'} =~ /UPDATE/){
! 	&UpdateBlock($conn,$FORM{'UPDATE'},$FORM{'REGION'},$FORM{'CUSTOMER'},$FORM{'SITECODE'},$FORM{'CUSTDESC'});
  	print "Updated\n";
  }
  
--- 51,57 ----
  }
  
  if($FORM{'FORM'} =~ /UPDATE/){
! 	&UpdateBlock($conn,$FORM{'UPDATE'},$FORM{'REGION'},$FORM{'CUSTOMER'},$FORM{'CUSTDESC'});
  	print "Updated\n";
  }
  
***************
*** 76,97 ****
  		print "<TR><TD><H1>Can't Sethostname and request a block at the same time </TD></TR>\n";
  		$exit = 1;
  	}
- 	#if($FORM{'SITECODE'} =~ /---/){
- 	#	print "<TR><TD><H1>Please go back and choose a City</TD></TR>\n";
- 	#	$exit = 1;
- 	#}
- 	#if($FORM{'SWIP'} =~ /---/){
- 	#	print "<TR><TD><H1>Please go back and choose a Swip setting</TD></TR>\n";
- 	#	$exit = 1;
- 	#}
- 	#if($FORM{'CUSTOMER'} =~ /^$/){
- 	#	print "<TR><TD><H1>Please go back and set a Customer Number</TD></TR>\n";
- 	#	$exit = 1;
- 	#}
  	if($exit){ print "</TABLE>";&printTail();exit();} # Bail Missing some info.
  	print "<TR><TD>";
  	my $ra = &GetRAFromRegion($conn,$FORM{'REGION'});
! 	my $newblock = &GetNewBlock($conn,$conn,$FORM{'REGION'},$FORM{'BITS'},$FORM{'CUSTDESC'},$FORM{'SWIP'},$FORM{'CUSTOMER'},$FORM{'SITECODE'});
  	my $ev = sprintf("&RA_%s_SUBMIT1(%d,%d,%d);",$ra,$FORM{'CUSTOMER'},$newblock,$FORM{'REGION'});
  	eval $ev;
  	if($FORM{'REVERSE'}){
--- 76,85 ----
  		print "<TR><TD><H1>Can't Sethostname and request a block at the same time </TD></TR>\n";
  		$exit = 1;
  	}
  	if($exit){ print "</TABLE>";&printTail();exit();} # Bail Missing some info.
  	print "<TR><TD>";
  	my $ra = &GetRAFromRegion($conn,$FORM{'REGION'});
! 	my $newblock = &GetNewBlock($conn,$FORM{'REGION'},$FORM{'BITS'},$FORM{'CUSTDESC'},$FORM{'SWIP'},$FORM{'CUSTOMER'});
  	my $ev = sprintf("&RA_%s_SUBMIT1(%d,%d,%d);",$ra,$FORM{'CUSTOMER'},$newblock,$FORM{'REGION'});
  	eval $ev;
  	if($FORM{'REVERSE'}){
***************
*** 116,126 ****
  	}
  	my $region = $FORM{'REGION'};
  	my $bits = $FORM{'BITS'};
- 	my $city = $FORM{'SITECODE'};
  	my $cust = $FORM{'CUSTOMER'};
  	my $custdesc = $FORM{'CUSTDESC'};
  	my $id = "";
! 	print "<!-- REGION $region BITS $bits CITY $city CUST $cust CUSTDESC $custdesc -->\n";
  	&AllocatedSearch_Head();
  	&AllocatedSearch($conn,$script,1,$id,$block,$bits,$region,$cust,$custdesc,1);
  	print "</TABLE></FORM>";
--- 104,113 ----
  	}
  	my $region = $FORM{'REGION'};
  	my $bits = $FORM{'BITS'};
  	my $cust = $FORM{'CUSTOMER'};
  	my $custdesc = $FORM{'CUSTDESC'};
  	my $id = "";
! 	print "<!-- REGION $region BITS $bits CUST $cust CUSTDESC $custdesc -->\n";
  	&AllocatedSearch_Head();
  	&AllocatedSearch($conn,$script,1,$id,$block,$bits,$region,$cust,$custdesc,1);
  	print "</TABLE></FORM>";
***************
*** 187,193 ****
  <center>
  <h1>
  <b><font face="Arial,Helvetica"><font color="#000000">
! <font size=+2>FreeIPdb v1.0</font>
  </font></font></b></h1></center>
  </td>
  </tr>
--- 174,180 ----
  <center>
  <h1>
  <b><font face="Arial,Helvetica"><font color="#000000">
! <font size=+2>FreeIPdb v0.1.1</font>
  </font></font></b></h1></center>
  </td>
  </tr>
diff -c freeipdb-0_1/ipdb_ck.pl freeipdb-0_1_1/ipdb_ck.pl
*** freeipdb-0_1/ipdb_ck.pl	Tue Nov 13 14:46:16 2001
--- freeipdb-0_1_1/ipdb_ck.pl	Tue Nov 13 21:19:17 2001
***************
*** 1,3 ****
--- 1,13 ----
+ #                _____              ___ ____     _ _
+ #               |  ___| __ ___  ___|_ _|  _ \ __| | |__
+ #               | |_ | '__/ _ \/ _ \| || |_) / _` | '_ \
+ #               |  _|| | |  __/  __/| ||  __/ (_| | |_) |
+ #               |_|  |_|  \___|\___|___|_|   \__,_|_.__/
+ #
+ #       FreeIPdb-0.1.1 11-13-2001 <ben@freeipdb.org>
+ ######################################################################
+ 
+ 
  #!/usr/bin/perl
  
  use Pg;
***************
*** 6,16 ****
  require 'ipdb_lib.pl';
  $conn = Pg::connectdb("dbname=$config{dbname} host=$config{dbhost} user=$config{dbuser}");
  
! print " /*--------------------- IP Database Cinsistancy Check ---------------------*/\n\n";
  
  
  
! #Check for reclaims that havn't rolled up due to holdtime.
  $now = time;
  $result = $conn->exec("SELECT ID,PARENT,REGION,BITS
  	FROM IPDB
--- 16,26 ----
  require 'ipdb_lib.pl';
  $conn = Pg::connectdb("dbname=$config{dbname} host=$config{dbhost} user=$config{dbuser}");
  
! print " /*--------------------- IP Database Consistency Check ---------------------*/\n\n";
  
  
  
! #Check for reclaims that haven't rolled up due to holdtime.
  $now = time;
  $result = $conn->exec("SELECT ID,PARENT,REGION,BITS
  	FROM IPDB
diff -c freeipdb-0_1/ipdb_httpcgi.pl freeipdb-0_1_1/ipdb_httpcgi.pl
*** freeipdb-0_1/ipdb_httpcgi.pl	Tue Nov 13 15:40:28 2001
--- freeipdb-0_1_1/ipdb_httpcgi.pl	Tue Nov 13 21:21:42 2001
***************
*** 4,10 ****
  #               |  _|| | |  __/  __/| ||  __/ (_| | |_) |
  #               |_|  |_|  \___|\___|___|_|   \__,_|_.__/
  #
! #       FreeIPdb-0.1 11-13-2001 <ben@freeipdb.org>
  ######################################################################
  
  
--- 4,10 ----
  #               |  _|| | |  __/  __/| ||  __/ (_| | |_) |
  #               |_|  |_|  \___|\___|___|_|   \__,_|_.__/
  #
! #       FreeIPdb-0.1.1 11-13-2001 <ben@freeipdb.org>
  ######################################################################
  
  
***************
*** 56,71 ****
  
  sub GetNewBlock(){
  	my $conn = shift;
- 	my $conn1 = shift;
  	my $region = shift;
  	my $bits = shift;
  	my $CUSTDESC = shift;
  	my $SWIP = shift;
  	my $CUST = shift;
! 	my $SITE = shift;
! 	my $newblock = &NewBlock($conn,$region,$bits,$CUSTDESC,$SWIP,$CUST,$SITE) || &IPDBError(-1,"Could not create Block");
  	print "Your New BlockID is : $newblock\n";
! 	my $string = &ReadBlock($conn,$conn1,$newblock);
  	print "<BR>$string<BR>";
  	return($newblock);
  }
--- 56,69 ----
  
  sub GetNewBlock(){
  	my $conn = shift;
  	my $region = shift;
  	my $bits = shift;
  	my $CUSTDESC = shift;
  	my $SWIP = shift;
  	my $CUST = shift;
! 	my $newblock = &NewBlock($conn,$region,$bits,$CUSTDESC,$SWIP,$CUST) || &IPDBError(-1,"Could not create Block");
  	print "Your New BlockID is : $newblock\n";
! 	my $string = &ReadBlock($conn,$newblock);
  	print "<BR>$string<BR>";
  	return($newblock);
  }
***************
*** 147,159 ****
          my $region = shift;
          my $cust = shift;
          my $custdesc = shift;
! 	my $query = "SELECT ID,BLOCK,BITS,REGION,ALLOCATED,CUSTNUM,SITECODE,CUSTDESC,CHILDL,CHILDR FROM IPDB WHERE ID NOTNULL ";
  	if($id){
  		$query = $query." AND ID = $id";
  	} else {
  		if($custdesc){$query = $query." AND CUSTDESC LIKE '%$custdesc%'";}
  		if($cust){$query = $query." AND CUSTNUM LIKE '%$cust%'";}
- 		if($city){$query = $query." AND SITECODE = $city";}
  		if($region){$query = $query." AND REGION = $region";}
  		if($bits =~ m/^[0-9]*$/){$query = $query." AND BITS = $bits";}
  		if($block){
--- 145,156 ----
          my $region = shift;
          my $cust = shift;
          my $custdesc = shift;
! 	my $query = "SELECT ID,BLOCK,BITS,REGION,ALLOCATED,CUSTNUM,CUSTDESC,CHILDL,CHILDR FROM IPDB WHERE ID NOTNULL ";
  	if($id){
  		$query = $query." AND ID = $id";
  	} else {
  		if($custdesc){$query = $query." AND CUSTDESC LIKE '%$custdesc%'";}
  		if($cust){$query = $query." AND CUSTNUM LIKE '%$cust%'";}
  		if($region){$query = $query." AND REGION = $region";}
  		if($bits =~ m/^[0-9]*$/){$query = $query." AND BITS = $bits";}
  		if($block){
***************
*** 178,193 ****
  		$year += 1900;
  		my $allocated = $hour.":".$min.":".$sec." ".$mon."/".$mday."/".$year;
  		my $customer = $result->getvalue($i,5);
! 		my $sitecode = $result->getvalue($i,6);
! 		my $custdesc = $result->getvalue($i,7);
! 		my $childl = $result->getvalue($i,8);
! 		my $childr = $result->getvalue($i,9);
  		print "<TR><TD>$id</TD><TD>$block/$bits</TD><TD>$region</TD><TD>";
  		if($alloc){
  			print "$allocated";
  		}
  		print "</TD><TD>$customer</TD>";
! 		print "<TD>$sitecode</TD><TD>$custdesc</TD><TD>";
  		if($class && $alloc){
  			print "<FORM ACTION=$script METHOD=POST><INPUT TYPE=HIDDEN NAME=RECLAIM VALUE=$id>";
  			print "<INPUT TYPE=HIDDEN NAME=FORM VALUE=RECLAIM><INPUT TYPE=SUBMIT VALUE=RECLAIM></FORM>";
--- 175,189 ----
  		$year += 1900;
  		my $allocated = $hour.":".$min.":".$sec." ".$mon."/".$mday."/".$year;
  		my $customer = $result->getvalue($i,5);
! 		my $custdesc = $result->getvalue($i,6);
! 		my $childl = $result->getvalue($i,7);
! 		my $childr = $result->getvalue($i,8);
  		print "<TR><TD>$id</TD><TD>$block/$bits</TD><TD>$region</TD><TD>";
  		if($alloc){
  			print "$allocated";
  		}
  		print "</TD><TD>$customer</TD>";
! 		print "<TD>$custdesc</TD><TD>";
  		if($class && $alloc){
  			print "<FORM ACTION=$script METHOD=POST><INPUT TYPE=HIDDEN NAME=RECLAIM VALUE=$id>";
  			print "<INPUT TYPE=HIDDEN NAME=FORM VALUE=RECLAIM><INPUT TYPE=SUBMIT VALUE=RECLAIM></FORM>";
***************
*** 209,234 ****
  	my $conn1 = shift;
          my $id = shift;
  	my $script = shift;
! 	my $query = "SELECT BLOCK,BITS,REGION,CUSTNUM,SITECODE,CUSTDESC FROM IPDB WHERE ID = $id";
  	my $result = $conn->exec($query);
  	$block = deci2ip($result->getvalue(0,0),Version($conn,$id));
  	my $bits = $result->getvalue(0,1);
  	my $regionid = $result->getvalue(0,2);
  	$region = &LookupRegion($conn,$regionid);
  	my $customer = $result->getvalue(0,3);
! 	my $siteid = $result->getvalue(0,4);
! 	my $custdesc = $result->getvalue(0,5);
  	print "<TABLE BORDER><TR><TH>ID</TH><TH>Block</TH><TH>Region</TH>\n";
! 	print "<TH>Customer</TH><TH>Site</TH><TH>Customer Name</TH></TR>\n";
  	print "<FORM ACTION=$script METHOD=POST>";
  	print "<TR><TD>$id</TD><TD>$block/$bits</TD><TD><SELECT NAME=REGION>\n<OPTION VALUE=$regionid>$region\n";
  	ListRegions($conn);
  	print "</SELECT>";
  	print "</TD><TD><INPUT NAME=CUSTOMER VALUE=$customer></TD>\n";
! 	print "<TD><SELECT NAME=SITECODE><OPTION VALUE=$siteid>$sitecode\n";
! 	&CityListV($conn1);	
! 	print "</SELECT>";
! 	print "</TD><TD><INPUT NAME=CUSTDESC VALUE=$custdesc></TD><TD>\n";
  	print "<INPUT TYPE=HIDDEN NAME=UPDATE  VALUE=$id>\n";
  	print "<INPUT TYPE=HIDDEN NAME=FORM VALUE=UPDATE><INPUT TYPE=SUBMIT VALUE=UPDATE></FORM>\n";
  	print "</TD></TR>\n";
--- 205,226 ----
  	my $conn1 = shift;
          my $id = shift;
  	my $script = shift;
! 	my $query = "SELECT BLOCK,BITS,REGION,CUSTNUM,CUSTDESC FROM IPDB WHERE ID = $id";
  	my $result = $conn->exec($query);
  	$block = deci2ip($result->getvalue(0,0),Version($conn,$id));
  	my $bits = $result->getvalue(0,1);
  	my $regionid = $result->getvalue(0,2);
  	$region = &LookupRegion($conn,$regionid);
  	my $customer = $result->getvalue(0,3);
! 	my $custdesc = $result->getvalue(0,4);
  	print "<TABLE BORDER><TR><TH>ID</TH><TH>Block</TH><TH>Region</TH>\n";
! 	print "<TH>Customer</TH><TH>Customer Name</TH></TR>\n";
  	print "<FORM ACTION=$script METHOD=POST>";
  	print "<TR><TD>$id</TD><TD>$block/$bits</TD><TD><SELECT NAME=REGION>\n<OPTION VALUE=$regionid>$region\n";
  	ListRegions($conn);
  	print "</SELECT>";
  	print "</TD><TD><INPUT NAME=CUSTOMER VALUE=$customer></TD>\n";
! 	print "<TD><INPUT NAME=CUSTDESC VALUE=$custdesc></TD><TD>\n";
  	print "<INPUT TYPE=HIDDEN NAME=UPDATE  VALUE=$id>\n";
  	print "<INPUT TYPE=HIDDEN NAME=FORM VALUE=UPDATE><INPUT TYPE=SUBMIT VALUE=UPDATE></FORM>\n";
  	print "</TD></TR>\n";
***************
*** 241,249 ****
  	$id = shift;
  	$region = shift;
  	$customer = shift;
- 	$sitecode = shift;
  	$custdesc = shift;
! 	print "Setting on ID $id | REGION = $region | CUSTOMER = $customer | SITE = $sitecode | CUSTDESC = $custdesc\n";
  	$conn->exec("UPDATE IPDB SET REGION = $region WHERE ID = $id");
  	if(my $errorMessage = $conn->errorMessage){
  		IPDBError(-1,"Could not update block info in IPDB $errorMessage");
--- 233,240 ----
  	$id = shift;
  	$region = shift;
  	$customer = shift;
  	$custdesc = shift;
! 	print "Setting on ID $id | REGION = $region | CUSTOMER = $customer | CUSTDESC = $custdesc\n";
  	$conn->exec("UPDATE IPDB SET REGION = $region WHERE ID = $id");
  	if(my $errorMessage = $conn->errorMessage){
  		IPDBError(-1,"Could not update block info in IPDB $errorMessage");
***************
*** 256,271 ****
  	if(my $errorMessage = $conn->errorMessage){
  		IPDBError(-1,"Could not update block info in IPDB $errorMessage");
  	}
- 	$conn->exec("UPDATE IPDB SET SITECODE = $sitecode WHERE ID = $id");
- 	if(my $errorMessage = $conn->errorMessage){
- 		IPDBError(-1,"Could not update block info in IPDB $errorMessage");
- 	}
  }
  
  sub AllocatedSearch_Head(){
  	print "<TABLE BORDER>";
  	print "<TR><TH>Id</TH><TH>Block Bits</TH><TH>Region</TH><TH>Allocated</TH><TH>Customer</TH>";
!         print "<TH>Site</TH><TH>Customer Name</TH><TH>Functions</TH></TR>\n";
  }
  
  #-----------------------------------------------------------------------------
--- 247,258 ----
  	if(my $errorMessage = $conn->errorMessage){
  		IPDBError(-1,"Could not update block info in IPDB $errorMessage");
  	}
  }
  
  sub AllocatedSearch_Head(){
  	print "<TABLE BORDER>";
  	print "<TR><TH>Id</TH><TH>Block Bits</TH><TH>Region</TH><TH>Allocated</TH><TH>Customer</TH>";
!         print "<TH>Customer Name</TH><TH>Functions</TH></TR>\n";
  }
  
  #-----------------------------------------------------------------------------
***************
*** 391,398 ****
          my $cust = shift;
          my $port = shift;
          my $router = shift;
!         my $site = shift;
!         my $zone = $router.".".$site.".gblx.net";
          my $zoneid = &GetZone($conn,$zone);
          $string1 = $port;
          $string2 = $cust.".".$port;
--- 378,384 ----
          my $cust = shift;
          my $port = shift;
          my $router = shift;
!         my $zone = $router.".somewhere.net";
          my $zoneid = &GetZone($conn,$zone);
          $string1 = $port;
          $string2 = $cust.".".$port;
diff -c freeipdb-0_1/ipdb_lib.pl freeipdb-0_1_1/ipdb_lib.pl
*** freeipdb-0_1/ipdb_lib.pl	Tue Nov 13 15:40:22 2001
--- freeipdb-0_1_1/ipdb_lib.pl	Tue Nov 13 21:50:37 2001
***************
*** 4,10 ****
  #               |  _|| | |  __/  __/| ||  __/ (_| | |_) |
  #               |_|  |_|  \___|\___|___|_|   \__,_|_.__/
  #
! #       FreeIPdb-0.1 11-13-2001 <ben@freeipdb.org>
  ######################################################################
  
  
--- 4,10 ----
  #               |  _|| | |  __/  __/| ||  __/ (_| | |_) |
  #               |_|  |_|  \___|\___|___|_|   \__,_|_.__/
  #
! #       FreeIPdb-0.1.1 11-13-2001 <ben@freeipdb.org>
  ######################################################################
  
  
***************
*** 263,271 ****
  #
  sub ReadBlock(){
  	my $conn = shift || &IPDBError(-1,"No Database connection");
- 	my $conn1 = shift || &IPDBError(-1,"No Database connecton (for sitedb)");
  	my $block = shift || &IPDBError(-1,"No Block supplied");
! 	$query = "SELECT i.BLOCK,i.BITS,r.name,i.ALLOCATED,i.SWIPPED,i.CUSTNUM,i.SITECODE,i.CUSTDESC
  		FROM IPDB i,REGIONTABLE r
  		WHERE i.ID = $block
  			AND i.REGION = r.ID";
--- 263,270 ----
  #
  sub ReadBlock(){
  	my $conn = shift || &IPDBError(-1,"No Database connection");
  	my $block = shift || &IPDBError(-1,"No Block supplied");
! 	$query = "SELECT i.BLOCK,i.BITS,r.name,i.ALLOCATED,i.SWIPPED,i.CUSTNUM,i.CUSTDESC
  		FROM IPDB i,REGIONTABLE r
  		WHERE i.ID = $block
  			AND i.REGION = r.ID";
***************
*** 280,293 ****
  		my $allocated = $result->getvalue(0,3);
  		my $swip = $result->getvalue(0,4);
  		my $customer = $result->getvalue(0,5);
! 		my $sitecode = $result->getvalue(0,6);
! 		my $CUSTDESC = $result->getvalue(0,7);
  		my $city;
  		my $v;
  		$ipblock = deci2ip($dblock,Version($conn,$block)) || &IPDBError(-1,"Invalid Deci2IP");
  		if($swip){$swip = "Yes";} else {$swip = "No";}
  		$v = Version($conn,$block)|| &IPDBError(-1,"determine version");
! 		$string = "$ipblock/$bits from $region Swipped=$swip To: $customer On: $city IPv$v\n";
  		return($string);
  	} else {
  		IPDBError(0,"");
--- 279,291 ----
  		my $allocated = $result->getvalue(0,3);
  		my $swip = $result->getvalue(0,4);
  		my $customer = $result->getvalue(0,5);
! 		my $CUSTDESC = $result->getvalue(0,6);
  		my $city;
  		my $v;
  		$ipblock = deci2ip($dblock,Version($conn,$block)) || &IPDBError(-1,"Invalid Deci2IP");
  		if($swip){$swip = "Yes";} else {$swip = "No";}
  		$v = Version($conn,$block)|| &IPDBError(-1,"determine version");
! 		$string = "$ipblock/$bits from $region Swipped=$swip To: $customer IPv$v\n";
  		return($string);
  	} else {
  		IPDBError(0,"");
***************
*** 358,367 ****
  	if($errorMessage = $conn->errorMessage){ 
  		IPDBError(-1,"Could not set swipped null on block-$id $errorMessage");
  	}
- 	$conn->exec("UPDATE IPDB SET SITECODE = NULL WHERE ID = $id");
- 	if($errorMessage = $conn->errorMessage){ 
- 		IPDBError(-1,"Could not set sitecode null on block $errorMessage");
- 	}
  	$conn->exec("UPDATE IPDB SET CUSTNUM = NULL WHERE ID = $id");
  	if($errorMessage = $conn->errorMessage){ 
  		IPDBError(-1,"Could not set customer null on block $errorMessage");
--- 356,361 ----
***************
*** 450,456 ****
  #	A req #
  #	Is the block swipped?
  #	A customer code.
- #	A Site code.
  # Returns:
  #	-1 on error
  #	0 on No Free Space
--- 444,449 ----
***************
*** 463,469 ****
  	my $CUSTDESC = shift;
  	my $SWIPPED = shift;
  	my $CUST = shift ;
- 	my $SITECODE = shift ;
  	my $id = "";
  	my $newblock = "";
  	my $now = time();
--- 456,461 ----
***************
*** 488,499 ****
  		$id = $result->getvalue(0,0);
  		if($size == $bits){
  			#We have exact blocks
! 			&setblock($conn,$id,$CUSTDESC,$SWIPPED,$CUST,$SITECODE,$region) || &IPDBError(-1,"Unable to setblock");
  			return($id);
  		} else {
  			# There are larger blocks in region.
  			$newblock = &makeblock($conn,$id,$bits) || &IPDBError(-1,"Unable to makeblock");
! 			&setblock($conn,$newblock,$CUSTDESC,$SWIPPED,$CUST,$SITECODE,$region) || &IPDBError(-1,"Unable to setblock #2");
  			return($newblock);
  		}
  		$i++;
--- 480,491 ----
  		$id = $result->getvalue(0,0);
  		if($size == $bits){
  			#We have exact blocks
! 			&setblock($conn,$id,$CUSTDESC,$SWIPPED,$CUST,$region) || &IPDBError(-1,"Unable to setblock");
  			return($id);
  		} else {
  			# There are larger blocks in region.
  			$newblock = &makeblock($conn,$id,$bits) || &IPDBError(-1,"Unable to makeblock");
! 			&setblock($conn,$newblock,$CUSTDESC,$SWIPPED,$CUST,$region) || &IPDBError(-1,"Unable to setblock #2");
  			return($newblock);
  		}
  		$i++;
***************
*** 528,534 ****
  #       The Customer name to assign this allocation to.
  #       't' or NULL for is the block swipped.
  #       Customer code/number
- #       Site ID
  #       Optional Region
  # Returns:
  #       -1 on error or not in database.
--- 520,525 ----
***************
*** 540,546 ****
          my $CUSTDESC = shift;
          my $SWIPPED = shift;
          my $CUST = shift;
-         my $SITECODE = shift;
          my $region = shift;
          my $time = time();
          $conn->exec("BEGIN");
--- 531,536 ----
***************
*** 593,604 ****
                          IPDBError(-1,"unable to set customer code $errorMessage");
                  }
          }
-         if($SITECODE){
-                 $conn->exec("UPDATE IPDB SET SITECODE = $SITECODE WHERE ID = $block");
-                 if($errorMessage = $conn->errorMessage){
-                         IPDBError(-1,"unable to set sitecode $errorMessage");
-                 }
-         }
          if($region){
                  $conn->exec("UPDATE IPDB SET REGION = $region WHERE ID = $block");
                  if($errorMessage = $conn->errorMessage){
--- 583,588 ----
***************
*** 633,639 ****
                  print "Block is in use<BR>\n";
                  return(0);
          } else {
!                 my $added = &SetBlockP($conn,$block,$region,$bits,1,1,1,1,4);
                  if($added){
                          print "A parent of that block exists.<BR>\n";
                          &reclaim($conn,$added);
--- 617,623 ----
                  print "Block is in use<BR>\n";
                  return(0);
          } else {
!                 my $added = &SetBlockP($conn,$block,$region,$bits,1,1,1,4);
                  if($added){
                          print "A parent of that block exists.<BR>\n";
                          &reclaim($conn,$added);
***************
*** 902,908 ****
  #	CUSTDESC Number 
  #	SWIPPED 't' or null
  #	CUST number
- #	SITECODE (ID of site)
  # Returns:
  #	-1 on error
  #	0 on block does not exist or is in use.
--- 886,891 ----
***************
*** 916,922 ****
          my $CUSTDESC = shift || &IPDBError(-1,"CUSTDESC Not supplied");
  	my $SWIPPED = shift || &IPDBError(-1,"SWIPPED Not supplied");
  	my $CUST = shift || &IPDBError(-1,"Customer Code not supplied");
- 	my $SITECODE = shift || &IPDBError(-1,"Sitecode not supplied");
  	my $ver = shift || &IPDBError(-1,"No IP version supplied");
  	my $bblock = &ip2deci($block);
  	my $newblock = &CheckBlockFree($conn,$bblock,$bits,$region);
--- 899,904 ----
***************
*** 926,936 ****
  		exit();
  	}
  	if($newblock == 0){
! 		print "Parent\n";
  		$newblock = &MakeParent($conn,$bblock,$bits,$region,$bblock,$ver) || return(0);
  		print "Makeparent";
  	}
! 	&setblock($conn,$newblock,$CUSTDESC,$SWIPPED,$CUST,$SITECODE,$region);
  	return($newblock);
  }
  #--------------------------------------------------------------------------------------
--- 908,918 ----
  		exit();
  	}
  	if($newblock == 0){
! 		print "Parent $ver\n";
  		$newblock = &MakeParent($conn,$bblock,$bits,$region,$bblock,$ver) || return(0);
  		print "Makeparent";
  	}
! 	&setblock($conn,$newblock,$CUSTDESC,$SWIPPED,$CUST,$region);
  	return($newblock);
  }
  #--------------------------------------------------------------------------------------
***************
*** 995,1001 ****
  		$BitFlip = $BitFlip->blsft(32 - $bits);
  		$other = ($block ^ $BitFlip);
  	} else {
! 		&IPDBError(-1,"IP Version not valid");
  	}
  	if($bits == 0){
                  return(0);
--- 977,983 ----
  		$BitFlip = $BitFlip->blsft(32 - $bits);
  		$other = ($block ^ $BitFlip);
  	} else {
! 		&IPDBError(-1,"IP Version not valid [$v]");
  	}
  	if($bits == 0){
                  return(0);
diff -c freeipdb-0_1/rev_gen_tool.pl freeipdb-0_1_1/rev_gen_tool.pl
*** freeipdb-0_1/rev_gen_tool.pl	Tue Nov 13 15:40:39 2001
--- freeipdb-0_1_1/rev_gen_tool.pl	Tue Nov 13 21:22:01 2001
***************
*** 5,11 ****
  #               |  _|| | |  __/  __/| ||  __/ (_| | |_) |
  #               |_|  |_|  \___|\___|___|_|   \__,_|_.__/
  #
! #       FreeIPdb-0.1 11-13-2001 <ben@freeipdb.org>
  ######################################################################
  
  
--- 5,11 ----
  #               |  _|| | |  __/  __/| ||  __/ (_| | |_) |
  #               |_|  |_|  \___|\___|___|_|   \__,_|_.__/
  #
! #       FreeIPdb-0.1.1 11-13-2001 <ben@freeipdb.org>
  ######################################################################
  
  
diff -c freeipdb-0_1/search.cgi freeipdb-0_1_1/search.cgi
*** freeipdb-0_1/search.cgi	Tue Nov 13 15:40:46 2001
--- freeipdb-0_1_1/search.cgi	Tue Nov 13 21:22:08 2001
***************
*** 5,18 ****
  #               |  _|| | |  __/  __/| ||  __/ (_| | |_) |
  #               |_|  |_|  \___|\___|___|_|   \__,_|_.__/
  #
! #       FreeIPdb-0.1 11-13-2001 <ben@freeipdb.org>
  ######################################################################
  
- use strict;
  require 'ipdb_httpcgi.pl';
  use config;
  %config = config::config();
! printHead("IP Allocation Database - Search");
  use Pg;
  #my $dbhost = "127.0.0.1";
  my $dbhost = "64.210.27.11";
--- 5,17 ----
  #               |  _|| | |  __/  __/| ||  __/ (_| | |_) |
  #               |_|  |_|  \___|\___|___|_|   \__,_|_.__/
  #
! #       FreeIPdb-0.1.1 11-13-2001 <ben@freeipdb.org>
  ######################################################################
  
  require 'ipdb_httpcgi.pl';
  use config;
  %config = config::config();
! printHead("FreeIPdb 0.1.1");
  use Pg;
  #my $dbhost = "127.0.0.1";
  my $dbhost = "64.210.27.11";
***************
*** 38,43 ****
--- 37,57 ----
  }
  $FORM{NULL} = "NULL";
  
+ print <<EOF;
+ <center><table BORDER COLS=2>
+ <tr>
+ <td BGCOLOR="#33CCFF" COLSPAN=2>
+ <center>
+ <h1>
+ <b><font face="Arial,Helvetica"><font color="#000000">
+ <font size=+2>FreeIPdb v0.1.1</font>
+ </font></font></b></h1></center>
+ </td>
+ </tr>
+ </TABLE>
+ EOF
+ 
+ 
  if($FORM{'FORM'} =~ /SUBMIT2/){
          my $block = "";
          if($FORM{'BLOCK'}){
***************
*** 63,83 ****
                  
  }
  
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
  print <<EOF;
! <Table><TR>
  </FORM><FORM ACTION=$script METHOD=POST>
  <INPUT TYPE=HIDDEN NAME=FORM VALUE=SUBMIT2>
  <td bgcolor=#000000><font color=#FFFFFF>Search:</font></td>
--- 77,85 ----
                  
  }
  
  print <<EOF;
! <TABLE BORDER>
! <TR>
  </FORM><FORM ACTION=$script METHOD=POST>
  <INPUT TYPE=HIDDEN NAME=FORM VALUE=SUBMIT2>
  <td bgcolor=#000000><font color=#FFFFFF>Search:</font></td>
***************
*** 101,103 ****
--- 103,106 ----
  
  </TABLE>
  EOF
+ &printTail();