Procházet zdrojové kódy

Simplifying avahi browsing

Bob Mottram před 9 roky
rodič
revize
fe8e416909
3 změnil soubory, kde provedl 6 přidání a 11 odebrání
  1. 1
    1
      src/freedombone-mesh
  2. 1
    1
      src/freedombone-meshweb
  3. 4
    9
      src/zeronetavahi

+ 1
- 1
src/freedombone-mesh Zobrazit soubor

250
     fi
250
     fi
251
 fi
251
 fi
252
 
252
 
253
-avahi-browse -atl | grep "Workstation" | awk -F ' ' '{print $4}' | sort -u > $PEERS_FILE
253
+avahi-browse -atl | awk -F ' ' '{print $4}' | sort -u > $PEERS_FILE
254
 
254
 
255
 if [ ! -f $PEERS_FILE ]; then
255
 if [ ! -f $PEERS_FILE ]; then
256
    echo 'No peers were found'
256
    echo 'No peers were found'

+ 1
- 1
src/freedombone-meshweb Zobrazit soubor

277
     fi
277
     fi
278
 fi
278
 fi
279
 
279
 
280
-avahi-browse -atl | grep "Workstation" | awk -F ' ' '{print $4}' | sort -u > $PEERS_FILE
280
+avahi-browse -atl | awk -F ' ' '{print $4}' | sort -u > $PEERS_FILE
281
 
281
 
282
 if [ ! -f $PEERS_FILE ]; then
282
 if [ ! -f $PEERS_FILE ]; then
283
    echo 'No peers were found'
283
    echo 'No peers were found'

+ 4
- 9
src/zeronetavahi Zobrazit soubor

114
 TEMPFILE_BASE=/tmp/tmpzeronetavahibase.txt
114
 TEMPFILE_BASE=/tmp/tmpzeronetavahibase.txt
115
 TEMPFILE=/tmp/tmpzeronetavahi.txt
115
 TEMPFILE=/tmp/tmpzeronetavahi.txt
116
 avahi-browse -atr > $TEMPFILE_BASE
116
 avahi-browse -atr > $TEMPFILE_BASE
117
-cat $TEMPFILE_BASE | grep "Workstation\|hostname =\|address =\|port =" > $TEMPFILE
117
+cat $TEMPFILE_BASE | grep "hostname =\|address =\|port =" > $TEMPFILE
118
 if [ ! -f $TEMPFILE ]; then
118
 if [ ! -f $TEMPFILE ]; then
119
     exit 1
119
     exit 1
120
 fi
120
 fi
131
 peer=""
131
 peer=""
132
 tracker_ctr=0
132
 tracker_ctr=0
133
 while IFS='' read -r line || [[ -n "$line" ]]; do
133
 while IFS='' read -r line || [[ -n "$line" ]]; do
134
-    if [ ${state} -eq "2" ]; then
134
+    if [ ${state} -eq "1" ]; then
135
         if [[ $line == *"address ="* ]]; then
135
         if [[ $line == *"address ="* ]]; then
136
             address=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
136
             address=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
137
             echo "    http://$peer:$TRACKER_PORT/announce" >> $ZERONET_CONFIG.new
137
             echo "    http://$peer:$TRACKER_PORT/announce" >> $ZERONET_CONFIG.new
139
             tracker_ctr=$((tracker_ctr + 1))
139
             tracker_ctr=$((tracker_ctr + 1))
140
         fi
140
         fi
141
     fi
141
     fi
142
-    if [ ${state} -eq "1" ]; then
143
-        if [[ $line == *"hostname ="* ]]; then
144
-            peer=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
145
-            state=2
146
-        fi
147
-    fi
148
-    if [[ $line == *"Workstation"* && $line == "= "* ]]; then
142
+    if [[ $line == *"hostname ="* ]]; then
143
+        peer=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
149
         state=1
144
         state=1
150
     fi
145
     fi
151
 done < "$TEMPFILE"
146
 done < "$TEMPFILE"