commits December 2017

commits@lists.open-mesh.org

1 participants
242 discussions

[doc] batman-adv-doc, master: more IV stuff added (7b28efdc)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit 7b28efdc973cff12853b2bff791375f8b265fb15 Author: Marek <marek(a)openmoko.com> Date: Sun Aug 24 03:34:02 2008 +0800 more IV stuff added >--------------------------------------------------------------- 7b28efdc973cff12853b2bff791375f8b265fb15 batman_iv.docbook | 40 ++++++++++++++++++++++++++++++++++------ bookinfo.docbook | 2 +- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/batman_iv.docbook b/batman_iv.docbook index 85688d9c..0540c2ac 100644 --- a/batman_iv.docbook +++ b/batman_iv.docbook @@ -64,7 +64,7 @@ directions each B.A.T.M.A.N. node awaits rebroadcasts of its own OGMs from his neighbors within a certain timeframe (bidirectional link check). If the OGMs are not successfully retransmitted the connection is - considered asymetric and therefore ignored. + considered too asymetric (unusable) and therefore ignored. [more text needed here ? we can add it later when we work on the IV advantages] @@ -106,7 +106,7 @@ TODO Explain multiple interfaces, which interface sends which OGM by which TTL, <listitem><para>B.A.T.M.A.N. can calculate the transmit link quality (TQ) by dividing the echo link quality by the receiving link quality.</para></listitem> </orderedlist> - As shown above B.A.T.M.A.N. IV is able to retrieve the local transmit quality by using the same mechanisms as B.A.T.M.A.N. III without adding further overhead. + As shown above B.A.T.M.A.N. IV is able to retrieve the local transmit quality by using the same mechanisms as B.A.T.M.A.N. III without adding further overhead. [4 illustrations needed (for each list item and one for the tq alone)] </para> @@ -114,11 +114,33 @@ TODO Explain multiple interfaces, which interface sends which OGM by which TTL, <sect2 id="batman4_tq_prop"> <title>Transmit Quality Propagation</title> <para> -TODO Each node decreases TQ-field before rebroadcasting the packet. -Explain how it is done (multiple neihgbours, average over time). -[ illustration: simple setup with multiple hops] + The local link quality needs to be propagated throughout the network to inform other nodes about the transmit quality. Therefore B.A.TM.A.N. IV introduces a new field called "TQ" which is 1 byte long. This field is added to the known B.A.T.M.A.N. III packet. Whenever the OGM is generated this field is set to maximum length (256) before it is broadcasted. The receiving neighbor will calculate their own local link quality into the received TQ value and rebroadcast the packet. Hence, every node receiving a packet knows about the transmit quality towards the originator node. +</para> +<para> + To add the local link quality in the TQ value the following calculation is performed: TQ incoming * local TQ towards this node / TQ max. +</para> +<para> + Example: Node A broadcasts the packet with TQ max. Node B receives it, applies the TQ calculation and rebroadcasts it. When node C gets the packet it knows about the transmit quality towards node A. [illustration needed] +</para> +</sect2> + +<sect2 id="batman4_local_global_tq"> +<title>local TQ vs global TQ</title> +<para> + A B.A.T.M.A.N. IV node has to keep track of 2 different TQ values: + <orderedlist> + <listitem><para>The local TQ which represents the transmit quality towards every single hop neighbor (retrieved via the packet count plus TQ calculation).</para></listitem> + <listitem><para>The global link quality which describes the link quality towards every multi hop neighbor (received via B.A.T.M.A.N. IV packets).</para></listitem> + </orderedlist> +</para> +<para> + The calculation for the local TQ needs the OGM packet count of the neigbor and the own OGM packet count rebroadcasted by that very neighbor. Therefore a B.A.T.M.A.N. node has keep track of received packets over a certain interval. The slinding window size of these statistics is called TQ_LOCAL_WINDOW_SIZE. [what else shoud be mentioned here ?] +</para> +<para> + The global TQ is an average of all received TQ values from one originator via a distinct neighbor. Packets with a TQ value of 0 also count as non-received packets. B.A.T.M.A.N. IV uses a sliding window size (TQ_GLOBAL_WINDOW_SIZE) greater than 1 [dat muss noch schöner ...] </para> </sect2> + <sect2 id="batman4_tq_asymetry"> <title>Handling asymetric links</title> <para> @@ -132,7 +154,7 @@ TODO Also calculate the receive direction - but weight it. </sect2> <sect2 id="batman4_tq_hop_penalty"> -<title>Hop penalty - for ethernet networks</title> +<title>Hop penalty</title> <para> TODO There would be loops in "perfect" networks without loss, e.g. ethernet. [ illustration: triangle A,B,C with perfect links ] @@ -141,6 +163,12 @@ TODO Also calculate the receive direction - but weight it. </para> </sect2> +<sect2 id="batman4_tq_echo_cancellation"> +<title>Echo cancellation</title> +<para> + TODO rebroadcast cancellation by adding IP of previous node because we don't drop packets +</para> +</sect2> </sect1> </chapter> diff --git a/bookinfo.docbook b/bookinfo.docbook index ad2e8037..902ed474 100644 --- a/bookinfo.docbook +++ b/bookinfo.docbook @@ -17,7 +17,7 @@ <abstract> <para> - This Document should give detailed information about the B.A.T.M.A.N. advnced + This Document should give detailed information about the B.A.T.M.A.N. advanced algorithm, data types, packets and implementation. This is a DRAFT, do not refer or cite to this document. </para>

1 0

[doc] batman-adv-doc, master: add first illustration and infrastructure for png/eps (cf94e907)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit cf94e907a4a30b6c3a6d91209c2bc4c126c538a5 Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Mon Aug 25 16:57:27 2008 +0200 add first illustration and infrastructure for png/eps Illustrations are done in dia (vector editing program) and then converted to png (for html) and eps (for pdf). The eps output looks bad on my system, that's hopefully just a bug over here... :( >--------------------------------------------------------------- cf94e907a4a30b6c3a6d91209c2bc4c126c538a5 Makefile | 6 +++++- batman_iv.docbook | 7 ++++++- images/Makefile | 17 +++++++++++++++++ images/asymetry.dia | Bin 0 -> 1396 bytes 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3f2f1c9f..b25f1e3d 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,11 @@ default: all all: batman_doc -batman_doc: Makefile *.docbook +.PHONY: clean images +batman_doc: Makefile *.docbook images docbook2html batman.docbook docbook2pdf batman.docbook +images: + make -C images/ clean: rm -rf *.html *.pdf + make -C images clean diff --git a/batman_iv.docbook b/batman_iv.docbook index 0540c2ac..e9e0472c 100644 --- a/batman_iv.docbook +++ b/batman_iv.docbook @@ -87,7 +87,12 @@ TODO Explain multiple interfaces, which interface sends which OGM by which TTL, The B.A.T.M.A.N. III algorithm has serious problems when it comes to asymetric links. The bidirectional link check tries to limit its impact but the result is far from being perfect. The timeframe in which B.A.T.M.A.N. accepts his own OGMs being rebroadcasted by its neighbor allows to tweak the behaviour. If this timeframe is rather short B.A.T.M.A.N. is very strict on choosing links. This may lead to many ignored links which might be usable in one direction. Only symetric connections will be considered. If the timeframe value is less strict B.A.T.M.A.N. will accept more links but tends to route in the wrong direction. </para> <para> - Example: OGMs from Node A propagate to B. The link is asymetric, therefore B receives all packets from A in contrast to A which receives almost nothing from B. As all the packets from A get to B the packet count at B's side goes up. B will assume that it has a perfect link towards A which is not the case. [illustration needed] + Example: OGMs from Node A propagate to B. The link is asymetric, therefore B receives all packets from A in contrast to A which receives almost nothing from B. As all the packets from A get to B the packet count at B's side goes up. B will assume that it has a perfect link towards A which is not the case. +<inlinemediaobject> + <imageobject> <imagedata fileref="images/asymetry" format="EPS" /> </imageobject> + <imageobject> <imagedata fileref="images/asymetry.png" format="PNG" /> </imageobject> + <textobject> <phrase>asymetry illustration</phrase> </textobject> +</inlinemediaobject> </para> <para> To overcome this flaw B.A.T.M.A.N. IV has been enhanced with the Transmit Quality (TQ) algorithm. The following section is going to outline its design and how it strengthens B.A.T.M.A.N.'s routing capabilities in asymetric environments. diff --git a/images/Makefile b/images/Makefile new file mode 100644 index 00000000..627d1354 --- /dev/null +++ b/images/Makefile @@ -0,0 +1,17 @@ +DIA_IMAGES=asymetry.dia +PNG_IMAGES=$(DIA_IMAGES:.dia=.png) +EPS_IMAGES=$(DIA_IMAGES:.dia=.eps) + +.PHONY: clean +.SUFFIXES: .dia .png .eps + +default: all +all: $(EPS_IMAGES) $(PNG_IMAGES) + +.dia.png: + /usr/bin/dia -e $@ $< +.dia.eps: + /usr/bin/dia -e $@ $< + +clean: + rm *.png *.eps diff --git a/images/asymetry.dia b/images/asymetry.dia new file mode 100644 index 00000000..9cc362bc Binary files /dev/null and b/images/asymetry.dia differ

1 0

[doc] batman-adv-doc, master: Include figures als scalable image in pdf (ac03def1)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit ac03def174a45f6fc970a9189d8310042df5f4e5 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Mon Aug 25 21:11:49 2008 +0200 Include figures als scalable image in pdf docbook2pdf (or the latex backend) will not include eps files in pdf and will choose the png file instead. To get the image displayed, we will need to set the parameter format to EPS - even when this seems to be wrong. >--------------------------------------------------------------- ac03def174a45f6fc970a9189d8310042df5f4e5 Makefile | 2 +- batman_iv.docbook | 2 +- images/Makefile | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index b25f1e3d..09946e1e 100644 --- a/Makefile +++ b/Makefile @@ -7,5 +7,5 @@ batman_doc: Makefile *.docbook images images: make -C images/ clean: - rm -rf *.html *.pdf + rm -f *.html *.pdf *.log *.refs make -C images clean diff --git a/batman_iv.docbook b/batman_iv.docbook index e9e0472c..68838ce3 100644 --- a/batman_iv.docbook +++ b/batman_iv.docbook @@ -89,7 +89,7 @@ TODO Explain multiple interfaces, which interface sends which OGM by which TTL, <para> Example: OGMs from Node A propagate to B. The link is asymetric, therefore B receives all packets from A in contrast to A which receives almost nothing from B. As all the packets from A get to B the packet count at B's side goes up. B will assume that it has a perfect link towards A which is not the case. <inlinemediaobject> - <imageobject> <imagedata fileref="images/asymetry" format="EPS" /> </imageobject> + <imageobject> <imagedata fileref="images/asymetry.pdf" format="EPS" /> </imageobject> <imageobject> <imagedata fileref="images/asymetry.png" format="PNG" /> </imageobject> <textobject> <phrase>asymetry illustration</phrase> </textobject> </inlinemediaobject> diff --git a/images/Makefile b/images/Makefile index 627d1354..ace4a975 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,17 +1,19 @@ DIA_IMAGES=asymetry.dia PNG_IMAGES=$(DIA_IMAGES:.dia=.png) -EPS_IMAGES=$(DIA_IMAGES:.dia=.eps) +PDF_IMAGES=$(DIA_IMAGES:.dia=.pdf) .PHONY: clean -.SUFFIXES: .dia .png .eps +.SUFFIXES: .dia .png .eps .pdf default: all -all: $(EPS_IMAGES) $(PNG_IMAGES) +all: $(PDF_IMAGES) $(PNG_IMAGES) .dia.png: /usr/bin/dia -e $@ $< .dia.eps: /usr/bin/dia -e $@ $< +.eps.pdf: + /usr/bin/epstopdf --outfile=$@ $< clean: - rm *.png *.eps + rm -f *.png *.eps *.pdf

1 0

[doc] batman-adv-doc, master: add most of the proposed illustrations (3c39bd49)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit 3c39bd4919c0a663694b90647fd6cfdadf399ec9 Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Tue Sep 2 16:29:28 2008 +0200 add most of the proposed illustrations >--------------------------------------------------------------- 3c39bd4919c0a663694b90647fd6cfdadf399ec9 batman_iv.docbook | 69 +++++++++++++++++++++++++++++++++++++++++------- images/Makefile | 16 ++++++++--- images/asym_link1.dia | Bin 0 -> 1359 bytes images/asym_link2.dia | Bin 0 -> 1385 bytes images/asym_penalty.gp | 19 +++++++++++++ images/eq.dia | Bin 0 -> 1219 bytes images/hop_penalty1.dia | Bin 0 -> 1841 bytes images/hop_penalty2.dia | Bin 0 -> 1865 bytes images/rq.dia | Bin 0 -> 1143 bytes images/tq.dia | Bin 0 -> 1161 bytes 10 files changed, 90 insertions(+), 14 deletions(-) diff --git a/batman_iv.docbook b/batman_iv.docbook index 68838ce3..565fe797 100644 --- a/batman_iv.docbook +++ b/batman_iv.docbook @@ -89,7 +89,7 @@ TODO Explain multiple interfaces, which interface sends which OGM by which TTL, <para> Example: OGMs from Node A propagate to B. The link is asymetric, therefore B receives all packets from A in contrast to A which receives almost nothing from B. As all the packets from A get to B the packet count at B's side goes up. B will assume that it has a perfect link towards A which is not the case. <inlinemediaobject> - <imageobject> <imagedata fileref="images/asymetry.pdf" format="EPS" /> </imageobject> + <imageobject> <imagedata fileref="images/asymetry.pdf" format="EPS" scale="50"/> </imageobject> <imageobject> <imagedata fileref="images/asymetry.png" format="PNG" /> </imageobject> <textobject> <phrase>asymetry illustration</phrase> </textobject> </inlinemediaobject> @@ -106,14 +106,38 @@ TODO Explain multiple interfaces, which interface sends which OGM by which TTL, As explained in the previous section the packet counting floods the network with receiving link quality rather than transmit link quality. On the link-local level the transmit link quality can be derived from the receiving link quality by applying some calculations on the packet count. <orderedlist> - <listitem><para>B.A.T.M.A.N. knows the receiving link quality (RQ) by counting the packets of its neighbors.</para></listitem> - <listitem><para>B.A.T.M.A.N. knows the echo link quality (EQ) by counting rebroadcasts of its own OGMs from his neighbors.</para></listitem> - <listitem><para>B.A.T.M.A.N. can calculate the transmit link quality (TQ) by dividing the echo link quality by the receiving link quality.</para></listitem> + <listitem> + <para>B.A.T.M.A.N. knows the receiving link quality (RQ) by counting the packets of its neighbors.</para> + <para> + <inlinemediaobject> + <imageobject> <imagedata fileref="images/rq.pdf" format="EPS" scale="50" /> </imageobject> + <imageobject> <imagedata fileref="images/rq.png" format="PNG" /> </imageobject> + <textobject> <phrase>Receive Quality (RQ)</phrase> </textobject> + </inlinemediaobject></para> + </listitem> + <listitem> + <para>B.A.T.M.A.N. knows the echo link quality (EQ) by counting rebroadcasts of its own OGMs from his neighbors.</para> + <para> + <inlinemediaobject> + <imageobject> <imagedata fileref="images/eq.pdf" format="EPS" scale="50" /> </imageobject> + <imageobject> <imagedata fileref="images/eq.png" format="PNG" /> </imageobject> + <textobject> <phrase>Echo Link Quality (EQ)</phrase> </textobject> + </inlinemediaobject></para> + </listitem> + <listitem> + <para>B.A.T.M.A.N. can calculate the transmit link quality (TQ) by dividing the echo link quality by the receiving link quality.</para> + <para> + <inlinemediaobject> + <imageobject> <imagedata fileref="images/tq.pdf" format="EPS" scale="50" /> </imageobject> + <imageobject> <imagedata fileref="images/tq.png" format="PNG" /> </imageobject> + <textobject> <phrase>Transmit Link Quality (TQ)</phrase> </textobject> + </inlinemediaobject></para> + </listitem> </orderedlist> As shown above B.A.T.M.A.N. IV is able to retrieve the local transmit quality by using the same mechanisms as B.A.T.M.A.N. III without adding further overhead. - [4 illustrations needed (for each list item and one for the tq alone)] +[??? what kind of 4th illustration? put the formular in a picture, or in the text?] </para> </sect2> <sect2 id="batman4_tq_prop"> @@ -151,10 +175,25 @@ TODO Explain multiple interfaces, which interface sends which OGM by which TTL, <para> TODO Only transmit quality is not enough - nothing worth if the receive direction is too bad to receive WIFI acks. -[ illustration: bad situation :) ] + <inlinemediaobject> + <imageobject> <imagedata fileref="images/asym_link1.pdf" format="EPS" scale="50" /> </imageobject> + <imageobject> <imagedata fileref="images/asym_link1.png" format="PNG" /> </imageobject> + <textobject> <phrase>Asymetry situation without asymetry penalty</phrase> </textobject> + </inlinemediaobject> + + TODO Also calculate the receive direction - but weight it. -[ illustration: how to weight (graph of 1 - (1-x) **3)] -[ illustration: bad situation after using asym penalty ] + <inlinemediaobject> + <imageobject> <imagedata fileref="images/asym_penalty.pdf" format="EPS" /> </imageobject> + <imageobject> <imagedata fileref="images/asym_penalty.png" format="PNG" /> </imageobject> + <textobject> <phrase>graph for asymetry penalty</phrase> </textobject> + </inlinemediaobject> + + <inlinemediaobject> + <imageobject> <imagedata fileref="images/asym_link2.pdf" format="EPS" scale="50" /> </imageobject> + <imageobject> <imagedata fileref="images/asym_link2.png" format="PNG" /> </imageobject> + <textobject> <phrase>Asymetry situation with applied asymetry penalty</phrase> </textobject> + </inlinemediaobject> </para> </sect2> @@ -162,9 +201,19 @@ TODO Also calculate the receive direction - but weight it. <title>Hop penalty</title> <para> TODO There would be loops in "perfect" networks without loss, e.g. ethernet. - [ illustration: triangle A,B,C with perfect links ] + <inlinemediaobject> + <imageobject> <imagedata fileref="images/hop_penalty1.pdf" format="EPS" scale="50" /> </imageobject> + <imageobject> <imagedata fileref="images/hop_penalty1.png" format="PNG" /> </imageobject> + <textobject> <phrase>no hop penalty</phrase> </textobject> + </inlinemediaobject> + Explain hop penalty. - [ illustration: triangle A,B,C after hop penalty ] + <inlinemediaobject> + <imageobject> <imagedata fileref="images/hop_penalty2.pdf" format="EPS" scale="50" /> </imageobject> + <imageobject> <imagedata fileref="images/hop_penalty2.png" format="PNG" /> </imageobject> + <textobject> <phrase>hop penalty applied</phrase> </textobject> + </inlinemediaobject> + </para> </sect2> diff --git a/images/Makefile b/images/Makefile index ace4a975..ae167d56 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,13 +1,21 @@ -DIA_IMAGES=asymetry.dia -PNG_IMAGES=$(DIA_IMAGES:.dia=.png) -PDF_IMAGES=$(DIA_IMAGES:.dia=.pdf) +GP_IMAGES=asym_penalty.gp +DIA_IMAGES=asymetry.dia tq.dia eq.dia rq.dia hop_penalty1.dia hop_penalty2.dia asym_link1.dia asym_link2.dia +PNG_IMAGES= $(DIA_IMAGES:.dia=.png) +PNG_IMAGES+=$(GP_IMAGES:.gp=.png) +PDF_IMAGES= $(DIA_IMAGES:.dia=.pdf) +PDF_IMAGES+=$(GP_IMAGES:.gp=.pdf) .PHONY: clean -.SUFFIXES: .dia .png .eps .pdf +.SUFFIXES: .dia .png .eps .pdf .gp default: all all: $(PDF_IMAGES) $(PNG_IMAGES) +.gp.png: + gnuplot $< +.gp.eps: + gnuplot $< + .dia.png: /usr/bin/dia -e $@ $< .dia.eps: diff --git a/images/asym_link1.dia b/images/asym_link1.dia new file mode 100644 index 00000000..497b785d Binary files /dev/null and b/images/asym_link1.dia differ diff --git a/images/asym_link2.dia b/images/asym_link2.dia new file mode 100644 index 00000000..ce1953c1 Binary files /dev/null and b/images/asym_link2.dia differ diff --git a/images/asym_penalty.gp b/images/asym_penalty.gp new file mode 100644 index 00000000..8ed0e6b0 --- /dev/null +++ b/images/asym_penalty.gp @@ -0,0 +1,19 @@ +#!/usr/bin/gnuplot +set title "Asymetry Penalty illustration" +set xlabel "Receive Quality (RQ)" +set ylabel "applied Asymetry Penalty" +set xrange [0:1] +set yrange [0:1] +set grid + +set terminal png +set output "asym_penalty.png" + +plot (1 - (1-x) ** 3) title "asymetry penalty 1 - (1-x)^3",\ + x title "receive quality" + +set terminal postscript eps enhanced color solid +set output "asym_penalty.eps" + +plot (1 - (1-x) ** 3) title "asymetry penalty 1 - (1-x)^3",\ + x title "receive quality" diff --git a/images/eq.dia b/images/eq.dia new file mode 100644 index 00000000..2a694864 Binary files /dev/null and b/images/eq.dia differ diff --git a/images/hop_penalty1.dia b/images/hop_penalty1.dia new file mode 100644 index 00000000..ce0d584c Binary files /dev/null and b/images/hop_penalty1.dia differ diff --git a/images/hop_penalty2.dia b/images/hop_penalty2.dia new file mode 100644 index 00000000..0a926e44 Binary files /dev/null and b/images/hop_penalty2.dia differ diff --git a/images/rq.dia b/images/rq.dia new file mode 100644 index 00000000..99ba6c97 Binary files /dev/null and b/images/rq.dia differ diff --git a/images/tq.dia b/images/tq.dia new file mode 100644 index 00000000..1ee4c056 Binary files /dev/null and b/images/tq.dia differ

1 0

[batman-adv-doc] master: batman-adv-doc: Convert to sphinx documentation format (d80ed69)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/batman-adv-doc On branch : master >--------------------------------------------------------------- commit d80ed6979508073c2560745a9b3b250842b1ec62 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Dec 14 15:59:17 2017 +0100 batman-adv-doc: Convert to sphinx documentation format The documentation is currently converted to Sphinx. Parts of this legacy document will also be used in the new documentation. It is therefore necessary to have both in a common format. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- .gitattributes | 4 + .gitignore | 9 +- Makefile | 244 ++++++++-- README | 29 +- batman.docbook | 24 - batman_adv.docbook | 377 --------------- batman_adv/index.rst | 250 ++++++++++ batman_iv.docbook | 509 --------------------- {images => batman_iv}/asym_link1.dia | 0 batman_iv/asym_link1.svg | 34 ++ {images => batman_iv}/asym_link2.dia | 0 batman_iv/asym_link2.svg | 34 ++ {images => batman_iv}/asym_penalty.gp | 4 +- batman_iv/asym_penalty.svg | 254 ++++++++++ {images => batman_iv}/asymetry.dia | 0 batman_iv/asymetry.svg | 39 ++ {images => batman_iv}/echo_cancel1.dia | 0 batman_iv/echo_cancel1.svg | 68 +++ {images => batman_iv}/echo_cancel2.dia | 0 batman_iv/echo_cancel2.svg | 72 +++ {images => batman_iv}/eq_alt1.dia | 0 batman_iv/eq_alt1.svg | 22 + {images => batman_iv}/hop_penalty_new1.dia | 0 batman_iv/hop_penalty_new1.svg | 51 +++ {images => batman_iv}/hop_penalty_new2.dia | 0 batman_iv/hop_penalty_new2.svg | 51 +++ batman_iv/index.rst | 429 +++++++++++++++++ {images => batman_iv}/multi_interface_1.dia | 0 batman_iv/multi_interface_1.svg | 53 +++ {images => batman_iv}/multi_interface_2.dia | 0 batman_iv/multi_interface_2.svg | 53 +++ {images => batman_iv}/rq.dia | 0 batman_iv/rq.svg | 22 + {images => batman_iv}/tq.dia | 0 batman_iv/tq.svg | 22 + {images => batman_iv}/tq_prop.dia | 0 batman_iv/tq_prop.svg | 79 ++++ {images => batman_iv}/tq_prop_best1.dia | 0 batman_iv/tq_prop_best1.svg | 43 ++ {images => batman_iv}/tq_prop_best2.dia | 0 batman_iv/tq_prop_best2.svg | 71 +++ {images => batman_iv}/tq_prop_best3.dia | 0 batman_iv/tq_prop_best3.svg | 63 +++ batman_iv_only.docbook | 17 - batmand.docbook | 428 ----------------- {images => batmand}/announce_networks.dia | 0 batmand/announce_networks.svg | 33 ++ batmand/index.rst | 468 +++++++++++++++++++ {images => batmand}/multiple_announces.dia | 0 batmand/multiple_announces.svg | 43 ++ {images => batmand}/multiple_clients.dia | 0 batmand/multiple_clients.svg | 36 ++ bookinfo.docbook | 39 -- conf.py | 338 ++++++++++++++ copyright.docbook | 10 - images/Makefile | 51 --- images/asym_penalty_formula.tex | 6 - images/compute_tq.tex | 6 - images/eq.dia | 265 ----------- images/eq_alt2.dia | 242 ---------- images/eq_alt3.dia | 242 ---------- images/hop_penalty1.dia | 686 ---------------------------- images/hop_penalty2.dia | 686 ---------------------------- images/hop_penalty3.dia | 339 -------------- images/hop_penalty4.dia | 420 ----------------- images/hop_penalty5.dia | 359 --------------- images/hop_penalty6.dia | 420 ----------------- images/tq_prop_calc.tex | 6 - index.rst | 36 ++ introduction.docbook | 0 references.docbook | 8 - 71 files changed, 2893 insertions(+), 5201 deletions(-) Diff suppressed because of size. To see it, use: git diff-tree --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc d80ed6979508073c2560745a9b3b250842b1ec62

1 0

[linux-merge]linux integration; annotated tag, v4.15-rc3, created. v4.15-rc3
by postmaster＠open-mesh.org 11 Dec '17

11 Dec '17

The annotated tag, v4.15-rc3 has been created at fa0dd402a43dd6a02af9f3b8690bc1c9d4090a26 (tag) tagging 50c4c4e268a2d7a3e58ebb698ac74da0de40ae36 (commit) replaces v4.15-rc2 tagged by Linus Torvalds on Sun Dec 10 17:56:35 2017 -0800 - Shortlog ------------------------------------------------------------ Linux 4.15-rc3 -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJaLeXTAAoJEHm+PkMAQRiGA9EH/36KP3vBbsJ6gvaQP8i3d0eS VH0MWr7GajRcr82f5x1RnDE2hPeUj/T38Gealnsaz3YZMbxjMulc09UiwUHpeTFu h9Spp9dgJPAesOzwZ0AWQzqUA7eckiid6XOyoWfQielbK02uI48IeJJPO9Rf6Q3r AlxN8ufMMqs3edIRw3U64GEyH77Vn6eUrk4xX0SdYlL/XFXIrV2ud/k3QyIOh9L/ z87HgTc2oY4z104YcAJjCaOp38hAd6SLn3UPMg0A3Ao4/1nZKqXhpqnXkNTWc058 MJeYNs+wXWiglF7jzYTYXwdV1kDr6pYYmHdaSOZ7AMS2mmplklX1uOqSG3DhYCY= =v+z2 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batctl] master: batctl: Add missing kernel-doc to packet.h (7e14ee4)
by postmaster＠open-mesh.org 08 Dec '17

08 Dec '17

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 7e14ee4c2aaf81cdd7e7b2b11b1890b8c766082c Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Dec 2 19:51:46 2017 +0100 batctl: Add missing kernel-doc to packet.h Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 7e14ee4c2aaf81cdd7e7b2b11b1890b8c766082c packet.h | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/packet.h b/packet.h index d58288c..ebe0605 100644 --- a/packet.h +++ b/packet.h @@ -24,6 +24,12 @@ #include <asm/byteorder.h> #include <linux/types.h> +/** + * batadv_tp_is_error() - Check throughput meter return code for error + * @n: throughput meter return code + * + * Return: 0 when not error was detected, != 0 otherwise + */ #define batadv_tp_is_error(n) ((u8)(n) > 127 ? 1 : 0) /** @@ -91,7 +97,15 @@ enum batadv_iv_flags { BATADV_DIRECTLINK = BIT(2), }; -/* ICMP message types */ +/** + * enum batadv_icmp_packettype - ICMP message types + * @BATADV_ECHO_REPLY: success reply to BATADV_ECHO_REQUEST + * @BATADV_DESTINATION_UNREACHABLE: failure when route to destination not found + * @BATADV_ECHO_REQUEST: request BATADV_ECHO_REPLY from destination + * @BATADV_TTL_EXCEEDED: error after BATADV_ECHO_REQUEST traversed too many hops + * @BATADV_PARAMETER_PROBLEM: return code for malformed messages + * @BATADV_TP: throughput meter packet + */ enum batadv_icmp_packettype { BATADV_ECHO_REPLY = 0, BATADV_DESTINATION_UNREACHABLE = 3, @@ -139,7 +153,14 @@ enum batadv_vlan_flags { BATADV_VLAN_HAS_TAG = BIT(15), }; -/* claim frame types for the bridge loop avoidance */ +/** + * enum batadv_bla_claimframe - claim frame types for the bridge loop avoidance + * @BATADV_CLAIM_TYPE_CLAIM: claim of a client mac address + * @BATADV_CLAIM_TYPE_UNCLAIM: unclaim of a client mac address + * @BATADV_CLAIM_TYPE_ANNOUNCE: announcement of backbone with current crc + * @BATADV_CLAIM_TYPE_REQUEST: request of full claim table + * @BATADV_CLAIM_TYPE_LOOPDETECT: mesh-traversing loop detect packet + */ enum batadv_bla_claimframe { BATADV_CLAIM_TYPE_CLAIM = 0x00, BATADV_CLAIM_TYPE_UNCLAIM = 0x01,

1 0

[alfred] master: alfred: Change batman_adv.h license to MIT (091594c)
by postmaster＠open-mesh.org 08 Dec '17

08 Dec '17

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 091594c33ba949f6b9ae80c805ef20fb92be7b09 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Nov 19 15:06:02 2017 +0100 alfred: Change batman_adv.h license to MIT The ISC license is considered as not recommended in "Linux kernel licensing rules". It should only be used for existing code or for importing code from a different project with that license. But the kernel still has the similar sounding MIT/Expat license under the preferred licenses. Switching to this license for this relatively new file should therefore allow batman-adv to better follow the new licensing rules. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Antonio Quartulli <a(a)unstable.cc> Acked-by: Matthias Schiffer <mschiffer(a)universe-factory.net> Acked-by: Simon Wunderlich <sw(a)simonwunderlich.de> Acked-by: Andrew Lunn <andrew(a)lunn.ch> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 091594c33ba949f6b9ae80c805ef20fb92be7b09 batman_adv.h | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/batman_adv.h b/batman_adv.h index fb45338..ae00c99 100644 --- a/batman_adv.h +++ b/batman_adv.h @@ -1,19 +1,25 @@ -/* SPDX-License-Identifier: ISC */ +/* SPDX-License-Identifier: MIT */ /* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors: * * Matthias Schiffer * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. */ #ifndef _UAPI_LINUX_BATMAN_ADV_H_

1 0

[alfred] master: alfred: Add SPDX license identifier above copyright header (ea81a05)
by postmaster＠open-mesh.org 08 Dec '17

08 Dec '17

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit ea81a05080bdbae64928d6a404527038d1121318 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Nov 19 15:06:00 2017 +0100 alfred: Add SPDX license identifier above copyright header The "Linux kernel licensing rules" require that each file has a SPDX license identifier as first line (and sometimes as second line). Since alfred shares source files with the Linux kernel, it is appropriate to use the same identifier. The FSFE REUSE practices [1] would also require the same tags but have no restrictions on the placement in the source file. Using the "Linux kernel licensing rules" is therefore also fulfilling the FSFE REUSE practices requirements at the same time. [1] https://reuse.software/practices/ Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- ea81a05080bdbae64928d6a404527038d1121318 Makefile | 1 + alfred.h | 4 ++-- batadv_query.c | 4 ++-- batadv_query.h | 4 ++-- batadv_querynl.c | 4 ++-- batadv_querynl.h | 4 ++-- batman_adv.h | 1 + bitops.h | 1 + client.c | 4 ++-- debugfs.c | 4 ++-- debugfs.h | 4 ++-- gpsd/Makefile | 1 + gpsd/alfred-gpsd.c | 4 ++-- gpsd/alfred-gpsd.h | 4 ++-- hash.c | 4 ++-- hash.h | 4 ++-- list.h | 4 ++-- main.c | 4 ++-- netlink.c | 4 ++-- netlink.h | 4 ++-- netsock.c | 4 ++-- packet.h | 4 ++-- recv.c | 4 ++-- send.c | 4 ++-- server.c | 4 ++-- unix_sock.c | 4 ++-- util.c | 4 ++-- vis/Makefile | 1 + vis/vis.c | 4 ++-- vis/vis.h | 4 ++-- 30 files changed, 55 insertions(+), 50 deletions(-) diff --git a/Makefile b/Makefile index 1662412..c2bacc0 100755 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ #!/usr/bin/make -f +# SPDX-License-Identifier: GPL-2.0 # -*- makefile -*- # # Copyright (C) 2012-2017 B.A.T.M.A.N. contributors diff --git a/alfred.h b/alfred.h index a40f065..dcbeea0 100644 --- a/alfred.h +++ b/alfred.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/batadv_query.c b/batadv_query.c index 387950a..ac29da1 100644 --- a/batadv_query.c +++ b/batadv_query.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/batadv_query.h b/batadv_query.h index 5633322..4bf30c2 100644 --- a/batadv_query.h +++ b/batadv_query.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2006-2017 B.A.T.M.A.N. contributors: +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2006-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/batadv_querynl.c b/batadv_querynl.c index c197d24..b58dac4 100644 --- a/batadv_querynl.c +++ b/batadv_querynl.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch> * diff --git a/batadv_querynl.h b/batadv_querynl.h index 90f6546..8d76ea9 100644 --- a/batadv_querynl.h +++ b/batadv_querynl.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch> * diff --git a/batman_adv.h b/batman_adv.h index efd641c..fb45338 100644 --- a/batman_adv.h +++ b/batman_adv.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: ISC */ /* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors: * * Matthias Schiffer diff --git a/bitops.h b/bitops.h index 37ce7e8..459fafc 100644 --- a/bitops.h +++ b/bitops.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /* Minimal Linux-like bit manipulation helper functions * (reduced version for alfred) * diff --git a/client.c b/client.c index 27dbc4a..7c89f95 100644 --- a/client.c +++ b/client.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/debugfs.c b/debugfs.c index e90c3a8..1cea8ac 100644 --- a/debugfs.c +++ b/debugfs.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2009 Clark Williams <williams(a)redhat.com> +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2009 Clark Williams <williams(a)redhat.com> * Copyright (C) 2009 Xiao Guangrong <xiaoguangrong(a)cn.fujitsu.com> * * This program is free software; you can redistribute it and/or diff --git a/debugfs.h b/debugfs.h index 5404a45..6e49efa 100644 --- a/debugfs.h +++ b/debugfs.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2009 Clark Williams <williams(a)redhat.com> +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2009 Clark Williams <williams(a)redhat.com> * Copyright (C) 2009 Xiao Guangrong <xiaoguangrong(a)cn.fujitsu.com> * * This program is free software; you can redistribute it and/or diff --git a/gpsd/Makefile b/gpsd/Makefile index dae2b48..e3c824b 100755 --- a/gpsd/Makefile +++ b/gpsd/Makefile @@ -1,4 +1,5 @@ #!/usr/bin/make -f +# SPDX-License-Identifier: GPL-2.0 # -*- makefile -*- # # Copyright (C) 2013-2017 B.A.T.M.A.N. contributors diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c index 7147136..b2eee9b 100644 --- a/gpsd/alfred-gpsd.c +++ b/gpsd/alfred-gpsd.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: * * Andrew Lunn, Simon Wunderlich * diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index 5ede96d..0c2b25d 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: * * Andrew Lunn, Simon Wunderlich * diff --git a/hash.c b/hash.c index fa379f8..336cffc 100644 --- a/hash.c +++ b/hash.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2006-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2006-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/hash.h b/hash.h index 3111b49..4ec5c57 100644 --- a/hash.h +++ b/hash.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2006-2017 B.A.T.M.A.N. contributors: +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2006-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/list.h b/list.h index 5d4c25a..f6c0cae 100644 --- a/list.h +++ b/list.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 1991-2013 linux kernel contributors +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 1991-2013 linux kernel contributors * * Linus Torvalds, ... * diff --git a/main.c b/main.c index be79fb9..59a24c9 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/netlink.c b/netlink.c index 7678f99..e050de3 100644 --- a/netlink.c +++ b/netlink.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch> * diff --git a/netlink.h b/netlink.h index 446948c..81a8f8d 100644 --- a/netlink.h +++ b/netlink.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2009-2017 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch>, Andrew Lunn <andrew(a)lunn.ch> * diff --git a/netsock.c b/netsock.c index ced8fbd..5de1bbb 100644 --- a/netsock.c +++ b/netsock.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/packet.h b/packet.h index a132326..a60c8ac 100644 --- a/packet.h +++ b/packet.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Sven Eckelmann * diff --git a/recv.c b/recv.c index 0f8004e..b93af7c 100644 --- a/recv.c +++ b/recv.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/send.c b/send.c index 9c1e31b..f1be0ea 100644 --- a/send.c +++ b/send.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/server.c b/server.c index 199d38c..95e5f24 100644 --- a/server.c +++ b/server.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/unix_sock.c b/unix_sock.c index 7f5e99c..fd9465d 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/util.c b/util.c index 87261a0..bf82d1e 100644 --- a/util.c +++ b/util.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2012-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/vis/Makefile b/vis/Makefile index 63500c9..18b8070 100755 --- a/vis/Makefile +++ b/vis/Makefile @@ -1,4 +1,5 @@ #!/usr/bin/make -f +# SPDX-License-Identifier: GPL-2.0 # -*- makefile -*- # # Copyright (C) 2013-2017 B.A.T.M.A.N. contributors diff --git a/vis/vis.c b/vis/vis.c index 148c581..5371f05 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/vis/vis.h b/vis/vis.h index bacfd26..f4ce70e 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2013-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich *

1 0

[alfred] master: alfred: Import Linux's LICENSES/preferred/MIT (3b65aaf)
by postmaster＠open-mesh.org 08 Dec '17

08 Dec '17

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 3b65aaf0e32ee41e330f381b683a352c1fc5655c Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Nov 19 15:05:59 2017 +0100 alfred: Import Linux's LICENSES/preferred/MIT The MIT license is used by alfred for some of the code. Copy the Linux license reference file with SPDX header for completeness sake. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 3b65aaf0e32ee41e330f381b683a352c1fc5655c LICENSES/preferred/MIT | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/LICENSES/preferred/MIT b/LICENSES/preferred/MIT new file mode 100644 index 0000000..f33a68c --- /dev/null +++ b/LICENSES/preferred/MIT @@ -0,0 +1,30 @@ +Valid-License-Identifier: MIT +SPDX-URL: https://spdx.org/licenses/MIT.html +Usage-Guide: + To use the MIT License put the following SPDX tag/value pair into a + comment according to the placement guidelines in the licensing rules + documentation: + SPDX-License-Identifier: MIT +License-Text: + +MIT License + +Copyright (c) <year> <copyright holders> + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE.

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2017