Changeset 1062

Show
Ignore:
Timestamp:
05/22/08 21:52:21 (6 months ago)
Author:
mbr
Message:

added the ability to use a colon for --NAT-access command arg, e.g. '--NAT-access 192.168.10.1:12345'

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • fwknop/trunk/fwknop

    r1059 r1062  
    615615sub SPA_nat_access() { 
    616616    if ($NAT_access_str) { 
    617         print "        Forward access: $NAT_access_str\n" 
     617        print "        NAT access:    $NAT_access_str\n" 
    618618            unless $quiet; 
    619619        return ':' . encode_base64($NAT_access_str, ''); 
    …… 
    15781578 
    15791579    } else { 
    1580         unless ($NAT_access_str =~ /^$ip_re,\d+$/) { 
    1581             die "[*] Must specify '<internal_IP>,<external_port>'"; 
    1582         } 
    1583     } 
     1580        unless ($NAT_access_str =~ /^$ip_re,\d+$/ 
     1581                or $NAT_access_str =~ /^$ip_re:\d+$/) { 
     1582            die "[*] Must specify '<internal_IP>:<external_port>'"; 
     1583        } 
     1584    } 
     1585 
     1586    ### change ":" to "," for the fwknopd server (which uses colons 
     1587    ### to separate SPA packet fields, but colons are a better 
     1588    ### syntax for the fwknop command line) 
     1589    $NAT_access_str =~ s/:/,/; 
    15841590    return; 
    15851591}