Compare commits

..

No commits in common. "a1be97bd69e54ac10bdd90f82af1b50649b35b88" and "6ded42edd7ae203e5a565cb70138c2d7b4b58b5b" have entirely different histories.

3 changed files with 3 additions and 11 deletions

View File

@ -70,7 +70,7 @@ def server_loop(destination):
" running, waiting for a connection." " running, waiting for a connection."
) )
RNS.log("Hit enter to manually send an announce (Ctrl-C or \"quit\" to quit)") RNS.log("Hit enter to manually send an announce (Ctrl-C to quit)")
# We enter a loop that runs until the users exits. # We enter a loop that runs until the users exits.
# If the user hits enter, we will announce our server # If the user hits enter, we will announce our server
@ -80,12 +80,6 @@ def server_loop(destination):
entered = input() entered = input()
destination.announce() destination.announce()
RNS.log("Sent announce from "+RNS.prettyhexrep(destination.hash)) RNS.log("Sent announce from "+RNS.prettyhexrep(destination.hash))
if entered == "quit":
if latest_client_link:
latest_client_link.teardown()
break
print("")
exit()
# When a client establishes a link to our server # When a client establishes a link to our server
# destination, this function will be called with # destination, this function will be called with

View File

@ -37,7 +37,7 @@ The full documentation for Reticulum is available at [markqvist.github.io/Reticu
You can also download the [Reticulum manual as a PDF](https://github.com/markqvist/Reticulum/raw/master/docs/Reticulum%20Manual.pdf) or [as an e-book in EPUB format](https://github.com/markqvist/Reticulum/raw/master/docs/Reticulum%20Manual.epub). You can also download the [Reticulum manual as a PDF](https://github.com/markqvist/Reticulum/raw/master/docs/Reticulum%20Manual.pdf) or [as an e-book in EPUB format](https://github.com/markqvist/Reticulum/raw/master/docs/Reticulum%20Manual.epub).
For more info, see [reticulum.network](https://reticulum.network/) and [the FAQ section of the wiki](https://github.com/markqvist/Reticulum/wiki/Frequently-Asked-Questions). For more info, see [reticulum.network](https://reticulum.network/)
## Notable Features ## Notable Features
- Coordination-less globally unique addressing and identification - Coordination-less globally unique addressing and identification

View File

@ -3204,7 +3204,7 @@ def main():
else: else:
RNS.log("EEPROM is invalid, no further information available") RNS.log("EEPROM is invalid, no further information available")
graceful_exit() egraceful_xit()
if args.rom: if args.rom:
if rnode.provisioned and not args.autoinstall: if rnode.provisioned and not args.autoinstall:
@ -3310,8 +3310,6 @@ def main():
if len(args.model) == 2: if len(args.model) == 2:
model = ord(bytes.fromhex(args.model)) model = ord(bytes.fromhex(args.model))
# Initialize selected_model from specified model
selected_model = model
if args.hwrev != None and (args.hwrev > 0 and args.hwrev < 256): if args.hwrev != None and (args.hwrev > 0 and args.hwrev < 256):
hwrev = chr(args.hwrev) hwrev = chr(args.hwrev)