<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"><head><meta name=Generator content="Microsoft Word 15 (filtered medium)"><style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman",serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:#0563C1;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:#954F72;
text-decoration:underline;}
p
{mso-style-priority:99;
mso-margin-top-alt:auto;
margin-right:0cm;
mso-margin-bottom-alt:auto;
margin-left:0cm;
font-size:12.0pt;
font-family:"Times New Roman",serif;}
span.EmailStyle18
{mso-style-type:personal;
font-family:"Calibri",sans-serif;
color:#1F497D;}
span.EmailStyle19
{mso-style-type:personal-compose;
font-family:"Calibri",sans-serif;
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:70.85pt 70.85pt 2.0cm 70.85pt;}
div.WordSection1
{page:WordSection1;}
--></style></head><body lang=DE link="#0563C1" vlink="#954F72"><div class=WordSection1><p class=MsoNormal><span style='font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US'>Applied.<o:p></o:p></span></p><p class=MsoNormal><span style='font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D;mso-fareast-language:EN-US'><o:p> </o:p></span></p><div style='border:none;border-left:solid blue 1.5pt;padding:0cm 0cm 0cm 4.0pt'><div><div style='border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0cm 0cm 0cm'><p class=MsoNormal><b><span lang=EN-US style='font-size:11.0pt;font-family:"Calibri",sans-serif'>From:</span></b><span lang=EN-US style='font-size:11.0pt;font-family:"Calibri",sans-serif'> Fabian Bläse [mailto:fabian@blaese.de] <br><b>Sent:</b> Dienstag, 27. November 2018 10:15<br><b>To:</b> Adrian Schmutzler <freifunk@adrianschmutzler.de>; franken-dev@freifunk.net<br><b>Subject:</b> Re: [PATCH] configurehood/nodewatcher: Also process hood ID in addition to name<o:p></o:p></span></p></div></div><p class=MsoNormal><o:p> </o:p></p><p><span style='font-family:"Calibri",sans-serif'>Hallo Adrian,</span> <o:p></o:p></p><p><span style='font-family:"Calibri",sans-serif'>das sollte man imho eigentlich generell für alles so machen, nicht nur für den nodewatcher. Aber eins nach dem anderen, dieser Patch gefällt mir soweit.</span><o:p></o:p></p><p><span style='font-family:"Calibri",sans-serif'>Später kann man sich ggf. noch folgendes um die Hood-ID erweitern:</span> <br><span style='font-family:"Calibri",sans-serif'>- macnocker (würde Kompatibilität brechen..)</span> <br><span style='font-family:"Calibri",sans-serif'>- show_info</span> <o:p></o:p></p><p><span style='font-family:"Calibri",sans-serif'>Reviewed-by: Fabian Bläse <<a href="mailto:fabian@blaese.de">fabian@blaese.de</a>></span> <o:p></o:p></p><p><span style='font-family:"Calibri",sans-serif'>Fabian</span> <o:p></o:p></p><p><span style='font-family:"Calibri",sans-serif'>On 23.11.18 16:56, Adrian Schmutzler wrote:</span> <br><span style='font-family:"Calibri",sans-serif'>> So far, the Monitoring evaluates hoods based on their names.</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> This introduces several problems, most prominently a hood</span> <br><span style='font-family:"Calibri",sans-serif'>> re-creation if it is renamed at the KeyXchange.</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> Since we have unique hood IDs in the KeyXchange and the</span> <br><span style='font-family:"Calibri",sans-serif'>> Monitoring retrieves those via hoods.php, it is logical use this</span> <br><span style='font-family:"Calibri",sans-serif'>> information instead of relying on string comparison.</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> This requires the hood files to contain an additional field "id".</span> <br><span style='font-family:"Calibri",sans-serif'>> While this has not been implemented, the changes in this patch</span> <br><span style='font-family:"Calibri",sans-serif'>> will still work and just write empty data to the uci field and</span> <br><span style='font-family:"Calibri",sans-serif'>> alfred data.</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> For local hoods, the "id" in the hood file will remain unset.</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> Signed-off-by: Adrian Schmutzler <<a href="mailto:freifunk@adrianschmutzler.de">freifunk@adrianschmutzler.de</a>></span> <br><span style='font-family:"Calibri",sans-serif'>> ---</span> <br><span style='font-family:"Calibri",sans-serif'>> src/packages/fff/fff-hoods/Makefile | 2 +-</span> <br><span style='font-family:"Calibri",sans-serif'>> src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 5 ++++-</span> <br><span style='font-family:"Calibri",sans-serif'>> src/packages/fff/fff-nodewatcher/Makefile | 2 +-</span> <br><span style='font-family:"Calibri",sans-serif'>> src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 3 ++-</span> <br><span style='font-family:"Calibri",sans-serif'>> 4 files changed, 8 insertions(+), 4 deletions(-)</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> diff --git a/src/packages/fff/fff-hoods/Makefile b/src/packages/fff/fff-hoods/Makefile</span> <br><span style='font-family:"Calibri",sans-serif'>> index 5233e611..264d28ab 100644</span> <br><span style='font-family:"Calibri",sans-serif'>> --- a/src/packages/fff/fff-hoods/Makefile</span> <br><span style='font-family:"Calibri",sans-serif'>> +++ b/src/packages/fff/fff-hoods/Makefile</span> <br><span style='font-family:"Calibri",sans-serif'>> @@ -1,7 +1,7 @@</span> <br><span style='font-family:"Calibri",sans-serif'>> include $(TOPDIR)/rules.mk</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> PKG_NAME:=fff-hoods</span> <br><span style='font-family:"Calibri",sans-serif'>> -PKG_VERSION:=4</span> <br><span style='font-family:"Calibri",sans-serif'>> +PKG_VERSION:=5</span> <br><span style='font-family:"Calibri",sans-serif'>> PKG_RELEASE:=1</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)</span> <br><span style='font-family:"Calibri",sans-serif'>> diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood</span><o:p></o:p></p><p><span style='font-family:"Calibri",sans-serif'>> index e31ba219..de60c21d 100755</span> <br><span style='font-family:"Calibri",sans-serif'>> --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood</span> <br><span style='font-family:"Calibri",sans-serif'>> +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood</span> <br><span style='font-family:"Calibri",sans-serif'>> @@ -95,6 +95,7 @@ else</span> <br><span style='font-family:"Calibri",sans-serif'>> rm -f "$hoodfilewww" # delete this, so wrong hood file is not broadcasted anymore</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> uci -q del "<a href="mailto:system.@system[0].hood">system.@system[0].hood</a>"</span> <br><span style='font-family:"Calibri",sans-serif'>> + uci -q del "<a href="mailto:system.@system[0].hoodid">system.@system[0].hoodid</a>"</span> <br><span style='font-family:"Calibri",sans-serif'>> uci -q commit system</span> <br><span style='font-family:"Calibri",sans-serif'>> reload_config</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> @@ -125,6 +126,7 @@ if [ -s "$hoodfiletmp" ]; then</span> <br><span style='font-family:"Calibri",sans-serif'>> json_select hood</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> json_get_var hood name</span> <br><span style='font-family:"Calibri",sans-serif'>> + json_get_var hoodid id</span> <br><span style='font-family:"Calibri",sans-serif'>> [ -n "$mesh_id" ] || json_get_var mesh_id mesh_id</span> <br><span style='font-family:"Calibri",sans-serif'>> [ -n "$mesh_bssid" ] || json_get_var mesh_bssid mesh_bssid</span> <br><span style='font-family:"Calibri",sans-serif'>> [ -n "$mesh_essid" ] || json_get_var mesh_essid mesh_essid</span> <br><span style='font-family:"Calibri",sans-serif'>> @@ -146,8 +148,9 @@ if [ -s "$hoodfiletmp" ]; then</span> <br><span style='font-family:"Calibri",sans-serif'>> exit 0</span> <br><span style='font-family:"Calibri",sans-serif'>> fi</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> - echo "Setting hood name: $hood"</span> <br><span style='font-family:"Calibri",sans-serif'>> + echo "Setting hood name: $hood (ID $hoodid)"</span> <br><span style='font-family:"Calibri",sans-serif'>> uci -q set "<a href="mailto:system.@system[0].hood=$hood">system.@system[0].hood=$hood</a>"</span> <br><span style='font-family:"Calibri",sans-serif'>> + uci -q set "<a href="mailto:system.@system[0].hoodid=$hoodid">system.@system[0].hoodid=$hoodid</a>"</span> <br><span style='font-family:"Calibri",sans-serif'>> uci -q commit system</span> <br><span style='font-family:"Calibri",sans-serif'>> reload_config</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> diff --git a/src/packages/fff/fff-nodewatcher/Makefile b/src/packages/fff/fff-nodewatcher/Makefile</span> <br><span style='font-family:"Calibri",sans-serif'>> index 927c6293..3c66a0ae 100644</span> <br><span style='font-family:"Calibri",sans-serif'>> --- a/src/packages/fff/fff-nodewatcher/Makefile</span> <br><span style='font-family:"Calibri",sans-serif'>> +++ b/src/packages/fff/fff-nodewatcher/Makefile</span> <br><span style='font-family:"Calibri",sans-serif'>> @@ -1,7 +1,7 @@</span> <br><span style='font-family:"Calibri",sans-serif'>> include $(TOPDIR)/rules.mk</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> PKG_NAME:=fff-nodewatcher</span> <br><span style='font-family:"Calibri",sans-serif'>> -PKG_VERSION:=50</span> <br><span style='font-family:"Calibri",sans-serif'>> +PKG_VERSION:=51</span> <br><span style='font-family:"Calibri",sans-serif'>> PKG_RELEASE:=1</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)</span> <br><span style='font-family:"Calibri",sans-serif'>> diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher</span><o:p></o:p></p><p><span style='font-family:"Calibri",sans-serif'>> index 9486fbc8..9d96b07b 100755</span> <br><span style='font-family:"Calibri",sans-serif'>> --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher</span> <br><span style='font-family:"Calibri",sans-serif'>> +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher</span> <br><span style='font-family:"Calibri",sans-serif'>> @@ -12,7 +12,7 @@ if ! lock -n "$lockfile"; then</span> <br><span style='font-family:"Calibri",sans-serif'>> fi</span> <br><span style='font-family:"Calibri",sans-serif'>> trap "lock -u \"$lockfile\"" INT TERM EXIT</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> -SCRIPT_VERSION="50"</span> <br><span style='font-family:"Calibri",sans-serif'>> +SCRIPT_VERSION="51"</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><br><span style='font-family:"Calibri",sans-serif'>> #Get the configuration from the uci configuration file</span> <br><span style='font-family:"Calibri",sans-serif'>> #If it does not exists, then get it from a normal bash file with variables.</span> <br><span style='font-family:"Calibri",sans-serif'>> @@ -147,6 +147,7 @@ crawl() {</span> <br><span style='font-family:"Calibri",sans-serif'>> SYSTEM_DATA=$SYSTEM_DATA"${position_comment}"</span> <br><span style='font-family:"Calibri",sans-serif'>> SYSTEM_DATA=$SYSTEM_DATA"${contact}"</span> <br><span style='font-family:"Calibri",sans-serif'>> SYSTEM_DATA=$SYSTEM_DATA"<hood>$(uci -q get "<a href="mailto:system.@system[0].hood">system.@system[0].hood</a>")</hood>"</span> <br><span style='font-family:"Calibri",sans-serif'>> + SYSTEM_DATA=$SYSTEM_DATA"<hoodid>$(uci -q get "<a href="mailto:system.@system[0].hoodid">system.@system[0].hoodid</a>")</hoodid>"</span> <br><span style='font-family:"Calibri",sans-serif'>> SYSTEM_DATA=$SYSTEM_DATA"<distname>$distname</distname>"</span> <br><span style='font-family:"Calibri",sans-serif'>> SYSTEM_DATA=$SYSTEM_DATA"<distversion>$distversion</distversion>"</span> <br><span style='font-family:"Calibri",sans-serif'>> SYSTEM_DATA=$SYSTEM_DATA"$cpu"</span> <br><span style='font-family:"Calibri",sans-serif'>> </span><o:p></o:p></p><p class=MsoNormal style='margin-bottom:12.0pt'><o:p> </o:p></p></div></div></body></html>