Browse Source

broadcast the mesh routing protocol on avahi

Bob Mottram 7 years ago
parent
commit
256e01647a
2 changed files with 14 additions and 1 deletions
  1. 3
    0
      src/freedombone-mesh-batman
  2. 11
    1
      src/freedombone-mesh-install

+ 3
- 0
src/freedombone-mesh-batman View File

260
     if grep -q "bmx6" $MESH_DEFAULT_PROTOCOL; then
260
     if grep -q "bmx6" $MESH_DEFAULT_PROTOCOL; then
261
         systemctl enable bmx6
261
         systemctl enable bmx6
262
         systemctl restart bmx6
262
         systemctl restart bmx6
263
+        sed -i 's|<type>.*|<type>_bmx6._tcp</type>|g' /etc/avahi/services/routing.service
263
     fi
264
     fi
264
 
265
 
265
     if grep -q "bmx7" $MESH_DEFAULT_PROTOCOL; then
266
     if grep -q "bmx7" $MESH_DEFAULT_PROTOCOL; then
266
         systemctl enable bmx7
267
         systemctl enable bmx7
267
         systemctl restart bmx7
268
         systemctl restart bmx7
269
+        sed -i 's|<type>.*|<type>_bmx7._tcp</type>|g' /etc/avahi/services/routing.service
268
     fi
270
     fi
269
 
271
 
270
     if grep -q "olsr" $MESH_DEFAULT_PROTOCOL; then
272
     if grep -q "olsr" $MESH_DEFAULT_PROTOCOL; then
271
         systemctl enable olsr2
273
         systemctl enable olsr2
272
         systemctl restart olsr2
274
         systemctl restart olsr2
275
+        sed -i 's|<type>.*|<type>_olsr2._tcp</type>|g' /etc/avahi/services/routing.service
273
     fi
276
     fi
274
 
277
 
275
     systemctl restart avahi-daemon
278
     systemctl restart avahi-daemon

+ 11
- 1
src/freedombone-mesh-install View File

111
     echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > $rootdir/etc/avahi/services/ssh.service
111
     echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > $rootdir/etc/avahi/services/ssh.service
112
     echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> $rootdir/etc/avahi/services/ssh.service
112
     echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> $rootdir/etc/avahi/services/ssh.service
113
     echo '<service-group>' >> $rootdir/etc/avahi/services/ssh.service
113
     echo '<service-group>' >> $rootdir/etc/avahi/services/ssh.service
114
-    echo '  <name replace-wildcards="yes">%h SSH</name>' >> $rootdir/etc/avahi/services/ssh.service
114
+    echo '  <name replace-wildcards="yes">%h ssh</name>' >> $rootdir/etc/avahi/services/ssh.service
115
     echo '  <service>' >> $rootdir/etc/avahi/services/ssh.service
115
     echo '  <service>' >> $rootdir/etc/avahi/services/ssh.service
116
     echo '    <type>_ssh._tcp</type>' >> $rootdir/etc/avahi/services/ssh.service
116
     echo '    <type>_ssh._tcp</type>' >> $rootdir/etc/avahi/services/ssh.service
117
     echo "    <port>$SSH_PORT</port>" >> $rootdir/etc/avahi/services/ssh.service
117
     echo "    <port>$SSH_PORT</port>" >> $rootdir/etc/avahi/services/ssh.service
118
     echo '  </service>' >> $rootdir/etc/avahi/services/ssh.service
118
     echo '  </service>' >> $rootdir/etc/avahi/services/ssh.service
119
     echo '</service-group>' >> $rootdir/etc/avahi/services/ssh.service
119
     echo '</service-group>' >> $rootdir/etc/avahi/services/ssh.service
120
 
120
 
121
+    # Add a mesh routing protocol service
122
+    echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > $rootdir/etc/avahi/services/routing.service
123
+    echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> $rootdir/etc/avahi/services/routing.service
124
+    echo '<service-group>' >> $rootdir/etc/avahi/services/routing.service
125
+    echo '  <name replace-wildcards="yes">%h routing</name>' >> $rootdir/etc/avahi/services/routing.service
126
+    echo '  <service>' >> $rootdir/etc/avahi/services/routing.service
127
+    echo '    <type>_bmx6._tcp</type>' >> $rootdir/etc/avahi/services/routing.service
128
+    echo '  </service>' >> $rootdir/etc/avahi/services/routing.service
129
+    echo '</service-group>' >> $rootdir/etc/avahi/services/routing.service
130
+
121
     # keep the daemon running
131
     # keep the daemon running
122
     WATCHDOG_SCRIPT_NAME="keepon"
132
     WATCHDOG_SCRIPT_NAME="keepon"
123
     echo '' >> $rootdir/usr/bin/$WATCHDOG_SCRIPT_NAME
133
     echo '' >> $rootdir/usr/bin/$WATCHDOG_SCRIPT_NAME