[freeside-commits] branch master updated. 96ac8187cdd42d1022944c6a41136378f841f064

Mark Wells mark at 420.am
Fri Aug 5 11:15:12 PDT 2016


The branch, master has been updated
       via  96ac8187cdd42d1022944c6a41136378f841f064 (commit)
      from  707b5633e9e8de71e9592bc135cb79f31725df6a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 96ac8187cdd42d1022944c6a41136378f841f064
Author: Mark Wells <mark at freeside.biz>
Date:   Fri Aug 5 00:24:43 2016 -0700

    when allocating IP addresses, correctly roll over to the next block, #42406

diff --git a/FS/FS/IP_Mixin.pm b/FS/FS/IP_Mixin.pm
index d492046..beb41d2 100644
--- a/FS/FS/IP_Mixin.pm
+++ b/FS/FS/IP_Mixin.pm
@@ -153,14 +153,14 @@ sub assign_ip_addr {
     # don't exit early on assigning a free address--check the rest of 
     # the blocks to see if the current address is in one of them.
     if (!$new_addr) {
-      $new_addr = $block->next_free_addr->addr;
+      $new_addr = $block->next_free_addr;
       $new_block = $block;
     }
   }
  
   return 'No IP address available on this router' unless $new_addr;
 
-  $self->ip_addr($new_addr);
+  $self->ip_addr($new_addr->addr);
   $self->addr_block($new_block);
   '';
 }

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/IP_Mixin.pm |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)




More information about the freeside-commits mailing list