Merge branch 'master' of https://git.unsigned.io/markqvist/Reticulum
This commit is contained in:
commit
ce21800537
Binary file not shown.
|
@ -1065,10 +1065,6 @@ destination, and passing traffic back and forth over the link.</p>
|
||||||
<span class="k">global</span> <span class="n">latest_client_link</span>
|
<span class="k">global</span> <span class="n">latest_client_link</span>
|
||||||
|
|
||||||
<span class="n">RNS</span><span class="o">.</span><span class="n">log</span><span class="p">(</span><span class="s2">"Client connected"</span><span class="p">)</span>
|
<span class="n">RNS</span><span class="o">.</span><span class="n">log</span><span class="p">(</span><span class="s2">"Client connected"</span><span class="p">)</span>
|
||||||
<span class="c1"># TODO: Remove</span>
|
|
||||||
<span class="n">RNS</span><span class="o">.</span><span class="n">log</span><span class="p">(</span><span class="s2">"Establishment rate: "</span><span class="o">+</span><span class="nb">str</span><span class="p">(</span><span class="n">link</span><span class="o">.</span><span class="n">get_establishment_rate</span><span class="p">()))</span>
|
|
||||||
<span class="n">RNS</span><span class="o">.</span><span class="n">log</span><span class="p">(</span><span class="s2">"Establishment rate: "</span><span class="o">+</span><span class="n">RNS</span><span class="o">.</span><span class="n">prettysize</span><span class="p">(</span><span class="n">link</span><span class="o">.</span><span class="n">get_establishment_rate</span><span class="p">(),</span> <span class="s2">"b"</span><span class="p">))</span>
|
|
||||||
|
|
||||||
<span class="n">link</span><span class="o">.</span><span class="n">set_link_closed_callback</span><span class="p">(</span><span class="n">client_disconnected</span><span class="p">)</span>
|
<span class="n">link</span><span class="o">.</span><span class="n">set_link_closed_callback</span><span class="p">(</span><span class="n">client_disconnected</span><span class="p">)</span>
|
||||||
<span class="n">link</span><span class="o">.</span><span class="n">set_packet_callback</span><span class="p">(</span><span class="n">server_packet_received</span><span class="p">)</span>
|
<span class="n">link</span><span class="o">.</span><span class="n">set_packet_callback</span><span class="p">(</span><span class="n">server_packet_received</span><span class="p">)</span>
|
||||||
<span class="n">latest_client_link</span> <span class="o">=</span> <span class="n">link</span>
|
<span class="n">latest_client_link</span> <span class="o">=</span> <span class="n">link</span>
|
||||||
|
@ -1201,10 +1197,6 @@ destination, and passing traffic back and forth over the link.</p>
|
||||||
<span class="k">global</span> <span class="n">server_link</span>
|
<span class="k">global</span> <span class="n">server_link</span>
|
||||||
<span class="n">server_link</span> <span class="o">=</span> <span class="n">link</span>
|
<span class="n">server_link</span> <span class="o">=</span> <span class="n">link</span>
|
||||||
|
|
||||||
<span class="c1"># TODO: Remove</span>
|
|
||||||
<span class="n">RNS</span><span class="o">.</span><span class="n">log</span><span class="p">(</span><span class="s2">"Establishment rate: "</span><span class="o">+</span><span class="nb">str</span><span class="p">(</span><span class="n">link</span><span class="o">.</span><span class="n">get_establishment_rate</span><span class="p">()))</span>
|
|
||||||
<span class="n">RNS</span><span class="o">.</span><span class="n">log</span><span class="p">(</span><span class="s2">"Establishment rate: "</span><span class="o">+</span><span class="n">RNS</span><span class="o">.</span><span class="n">prettysize</span><span class="p">(</span><span class="n">link</span><span class="o">.</span><span class="n">get_establishment_rate</span><span class="p">(),</span> <span class="s2">"B"</span><span class="p">))</span>
|
|
||||||
|
|
||||||
<span class="c1"># Inform the user that the server is</span>
|
<span class="c1"># Inform the user that the server is</span>
|
||||||
<span class="c1"># connected</span>
|
<span class="c1"># connected</span>
|
||||||
<span class="n">RNS</span><span class="o">.</span><span class="n">log</span><span class="p">(</span><span class="s2">"Link established with server, enter some text to send, or </span><span class="se">\"</span><span class="s2">quit</span><span class="se">\"</span><span class="s2"> to quit"</span><span class="p">)</span>
|
<span class="n">RNS</span><span class="o">.</span><span class="n">log</span><span class="p">(</span><span class="s2">"Link established with server, enter some text to send, or </span><span class="se">\"</span><span class="s2">quit</span><span class="se">\"</span><span class="s2"> to quit"</span><span class="p">)</span>
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue