diff options
| author | adv <adv@uma.es> | 2018-07-05 14:11:48 +0200 |
|---|---|---|
| committer | adv <adv@uma.es> | 2018-07-05 14:11:48 +0200 |
| commit | 3aa81a4e1e94d0cd3fc251a6ee418f9b5210c20f (patch) | |
| tree | 4ba3b1d1457a5dbb92b82b6073a266f3eb0a5bed | |
| parent | 9c811246d40a137e6f0455f1ab854242c9f849fa (diff) | |
| parent | e0c7c420aacda93edcdd16e0cd6c8192ea7f2310 (diff) | |
Merge branch 'devel' of gituser@opengnsys.es:/git/opengnsys.git into devel
| -rwxr-xr-x | repoman/bin/getRepoIface | 9 | ||||
| -rwxr-xr-x | repoman/bin/sendFileMcast | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/repoman/bin/getRepoIface b/repoman/bin/getRepoIface new file mode 100755 index 00000000..2ce208be --- /dev/null +++ b/repoman/bin/getRepoIface @@ -0,0 +1,9 @@ +#!/bin/bash + +# This script takes the IPlocal variable of the repository +# and returns the system interface +# Alfredo Luque <aluque@soleta.eu> + +source /opt/opengnsys/etc/ogAdmRepo.cfg + +ip addr show | grep $IPlocal | cut -f2 | awk '{ print $NF }' diff --git a/repoman/bin/sendFileMcast b/repoman/bin/sendFileMcast index ac6446d8..222a6d40 100755 --- a/repoman/bin/sendFileMcast +++ b/repoman/bin/sendFileMcast @@ -9,7 +9,8 @@ OPENGNSYS=${OPENGNSYS:-"/opt/opengnsys"} OGIMG=$OPENGNSYS/images OGBIN=$OPENGNSYS/bin PATH=$PATH:$OGBIN - +REPO_IFACE="$(/opt/opengnsys/bin/getRepoIface)" + # Si se solicita, mostrar ayuda. if [ "$*" == "help" ]; then echo "Formato: $PROG fichero|nombreImagen datosMulticast" @@ -57,5 +58,5 @@ CERROR="8x8/128" # Envío de fichero por Multicast. # Se desabilita el uso de mbuffer: eesta versión del upd-sender no la admite. #which mbuffer &> /dev/null && MBUFFER="--pipe 'mbuffer -m 20M'" -$OGBIN/udp-sender $MBUFFER --nokbd --retries-until-drop 65 --portbase $PORTBASE --$METHOD --mcast-data-address $ADDRESS --fec $CERROR --max-bitrate $BITRATE --ttl 16 --min-clients $NCLIENTS --max-wait $MAXTIME --file "$FICHIMG" +$OGBIN/udp-sender $MBUFFER --nokbd --retries-until-drop 65 --portbase $PORTBASE --$METHOD --interface $REPO_IFACE --mcast-data-address $ADDRESS --fec $CERROR --max-bitrate $BITRATE --ttl 16 --min-clients $NCLIENTS --max-wait $MAXTIME --file "$FICHIMG" |