pf-tools commit: r735 [ccaillet-guest] - in /trunk: TODO debian/changelog lib/PFTools/Net.pm

[parmelan-guest at users.alioth.debian.org]

Author: ccaillet-guest
Date: Fri Jan 15 12:45:29 2010
New Revision: 735

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=735
Log:
Adds in TODO

Modified:
    trunk/TODO
    trunk/debian/changelog
    trunk/lib/PFTools/Net.pm

Modified: trunk/TODO
URL: http://svn.debian.org/wsvn/pf-tools/trunk/TODO?rev=735&op=diff
==============================================================================
--- trunk/TODO (original)
+++ trunk/TODO Fri Jan 15 12:45:29 2010
@@ -7,6 +7,8 @@
 LE Add %SERIAL% in addition to %CONSOLE% for PXE, if it is really interesting ("serial 0 115200" by default)
 LE Obsolete mk_packages and update-links (just have to be sure no one uses them anymore)
 MH Adding an abstract layer on package installation method for interfacing other than deb package like RPM
+MH Adding localization for private address class. Needed for using same subnets on different site
+MH IPv6 support
 
 UH br0/trunk sur uml (2e couche bridge?)
 NM Pouvoir forcer une version particulière d'un paquet (apt-get install paquet=version)

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/trunk/debian/changelog?rev=735&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Fri Jan 15 12:45:29 2010
@@ -43,20 +43,20 @@
     - in $FUNCTION->{'apt-get'} : adding handler for version directive which
       specifies a version to install (NEED TESTING!!). A control is done for
       the availability of the specified version.
+    - Get_conf: sort readdir result, in order to always read update-hostname
+      before update-hostname01 (thus allowing to ignore in update-hostname01 a
+      section defined in update-hostname).
+    - avoid multiple calls for updating the repository content (fix regression)
   * filters/filter_privateresolve : substitution occured with POPNAME keyword
     according to the value extracted from host parameter (backported from branche
     0.33-stable)
-  * lib/PFTools/Net.pm : permit different bonding definition for a specified
-    host number (backported from branche 0.33-stable)
+  * lib/PFTools/Net.pm :
+    - permit different bonding definition for a specified host number (from 0.33-stable)
+    - in Add_Network : fix th check for avoiding duplicate network, replacing
+    Abort by Warn. Sometimes we need to have same subnets on differetn sites.
   * filters/filter_vlan2if : substitution occured with POPNAME keyword
     according to the value extracted from host parameter (backported from branche
     0.33-stable)
-  * lib/PFTools/Update.pm (forward-port from branches/0.33-stable r726) 
-    - Get_conf: sort readdir result, in order to always read update-hostname
-      before update-hostname01 (thus allowing to ignore in update-hostname01 a
-      section defined in update-hostname).
-  * lib/PFTools/Update.pm : avoid multiple calls for updating the repository
-    content (fix regression)
 
   [ Thomas Parmelan ]
   * debian/control
@@ -78,7 +78,7 @@
   * tools/kvmlaunch:
     - new script.
 
- -- Christophe Caillet <quadchris at free.fr>  Fri, 11 Dec 2009 16:01:08 +0100
+ -- Christophe Caillet <quadchris at free.fr>  Thu, 14 Jan 2010 17:26:37 +0100
 
 pf-tools (0.33.1-1) unstable; urgency=low
 

Modified: trunk/lib/PFTools/Net.pm
URL: http://svn.debian.org/wsvn/pf-tools/trunk/lib/PFTools/Net.pm?rev=735&op=diff
==============================================================================
--- trunk/lib/PFTools/Net.pm (original)
+++ trunk/lib/PFTools/Net.pm Fri Jan 15 12:45:29 2010
@@ -1203,7 +1203,12 @@
 	}
 
 	my $srv_addr = Address ( $Z->{'NETWORK'}->{'BY_NAME'}->{ $S->{'shortname'} }->{'network'}, $start, 0 );
-	push ( @{$Z->{'SERVERS'}->{'BY_ADDR'}->{$srv_addr}}, $N ) ;
+	if ( defined $Z->{'SERVERS'}->{'BY_ADDR'}->{$srv_addr} ) {
+	    Warn ( $ERR_SYNTAX, "Address ".$srv_addr." for server ".$srv." is already in use" );
+	}
+	else {
+		push ( @{$Z->{'SERVERS'}->{'BY_ADDR'}->{$srv_addr}}, $N );
+	}
     }
 
     $Z->{'SERVERS'}->{'BY_NAME'}->{$srv} = $N;
@@ -1327,12 +1332,13 @@
 	    "Masque de reseau manquant pour le reseau " . $net );
     }
 
-    if ( defined( $Z->{'NETWORK'}->{ $S->{'network'} } ) ) {
+    if ( defined( $Z->{'NETWORK'}->{'BY_ADDR'}->{ $S->{'network'} } ) ) {
 	Abort( $ERR_SYNTAX,
 	          "Adresse de reseau dupliquee ("
 		. $S->{'network'}
 		. ") pour le reseau "
-		. $net );
+		. $net . " avec le reseau "
+		. $Z->{'NETWORK'}->{'BY_ADDR'}->{ $S->{'network'} }->{'name'} );
     }
 
     # Calcul des adresses, netmasks et broadcasts
@@ -1346,6 +1352,7 @@
     $N->{'media'}     = $S->{'media'};
     $N->{'comment'}   = $S->{'comment'}
 	|| "Network $net <no comment specified>";
+    $N->{'scope'}     = $S->{'scope'} if ( defined $S->{'scope'} );
 
     # Insertion dans la structure principale
     $Z->{'NETWORK'}->{'BY_ADDR'}->{ $N->{'network'} } = $N;