Skip to content

N
nx-libs
Commit 1e448d2f authored by Mihai Moldovan's avatar Mihai Moldovan
Browse files
Options

testscripts/run-nxproxy2nx*: use more quotes, common variables and braces.

parent a0003405
Hide whitespace changes
Inline Side-by-side
Showing with 163 additions and 177 deletions
testscripts/run-nxproxy2nxagent-on-localhost
View file @ 1e448d2f
...@@ -27,34 +27,34 @@ ...@@ -27,34 +27,34 @@
#set -x #set -x
# #
ulimit -c unlimited ulimit -c "unlimited"
NXPROXYBIN=nxproxy NXPROXYBIN="nxproxy"
NXAGENTBIN=nxagent NXAGENTBIN="nxagent"
NX_PORT=9 NX_PORT="9"
NX_SYSTEM=${HOME}/.nx NX_SYSTEM="${HOME}/.nx"
NX_ROOT=${HOME}/.nx NX_ROOT="${HOME}/.nx"
# #
# This should be randomly generated. # This should be randomly generated.
# #
#NX_COOKIE=`xauth list |grep "${HOSTNAME}/unix:\<${NX_PORT}\>" | grep MIT | cut -f 5 -d ' '` #NX_COOKIE="$(xauth list |grep "${HOSTNAME}/unix:\<${NX_PORT}\>" | grep 'MIT' | cut -f '5' -d ' ')"
NX_COOKIE=123efa980d2cba234ef6f73deac810ff NX_COOKIE="123efa980d2cba234ef6f73deac810ff"
# #
# Create the directories for the NX session. # Create the directories for the NX session.
# #
rm -rf ${NX_ROOT}/C-${NX_PORT} || exit rm -rf "${NX_ROOT}/C-${NX_PORT}" || exit
mkdir -p ${NX_ROOT}/C-${NX_PORT} || exit mkdir -p "${NX_ROOT}/C-${NX_PORT}" || exit
rm -rf ${HOME}/.nx/S-${NX_PORT} || exit rm -rf "${NX_ROOT}/S-${NX_PORT}" || exit
mkdir -p ${HOME}/.nx/S-${NX_PORT} || exit mkdir -p "${NX_ROOT}/S-${NX_PORT}" || exit
# #
# Set the path to libraries and NX executables. # Set the path to libraries and NX executables.
...@@ -72,8 +72,8 @@ export PATH ...@@ -72,8 +72,8 @@ export PATH
echo "Creating the X authorization cookie." echo "Creating the X authorization cookie."
xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} xauth add "${HOSTNAME}/unix:${NX_PORT}" "MIT-MAGIC-COOKIE-1" "${NX_COOKIE}"
xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} xauth add "${HOSTNAME}:${NX_PORT}" "MIT-MAGIC-COOKIE-1" "${NX_COOKIE}"
# #
# Options are written in a file 'options' in the session # Options are written in a file 'options' in the session
...@@ -86,37 +86,37 @@ xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} ...@@ -86,37 +86,37 @@ xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE}
# media=1:1098 # media=1:1098
# #
NX_HOST=nx/nx,cache=8192k,link=modem,menu=1,keybd=1,samba=0,cups=0,limit=0,\ NX_HOST="nx/nx,cache=8192k,link=modem,menu=1,keybd=1,samba=0,cups=0,limit=0,\
accept=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session accept=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session"
echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options echo "${NX_HOST}:${NX_PORT}" >"${NX_ROOT}/C-${NX_PORT}/options"
# #
# Run the agent. if you don't have a font server running, # Run the agent. if you don't have a font server running,
# remove the argument "-fp unix/:7100" # remove the argument "-fp unix/:7100"
# #
NX_AGENT=:${NX_PORT} NX_AGENT=":${NX_PORT}"
echo "Running the X client side NX agent." echo "Running the X client side NX agent."
SAVED_DISPLAY=$DISPLAY SAVED_DISPLAY="${DISPLAY}"
DISPLAY=nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT} DISPLAY="nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT}"
export DISPLAY export DISPLAY
#valgrind -v --num-callers=8 --error-limit=no --trace-children=no \ #valgrind -v --num-callers=8 --error-limit=no --trace-children=no \
#valgrind --num-callers=8 --tool=memcheck --leak-check=yes --show-reachable=yes --track-fds=yes \ #valgrind --num-callers=8 --tool=memcheck --leak-check=yes --show-reachable=yes --track-fds=yes \
#ldd ${NXAGENTBIN} #ldd "${NXAGENTBIN}"
${NXAGENTBIN} -name 'NX' -geometry 800x600+100+100 "$@" \ "${NXAGENTBIN}" -name 'NX' -geometry "800x600+100+100" "${@}" \
${NX_AGENT} 2>>${NX_ROOT}/C-${NX_PORT}/session & "${NX_AGENT}" 2>>"${NX_ROOT}/C-${NX_PORT}/session" &
# #
# The X server side proxy will forward the connection # The X server side proxy will forward the connection
# to the original DISPLAY. # to the original DISPLAY.
# #
DISPLAY=$SAVED_DISPLAY DISPLAY="${SAVED_DISPLAY}"
export DISPLAY export DISPLAY
# #
...@@ -127,17 +127,17 @@ export DISPLAY ...@@ -127,17 +127,17 @@ export DISPLAY
# connect=giulietta.nomachine.com:1098 # connect=giulietta.nomachine.com:1098
# #
#NX_HOST=nx/nx,keybd=1,samba=1,cups=1,connect=localhost,cookie=$NX_COOKIE,errors=${NX_ROOT}/S-${NX_PORT}/session #NX_HOST="nx/nx,keybd=1,samba=1,cups=1,connect=localhost,cookie=${NX_COOKIE},errors=${NX_ROOT}/S-${NX_PORT}/session"
NX_HOST=nx/nx,keybd=1,samba=0,cups=0,connect=localhost,cookie=$NX_COOKIE,errors=${NX_ROOT}/S-${NX_PORT}/session NX_HOST="nx/nx,keybd=1,samba=0,cups=0,connect=localhost,cookie=${NX_COOKIE},errors=${NX_ROOT}/S-${NX_PORT}/session"
echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/S-${NX_PORT}/options echo "${NX_HOST}:${NX_PORT}" >"${NX_ROOT}/S-${NX_PORT}/options"
echo "Running the X server side NX proxy." echo "Running the X server side NX proxy."
#valgrind -v --num-callers=8 --error-limit=no --trace-children=no \ #valgrind -v --num-callers=8 --error-limit=no --trace-children=no \
#valgrind --num-callers=8 --tool=memcheck --leak-check=yes --show-reachable=yes --track-fds=yes \ #valgrind --num-callers=8 --tool=memcheck --leak-check=yes --show-reachable=yes --track-fds=yes \
#ldd ${NXPROXYBIN} #ldd "${NXPROXYBIN}"
${NXPROXYBIN} -S nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT} \ "${NXPROXYBIN}" -S "nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT}" \
2>>${HOME}/.nx/S-${NX_PORT}/session & 2>>"${NX_ROOT}/S-${NX_PORT}/session" &
echo "Session running on display :$NX_PORT." echo "Session running on display :$NX_PORT."
testscripts/run-nxproxy2nxagent-over-network
View file @ 1e448d2f
...@@ -27,10 +27,10 @@ ...@@ -27,10 +27,10 @@
#set -x #set -x
# #
ulimit -c unlimited ulimit -c "unlimited"
NXPROXYBIN=nxproxy NXPROXYBIN="nxproxy"
NXAGENTBIN=nxagent NXAGENTBIN="nxagent"
### ###
### Adapt to your needs: NXAGENT_HOST, NXPROXY_HOST ### Adapt to your needs: NXAGENT_HOST, NXPROXY_HOST
...@@ -41,30 +41,30 @@ NXAGENTBIN=nxagent ...@@ -41,30 +41,30 @@ NXAGENTBIN=nxagent
### ###
### (Instructions for copy+pasting are given when this script has been launched). ### (Instructions for copy+pasting are given when this script has been launched).
### ###
NXAGENT_HOST=127.0.0.1 # (e.g. 192.168.1.1, this scripts is launched on the NXAGENT_HOST machine) NXAGENT_HOST="127.0.0.1" # (e.g., 192.168.1.1, this scripts is launched on the NXAGENT_HOST machine)
NXPROXY_HOST=127.0.0.1 # (e.g. 192.168.1.2, you want to connect nxproxy -> nxagent from the NXPROXY_HOST machine) NXPROXY_HOST="127.0.0.1" # (e.g., 192.168.1.2, you want to connect nxproxy -> nxagent from the NXPROXY_HOST machine)
NX_PORT=9 NX_PORT="9"
NX_SYSTEM=${HOME}/.nx NX_SYSTEM="${HOME}/.nx"
NX_ROOT=${HOME}/.nx NX_ROOT="${HOME}/.nx"
# #
# This should be randomly generated. # This should be randomly generated.
# #
#NX_COOKIE=`xauth list |grep "${HOSTNAME}/unix:\<${NX_PORT}\>" | grep MIT | cut -f 5 -d ' '` #NX_COOKIE="$(xauth list |grep "${HOSTNAME}/unix:\<${NX_PORT}\>" | grep 'MIT' | cut -f '5' -d ' ')"
NX_COOKIE=123efa980d2cba234ef6f73deac810ff NX_COOKIE="123efa980d2cba234ef6f73deac810ff"
# #
# Create the directories for the NX session. # Create the directories for the NX session.
# #
rm -rf ${NX_ROOT}/C-${NX_PORT} || exit rm -rf "${NX_ROOT}/C-${NX_PORT}" || exit
mkdir -p ${NX_ROOT}/C-${NX_PORT} || exit mkdir -p "${NX_ROOT}/C-${NX_PORT}" || exit
rm -rf ${HOME}/.nx/S-${NX_PORT} || exit rm -rf "${NX_ROOT}/S-${NX_PORT}" || exit
mkdir -p ${HOME}/.nx/S-${NX_PORT} || exit mkdir -p "${NX_ROOT}/S-${NX_PORT}" || exit
# #
# Set the path to libraries and NX executables. # Set the path to libraries and NX executables.
...@@ -82,8 +82,8 @@ export PATH ...@@ -82,8 +82,8 @@ export PATH
echo "Creating the X authorization cookie." echo "Creating the X authorization cookie."
xauth add ${NXPROXY_HOST}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} xauth add "${NXPROXY_HOST}/unix:${NX_PORT}" "MIT-MAGIC-COOKIE-1" "${NX_COOKIE}"
xauth add ${NXPROXY_HOST}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} xauth add "${NXPROXY_HOST}:${NX_PORT}" "MIT-MAGIC-COOKIE-1" "${NX_COOKIE}"
# #
# Options are written in a file 'options' in the session # Options are written in a file 'options' in the session
...@@ -91,63 +91,60 @@ xauth add ${NXPROXY_HOST}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} ...@@ -91,63 +91,60 @@ xauth add ${NXPROXY_HOST}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE}
# we pass in the DISPLAY the name of the options file. # we pass in the DISPLAY the name of the options file.
# #
# cache=8M,images=32M,link=modem,type=unix-kde,cleanup=0, # cache=8M,images=32M,link=modem,type=unix-kde,cleanup=0,
# accept=62.98.198.1,cookie=$NX_COOKIE, # accept=62.98.198.1,cookie=${NX_COOKIE},
# id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F, # id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F,
# media=1:1098 # media=1:1098
# #
NX_HOST=nx/nx,cache=8192k,link=modem,menu=1,keybd=1,samba=0,cups=0,limit=0,\ NX_HOST="nx/nx,cache=8192k,link=modem,menu=1,keybd=1,samba=0,cups=0,limit=0,\
accept=$NXPROXY_HOST,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session accept=${NXPROXY_HOST},cookie=${NX_COOKIE},errors=${NX_ROOT}/C-${NX_PORT}/session"
echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options echo "${NX_HOST}:${NX_PORT}" >"${NX_ROOT}/C-${NX_PORT}/options"
# #
# Run the agent. if you don't have a font server running, # Run the agent. if you don't have a font server running,
# remove the argument "-fp unix/:7100" # remove the argument "-fp unix/:7100"
# #
NX_AGENT=:${NX_PORT} NX_AGENT=":${NX_PORT}"
echo "Running the X client side NX agent." echo "Running the X client side NX agent."
SAVED_DISPLAY=$DISPLAY SAVED_DISPLAY="${DISPLAY}"
DISPLAY=nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT} DISPLAY="nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT}"
export DISPLAY export DISPLAY
#valgrind -v --num-callers=8 --error-limit=no --trace-children=no \ #valgrind -v --num-callers=8 --error-limit=no --trace-children=no \
#valgrind --num-callers=8 --tool=memcheck --leak-check=yes --show-reachable=yes --track-fds=yes \ #valgrind --num-callers=8 --tool=memcheck --leak-check=yes --show-reachable=yes --track-fds=yes \
#ldd ${NXAGENTBIN} #ldd "${NXAGENTBIN}"
${NXAGENTBIN} -name 'NX' -geometry 800x600+100+100 "$@" \ "${NXAGENTBIN}" -name 'NX' -geometry "800x600+100+100" "${@}" \
${NX_AGENT} 2>>${NX_ROOT}/C-${NX_PORT}/session & "${NX_AGENT}" 2>>"${NX_ROOT}/C-${NX_PORT}/session" &
# #
# The X server side proxy will forward the connection # The X server side proxy will forward the connection
# to the original DISPLAY. # to the original DISPLAY.
# #
DISPLAY=$SAVED_DISPLAY DISPLAY="${SAVED_DISPLAY}"
export DISPLAY export DISPLAY
# #
# These are the nxproxy options used to run a typical session. # These are the nxproxy options used to run a typical session.
# #
# cookie=$NX_COOKIE,root=/home/pinzari/.nx,media=32824, # cookie=${NX_COOKIE},root=/home/pinzari/.nx,media=32824,
# session=kde_on_giulietta,id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F, # session=kde_on_giulietta,id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F,
# connect=giulietta.nomachine.com:1098 # connect=giulietta.nomachine.com:1098
# #
echo printf '\n%s\n\n' 'Now... COPY+PASTE the below lines to your local system'
echo Now... COPY+PASTE the below lines to your local system echo '--------------8<---------'
echo
echo "--------------8<---------"
#NX_HOST=nx/nx,keybd=1,samba=1,cups=1,connect=$NXAGENT_HOST,cookie=$NX_COOKIE,errors=${NX_ROOT}/S-${NX_PORT}/session #NX_HOST="nx/nx,keybd=1,samba=1,cups=1,connect=${NXAGENT_HOST},cookie=${NX_COOKIE},errors=${NX_ROOT}/S-${NX_PORT}/session"
NX_HOST=nx/nx,keybd=1,samba=0,cups=0,connect=tcp:$NXAGENT_HOST:4009,cookie=$NX_COOKIE,errors=${NX_ROOT}/S-${NX_PORT}/session NX_HOST="nx/nx,keybd=1,samba=0,cups=0,connect=tcp:${NXAGENT_HOST}:4009,cookie=${NX_COOKIE},errors=${NX_ROOT}/S-${NX_PORT}/session"
echo "NX_HOST=$NX_HOST" echo "NX_HOST=${NX_HOST}"
echo "echo \"${NX_HOST}:${NX_PORT}\" >${NX_ROOT}/S-${NX_PORT}/options" echo "echo \"${NX_HOST}:${NX_PORT}\" >\"${NX_ROOT}/S-${NX_PORT}/options\""
echo "${NXPROXYBIN} -S nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT} 2>>${HOME}/.nx/S-${NX_PORT}/session" echo "\"${NXPROXYBIN}\" -S \"nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT}\" 2>>\"${NX_ROOT}/S-${NX_PORT}/session\""
echo "-------------->8---------" printf '%s\n\n' '-------------->8---------'
echo
testscripts/run-nxproxy2nxagent-over-sockets
View file @ 1e448d2f
...@@ -27,33 +27,33 @@ ...@@ -27,33 +27,33 @@
#set -x #set -x
# #
ulimit -c unlimited ulimit -c "unlimited"
NXPROXYBIN=nxproxy NXPROXYBIN="nxproxy"
NXAGENTBIN=nxagent NXAGENTBIN="nxagent"
NX_PORT=7 NX_PORT="7"
NX_SYSTEM=${HOME}/.nx NX_SYSTEM="${HOME}/.nx"
NX_ROOT=${HOME}/.nx NX_ROOT="${HOME}/.nx"
# #
# This should be randomly generated. # This should be randomly generated.
# #
#NX_COOKIE=`xauth list |grep "${HOSTNAME}/unix:\<${NX_PORT}\>" | grep MIT | cut -f 5 -d ' '` #NX_COOKIE="$(xauth list |grep "${HOSTNAME}/unix:\<${NX_PORT}\>" | grep 'MIT' | cut -f '5' -d ' ')"
NX_COOKIE=123efa980d2cba234ef6f73deac810ff NX_COOKIE="123efa980d2cba234ef6f73deac810ff"
# #
# Create the directories for the NX session. # Create the directories for the NX session.
# #
rm -rf ${NX_ROOT}/C-${NX_PORT} || exit rm -rf "${NX_ROOT}/C-${NX_PORT}" || exit
mkdir -p ${NX_ROOT}/C-${NX_PORT} || exit mkdir -p "${NX_ROOT}/C-${NX_PORT}" || exit
rm -rf ${HOME}/.nx/S-${NX_PORT} || exit rm -rf "${NX_ROOT}/S-${NX_PORT}" || exit
mkdir -p ${HOME}/.nx/S-${NX_PORT} || exit mkdir -p "${NX_ROOT}/S-${NX_PORT}" || exit
# #
# Set the path to libraries and NX executables. # Set the path to libraries and NX executables.
...@@ -71,13 +71,11 @@ export PATH ...@@ -71,13 +71,11 @@ export PATH
echo "Creating the X authorization cookie." echo "Creating the X authorization cookie."
xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} xauth add "${HOSTNAME}/unix:${NX_PORT}" "MIT-MAGIC-COOKIE-1" "${NX_COOKIE}"
xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} xauth add "${HOSTNAME}:${NX_PORT}" "MIT-MAGIC-COOKIE-1" "${NX_COOKIE}"
function urlencode() { function urlencode() {
echo "$(perl -MURI::Escape -e 'print uri_escape($ARGV[0]);' "$1")" echo "$(perl -MURI::Escape -e 'print uri_escape($ARGV[0]);' "$1")"
} }
# #
...@@ -86,64 +84,63 @@ function urlencode() { ...@@ -86,64 +84,63 @@ function urlencode() {
# we pass in the DISPLAY the name of the options file. # we pass in the DISPLAY the name of the options file.
# #
# cache=8M,images=32M,link=modem,type=unix-kde,cleanup=0, # cache=8M,images=32M,link=modem,type=unix-kde,cleanup=0,
# accept=62.98.198.1,cookie=$NX_COOKIE, # accept=62.98.198.1,cookie=${NX_COOKIE},
# id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F, # id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F,
# media=1:1098 # media=1:1098
# #
NX_HOST=nx/nx,cache=8192k,link=modem,menu=1,keybd=1,samba=0,cups=0,limit=0,\ NX_HOST="nx/nx,cache=8192k,link=modem,menu=1,keybd=1,samba=0,cups=0,limit=0,\
listen=$(urlencode "unix:${NX_SYSTEM}/C-${NX_PORT}/proxy.socket"),cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session listen=$(urlencode "unix:${NX_SYSTEM}/C-${NX_PORT}/proxy.socket"),cookie=${NX_COOKIE},errors=${NX_ROOT}/C-${NX_PORT}/session"
echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options echo "${NX_HOST}:${NX_PORT}" >"${NX_ROOT}/C-${NX_PORT}/options"
# #
# Run the agent. if you don't have a font server running, # Run the agent. if you don't have a font server running,
# remove the argument "-fp unix/:7100" # remove the argument "-fp unix/:7100"
# #
NX_AGENT=:${NX_PORT} NX_AGENT=":${NX_PORT}"
echo "Running the X client side NX agent." echo "Running the X client side NX agent."
SAVED_DISPLAY=$DISPLAY SAVED_DISPLAY="${DISPLAY}"
DISPLAY=nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT} DISPLAY="nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT}"
export DISPLAY export DISPLAY
#valgrind -v --num-callers=8 --error-limit=no --trace-children=no \ #valgrind -v --num-callers=8 --error-limit=no --trace-children=no \
#valgrind --num-callers=8 --tool=memcheck --leak-check=yes --show-reachable=yes --track-fds=yes \ #valgrind --num-callers=8 --tool=memcheck --leak-check=yes --show-reachable=yes --track-fds=yes \
#ldd ${NXAGENTBIN} #ldd "${NXAGENTBIN}"
${NXAGENTBIN} -name 'NX' -geometry 800x600+100+100 "$@" \ "${NXAGENTBIN}" -name 'NX' -geometry '800x600+100+100' "${@}" \
${NX_AGENT} 2>>${NX_ROOT}/C-${NX_PORT}/session & "${NX_AGENT}" 2>>"${NX_ROOT}/C-${NX_PORT}/session" &
# #
# The X server side proxy will forward the connection # The X server side proxy will forward the connection
# to the original DISPLAY. # to the original DISPLAY.
# #
DISPLAY=$SAVED_DISPLAY DISPLAY="${SAVED_DISPLAY}"
export DISPLAY export DISPLAY
# #
# These are the nxproxy options used to run a typical session. # These are the nxproxy options used to run a typical session.
# #
# cookie=$NX_COOKIE,root=/home/pinzari/.nx,media=32824, # cookie=${NX_COOKIE},root=/home/pinzari/.nx,media=32824,
# session=kde_on_giulietta,id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F, # session=kde_on_giulietta,id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F,
# connect=giulietta.nomachine.com:1098 # connect=giulietta.nomachine.com:1098
# #
#NX_HOST=nx/nx,keybd=1,samba=1,cups=1,connect=localhost,cookie=$NX_COOKIE,errors=${NX_ROOT}/S-${NX_PORT}/session #NX_HOST="nx/nx,keybd=1,samba=1,cups=1,connect=localhost,cookie=${NX_COOKIE},errors=${NX_ROOT}/S-${NX_PORT}/session"
NX_HOST=nx/nx,keybd=1,samba=0,cups=0,connect=$(urlencode "unix:${NX_SYSTEM}/C-${NX_PORT}/proxy.socket"),cookie=$NX_COOKIE,errors=${NX_ROOT}/S-${NX_PORT}/session NX_HOST="nx/nx,keybd=1,samba=0,cups=0,connect=$(urlencode "unix:${NX_SYSTEM}/C-${NX_PORT}/proxy.socket"),cookie=${NX_COOKIE},errors=${NX_ROOT}/S-${NX_PORT}/session"
echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/S-${NX_PORT}/options echo "${NX_HOST}:${NX_PORT}" >"${NX_ROOT}/S-${NX_PORT}/options"
echo "Running the X server side NX proxy." echo "Running the X server side NX proxy."
#valgrind -v --num-callers=8 --error-limit=no --trace-children=no \ #valgrind -v --num-callers=8 --error-limit=no --trace-children=no \
#valgrind --num-callers=8 --tool=memcheck --leak-check=yes --show-reachable=yes --track-fds=yes \ #valgrind --num-callers=8 --tool=memcheck --leak-check=yes --show-reachable=yes --track-fds=yes \
#ldd ${NXPROXYBIN} #ldd "${NXPROXYBIN}"
${NXPROXYBIN} -S nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT} \ "${NXPROXYBIN}" -S "nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT}" \
2>>${HOME}/.nx/S-${NX_PORT}/session & 2>>"${NX_ROOT}/S-${NX_PORT}/session" &
echo "Session running on display :$NX_PORT."
echo "Session running on display :${NX_PORT}."
testscripts/run-nxproxy2nxproxy
View file @ 1e448d2f
...@@ -29,13 +29,13 @@ set -e ...@@ -29,13 +29,13 @@ set -e
# set -x # set -x
# #
ulimit -c unlimited ulimit -c "unlimited"
NX_PORT=8 NX_PORT="8"
NX_SYSTEM=${HOME}/.nx NX_SYSTEM="${HOME}/.nx"
NX_ROOT=${HOME}/.nx NX_ROOT="${HOME}/.nx"
mkdir -p "${NX_ROOT}" mkdir -p "${NX_ROOT}"
...@@ -43,20 +43,18 @@ mkdir -p "${NX_ROOT}" ...@@ -43,20 +43,18 @@ mkdir -p "${NX_ROOT}"
# This should be randomly generated. # This should be randomly generated.
# #
NX_COOKIE=`xauth -n list |grep "${HOSTNAME}/unix:${NX_PORT}" | grep MIT | cut -f 5 -d ' ' | head -n1` NX_COOKIE="$(xauth -n list |grep "${HOSTNAME}/unix:${NX_PORT}" | grep 'MIT' | cut -f '5' -d ' ' | head -n1)"
if [ -z "$NX_COOKIE" ]; then [[ -z "$NX_COOKIE" ]] && NX_COOKIE="$(mcookie)"
NX_COOKIE=`mcookie`
fi
# #
# Create the directories for the NX session. # Create the directories for the NX session.
# #
rm -rf ${NX_ROOT}/C-${NX_PORT} || exit rm -rf "${NX_ROOT}/C-${NX_PORT}" || exit
mkdir -p ${NX_ROOT}/C-${NX_PORT} || exit mkdir -p "${NX_ROOT}/C-${NX_PORT}" || exit
rm -rf ${HOME}/.nx/S-${NX_PORT} || exit rm -rf "${NX_ROOT}/S-${NX_PORT}" || exit
mkdir -p ${HOME}/.nx/S-${NX_PORT} || exit mkdir -p "${NX_ROOT}/S-${NX_PORT}" || exit
# #
# Set the path to libraries and NX executables. # Set the path to libraries and NX executables.
...@@ -74,8 +72,8 @@ export PATH ...@@ -74,8 +72,8 @@ export PATH
echo "Creating the X authorization cookie." echo "Creating the X authorization cookie."
xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} xauth add "${HOSTNAME}/unix:${NX_PORT}" "MIT-MAGIC-COOKIE-1" "${NX_COOKIE}"
xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} xauth add "${HOSTNAME}:${NX_PORT}" "MIT-MAGIC-COOKIE-1" "${NX_COOKIE}"
# #
# Options are written in a file 'options' in the session # Options are written in a file 'options' in the session
...@@ -83,24 +81,24 @@ xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} ...@@ -83,24 +81,24 @@ xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE}
# we pass in the DISPLAY the name of the options file. # we pass in the DISPLAY the name of the options file.
# #
# cache=8M,images=32M,link=modem,type=unix-kde,cleanup=0, # cache=8M,images=32M,link=modem,type=unix-kde,cleanup=0,
# accept=62.98.198.1,cookie=$NX_COOKIE, # accept=62.98.198.1,cookie=${NX_COOKIE},
# id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F, # id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F,
# media=1:1098 # media=1:1098
# #
#NX_HOST=nx/nx,link=lan,pack=no-pack,keybd=1,samba=1,cups=1,limit=0,\ #NX_HOST="nx/nx,link=lan,pack=no-pack,keybd=1,samba=1,cups=1,limit=0,\
#accept=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session #accept=127.0.0.1,cookie=${NX_COOKIE},errors=${NX_ROOT}/C-${NX_PORT}/session"
#NX_HOST=nx/nx,link=lan,pack=16m-jpeg-9,keybd=1,samba=1,cups=1,limit=0,\ #NX_HOST="nx/nx,link=lan,pack=16m-jpeg-9,keybd=1,samba=1,cups=1,limit=0,\
#accept=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session #accept=127.0.0.1,cookie=${NX_COOKIE},errors=${NX_ROOT}/C-${NX_PORT}/session"
#NX_HOST=nx/nx,cache=8192k,link=modem,keybd=1,samba=1,cups=1,limit=0,\ #NX_HOST="nx/nx,cache=8192k,link=modem,keybd=1,samba=1,cups=1,limit=0,\
#connect=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session #connect=127.0.0.1,cookie=${NX_COOKIE},errors=${NX_ROOT}/C-${NX_PORT}/session"
NX_HOST=nx/nx,link=lan,pack=16m-jpeg-9,keybd=1,samba=1,cups=1,limit=0,\ NX_HOST="nx/nx,link=lan,pack=16m-jpeg-9,keybd=1,samba=1,cups=1,limit=0,\
accept=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session accept=127.0.0.1,cookie=${NX_COOKIE},errors=${NX_ROOT}/C-${NX_PORT}/session"
echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options echo "${NX_HOST}:${NX_PORT}" >"${NX_ROOT}/C-${NX_PORT}/options"
# #
# Run the local proxy impersonating the X display. # Run the local proxy impersonating the X display.
...@@ -110,8 +108,8 @@ echo "Running the X client side NX proxy." ...@@ -110,8 +108,8 @@ echo "Running the X client side NX proxy."
#valgrind -v --num-callers=8 --error-limit=no --trace-children=no \ #valgrind -v --num-callers=8 --error-limit=no --trace-children=no \
#valgrind --tool=memcheck --track-fds=yes \ #valgrind --tool=memcheck --track-fds=yes \
nxproxy -C nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT} \ nxproxy -C "nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT}" \
2>>${HOME}/.nx/C-${NX_PORT}/session & 2>>"${NX_ROOT}/C-${NX_PORT}/session" &
# #
# The X server side proxy will forward the connection # The X server side proxy will forward the connection
...@@ -121,14 +119,14 @@ nxproxy -C nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT} \ ...@@ -121,14 +119,14 @@ nxproxy -C nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT} \
# #
# These are the nxproxy options used to run a typical session. # These are the nxproxy options used to run a typical session.
# #
# cookie=$NX_COOKIE,root=/home/pinzari/.nx,media=32824, # cookie=${NX_COOKIE},root=/home/pinzari/.nx,media=32824,
# session=kde_on_giulietta,id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F, # session=kde_on_giulietta,id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F,
# connect=giulietta.nomachine.com:1098 # connect=giulietta.nomachine.com:1098
# #
NX_HOST=nx/nx,keybd=1,samba=1,cups=1,connect=localhost,cookie=$NX_COOKIE,errors=${NX_ROOT}/S-${NX_PORT}/session NX_HOST="nx/nx,keybd=1,samba=1,cups=1,connect=localhost,cookie=${NX_COOKIE},errors=${NX_ROOT}/S-${NX_PORT}/session"
echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/S-${NX_PORT}/options echo "${NX_HOST}:${NX_PORT}" >"${NX_ROOT}/S-${NX_PORT}/options"
echo "Running the X server side NX proxy." echo "Running the X server side NX proxy."
...@@ -137,8 +135,7 @@ echo "Running the X server side NX proxy." ...@@ -137,8 +135,7 @@ echo "Running the X server side NX proxy."
#valgrind -v --leak-check=yes --leak-resolution=high --show-reachable=yes \ #valgrind -v --leak-check=yes --leak-resolution=high --show-reachable=yes \
# --show-reachable=yes --suppressions=nxproxy/nxproxy.supp \ # --show-reachable=yes --suppressions=nxproxy/nxproxy.supp \
# --weird-hacks=lax-ioctls --num-callers=8 --logfile-fd=2 \ # --weird-hacks=lax-ioctls --num-callers=8 --logfile-fd=2 \
nxproxy -S nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT} \ nxproxy -S "nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT}" \
2>>${HOME}/.nx/S-${NX_PORT}/session & 2>>"${NX_ROOT}/S-${NX_PORT}/session" &
echo "Session running on display :$NX_PORT."
echo "Session running on display :${NX_PORT}."
testscripts/run-nxproxy2nxproxy-over-sockets
View file @ 1e448d2f
#!/bin/bash #!/bin/bash
set -ex set -e
#/**************************************************************************/ #/**************************************************************************/
#/* */ #/* */
...@@ -26,16 +26,16 @@ set -ex ...@@ -26,16 +26,16 @@ set -ex
# #
# Uncomment this to enable echo. # Uncomment this to enable echo.
# #
# set -x set -x
# #
ulimit -c unlimited ulimit -c "unlimited"
NX_PORT=6 NX_PORT="6"
NX_SYSTEM=${HOME}/.nx NX_SYSTEM="${HOME}/.nx"
NX_ROOT=${HOME}/.nx NX_ROOT="${HOME}/.nx"
mkdir -p "${NX_ROOT}" mkdir -p "${NX_ROOT}"
...@@ -43,20 +43,18 @@ mkdir -p "${NX_ROOT}" ...@@ -43,20 +43,18 @@ mkdir -p "${NX_ROOT}"
# This should be randomly generated. # This should be randomly generated.
# #
NX_COOKIE=`xauth -n list |grep "${HOSTNAME}/unix:${NX_PORT}" | grep MIT | cut -f 5 -d ' ' | head -n1` NX_COOKIE="$(xauth -n list |grep "${HOSTNAME}/unix:${NX_PORT}" | grep 'MIT' | cut -f '5' -d ' ' | head -n1)"
if [ -z "$NX_COOKIE" ]; then [[ -z "$NX_COOKIE" ]] && NX_COOKIE="$(mcookie)"
NX_COOKIE=`mcookie`
fi
# #
# Create the directories for the NX session. # Create the directories for the NX session.
# #
rm -rf ${NX_ROOT}/C-${NX_PORT} || exit rm -rf "${NX_ROOT}/C-${NX_PORT}" || exit
mkdir -p ${NX_ROOT}/C-${NX_PORT} || exit mkdir -p "${NX_ROOT}/C-${NX_PORT}" || exit
rm -rf ${HOME}/.nx/S-${NX_PORT} || exit rm -rf "${NX_ROOT}/S-${NX_PORT}" || exit
mkdir -p ${HOME}/.nx/S-${NX_PORT} || exit mkdir -p "${NX_ROOT}/S-${NX_PORT}" || exit
# #
# Set the path to libraries and NX executables. # Set the path to libraries and NX executables.
...@@ -74,13 +72,11 @@ export PATH ...@@ -74,13 +72,11 @@ export PATH
echo "Creating the X authorization cookie." echo "Creating the X authorization cookie."
xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} xauth add "${HOSTNAME}/unix:${NX_PORT}" "MIT-MAGIC-COOKIE-1" "${NX_COOKIE}"
xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} xauth add "${HOSTNAME}:${NX_PORT}" "MIT-MAGIC-COOKIE-1" "${NX_COOKIE}"
function urlencode() { function urlencode() {
echo "$(perl -MURI::Escape -e 'print uri_escape($ARGV[0]);' "$1")" echo "$(perl -MURI::Escape -e 'print uri_escape($ARGV[0]);' "$1")"
} }
# #
...@@ -89,27 +85,27 @@ function urlencode() { ...@@ -89,27 +85,27 @@ function urlencode() {
# we pass in the DISPLAY the name of the options file. # we pass in the DISPLAY the name of the options file.
# #
# cache=8M,images=32M,link=modem,type=unix-kde,cleanup=0, # cache=8M,images=32M,link=modem,type=unix-kde,cleanup=0,
# accept=62.98.198.1,cookie=$NX_COOKIE, # accept=62.98.198.1,cookie=${NX_COOKIE},
# id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F, # id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F,
# media=1:1098 # media=1:1098
# #
#NX_HOST=nx/nx,link=lan,pack=no-pack,keybd=1,samba=1,cups=1,limit=0,\ #NX_HOST="nx/nx,link=lan,pack=no-pack,keybd=1,samba=1,cups=1,limit=0,\
#accept=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session #accept=127.0.0.1,cookie=${NX_COOKIE},errors=${NX_ROOT}/C-${NX_PORT}/session"
#NX_HOST=nx/nx,link=lan,pack=16m-jpeg-9,keybd=1,samba=1,cups=1,limit=0,\ #NX_HOST="nx/nx,link=lan,pack=16m-jpeg-9,keybd=1,samba=1,cups=1,limit=0,\
#accept=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session #accept=127.0.0.1,cookie=${NX_COOKIE},errors=${NX_ROOT}/C-${NX_PORT}/session"
#NX_HOST=nx/nx,cache=8192k,link=modem,keybd=1,samba=1,cups=1,limit=0,\ #NX_HOST="nx/nx,cache=8192k,link=modem,keybd=1,samba=1,cups=1,limit=0,\
#connect=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session #connect=127.0.0.1,cookie=${NX_COOKIE},errors=${NX_ROOT}/C-${NX_PORT}/session"
#NX_HOST=nx/nx,link=lan,pack=16m-jpeg-9,keybd=1,samba=1,cups=1,limit=0,\ #NX_HOST="nx/nx,link=lan,pack=16m-jpeg-9,keybd=1,samba=1,cups=1,limit=0,\
#accept=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session #accept=127.0.0.1,cookie=${NX_COOKIE},errors=${NX_ROOT}/C-${NX_PORT}/session"
NX_HOST=nx/nx,link=lan,pack=16m-jpeg-9,keybd=1,samba=1,cups=1,limit=0,\ NX_HOST="nx/nx,link=lan,pack=16m-jpeg-9,keybd=1,samba=1,cups=1,limit=0,\
listen=$(urlencode "unix:${NX_SYSTEM}/C-${NX_PORT}/proxy.socket"),cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session listen=$(urlencode "unix:${NX_SYSTEM}/C-${NX_PORT}/proxy.socket"),cookie=${NX_COOKIE},errors=${NX_ROOT}/C-${NX_PORT}/session"
echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options echo "${NX_HOST}:${NX_PORT}" >"${NX_ROOT}/C-${NX_PORT}/options"
# #
# Run the local proxy impersonating the X display. # Run the local proxy impersonating the X display.
...@@ -119,8 +115,8 @@ echo "Running the X client side NX proxy." ...@@ -119,8 +115,8 @@ echo "Running the X client side NX proxy."
#valgrind -v --num-callers=8 --error-limit=no --trace-children=no \ #valgrind -v --num-callers=8 --error-limit=no --trace-children=no \
#valgrind --tool=memcheck --track-fds=yes \ #valgrind --tool=memcheck --track-fds=yes \
nxproxy -C nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT} \ nxproxy -C "nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT}" \
2>>${HOME}/.nx/C-${NX_PORT}/session & 2>>"${NX_ROOT}/C-${NX_PORT}/session" &
# #
# The X server side proxy will forward the connection # The X server side proxy will forward the connection
...@@ -130,14 +126,14 @@ nxproxy -C nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT} \ ...@@ -130,14 +126,14 @@ nxproxy -C nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT} \
# #
# These are the nxproxy options used to run a typical session. # These are the nxproxy options used to run a typical session.
# #
# cookie=$NX_COOKIE,root=/home/pinzari/.nx,media=32824, # cookie=${NX_COOKIE},root=/home/pinzari/.nx,media=32824,
# session=kde_on_giulietta,id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F, # session=kde_on_giulietta,id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F,
# connect=giulietta.nomachine.com:1098 # connect=giulietta.nomachine.com:1098
# #
NX_HOST=nx/nx,keybd=1,samba=1,cups=1,connect=$(urlencode "unix:${NX_SYSTEM}/C-${NX_PORT}/proxy.socket"),cookie=$NX_COOKIE,errors=${NX_ROOT}/S-${NX_PORT}/session NX_HOST="nx/nx,keybd=1,samba=1,cups=1,connect=$(urlencode "unix:${NX_SYSTEM}/C-${NX_PORT}/proxy.socket"),cookie=${NX_COOKIE},errors=${NX_ROOT}/S-${NX_PORT}/session"
echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/S-${NX_PORT}/options echo "${NX_HOST}:${NX_PORT}" >"${NX_ROOT}/S-${NX_PORT}/options"
echo "Running the X server side NX proxy." echo "Running the X server side NX proxy."
...@@ -146,8 +142,7 @@ echo "Running the X server side NX proxy." ...@@ -146,8 +142,7 @@ echo "Running the X server side NX proxy."
#valgrind -v --leak-check=yes --leak-resolution=high --show-reachable=yes \ #valgrind -v --leak-check=yes --leak-resolution=high --show-reachable=yes \
# --show-reachable=yes --suppressions=nxproxy/nxproxy.supp \ # --show-reachable=yes --suppressions=nxproxy/nxproxy.supp \
# --weird-hacks=lax-ioctls --num-callers=8 --logfile-fd=2 \ # --weird-hacks=lax-ioctls --num-callers=8 --logfile-fd=2 \
nxproxy -S nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT} \ nxproxy -S "nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT}" \
2>>${HOME}/.nx/S-${NX_PORT}/session & 2>>"${NX_ROOT}/S-${NX_PORT}/session" &
echo "Session running on display :$NX_PORT."
echo "Session running on display :${NX_PORT}."
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment