Project

General

Profile

« Previous | Next » 

Revision 54df925b

Added by Cyrill B about 13 years ago

Make mac_format aware of multiple Captiveportal instances

View differences:

usr/local/captiveportal/radius_accounting.inc
82 82 
    global $config, $cpzone;
83 83 

  		




  84
  84
  
    
    $retvalue = array();


  		




  85
  
  
    
    $nas_mac = mac_format(get_interface_mac("wan"));


  		




  86
  
  
    
    $clientmac = mac_format($clientmac);


  		




  
  85
  
    
    $nas_mac = mac_format(get_interface_mac("wan"), $cpzone);


  		




  
  86
  
    
    $clientmac = mac_format($clientmac, $cpzone);


  		




  87
  87
  
    
    $nas_port = intval($ruleno);


  		




  88
  88
  
    
    $radiusvendor = $config['captiveportal'][$cpzone]['radiusvendor'] ? $config['captiveportal'][$cpzone]['radiusvendor'] : null;


  		




  89
  89
  
    

  		




  ......




  194
  194
  
    
    global $config, $cpzone;


  		




  195
  195
  
    

  		




  196
  196
  
    
    $retvalue = array();


  		




  197
  
  
    
    $nas_mac = mac_format(get_interface_mac("wan"));


  		




  198
  
  
    
    $clientmac = mac_format($clientmac);


  		




  
  197
  
    
    $nas_mac = mac_format(get_interface_mac("wan"), $cpzone);


  		




  
  198
  
    
    $clientmac = mac_format($clientmac, $cpzone);


  		




  199
  199
  
    
    $nas_port = intval($ruleno);


  		




  200
  200
  
    
    $radiusvendor = $config['captiveportal'][$cpzone]['radiusvendor'] ? $config['captiveportal'][$cpzone]['radiusvendor'] : null;


  		




  201
  201
  
    
    $stop_time = (empty($stop_time)) ? time() : $stop_time;


  		












Also available in:  Unified diff