Re: [RFC 2/2] network: add vpn security policies commands

Hi,

On Thu, 2017-07-13 at 20:33 +0200, Jonatan Schlag wrote:

Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org

src/network | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--  1 file changed, 65 insertions(+), 2 deletions(-)

diff --git a/src/network b/src/network index 154d253..e7b637c 100644 --- a/src/network +++ b/src/network @@ -1194,7 +1194,6 @@ cli_reset() {   fi     warning_log "Will reset the whole network configuration!!!"

# Force mode is disabled by default   local force=0

This change doesn't have anything to do with the sec pols.

@@ -1384,13 +1383,77 @@ cli_raw() {   exit ${EXIT_OK}  }   +cli_vpn() {

• local action
• action=${1}
• shift 1

Just no :)

• case "${action}" in

• security-policies)
  

• 	cli_vpn_security-policies $@
  

• 	;;
  

• *)
  

• 	error "Unrecognized argument: ${action}"
  

• 	exit ${EXIT_ERROR}
  

• 	;;
  

• esac

+}

+cli_vpn_security-policies() {

Try to avoid a dash in the function name.

• local action
• local security_policy
• if vpn_security_policy_exists ${1}; then

• security_policy=${1}
  

• key=${2}
  

• shift 2
  

• case "${key}" in
  

• 	cipher|compression|integrity|lifetime|pfs|sh
  

ow)

• 		vpn_security_policies_${key}
  

${security_policy} $@

• 		;;
  

• 	group-type)
  

• 		vpn_security_policies_group_type
  

${security_policy} $@

• 		;;
  

• 	key-exchange)
  

• 		vpn_security_policies_key_exchange
  

${security_policy} $@

• 		;;
  

• 	*)
  

• 		error "Unrecognized argument:
  

${key}"

• 		exit ${EXIT_ERROR}
  

• 		;;
  

• esac
  

• else

• action=${1}
  

• shift
  

• case "${action}" in
  

• 	new)
  

• 		vpn_security_policies_new $@
  

• 		;;
  

• 	destroy)
  

• 		vpn_security_policies_destroy $@
  

• 		;;
  

• 	""|*)
  

• 		if [ -n "${action}" ]; then
  

• 			error "Unrecognized
  

argument: '${action}'"

• 		fi
  

• 		exit ${EXIT_ERROR}
  

• 		;;
  

• esac
  

• fi

+}

# Process the given action  case "${action}" in   init)   init_run   ;;

• settings|hostname|port|device|zone|start|stop|restart|status

|reset|route)

• settings|hostname|port|device|zone|start|stop|restart|status

|reset|route|vpn)   cli_${action} $@   ;;

-Michael