diff --git a/.vscode/numbered-bookmarks.json b/.vscode/numbered-bookmarks.json index 1d0bf1d..9a886f1 100644 --- a/.vscode/numbered-bookmarks.json +++ b/.vscode/numbered-bookmarks.json @@ -6,13 +6,13 @@ -1, 19, 54, - 751, + 754, 68, -1, -1, -1, - 640, - 616 + -1, + -1 ] } ] diff --git a/setup.sh b/setup.sh index 9ddd646..ae1a5b4 100755 --- a/setup.sh +++ b/setup.sh @@ -592,8 +592,11 @@ if [ "${phpType}" = "tcp" ]; then exit 1 ;; *) - # check basic format validity - if [[ "${inputPHPAddr}" =~ ^${regexIP6}$ ]] || [[ "${inputPHPAddr}" =~ ^${regexIP4}$ ]]; then + # check basic format validity and wrap IP6 in [square brackets] + if [[ "${inputPHPAddr}" =~ ^${regexIP6}$ ]]; then + phpAddr="[${inputPHPAddr}]" + break + elif [[ "${inputPHPAddr}" =~ ^${regexIP4}$ ]]; then phpAddr="${inputPHPAddr}" break else @@ -762,7 +765,7 @@ echo "KeyPath: $KeyPath" echo "noOSCP: $noOSCP" echo "CA-Chain: $CAChainPath" echo "DHPath: $DHPath" -echo "Generating DH Params? $generateDH" +echo "Generating DH Params: $generateDH" echo -e "${cyan}--------------------${norm}" echo "usePHP: $usePHP" echo "PHP listen type: $phpType"