X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2Fdeployments%2Fbasic%2Fconfigure.sh;h=ac4fa74190ee4fd1e6ccbbc12acd60d0bb71ea37;hb=9cf0513932fb41804095983e065e48aee078dfc7;hp=a5d15152e2b8d92082f151e1f59e2e1c370f4636;hpb=7bf36f6cec41494071f07699184d8230ccd8cb41;p=anna.git

diff --git a/example/diameter/launcher/deployments/basic/configure.sh b/example/diameter/launcher/deployments/basic/configure.sh
index a5d1515..ac4fa74 100755
--- a/example/diameter/launcher/deployments/basic/configure.sh
+++ b/example/diameter/launcher/deployments/basic/configure.sh
@@ -8,10 +8,6 @@
 STD_DICTIONARY=stacks/avps_etsi.xml,stacks/avps_ietf.xml,stacks/avps_tgpp.xml,stacks/commands_baseProtocol.xml
 APP_DICTIONARY=stacks/commands_qosControl.xml
 DICTIONARY=$STD_DICTIONARY,$APP_DICTIONARY
-# Perhaps the stack is not fully defined:
-#KINDNESS=-ignoreErrors
-# But we prefer stack to generate Failed-AVP automatically:
-KINDNESS=
 
 # Communication endpoints:
 LOCAL_STANDARD_ENDPOINT=localhost:3868
@@ -21,11 +17,6 @@ CONNS=10
 # General
 EXE_BN=ADL-launcher
 
-# Tracing:
-TRACING="-cntDir counters"
-# need detailed traces ?:
-#TRACING="$TRACING -trace debug"
-
 #############
 # FUNCTIONS #
 #############
@@ -77,6 +68,32 @@ read option
 tol=$(get_tol $option)
 [ "$tol" = "" ] && _exit "Option '$option' not implemented !!"
 
+# Tracing
+TRACING="--cntDir counters"
+echo
+echo "Enable debug traces ? (y/n) [n]:"
+read enable
+[ "$enable" = "" ] && enable=n
+[ "$enable" = "y" ] && TRACING="$TRACING --trace debug"
+
+# Kindness
+KINDNESS=
+echo
+echo "Strict xml for decoded messages ? (y/n) [y]:"
+echo " (ignoring flags turns a made-up xml representation; execute './$EXE_BN | grep -A1 ignoreFlags:' for more help)"
+read strict
+[ "$strict" = "" ] && strict=y
+[ "$strict" = "n" ] && KINDNESS="--ignoreFlags"
+if [ "$option" = "s" ]
+then
+  echo
+  echo "Ignore errors ? (y/n) [n]:"
+  echo " (ignoring errors, the process won't answer Failed-AVP automatically; execute './$EXE_BN | grep -A1 ignoreErrors:' for more help)"
+  read i_errors
+  [ "$i_errors" = "" ] && i_errors=n
+  [ "$i_errors" = "y" ] && KINDNESS="$KINDNESS --ignoreErrors"
+fi
+
 # Run script:
 EXE_LINK=ADL-$tol
 ln -sf $EXE_BN $EXE_LINK
@@ -85,25 +102,26 @@ case $tol in
 
   client)
     ENTITY=$LOCAL_STANDARD_ENDPOINT
-    createRunScript $EXE_LINK -dictionary $DICTIONARY -entity $ENTITY -entityServerSessions $CONNS -diameterServerSessions 0 $KINDNESS $TRACING &
+    createRunScript $EXE_LINK --dictionary $DICTIONARY --entity $ENTITY --entityServerSessions $CONNS --diameterServerSessions 0 $KINDNESS $TRACING &
     ;;
 
   server)
     SERVER=$LOCAL_STANDARD_ENDPOINT
-    createRunScript $EXE_LINK -dictionary $DICTIONARY -diameterServer $SERVER -diameterServerSessions $CONNS -entityServerSessions 0 $KINDNESS $TRACING &
+    createRunScript $EXE_LINK --dictionary $DICTIONARY --diameterServer $SERVER --diameterServerSessions $CONNS --entityServerSessions 0 $KINDNESS $TRACING &
     ;;
 
   balancer)
     SERVER=$LOCAL_STANDARD_ENDPOINT
     ENTITY=$EXAMPLE_ENTITY_4_BALANCER
-    createRunScript $EXE_LINK -dictionary $DICTIONARY -entity $ENTITY -entityServerSessions $CONNS -diameterServer $SERVER -diameterServerSessions $CONNS -balance $KINDNESS $TRACING &
+    createRunScript $EXE_LINK --dictionary $DICTIONARY --entity $ENTITY --entityServerSessions $CONNS --diameterServer $SERVER --diameterServerSessions $CONNS --balance $KINDNESS $TRACING &
     ;;
 
   dummy)
-    createRunScript $EXE_LINK -dictionary $DICTIONARY -entityServerSessions 0 -diameterServerSessions 0 $KINDNESS $TRACING &
+    createRunScript $EXE_LINK --dictionary $DICTIONARY --entityServerSessions 0 --diameterServerSessions 0 $KINDNESS $TRACING &
     ;;
 
 esac
 
+echo
 echo "Created 'run.sh' script !"
 echo