[freeside-commits] branch FREESIDE_4_BRANCH updated. 630a48c51cc20dd2e2c2a09a61999e5a0ae3e5ba

[Mark Wells]

The branch, FREESIDE_4_BRANCH has been updated
       via  630a48c51cc20dd2e2c2a09a61999e5a0ae3e5ba (commit)
      from  a7e54f3bf896037443c3da5d8f699acab0177a6c (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 630a48c51cc20dd2e2c2a09a61999e5a0ae3e5ba
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(-)